moepman/acertmgr
1
0
Fork 0
mirror of https://github.com/moepman/acertmgr.git synced 2025-01-04 02:35:23 +01:00
Code Releases Activity

Minor code improvements

Browse Source
This commit is contained in:
David Klaftenegger 2016-04-07 02:25:53 +02:00 committed by Markus Hauschild
parent c8a72094d1
commit 6c91b03cc6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
acertmgr_ssl.py
View File

@ -26,7 +26,7 @@ except ImportError:
# @param cert_file the path to the certificate # @param cert_file the path to the certificate
# @return the tuple of dates: (notBefore, notAfter) # @return the tuple of dates: (notBefore, notAfter)
def cert_valid_times(cert_file): def cert_valid_times(cert_file):
with open(cert_file) as f: with open(cert_file, 'r') as f:
cert_data = f.read() cert_data = f.read()
cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert_data) cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert_data)
asn1time = str('%Y%m%d%H%M%SZ'.encode('utf8')) asn1time = str('%Y%m%d%H%M%SZ'.encode('utf8'))
@ -46,7 +46,6 @@ def cert_request(names, key):
req.add_extensions(extensions) req.add_extensions(extensions)
req.set_pubkey(key) req.set_pubkey(key)
req.sign(key, 'sha256') req.sign(key, 'sha256')
#return crypto.dump_certificate_request(crypto.FILETYPE_PEM, req)
return req return req
# @brief convert certificate to PEM format # @brief convert certificate to PEM format
@ -59,7 +58,7 @@ def cert_to_pem(cert):
# @param path path to key file # @param path path to key file
# @return the key in pyopenssl format # @return the key in pyopenssl format
def read_key(path): def read_key(path):
with open(path) as f: with open(path, 'r') as f:
key_data = f.read() key_data = f.read()
return crypto.load_privatekey(crypto.FILETYPE_PEM, key_data) return crypto.load_privatekey(crypto.FILETYPE_PEM, key_data)