From f0dd2e7648ab80a6233077d372b374cf96e38150 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 26 Dec 2015 16:50:29 -0500 Subject: A handful of small cleanups and simplifications --- src/cryptography/hazmat/backends/openssl/backend.py | 3 +++ src/cryptography/hazmat/backends/openssl/x509.py | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src') 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) ) -- cgit v1.2.3 From a52e39b50349f39c9cb313b93d1f3d8e97f96beb Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 26 Dec 2015 16:54:10 -0500 Subject: unused import --- src/cryptography/hazmat/backends/openssl/x509.py | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 49d895bb..419fae8d 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -4,7 +4,6 @@ from __future__ import absolute_import, division, print_function -import datetime import ipaddress import operator -- cgit v1.2.3