a-c-m
/
community.crypto
mirror of https://github.com/ansible-collections/community.crypto.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify code change.

pull/294/head
Felix Fontein 2021-09-30 22:37:20 +02:00
parent 5a27b23121
commit 548cdc6985
1 changed files with 38 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
plugins/module_utils/crypto/cryptography_support.py
View File

@ -78,43 +78,28 @@ def cryptography_get_extensions_from_cert(cert):
backend = cert._backend backend = cert._backend
result = dict() result = dict()
try: x509_obj = cert._x509
x509_obj = cert._x509 # With cryptography 35.0.0, we can no longer use obj2txt. Unfortunately it still does
# not allow to get the raw value of an extension, so we have to use this ugly hack:
exts = list(cert.extensions)
for i in range(backend._lib.X509_get_ext_count(x509_obj)): for i in range(backend._lib.X509_get_ext_count(x509_obj)):
ext = backend._lib.X509_get_ext(x509_obj, i) ext = backend._lib.X509_get_ext(x509_obj, i)
if ext == backend._ffi.NULL: if ext == backend._ffi.NULL:
continue continue
crit = backend._lib.X509_EXTENSION_get_critical(ext) crit = backend._lib.X509_EXTENSION_get_critical(ext)
data = backend._lib.X509_EXTENSION_get_data(ext) data = backend._lib.X509_EXTENSION_get_data(ext)
backend.openssl_assert(data != backend._ffi.NULL) backend.openssl_assert(data != backend._ffi.NULL)
der = backend._ffi.buffer(data.data, data.length)[:] der = backend._ffi.buffer(data.data, data.length)[:]
entry = dict( entry = dict(
critical=(crit == 1), critical=(crit == 1),
value=base64.b64encode(der), value=base64.b64encode(der),
) )
try:
oid = obj2txt(backend._lib, backend._ffi, backend._lib.X509_EXTENSION_get_object(ext)) oid = obj2txt(backend._lib, backend._ffi, backend._lib.X509_EXTENSION_get_object(ext))
result[oid] = entry except AttributeError:
except AttributeError:
# With cryptography 35.0.0, we can no longer use obj2txt. Unfortunately it still does
# not allow to get the raw value of an extension, so we have to use this ugly hack:
x509_obj = cert._x509
exts = list(cert.extensions)
for i in range(backend._lib.X509_get_ext_count(x509_obj)):
ext = backend._lib.X509_get_ext(x509_obj, i)
if ext == backend._ffi.NULL:
continue
crit = backend._lib.X509_EXTENSION_get_critical(ext)
data = backend._lib.X509_EXTENSION_get_data(ext)
backend.openssl_assert(data != backend._ffi.NULL)
der = backend._ffi.buffer(data.data, data.length)[:]
entry = dict(
critical=(crit == 1),
value=base64.b64encode(der),
)
oid = exts[i].oid.dotted_string oid = exts[i].oid.dotted_string
result[oid] = entry result[oid] = entry
return result return result
@ -141,39 +126,27 @@ def cryptography_get_extensions_from_csr(csr):
) )
) )
try: # With cryptography 35.0.0, we can no longer use obj2txt. Unfortunately it still does
for i in range(backend._lib.sk_X509_EXTENSION_num(extensions)): # not allow to get the raw value of an extension, so we have to use this ugly hack:
ext = backend._lib.sk_X509_EXTENSION_value(extensions, i) exts = list(csr.extensions)
if ext == backend._ffi.NULL:
continue for i in range(backend._lib.sk_X509_EXTENSION_num(extensions)):
crit = backend._lib.X509_EXTENSION_get_critical(ext) ext = backend._lib.sk_X509_EXTENSION_value(extensions, i)
data = backend._lib.X509_EXTENSION_get_data(ext) if ext == backend._ffi.NULL:
backend.openssl_assert(data != backend._ffi.NULL) continue
der = backend._ffi.buffer(data.data, data.length)[:] crit = backend._lib.X509_EXTENSION_get_critical(ext)
entry = dict( data = backend._lib.X509_EXTENSION_get_data(ext)
critical=(crit == 1), backend.openssl_assert(data != backend._ffi.NULL)
value=base64.b64encode(der), der = backend._ffi.buffer(data.data, data.length)[:]
) entry = dict(
critical=(crit == 1),
value=base64.b64encode(der),
)
try:
oid = obj2txt(backend._lib, backend._ffi, backend._lib.X509_EXTENSION_get_object(ext)) oid = obj2txt(backend._lib, backend._ffi, backend._lib.X509_EXTENSION_get_object(ext))
result[oid] = entry except AttributeError:
except AttributeError:
# With cryptography 35.0.0, we can no longer use obj2txt. Unfortunately it still does
# not allow to get the raw value of an extension, so we have to use this ugly hack:
exts = list(csr.extensions)
for i in range(backend._lib.sk_X509_EXTENSION_num(extensions)):
ext = backend._lib.sk_X509_EXTENSION_value(extensions, i)
if ext == backend._ffi.NULL:
continue
crit = backend._lib.X509_EXTENSION_get_critical(ext)
data = backend._lib.X509_EXTENSION_get_data(ext)
backend.openssl_assert(data != backend._ffi.NULL)
der = backend._ffi.buffer(data.data, data.length)[:]
entry = dict(
critical=(crit == 1),
value=base64.b64encode(der),
)
oid = exts[i].oid.dotted_string oid = exts[i].oid.dotted_string
result[oid] = entry result[oid] = entry
return result return result