mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
lang/python311: add LibreSSL support
LibreSSL 3.6 and later are fully compatible with PEP-644 for the
ssl and hmac modules, but not hashlib due to missing SHA-3/SHAKE,
BLAKE2 and scrypt. Partially reverts
39258d3595
for _hashopenssl.c only and void the configure check so that hashlib
builds on LibreSSL.
This commit is contained in:
parent
cef3809527
commit
53de41c33d
@ -109,12 +109,9 @@ DISABLED_EXTENSIONS+= nis
|
||||
PLIST_SUB+= NO_NIS=""
|
||||
.endif
|
||||
|
||||
# Python 3.10 requires OpenSSL >= 1.1.1 (PEP 644), so with
|
||||
# libressl, some modules are not built
|
||||
.if ${SSL_DEFAULT:Mlibressl*}
|
||||
PLIST_SUB+= SUPPORTED_OPENSSL="@comment "
|
||||
.else
|
||||
PLIST_SUB+= SUPPORTED_OPENSSL=""
|
||||
EXTRA_PATCHES+= ${PATCHDIR}/libressl
|
||||
CONFIGURE_ENV+= ac_cv_working_openssl_hashlib=yes
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
|
66
lang/python311/files/libressl/patch-Modules___hashopenssl.c
Normal file
66
lang/python311/files/libressl/patch-Modules___hashopenssl.c
Normal file
@ -0,0 +1,66 @@
|
||||
--- Modules/_hashopenssl.c.orig 2023-02-07 13:37:51 UTC
|
||||
+++ Modules/_hashopenssl.c
|
||||
@@ -45,10 +45,21 @@
|
||||
|
||||
#define MUNCH_SIZE INT_MAX
|
||||
|
||||
+#ifndef LIBRESSL_VERSION_NUMBER
|
||||
#define PY_OPENSSL_HAS_SCRYPT 1
|
||||
+#endif
|
||||
+
|
||||
+#ifdef NID_sha3_224
|
||||
#define PY_OPENSSL_HAS_SHA3 1
|
||||
+#endif
|
||||
+
|
||||
+#if defined(EVP_MD_FLAG_XOF) && defined(NID_shake128)
|
||||
#define PY_OPENSSL_HAS_SHAKE 1
|
||||
+#endif
|
||||
+
|
||||
+#if defined(NID_blake2b512) && !defined(OPENSSL_NO_BLAKE2)
|
||||
#define PY_OPENSSL_HAS_BLAKE2 1
|
||||
+#endif
|
||||
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
|
||||
#define PY_EVP_MD EVP_MD
|
||||
@@ -120,19 +131,27 @@ static const py_hashentry_t py_hashes[] = {
|
||||
PY_HASH_ENTRY(Py_hash_sha384, "SHA384", SN_sha384, NID_sha384),
|
||||
PY_HASH_ENTRY(Py_hash_sha512, "SHA512", SN_sha512, NID_sha512),
|
||||
/* truncated sha2 */
|
||||
+#ifdef NID_sha512_224
|
||||
PY_HASH_ENTRY(Py_hash_sha512_224, "SHA512_224", SN_sha512_224, NID_sha512_224),
|
||||
PY_HASH_ENTRY(Py_hash_sha512_256, "SHA512_256", SN_sha512_256, NID_sha512_256),
|
||||
+#endif
|
||||
/* sha3 */
|
||||
+#ifdef PY_OPENSSL_HAS_SHA3
|
||||
PY_HASH_ENTRY(Py_hash_sha3_224, NULL, SN_sha3_224, NID_sha3_224),
|
||||
PY_HASH_ENTRY(Py_hash_sha3_256, NULL, SN_sha3_256, NID_sha3_256),
|
||||
PY_HASH_ENTRY(Py_hash_sha3_384, NULL, SN_sha3_384, NID_sha3_384),
|
||||
PY_HASH_ENTRY(Py_hash_sha3_512, NULL, SN_sha3_512, NID_sha3_512),
|
||||
+#endif
|
||||
/* sha3 shake */
|
||||
+#ifdef PY_OPENSSL_HAS_SHAKE
|
||||
PY_HASH_ENTRY(Py_hash_shake_128, NULL, SN_shake128, NID_shake128),
|
||||
PY_HASH_ENTRY(Py_hash_shake_256, NULL, SN_shake256, NID_shake256),
|
||||
+#endif
|
||||
/* blake2 digest */
|
||||
+#ifdef PY_OPENSSL_HAS_BLAKE2
|
||||
PY_HASH_ENTRY(Py_hash_blake2s, "blake2s256", SN_blake2s256, NID_blake2s256),
|
||||
PY_HASH_ENTRY(Py_hash_blake2b, "blake2b512", SN_blake2b512, NID_blake2b512),
|
||||
+#endif
|
||||
PY_HASH_ENTRY(NULL, NULL, NULL, 0),
|
||||
};
|
||||
|
||||
@@ -873,9 +892,12 @@ py_evp_fromname(PyObject *module, const char *digestna
|
||||
goto exit;
|
||||
}
|
||||
|
||||
+#ifdef PY_OPENSSL_HAS_SHAKE
|
||||
if ((EVP_MD_flags(digest) & EVP_MD_FLAG_XOF) == EVP_MD_FLAG_XOF) {
|
||||
type = get_hashlib_state(module)->EVPXOFtype;
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
type = get_hashlib_state(module)->EVPtype;
|
||||
}
|
||||
|
@ -2934,7 +2934,7 @@ lib/python%%XYDOT%%/lib-dynload/_datetime.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_dbm.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_decimal.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_elementtree.cpython-%%XY%%%%ABI%%.so
|
||||
%%SUPPORTED_OPENSSL%%lib/python%%XYDOT%%/lib-dynload/_hashlib.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_hashlib.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_heapq.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_json.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_lsprof.cpython-%%XY%%%%ABI%%.so
|
||||
@ -2953,7 +2953,7 @@ lib/python%%XYDOT%%/lib-dynload/_sha256.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_sha3.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_sha512.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_socket.cpython-%%XY%%%%ABI%%.so
|
||||
%%SUPPORTED_OPENSSL%%lib/python%%XYDOT%%/lib-dynload/_ssl.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_ssl.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_statistics.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_struct.cpython-%%XY%%%%ABI%%.so
|
||||
lib/python%%XYDOT%%/lib-dynload/_testbuffer.cpython-%%XY%%%%ABI%%.so
|
||||
|
Loading…
Reference in New Issue
Block a user