r00t2/optools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

aaaand pubkey parsing added as well. i think this is Done(TM)

Browse Source
This commit is contained in:
brent s 2018-05-08 12:32:17 -04:00
parent 38227cf938
commit e18ebb24fb
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ssl_tls/certparser.py
View File

@ -89,8 +89,7 @@ class CertParse(object):
certinfo['Extensions'] = self.parse_ext() certinfo['Extensions'] = self.parse_ext()
elif self.alt_names: elif self.alt_names:
certinfo['SANs'] = self.parse_ext_san_only() certinfo['SANs'] = self.parse_ext_san_only()
# TODO: parse? certinfo['Pubkey'] = self.get_pubkey()
#certinfo['Pubkey'] = self.cert.get_pubkey()
certinfo['Serial'] = int(self.cert.get_serial_number()) certinfo['Serial'] = int(self.cert.get_serial_number())
certinfo['Signature Algorithm'] = self.cert.get_signature_algorithm().\ certinfo['Signature Algorithm'] = self.cert.get_signature_algorithm().\
decode('utf-8') decode('utf-8')
@ -98,7 +97,6 @@ class CertParse(object):
certinfo['Subject Name Hash'] = self.cert.subject_name_hash() certinfo['Subject Name Hash'] = self.cert.subject_name_hash()
certinfo['Fingerprints'] = self.gen_hashes() certinfo['Fingerprints'] = self.gen_hashes()
self.certinfo = certinfo self.certinfo = certinfo
#print(certinfo)
return() return()


def print(self, json_fmt = None): def print(self, json_fmt = None):
@ -116,6 +114,17 @@ class CertParse(object):
return() return()
return(output) return(output)


def get_pubkey(self):
pubkey = {}
key = self.cert.get_pubkey()
pubkey['Bit Length'] = key.bits()
# I wish there was a more comfortable way of comparing these.
if key.type() == OpenSSL.crypto.TYPE_RSA:
pubkey['Algorithm'] = 'RSA'
elif key.type() == OpenSSL.crypto.TYPE_DSA:
pubkey['Algorithm'] = 'DSA'
return(pubkey)

def gen_hashes(self): def gen_hashes(self):
hashes = {} hashes = {}
# Note: MD2 is *so old* that they aren't even # Note: MD2 is *so old* that they aren't even
@ -252,7 +261,6 @@ class CertParse(object):
for i in [n.strip() for n in _tmp]: for i in [n.strip() for n in _tmp]:
l = [y for y in i.split(':', 1) if y not in ('', None)] l = [y for y in i.split(':', 1) if y not in ('', None)]
if len(l) > 1: if len(l) > 1:
print(l)
# Is it a line continuation (of a hex value)? # Is it a line continuation (of a hex value)?
if ((re.search('^[0-9A-Z]{2}$', l[0])) and if ((re.search('^[0-9A-Z]{2}$', l[0])) and
(re.search('^[0-9A-Z:]*:?$', ':'.join(l)))): (re.search('^[0-9A-Z:]*:?$', ':'.join(l)))):