From nobody Tue Mar 28 08:03:48 2023 X-Original-To: dev-commits-ports-main@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 4Pm2J460fzz41YpF; Tue, 28 Mar 2023 08:03:48 +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 4Pm2J45JTXz3wm6; Tue, 28 Mar 2023 08:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679990628; 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=BoLnZDRPqvXDuo0eNZgMKxOuj8wPukzQQfD/tgwQGo4=; b=rdgD4LiJ9nym0rAQdsR5UXJCVIw6zlqAjzcX2YOyo6BoDFSpNtwuelgqu/7zmylKMitMsU PzAcAA8M6GLHtlX2wyQrtcuCJWz3RJtZo3sRzhJRu4vA9E6keQVLW64GM3OfO4Ej24zxbs XJXMR3WledBssjTjXy2/2SVj8Pn209FJp18RREiN0JZ+dFTcbFsbv5pFsOD/gEca/kcKRN 1yH6ioPDlQvNDKXWzOMP6529Sxf8p3ZkAySKLWWls1WRwSfs164b1a7zjheAKLMSXYf7KR CAj+/+sBcz370acTclMS+onx9SZh2gbobZYCWyqiHq8bDQtnUBwIX99u9aQg9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679990628; 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=BoLnZDRPqvXDuo0eNZgMKxOuj8wPukzQQfD/tgwQGo4=; b=jRyBeRiDpKNHoaOem2cYzFpCJXDIIlc3c0EQrVFhXmfI6c8UXtziRSP0CGjnyRgSaJGdhv T7TJNGm6/MkO8Nh38q8mna5QL20x1RLI8egmvFlQJ2a2WEs+H+aY0m6tlz4mIL2CAgE79e ootMjHO6N1DfLQWcYazUhcmWfy8PVWTRW1Ddl83XWiPma/rcqSFsPItm0lsJtWfVC6qszD pYSM9ohhzQ6dWL3r2BYo6ycJHwZXcvKDfpgVIITdaZ8HQDpgUnhWiuku9r7X3rxS6/+M6m EQ0uB+5y8eKXwBIH9VYxwXTlL/L83MOeTJrx+c4by4vVYsHOWOQRUVgdTc+Kag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679990628; a=rsa-sha256; cv=none; b=j2AR4TE3joFW87lpfQlYiPl9iiGOztTjdO2aiEc8AGlDiOGHdakEl1jKxuD+m5LHcuZ1E1 EiWVWqBCWXaOdwgtwbzMmaeMz/s3/J59UxsMDpqeXuxgJNNcFNpr05IzjnM8nYqfHR79QZ bEkAtlKI8XEtew+MYvE8KO6o509SJoE3CF2txYi7VdqHbO7CRAcU6FdKm4aSBRESWtuOMr S2mO/JsqSqH6fAwgSZHYTNjOsUCQGeCXeVUtDzXRPcgs3HnHE7B0l+c0oKOaG6wmQqfbtY fo/zBI2J3KnSJe/y1pE5gFa7kl/IHimzuEMBJrdLo7J9+eaJyU4FRDuWOqpkTw== 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 4Pm2J44NG1zwmG; Tue, 28 Mar 2023 08:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S83mP4002270; Tue, 28 Mar 2023 08:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S83mcB002269; Tue, 28 Mar 2023 08:03:48 GMT (envelope-from git) Date: Tue, 28 Mar 2023 08:03:48 GMT Message-Id: <202303280803.32S83mcB002269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: b5363bc1f2ff - main - security/py-cryptography: Fix with libressl 3.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5363bc1f2ff8f2815d58a4b04451334d56d1394 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5363bc1f2ff8f2815d58a4b04451334d56d1394 commit b5363bc1f2ff8f2815d58a4b04451334d56d1394 Author: Felix Palmen AuthorDate: 2023-03-22 07:30:27 +0000 Commit: Felix Palmen CommitDate: 2023-03-28 08:02:07 +0000 security/py-cryptography: Fix with libressl 3.6 PR: 270318 Approved by: sunpoet (maintainer) Approved by: tcberner (mentor, implicit: libressl) Differential Revision: https://reviews.freebsd.org/D39224 --- .../files/{patch-libressl35 => patch-libressl} | 39 +++++++++++++++++----- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/security/py-cryptography/files/patch-libressl35 b/security/py-cryptography/files/patch-libressl similarity index 88% rename from security/py-cryptography/files/patch-libressl35 rename to security/py-cryptography/files/patch-libressl index 84c9f44a3350..80047e366bf2 100644 --- a/security/py-cryptography/files/patch-libressl35 +++ b/security/py-cryptography/files/patch-libressl @@ -1,4 +1,27 @@ ---- src/_cffi_src/openssl/cryptography.py.orig 2022-10-17 10:52:36 UTC +--- src/_cffi_src/openssl/crypto.py.orig 2023-03-22 07:29:15 UTC ++++ src/_cffi_src/openssl/crypto.py +@@ -74,11 +74,8 @@ CUSTOMIZATIONS = """ + # define OPENSSL_DIR SSLEAY_DIR + #endif + ++static const long Cryptography_HAS_OPENSSL_CLEANUP = 1; + #if CRYPTOGRAPHY_IS_LIBRESSL +-static const long Cryptography_HAS_OPENSSL_CLEANUP = 0; +- +-void (*OPENSSL_cleanup)(void) = NULL; +- + /* This function has a significantly different signature pre-1.1.0. since it is + * for testing only, we don't bother to expose it on older OpenSSLs. + */ +@@ -89,7 +86,6 @@ int (*Cryptography_CRYPTO_set_mem_functions)( + void (*)(void *, const char *, int)) = NULL; + + #else +-static const long Cryptography_HAS_OPENSSL_CLEANUP = 1; + static const long Cryptography_HAS_MEM_FUNCTIONS = 1; + + int Cryptography_CRYPTO_set_mem_functions( +--- src/_cffi_src/openssl/cryptography.py.orig 2021-08-24 17:17:17 UTC +++ src/_cffi_src/openssl/cryptography.py @@ -33,17 +33,17 @@ INCLUDES = """ #endif @@ -24,7 +47,7 @@ !defined(OPENSSL_NO_ENGINE)) || defined(USE_OSRANDOM_RNG_FOR_TESTING) #define CRYPTOGRAPHY_NEEDS_OSRANDOM_ENGINE 1 #else ---- src/_cffi_src/openssl/dh.py.orig 2022-10-17 11:10:57 UTC +--- 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); """ @@ -144,7 +167,7 @@ /* These functions were added in OpenSSL 1.1.0f commit d0c50e80a8 */ /* Define our own to simplify support across all versions. */ ---- src/_cffi_src/openssl/evp.py.orig 2023-02-24 07:28:50 UTC +--- src/_cffi_src/openssl/evp.py.orig 2021-08-24 17:02:37 UTC +++ src/_cffi_src/openssl/evp.py @@ -203,7 +203,20 @@ int (*EVP_PKEY_set1_tls_encodedpoint)(EVP_PKEY *, cons size_t) = NULL; @@ -168,7 +191,7 @@ static const long Cryptography_HAS_ONESHOT_EVP_DIGEST_SIGN_VERIFY = 0; static const long Cryptography_HAS_RAW_KEY = 0; static const long Cryptography_HAS_EVP_DIGESTFINAL_XOF = 0; ---- src/_cffi_src/openssl/fips.py.orig 2022-10-17 11:12:47 UTC +--- 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); """ @@ -182,7 +205,7 @@ static const long Cryptography_HAS_FIPS = 1; -#endif """ ---- src/_cffi_src/openssl/ocsp.py.orig 2022-10-17 11:14:50 UTC +--- 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 * @@ -255,7 +278,7 @@ } #endif """ ---- src/_cffi_src/openssl/ssl.py.orig 2022-10-17 11:17:08 UTC +--- 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 = """ // users have upgraded. PersistentlyDeprecated2020 @@ -270,7 +293,7 @@ #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_111 static const long Cryptography_HAS_KEYLOG = 0; -@@ -586,8 +581,6 @@ static const long Cryptography_HAS_TLS_ST = 1; +@@ -586,8 +581,6 @@ static const long TLS_ST_OK = 0; #endif #if CRYPTOGRAPHY_IS_LIBRESSL @@ -279,7 +302,7 @@ long (*DTLS_set_link_mtu)(SSL *, long) = NULL; long (*DTLS_get_link_min_mtu)(SSL *) = NULL; #endif ---- src/_cffi_src/openssl/x509.py.orig 2022-10-17 11:26:23 UTC +--- 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 """