Fix invalid cast from ASN1_TIME to ASN1_GENERALIZEDTIME (#612)
* Fix invalid cast from ASN1_TIME to ASN1_GENERALIZEDTIME, which ends up with an error with LibreSSL.
* Require cryptography >= 1.9
diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py
index 3ef0e9b..3404172 100644
--- a/src/OpenSSL/crypto.py
+++ b/src/OpenSSL/crypto.py
@@ -103,7 +103,7 @@
"""
The the time value of an ASN1 time object.
- @param boundary: An ASN1_GENERALIZEDTIME pointer (or an object safely
+ @param boundary: An ASN1_TIME pointer (or an object safely
castable to that type) which will have its value set.
@param when: A string representation of the desired time value.
@@ -116,17 +116,9 @@
if not isinstance(when, bytes):
raise TypeError("when must be a byte string")
- set_result = _lib.ASN1_GENERALIZEDTIME_set_string(
- _ffi.cast('ASN1_GENERALIZEDTIME*', boundary), when)
+ set_result = _lib.ASN1_TIME_set_string(boundary, when)
if set_result == 0:
- dummy = _ffi.gc(_lib.ASN1_STRING_new(), _lib.ASN1_STRING_free)
- _lib.ASN1_STRING_set(dummy, when, len(when))
- check_result = _lib.ASN1_GENERALIZEDTIME_check(
- _ffi.cast('ASN1_GENERALIZEDTIME*', dummy))
- if not check_result:
- raise ValueError("Invalid string")
- else:
- _untested_error()
+ raise ValueError("Invalid string")
def _get_asn1_time(timestamp):