From nobody Thu May 30 09:59:29 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VqhYY65n8z5MM1r; Thu, 30 May 2024 09:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqhYY5NV3z4Dcd; Thu, 30 May 2024 09:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717063169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tarou18Cr3NPNEbHiFaRjtUn7kdMUwyVO35QSCVuo3E=; b=aMrS23NVQwoQyqPhIeAZ40WFWkwqDZmhZli9T6S4MjDCs9fXkcX8YmXrSceVmtD3hxg4d8 ht3KrClSZKLLwDZskASk2C8/28ouZ9ikRUHkJZPQQoOtxqzhFwBB3IHaww0eZv1Zptr0Mh GN/93qmG0uCF+PnwUsM4I6Zagfid5rWTkIfH9J4/lvzuEGhpix4foB2Wm0GegSLkwOD+R2 O0I/pRuA8wd1ejz8W4abRyxInJNF2zeNG/aJOE6fx1txHm+GqoztDXUgZtV6aq/cMAz0ss RJBU6i1XsFr9qcqknVy9ixtqR42rjCvbdflFtHzR5DnyB/iL+veY5j+3cfpipQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717063169; a=rsa-sha256; cv=none; b=ex6Pjb+lrWutZ0DBjRzmE2Q3jXpH0umHDkcRmtln9CQNRGLYhlDjIKzqwrb+moPdRgNavG jJzsbqRUbmoKxRCSEynLqpKHtOnbZ5lu+Kh4VdxuktpjKktxASgDExssRdqTIlPBVHwSea J1elo513+9Cusih9wIrD9XyxSJ/cDBXuM2nwizF/NMLRT/wf6shhEJNgkv7irtOOr3cq3E lvlfBXhE0sZN10LVx0S+VNH9f5+e1J2Txj+hOpGxwq9CtGCcLpYbO6lLA+Ml1qUbE54g8q fABkvC3DAIDCLK6FqwHIBXUQwZCEiDrxzZJ5piHJ47S9iWKfU2etxHAu4TzcPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717063169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tarou18Cr3NPNEbHiFaRjtUn7kdMUwyVO35QSCVuo3E=; b=BmuvY5SW84iG2Ki9kBWEOKWZFlue4L3+lUxPICMSV5sPsDDFVXCBMJMqhbqMRxUfzWCXfl rDFlpJV21TtwixlJJpP9T60mIx0grvEcNOCHUaPNBk9HepJHcxpvprXAo7lZjl2EK+9c7/ mmmcoxnlZQpld0YbjFm5IHYatlV/E1jJvI0pqh5F+/wxFCMbFPuTtTkzpoNzWEUOqvcpTe FgpOvO3nYFQ95uYyDP/jVZ0MWhCrTaFOBjv6jCiUdEiLLgfqq2zKJG2pa3bl21vxbtdEm5 GOSgiEZ5NLjO5KKwEyk/ZvNDN5KS9ZJ5UwjtZw7Sl6r4NXxcF+okKoxuuouWGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqhYY4bRHzbth; Thu, 30 May 2024 09:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44U9xTLP057986; Thu, 30 May 2024 09:59:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U9xTWw057983; Thu, 30 May 2024 09:59:29 GMT (envelope-from git) Date: Thu, 30 May 2024 09:59:29 GMT Message-Id: <202405300959.44U9xTWw057983@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 403f201a1461 - main - security/py-cryptography-legacy: fix OpenSSL >= 3.0 compat List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 403f201a1461fd26f026f2c8d3e67f1481908362 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=403f201a1461fd26f026f2c8d3e67f1481908362 commit 403f201a1461fd26f026f2c8d3e67f1481908362 Author: Matthias Andree AuthorDate: 2024-05-30 09:48:22 +0000 Commit: Matthias Andree CommitDate: 2024-05-30 09:53:54 +0000 security/py-cryptography-legacy: fix OpenSSL >= 3.0 compat py-cryptography-legacy still references functions that have been removed in OpenSSL 3.0, and fails to load openssl.abi3.so at run-time because it lacks ERR_GET_FUNC (reported) and FIPS_mode (masked by first error), and later because py-openssl feeds our utils/deprecated() an unsupported name= keyword argument. https://www.openssl.org/docs/man3.0/man7/migration_guide.html is the basis for fixes #1 and #2 removed, because OpenSSL 3.0 removed function codes from the error. In our own binding, leave the err_func attribute in, but set it to a constant 0. (patch-src___cffi* and patch-*binding.py) and FIPS_mode_set, which need rework. (patch-libressl) our utils/deprecated() function does not support, so steal the utils function from py-cryptography 42.0.7,1, drop the argument and return type annotations for consistency. (patch-src_cryptography_utils.py) This is sufficient to fix run-time errors for py-certbot on my FreeBSD 14.0-RELEASE-p6 amd64 server with Python 3.11, which I set to default to py-cryptography-legacy. PR: 272935 (and bug linkage will reflect changes in PRs 273770, 272885) Approved by: portmgr@ (just-fix-it blanket approval) MFH: 2024Q2 --- security/py-cryptography-legacy/Makefile | 2 +- .../py-cryptography-legacy/files/patch-libressl | 21 +++++++++------- .../files/patch-src___cffi__src_openssl_err.py | 13 ++++++++++ ...cryptography_hazmat_bindings_openssl_binding.py | 15 ++++++++++++ .../files/patch-src_cryptography_utils.py | 28 ++++++++++++++++++++++ 5 files changed, 70 insertions(+), 9 deletions(-) diff --git a/security/py-cryptography-legacy/Makefile b/security/py-cryptography-legacy/Makefile index 3ce998682727..30e7a21cc290 100644 --- a/security/py-cryptography-legacy/Makefile +++ b/security/py-cryptography-legacy/Makefile @@ -1,6 +1,6 @@ PORTNAME= cryptography PORTVERSION= 3.4.8 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= security python MASTER_SITES= PYPI diff --git a/security/py-cryptography-legacy/files/patch-libressl b/security/py-cryptography-legacy/files/patch-libressl index b9bc1e535d63..31a802026e1b 100644 --- a/security/py-cryptography-legacy/files/patch-libressl +++ b/security/py-cryptography-legacy/files/patch-libressl @@ -1,4 +1,4 @@ ---- src/_cffi_src/openssl/crypto.py.orig 2023-03-22 07:29:15 UTC +--- src/_cffi_src/openssl/crypto.py.orig 2021-08-24 17:02:37 UTC +++ src/_cffi_src/openssl/crypto.py @@ -74,11 +74,8 @@ CUSTOMIZATIONS = """ # define OPENSSL_DIR SSLEAY_DIR @@ -49,7 +49,7 @@ #else --- src/_cffi_src/openssl/dh.py.orig 2021-08-24 17:17:17 UTC +++ src/_cffi_src/openssl/dh.py -@@ -37,117 +37,9 @@ int Cryptography_i2d_DHxparams_bio(BIO *bp, DH *x); +@@ -37,117 +37,9 @@ CUSTOMIZATIONS = """ """ CUSTOMIZATIONS = """ @@ -169,21 +169,26 @@ /* Define our own to simplify support across all versions. */ --- src/_cffi_src/openssl/fips.py.orig 2021-08-24 17:17:17 UTC +++ src/_cffi_src/openssl/fips.py -@@ -17,11 +17,5 @@ int FIPS_mode(void); +@@ -12,16 +12,8 @@ FUNCTIONS = """ + """ + + FUNCTIONS = """ +-int FIPS_mode_set(int); +-int FIPS_mode(void); """ CUSTOMIZATIONS = """ -#if CRYPTOGRAPHY_IS_LIBRESSL --static const long Cryptography_HAS_FIPS = 0; + static const long Cryptography_HAS_FIPS = 0; -int (*FIPS_mode_set)(int) = NULL; -int (*FIPS_mode)(void) = NULL; -#else - static const long Cryptography_HAS_FIPS = 1; +-static const long Cryptography_HAS_FIPS = 1; -#endif """ --- src/_cffi_src/openssl/ocsp.py.orig 2021-08-24 17:17:17 UTC +++ src/_cffi_src/openssl/ocsp.py -@@ -77,7 +77,6 @@ int i2d_OCSP_RESPDATA(OCSP_RESPDATA *, unsigned char * +@@ -77,7 +77,6 @@ CUSTOMIZATIONS = """ CUSTOMIZATIONS = """ #if ( \ @@ -256,7 +261,7 @@ """ --- src/_cffi_src/openssl/ssl.py.orig 2021-08-24 17:17:17 UTC +++ src/_cffi_src/openssl/ssl.py -@@ -515,12 +515,7 @@ CUSTOMIZATIONS = """ +@@ -515,12 +515,7 @@ static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1 // users have upgraded. PersistentlyDeprecated2020 static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1; @@ -280,7 +285,7 @@ #endif --- src/_cffi_src/openssl/x509.py.orig 2021-08-24 17:02:37 UTC +++ src/_cffi_src/openssl/x509.py -@@ -276,33 +276,8 @@ void X509_REQ_get0_signature(const X509_REQ *, const A +@@ -276,33 +276,8 @@ CUSTOMIZATIONS = """ """ CUSTOMIZATIONS = """ diff --git a/security/py-cryptography-legacy/files/patch-src___cffi__src_openssl_err.py b/security/py-cryptography-legacy/files/patch-src___cffi__src_openssl_err.py new file mode 100644 index 000000000000..fed5fe1cf1a7 --- /dev/null +++ b/security/py-cryptography-legacy/files/patch-src___cffi__src_openssl_err.py @@ -0,0 +1,13 @@ +https://www.openssl.org/docs/man3.0/man7/migration_guide.html#Removal-of-function-code-from-the-error-codes +states that the ERR_GET_FUNC() "macro" was removed, so follow suit: + +--- src/_cffi_src/openssl/err.py.orig 2021-08-24 17:17:17 UTC ++++ src/_cffi_src/openssl/err.py +@@ -39,7 +39,6 @@ int ERR_GET_LIB(unsigned long); + void ERR_put_error(int, int, int, const char *, int); + + int ERR_GET_LIB(unsigned long); +-int ERR_GET_FUNC(unsigned long); + int ERR_GET_REASON(unsigned long); + + """ diff --git a/security/py-cryptography-legacy/files/patch-src_cryptography_hazmat_bindings_openssl_binding.py b/security/py-cryptography-legacy/files/patch-src_cryptography_hazmat_bindings_openssl_binding.py new file mode 100644 index 000000000000..da25fa61681a --- /dev/null +++ b/security/py-cryptography-legacy/files/patch-src_cryptography_hazmat_bindings_openssl_binding.py @@ -0,0 +1,15 @@ +https://www.openssl.org/docs/man3.0/man7/migration_guide.html#Removal-of-function-code-from-the-error-codes +states that the code is always 0, so do just that and forgo the call of a +nonexistent function. + +--- src/cryptography/hazmat/bindings/openssl/binding.py.orig 2021-08-24 17:17:17 UTC ++++ src/cryptography/hazmat/bindings/openssl/binding.py +@@ -43,7 +43,7 @@ def _consume_errors(lib): + break + + err_lib = lib.ERR_GET_LIB(code) +- err_func = lib.ERR_GET_FUNC(code) ++ err_func = 0 + err_reason = lib.ERR_GET_REASON(code) + + errors.append(_OpenSSLError(code, err_lib, err_func, err_reason)) diff --git a/security/py-cryptography-legacy/files/patch-src_cryptography_utils.py b/security/py-cryptography-legacy/files/patch-src_cryptography_utils.py new file mode 100644 index 000000000000..8650c280071b --- /dev/null +++ b/security/py-cryptography-legacy/files/patch-src_cryptography_utils.py @@ -0,0 +1,28 @@ +Taken from ../py-cryptography source code as of +FreeBSD ports tree 3216ed57448ee28aa6061e08839198c3e5cff5d7 +with py-cryptography-42.0.7,1, with type annotations stripped out: +-- mandree@ 2024-05-30 + +--- src/cryptography/utils.py.orig 2021-08-24 17:17:17 UTC ++++ src/cryptography/utils.py +@@ -132,13 +132,15 @@ class _ModuleWithDeprecations(object): + return ["_module"] + dir(self._module) + + +-def deprecated(value, module_name, message, warning_class): ++def deprecated(value, module_name, message, warning_class, name=None): + module = sys.modules[module_name] + if not isinstance(module, _ModuleWithDeprecations): +- sys.modules[module_name] = _ModuleWithDeprecations( +- module +- ) # type: ignore[assignment] +- return _DeprecatedValue(value, message, warning_class) ++ sys.modules[module_name] = module = _ModuleWithDeprecations(module) ++ dv = _DeprecatedValue(value, message, warning_class) ++ # Maintain backwards compatibility with `name is None` for pyOpenSSL. ++ if name is not None: ++ setattr(module, name, dv) ++ return dv + + + def cached_property(func):