summaryrefslogtreecommitdiffstats
path: root/crypto/evp
diff options
context:
space:
mode:
authorDmitry Belyavskiy <beldmit@gmail.com>2022-04-22 18:16:56 +0200
committerDmitry Belyavskiy <beldmit@gmail.com>2022-04-29 14:13:02 +0200
commite560655f72dc27bcea973c6abfe99af75d313ad7 (patch)
treecbf8d08bac8c0651efbf8e60b278234b0d8967dc /crypto/evp
parent49d874e0b7514cb270e817103ff0e13d4689e1f0 (diff)
Ensure we initialized the locale before evp_pkey_name2type
Fixes #18158 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18199)
Diffstat (limited to 'crypto/evp')
-rw-r--r--crypto/evp/pmeth_lib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index a61876621a..530e1b47d1 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -23,7 +23,7 @@
#include <openssl/dh.h>
#include <openssl/rsa.h>
#include <openssl/kdf.h>
-#include "internal/cryptlib.h"
+#include "crypto/cryptlib.h"
#ifndef FIPS_MODULE
# include "crypto/asn1.h"
#endif
@@ -199,6 +199,7 @@ 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;