diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-26 16:50:29 -0500 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-26 16:50:29 -0500 |
commit | f0dd2e7648ab80a6233077d372b374cf96e38150 (patch) | |
tree | 59f7ae0dc7f0cf8c0fed432d0e14efecc17dc0f5 /src | |
parent | 15bd026fde49861dbbd241c4e1d3bc1ab65e00fd (diff) | |
download | cryptography-f0dd2e7648ab80a6233077d372b374cf96e38150.tar.gz cryptography-f0dd2e7648ab80a6233077d372b374cf96e38150.tar.bz2 cryptography-f0dd2e7648ab80a6233077d372b374cf96e38150.zip |
A handful of small cleanups and simplifications
Diffstat (limited to 'src')
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 3 | ||||
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/x509.py | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index 7d8460c6..0dd9a2e3 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -2270,6 +2270,9 @@ class Backend(object): generalized_time = self._ffi.gc( generalized_time, self._lib.ASN1_GENERALIZEDTIME_free ) + return self._parse_asn1_generalized_time(generalized_time) + + def _parse_asn1_generalized_time(self, generalized_time): time = self._asn1_string_to_ascii( self._ffi.cast("ASN1_STRING *", generalized_time) ) diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 1376ab72..49d895bb 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -712,13 +712,8 @@ def _decode_invalidity_date(backend, inv_date): generalized_time = backend._ffi.gc( generalized_time, backend._lib.ASN1_GENERALIZEDTIME_free ) - time = backend._ffi.string( - backend._lib.ASN1_STRING_data( - backend._ffi.cast("ASN1_STRING *", generalized_time) - ) - ).decode("ascii") return x509.InvalidityDate( - datetime.datetime.strptime(time, "%Y%m%d%H%M%SZ") + backend._parse_asn1_generalized_time(generalized_time) ) |