]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
int_ctx_new(): Revert extra OPENSSL_init_crypto() call
authorTomas Mraz <tomas@openssl.org>
Tue, 10 May 2022 13:40:58 +0000 (15:40 +0200)
committerTomas Mraz <tomas@openssl.org>
Fri, 13 May 2022 06:30:41 +0000 (08:30 +0200)
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18282)

crypto/evp/pmeth_lib.c

index 45ab0a35fc542b8a30da760242dee3e90a039563..e58787a5ea0c81115627ed321e2ffc1eeec3c33e 100644 (file)
@@ -23,7 +23,7 @@
 #include <openssl/dh.h>
 #include <openssl/rsa.h>
 #include <openssl/kdf.h>
-#include "crypto/cryptlib.h"
+#include "internal/cryptlib.h"
 #ifndef FIPS_MODULE
 # include "crypto/asn1.h"
 #endif
@@ -199,7 +199,6 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx,
             }
 #ifndef FIPS_MODULE
             if (keytype != NULL) {
-                OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL);
                 id = evp_pkey_name2type(keytype);
                 if (id == NID_undef)
                     id = -1;