@@ -2315,7 +2315,7 @@ def get_revoked(self):
2315
2315
revoked_stack = _lib .X509_CRL_get_REVOKED (self ._crl )
2316
2316
for i in range (_lib .sk_X509_REVOKED_num (revoked_stack )):
2317
2317
revoked = _lib .sk_X509_REVOKED_value (revoked_stack , i )
2318
- revoked_copy = _lib .Cryptography_X509_REVOKED_dup (revoked )
2318
+ revoked_copy = _lib .X509_REVOKED_dup (revoked )
2319
2319
pyrev = Revoked .__new__ (Revoked )
2320
2320
pyrev ._revoked = _ffi .gc (revoked_copy , _lib .X509_REVOKED_free )
2321
2321
results .append (pyrev )
@@ -2333,7 +2333,7 @@ def add_revoked(self, revoked):
2333
2333
:param Revoked revoked: The new revocation.
2334
2334
:return: ``None``
2335
2335
"""
2336
- copy = _lib .Cryptography_X509_REVOKED_dup (revoked ._revoked )
2336
+ copy = _lib .X509_REVOKED_dup (revoked ._revoked )
2337
2337
_openssl_assert (copy != _ffi .NULL )
2338
2338
2339
2339
add_result = _lib .X509_CRL_add0_revoked (self ._crl , copy )
@@ -2381,7 +2381,7 @@ def set_lastUpdate(self, when):
2381
2381
:param bytes when: A timestamp string.
2382
2382
:return: ``None``
2383
2383
"""
2384
- return self ._set_boundary_time (_lib .X509_CRL_get_lastUpdate , when )
2384
+ return self ._set_boundary_time (_lib .X509_CRL_get0_lastUpdate , when )
2385
2385
2386
2386
def set_nextUpdate (self , when ):
2387
2387
"""
@@ -2396,7 +2396,7 @@ def set_nextUpdate(self, when):
2396
2396
:param bytes when: A timestamp string.
2397
2397
:return: ``None``
2398
2398
"""
2399
- return self ._set_boundary_time (_lib .X509_CRL_get_nextUpdate , when )
2399
+ return self ._set_boundary_time (_lib .X509_CRL_get0_nextUpdate , when )
2400
2400
2401
2401
def sign (self , issuer_cert , issuer_key , digest ):
2402
2402
"""
@@ -2463,10 +2463,10 @@ def export(
2463
2463
_openssl_assert (sometime != _ffi .NULL )
2464
2464
2465
2465
_lib .X509_gmtime_adj (sometime , 0 )
2466
- _lib .X509_CRL_set_lastUpdate (self ._crl , sometime )
2466
+ _lib .X509_CRL_set1_lastUpdate (self ._crl , sometime )
2467
2467
2468
2468
_lib .X509_gmtime_adj (sometime , days * 24 * 60 * 60 )
2469
- _lib .X509_CRL_set_nextUpdate (self ._crl , sometime )
2469
+ _lib .X509_CRL_set1_nextUpdate (self ._crl , sometime )
2470
2470
2471
2471
_lib .X509_CRL_set_issuer_name (
2472
2472
self ._crl , _lib .X509_get_subject_name (cert ._x509 )
@@ -3008,8 +3008,8 @@ def sign(pkey, data, digest):
3008
3008
if digest_obj == _ffi .NULL :
3009
3009
raise ValueError ("No such digest method" )
3010
3010
3011
- md_ctx = _lib .Cryptography_EVP_MD_CTX_new ()
3012
- md_ctx = _ffi .gc (md_ctx , _lib .Cryptography_EVP_MD_CTX_free )
3011
+ md_ctx = _lib .EVP_MD_CTX_new ()
3012
+ md_ctx = _ffi .gc (md_ctx , _lib .EVP_MD_CTX_free )
3013
3013
3014
3014
_lib .EVP_SignInit (md_ctx , digest_obj )
3015
3015
_lib .EVP_SignUpdate (md_ctx , data , len (data ))
@@ -3049,8 +3049,8 @@ def verify(cert, signature, data, digest):
3049
3049
_openssl_assert (pkey != _ffi .NULL )
3050
3050
pkey = _ffi .gc (pkey , _lib .EVP_PKEY_free )
3051
3051
3052
- md_ctx = _lib .Cryptography_EVP_MD_CTX_new ()
3053
- md_ctx = _ffi .gc (md_ctx , _lib .Cryptography_EVP_MD_CTX_free )
3052
+ md_ctx = _lib .EVP_MD_CTX_new ()
3053
+ md_ctx = _ffi .gc (md_ctx , _lib .EVP_MD_CTX_free )
3054
3054
3055
3055
_lib .EVP_VerifyInit (md_ctx , digest_obj )
3056
3056
_lib .EVP_VerifyUpdate (md_ctx , data , len (data ))
0 commit comments