projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
27e27cd
)
Make FIPS provider use KDF name for PBKDF2
author
Pauli
<paul.dale@oracle.com>
Mon, 9 Sep 2019 01:39:10 +0000
(11:39 +1000)
committer
Pauli
<paul.dale@oracle.com>
Wed, 11 Sep 2019 00:22:49 +0000
(10:22 +1000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9814)
providers/fips/fipsprov.c
patch
|
blob
|
history
diff --git
a/providers/fips/fipsprov.c
b/providers/fips/fipsprov.c
index 59cd4080f4f32927767b0784b2d405740bf6c1af..98ec491458e6d9eed08ca56ebee7d9f6d47b840e 100644
(file)
--- a/
providers/fips/fipsprov.c
+++ b/
providers/fips/fipsprov.c
@@
-122,7
+122,7
@@
static int dummy_evp_call(void *provctx)
OPENSSL_CTX *libctx = PROV_LIBRARY_CONTEXT_OF(provctx);
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
EVP_MD *sha256 = EVP_MD_fetch(libctx, "SHA256", NULL);
- EVP_KDF *kdf = EVP_KDF_fetch(libctx,
"pbkdf2"
, NULL);
+ EVP_KDF *kdf = EVP_KDF_fetch(libctx,
OSSL_KDF_NAME_PBKDF2
, NULL);
char msg[] = "Hello World!";
const unsigned char exptd[] = {
0x7f, 0x83, 0xb1, 0x65, 0x7f, 0xf1, 0xfc, 0x53, 0xb9, 0x2d, 0xc1, 0x81,