mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-12 01:43:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-40479: Fix hashlib issue with OpenSSL 3.0.0 (GH-20107)

Browse source 
OpenSSL 3.0.0-alpha2 was released today. The FIPS_mode() function has
been deprecated and removed. It no longer makes sense with the new
provider and context system in OpenSSL 3.0.0.

EVP_default_properties_is_fips_enabled() is good enough for our needs in
unit tests. It's an internal API, too.

Signed-off-by: Christian Heimes <christian@python.org>
This commit is contained in:
Christian Heimes 2020-05-15 18:28:05 +02:00 • committed by GitHub
parent 6e57237faf
commit 16d4e6f6f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2020-05-15-17-38-21.bpo-40479.yamSCh.rst Normal file
View file

@ -0,0 +1 @@
The :mod:`hashlib` now compiles with OpenSSL 3.0.0-alpha2.

15
Modules/_hashopenssl.c
View file

@ -1109,19 +1109,25 @@ _hashlib.get_fips_mode -> int
Determine the OpenSSL FIPS mode of operation. Determine the OpenSSL FIPS mode of operation.
For OpenSSL 3.0.0 and newer it returns the state of the default provider
in the default OSSL context. It's not quite the same as FIPS_mode() but good
enough for unittests.
Effectively any non-zero return value indicates FIPS mode; Effectively any non-zero return value indicates FIPS mode;
values other than 1 may have additional significance. values other than 1 may have additional significance.
See OpenSSL documentation for the FIPS_mode() function for details.
[clinic start generated code]*/ [clinic start generated code]*/
static int static int
_hashlib_get_fips_mode_impl(PyObject *module) _hashlib_get_fips_mode_impl(PyObject *module)
/*[clinic end generated code: output=87eece1bab4d3fa9 input=c2799c3132a36d6c]*/ /*[clinic end generated code: output=87eece1bab4d3fa9 input=2db61538c41c6fef]*/
{ {
int result;
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
result = EVP_default_properties_is_fips_enabled(NULL);
#else
ERR_clear_error(); ERR_clear_error();
int result = FIPS_mode(); result = FIPS_mode();
if (result == 0) { if (result == 0) {
// "If the library was built without support of the FIPS Object Module, // "If the library was built without support of the FIPS Object Module,
// then the function will return 0 with an error code of // then the function will return 0 with an error code of
@ -1134,6 +1140,7 @@ _hashlib_get_fips_mode_impl(PyObject *module)
} }
} }
return result; return result;
#endif
} }
#endif // !LIBRESSL_VERSION_NUMBER #endif // !LIBRESSL_VERSION_NUMBER

10
Modules/clinic/_hashopenssl.c.h generated
View file

@ -733,10 +733,12 @@ PyDoc_STRVAR(_hashlib_get_fips_mode__doc__,
"\n" "\n"
"Determine the OpenSSL FIPS mode of operation.\n" "Determine the OpenSSL FIPS mode of operation.\n"
"\n" "\n"
"Effectively any non-zero return value indicates FIPS mode;\n" "For OpenSSL 3.0.0 and newer it returns the state of the default provider\n"
"values other than 1 may have additional significance.\n" "in the default OSSL context. It\'s not quite the same as FIPS_mode() but good\n"
"enough for unittests.\n"
"\n" "\n"
"See OpenSSL documentation for the FIPS_mode() function for details."); "Effectively any non-zero return value indicates FIPS mode;\n"
"values other than 1 may have additional significance.");
#define _HASHLIB_GET_FIPS_MODE_METHODDEF \ #define _HASHLIB_GET_FIPS_MODE_METHODDEF \
{"get_fips_mode", (PyCFunction)_hashlib_get_fips_mode, METH_NOARGS, _hashlib_get_fips_mode__doc__}, {"get_fips_mode", (PyCFunction)_hashlib_get_fips_mode, METH_NOARGS, _hashlib_get_fips_mode__doc__},
@ -769,4 +771,4 @@ exit:
#ifndef _HASHLIB_GET_FIPS_MODE_METHODDEF #ifndef _HASHLIB_GET_FIPS_MODE_METHODDEF
#define _HASHLIB_GET_FIPS_MODE_METHODDEF #define _HASHLIB_GET_FIPS_MODE_METHODDEF
#endif /* !defined(_HASHLIB_GET_FIPS_MODE_METHODDEF) */ #endif /* !defined(_HASHLIB_GET_FIPS_MODE_METHODDEF) */
/*[clinic end generated code: output=b0703dd5a043394d input=a9049054013a1b77]*/ /*[clinic end generated code: output=4babbd88389a196b input=a9049054013a1b77]*/