x509: avoid use of nss.data_to_hex
Avoid use of the nss.data_to_hex function for formatting certificate fingerprints. Add our own helper functions to format the fingerprints as hex (with colons). Part of: https://fedorahosted.org/freeipa/ticket/6398 Reviewed-By: Jan Cholasta <jcholast@redhat.com> Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
This commit is contained in:
1 parent
85487281cd
commit
44c2d685f0
3 files changed
+31
-6
No files matched your search
@@ -379,10 +379,10 @@ class BaseCertObject(Object):
|
||||
obj['valid_not_before'] = unicode(cert.valid_not_before_str)
|
||||
obj['valid_not_after'] = unicode(cert.valid_not_after_str)
|
||||
if full:
|
||||
obj['md5_fingerprint'] = unicode(
|
||||
nss.data_to_hex(nss.md5_digest(cert.der_data), 64)[0])
|
||||
obj['sha1_fingerprint'] = unicode(
|
||||
nss.data_to_hex(nss.sha1_digest(cert.der_data), 64)[0])
|
||||
obj['md5_fingerprint'] = x509.to_hex_with_colons(
|
||||
nss.md5_digest(cert.der_data))
|
||||
obj['sha1_fingerprint'] = x509.to_hex_with_colons(
|
||||
nss.sha1_digest(cert.der_data))
|
||||
|
||||
try:
|
||||
ext_san = cert.get_extension(nss.SEC_OID_X509_SUBJECT_ALT_NAME)
|
||||
|
||||
@@ -274,8 +274,10 @@ def set_certificate_attrs(entry_attrs):
|
||||
entry_attrs['issuer'] = unicode(cert.issuer)
|
||||
entry_attrs['valid_not_before'] = unicode(cert.valid_not_before_str)
|
||||
entry_attrs['valid_not_after'] = unicode(cert.valid_not_after_str)
|
||||
entry_attrs['md5_fingerprint'] = unicode(nss.data_to_hex(nss.md5_digest(cert.der_data), 64)[0])
|
||||
entry_attrs['sha1_fingerprint'] = unicode(nss.data_to_hex(nss.sha1_digest(cert.der_data), 64)[0])
|
||||
entry_attrs['md5_fingerprint'] = x509.to_hex_with_colons(
|
||||
nss.md5_digest(cert.der_data))
|
||||
entry_attrs['sha1_fingerprint'] = x509.to_hex_with_colons(
|
||||
nss.sha1_digest(cert.der_data))
|
||||
|
||||
def check_required_principal(ldap, principal):
|
||||
"""
|
||||
|
||||
Reference in new issue
Block a user