diff options
Diffstat (limited to 'lang/python39/files/patch-freebsd-12')
-rw-r--r-- | lang/python39/files/patch-freebsd-12 | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/lang/python39/files/patch-freebsd-12 b/lang/python39/files/patch-freebsd-12 index 0a4332586a39..27d7fa761fa9 100644 --- a/lang/python39/files/patch-freebsd-12 +++ b/lang/python39/files/patch-freebsd-12 @@ -14,7 +14,7 @@ diff --git Modules/_hashopenssl.c Modules/_hashopenssl.c index 0dd1662101..adc8653773 100644 --- Modules/_hashopenssl.c +++ Modules/_hashopenssl.c -@@ -11,26 +11,20 @@ +@@ -11,13 +11,6 @@ * */ @@ -25,16 +25,10 @@ index 0dd1662101..adc8653773 100644 -#endif -#define OPENSSL_NO_DEPRECATED 1 - - #define PY_SSIZE_T_CLEAN - - #include "Python.h" - #include "hashlib.h" - #include "pystrhex.h" - -+ - /* EVP is the preferred interface to hashing in OpenSSL */ - #include <openssl/evp.h> - #include <openssl/hmac.h> + #ifndef Py_BUILD_CORE_BUILTIN + # define Py_BUILD_CORE_MODULE 1 + #endif +@@ -35,7 +28,7 @@ #include <openssl/crypto.h> /* We use the object interface to discover what hashes OpenSSL supports. */ #include <openssl/objects.h> @@ -43,7 +37,7 @@ index 0dd1662101..adc8653773 100644 #include <openssl/crypto.h> // FIPS_mode() -@@ -1817,11 +1811,12 @@ _hashlib_get_fips_mode_impl(PyObject *module) +@@ -1932,11 +1925,12 @@ _hashlib_get_fips_mode_impl(PyObject *module) /*[clinic end generated code: output=87eece1bab4d3fa9 input=2db61538c41c6fef]*/ { @@ -91,7 +85,7 @@ index 97e314b21f..82069a5832 100644 /* Include OpenSSL header files */ #include "openssl/rsa.h" #include "openssl/crypto.h" -@@ -147,20 +148,24 @@ static void _PySSLFixErrno(void) { +@@ -147,19 +148,23 @@ static void _PySSLFixErrno(void) { # define PY_OPENSSL_1_1_API 1 #endif @@ -116,13 +110,12 @@ index 97e314b21f..82069a5832 100644 -extern const SSL_METHOD *TLSv1_2_method(void); +#define OPENSSL_NO_TLS1_2_METHOD 1 #endif - ++ +#endif /* >= 1.1.0 compcat */ +#endif /* OPENSSL_API_COMPAT */ -+ + /* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL - # define PY_OPENSSL_1_1_API 1 -- 2.31.1 |