Skip to content

Commit a52d5e3

Browse files
authored
use more functions guaranteed available in cryptography 35.0 (#1060)
* use more functions guaranteed available in cryptography 35.0 * these are also guaranteed
1 parent c8fe4dd commit a52d5e3

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/OpenSSL/crypto.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,7 +2315,7 @@ def get_revoked(self):
23152315
revoked_stack = _lib.X509_CRL_get_REVOKED(self._crl)
23162316
for i in range(_lib.sk_X509_REVOKED_num(revoked_stack)):
23172317
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)
23192319
pyrev = Revoked.__new__(Revoked)
23202320
pyrev._revoked = _ffi.gc(revoked_copy, _lib.X509_REVOKED_free)
23212321
results.append(pyrev)
@@ -2333,7 +2333,7 @@ def add_revoked(self, revoked):
23332333
:param Revoked revoked: The new revocation.
23342334
:return: ``None``
23352335
"""
2336-
copy = _lib.Cryptography_X509_REVOKED_dup(revoked._revoked)
2336+
copy = _lib.X509_REVOKED_dup(revoked._revoked)
23372337
_openssl_assert(copy != _ffi.NULL)
23382338

23392339
add_result = _lib.X509_CRL_add0_revoked(self._crl, copy)
@@ -2381,7 +2381,7 @@ def set_lastUpdate(self, when):
23812381
:param bytes when: A timestamp string.
23822382
:return: ``None``
23832383
"""
2384-
return self._set_boundary_time(_lib.X509_CRL_get_lastUpdate, when)
2384+
return self._set_boundary_time(_lib.X509_CRL_get0_lastUpdate, when)
23852385

23862386
def set_nextUpdate(self, when):
23872387
"""
@@ -2396,7 +2396,7 @@ def set_nextUpdate(self, when):
23962396
:param bytes when: A timestamp string.
23972397
:return: ``None``
23982398
"""
2399-
return self._set_boundary_time(_lib.X509_CRL_get_nextUpdate, when)
2399+
return self._set_boundary_time(_lib.X509_CRL_get0_nextUpdate, when)
24002400

24012401
def sign(self, issuer_cert, issuer_key, digest):
24022402
"""
@@ -2463,10 +2463,10 @@ def export(
24632463
_openssl_assert(sometime != _ffi.NULL)
24642464

24652465
_lib.X509_gmtime_adj(sometime, 0)
2466-
_lib.X509_CRL_set_lastUpdate(self._crl, sometime)
2466+
_lib.X509_CRL_set1_lastUpdate(self._crl, sometime)
24672467

24682468
_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)
24702470

24712471
_lib.X509_CRL_set_issuer_name(
24722472
self._crl, _lib.X509_get_subject_name(cert._x509)
@@ -3008,8 +3008,8 @@ def sign(pkey, data, digest):
30083008
if digest_obj == _ffi.NULL:
30093009
raise ValueError("No such digest method")
30103010

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)
30133013

30143014
_lib.EVP_SignInit(md_ctx, digest_obj)
30153015
_lib.EVP_SignUpdate(md_ctx, data, len(data))
@@ -3049,8 +3049,8 @@ def verify(cert, signature, data, digest):
30493049
_openssl_assert(pkey != _ffi.NULL)
30503050
pkey = _ffi.gc(pkey, _lib.EVP_PKEY_free)
30513051

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)
30543054

30553055
_lib.EVP_VerifyInit(md_ctx, digest_obj)
30563056
_lib.EVP_VerifyUpdate(md_ctx, data, len(data))

0 commit comments

Comments
 (0)