adulau/crl-monitor
1
0
Fork 0
mirror of https://github.com/adulau/crl-monitor.git synced 2024-11-21 17:47:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bug fixed when exception is raised (int->str)

Browse source
This commit is contained in:
Alexandre Dulaunoy 2015-02-02 07:56:41 +01:00
parent 7b855b2969
commit 463c0c1d6a
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/x509/dumpx509subject.py
View file

@ -5,7 +5,7 @@
# #
# Software is free software released under the GNU General Public License version 3 and later # Software is free software released under the GNU General Public License version 3 and later
# #
# Copyright (c) 2014 Alexandre Dulaunoy - a@foo.be # Copyright (c) 2014-2015 Alexandre Dulaunoy - a@foo.be
import fileinput import fileinput
from M2Crypto import X509 from M2Crypto import X509
@ -53,7 +53,7 @@ for cert in fileinput.input(args.r):
certb = base64.b64decode(cert.split(",")[1]) certb = base64.b64decode(cert.split(",")[1])
except: except:
if args.v: if args.v:
print "Padding error "+fileinput.lineno() print "Padding error "+str(fileinput.lineno())
pass pass
if args.k: if args.k:
@ -71,7 +71,7 @@ for cert in fileinput.input(args.r):
try: try:
x509 = X509.load_cert_string(certb, X509.FORMAT_DER) x509 = X509.load_cert_string(certb, X509.FORMAT_DER)
except: except:
print "At line number "+ str(fileinput.lineno()) + " parsing error" print "At line number "+str(fileinput.lineno())+" parsing error"
pass pass
subject = x509.get_subject().as_text() subject = x509.get_subject().as_text()
if subject is not None: if subject is not None:
@ -81,5 +81,3 @@ for cert in fileinput.input(args.r):
r.sadd(fp, subject) r.sadd(fp, subject)
else: else:
sys.exit(1) sys.exit(1)