[3.10] bpo-40479: Fix typo, flag must be set for OpenSSL < 3.0.0 (pythonGH-30584) (pythonGH-30585)

miss-islington · web-flow · commit 47422a852de1 · 2022-01-13T13:08:47.000-08:00
(cherry picked from commit 276c234) Co-authored-by: Christian Heimes <christian@python.org> Automerge-Triggered-By: GH:tiran
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
@@ -883,7 +883,7 @@ py_evp_fromname(PyObject *module, const char *digestname, PyObject *data_obj,
         goto exit;
     }
 
-#if defined(EVP_MD_CTX_FLAG_NON_FIPS_ALLOW) &&  OPENSSL_VERSION_NUMBER >= 0x30000000L
+#if defined(EVP_MD_CTX_FLAG_NON_FIPS_ALLOW) && OPENSSL_VERSION_NUMBER < 0x30000000L
     // In OpenSSL 1.1.1 the non FIPS allowed flag is context specific while
     // in 3.0.0 it is a different EVP_MD provider.
     if (!usedforsecurity) {

Original file line number	Diff line number	Diff line change
`@@ -883,7 +883,7 @@ py_evp_fromname(PyObject module, const char digestname, PyObject *data_obj,`
`883`	`883`	`goto exit;`
`884`	`884`	`}`
`885`	`885`
`886`		`-#if defined(EVP_MD_CTX_FLAG_NON_FIPS_ALLOW) && OPENSSL_VERSION_NUMBER >= 0x30000000L`
	`886`	`+#if defined(EVP_MD_CTX_FLAG_NON_FIPS_ALLOW) && OPENSSL_VERSION_NUMBER < 0x30000000L`
`887`	`887`	`// In OpenSSL 1.1.1 the non FIPS allowed flag is context specific while`
`888`	`888`	`// in 3.0.0 it is a different EVP_MD provider.`
`889`	`889`	`if (!usedforsecurity) {`