From: Christian Schürmann Date: Fri, 4 Jul 2025 08:28:14 +0000 (+0200) Subject: Replace deprecated OpenSSL.crypto.load_crl X-Git-Tag: v2.7_alpha3~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2364488d36a758c8f2ac273af4642dc84b1b28f;p=thirdparty%2Fopenvpn.git Replace deprecated OpenSSL.crypto.load_crl OpenSSL.crypto.load_crl was deprecated with with pyOpenSSL 23.3.0 and eventually removed in 24.3.0. pyOpenSSL recommends using cryptography.x509's CRL functions as a replacement. See also: https://github.com/pyca/pyopenssl/blob/main/CHANGELOG.rst Signed-off-by: Christian Schürmann Acked-by: Arne Schwabe Message-Id: <20250704082813.99654-2-spike@fedoraproject.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32037.html Signed-off-by: Gert Doering --- diff --git a/contrib/extract-crl/extractcrl.py b/contrib/extract-crl/extractcrl.py index 441464e9d..c387ea1cd 100755 --- a/contrib/extract-crl/extractcrl.py +++ b/contrib/extract-crl/extractcrl.py @@ -42,17 +42,17 @@ def measure_time(method): def load_crl(filename, format): def try_openssl_module(filename, format): - from OpenSSL import crypto - types = { - FILETYPE_PEM: crypto.FILETYPE_PEM, - FILETYPE_DER: crypto.FILETYPE_ASN1 + from cryptography import x509 + load_crl_functions = { + FILETYPE_PEM: x509.load_pem_x509_crl, + FILETYPE_DER: x509.load_der_x509_crl } if filename == '-': - crl = crypto.load_crl(types[format], sys.stdin.buffer.read()) + crl = load_crl_functions[format](sys.stdin.buffer.read()) else: with open(filename, 'rb') as f: - crl = crypto.load_crl(types[format], f.read()) - return set(int(r.get_serial(), 16) for r in crl.get_revoked()) + crl = load_crl_functions[format](f.read()) + return set(r.serial_number for r in crl) def try_openssl_exec(filename, format): args = ['openssl', 'crl', '-inform', format, '-text']