diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-11 17:56:14 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-11 17:56:14 -0500 |
| commit | 920cac862ad1d590def52569ffb4d728ef1ba7e3 (patch) | |
| tree | bea41617862e68a54dc195c17e51d17e317b3569 | |
| parent | e250598d0468ae1c70308fce96991263d3be0f0c (diff) | |
| parent | 4fe9debd848dfed7afd61d1e2e3799311f93adbc (diff) | |
| download | cryptography-920cac862ad1d590def52569ffb4d728ef1ba7e3.tar.gz cryptography-920cac862ad1d590def52569ffb4d728ef1ba7e3.tar.bz2 cryptography-920cac862ad1d590def52569ffb4d728ef1ba7e3.zip | |
Merge pull request #2805 from reaperhulk/110-patch-25
modify how revocation date is set on X509_REVOKED in the openssl backend
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index e47f747c..064f9ad6 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -1003,11 +1003,14 @@ class Backend(object): x509_revoked, serial_number ) self.openssl_assert(res == 1) - res = self._lib.ASN1_TIME_set( - x509_revoked.revocationDate, + rev_date = self._lib.ASN1_TIME_set( + self._ffi.NULL, calendar.timegm(builder._revocation_date.timetuple()) ) - self.openssl_assert(res != self._ffi.NULL) + self.openssl_assert(rev_date != self._ffi.NULL) + rev_date = self._ffi.gc(rev_date, self._lib.ASN1_TIME_free) + res = self._lib.X509_REVOKED_set_revocationDate(x509_revoked, rev_date) + self.openssl_assert(res == 1) # add CRL entry extensions self._create_x509_extensions( extensions=builder._extensions, |