root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Usages of KDFs converted to use the name macros 

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9814)
This commit is contained in:
Pauli 2019-09-09 11:42:22 +10:00
parent 69333af49d
commit 64115f05ac
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/dh/dh_kdf.c
View File

@ -39,7 +39,7 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
if (oid_sn == NULL) if (oid_sn == NULL)
return 0; return 0;
kdf = EVP_KDF_fetch(provctx, SN_x942kdf, NULL); kdf = EVP_KDF_fetch(provctx, OSSL_KDF_NAME_X942KDF, NULL);
if ((kctx = EVP_KDF_CTX_new(kdf)) == NULL) if ((kctx = EVP_KDF_CTX_new(kdf)) == NULL)
goto err; goto err;
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,

2
crypto/ec/ecdh_kdf.c
View File

@ -24,7 +24,7 @@ int ecdh_KDF_X9_63(unsigned char *out, size_t outlen,
EVP_KDF_CTX *kctx = NULL; EVP_KDF_CTX *kctx = NULL;
OSSL_PARAM params[4], *p = params; OSSL_PARAM params[4], *p = params;
const char *mdname = EVP_MD_name(md); const char *mdname = EVP_MD_name(md);
EVP_KDF *kdf = EVP_KDF_fetch(NULL, SN_x963kdf, NULL); EVP_KDF *kdf = EVP_KDF_fetch(NULL, OSSL_KDF_NAME_X963KDF, NULL);
if ((kctx = EVP_KDF_CTX_new(kdf)) != NULL) { if ((kctx = EVP_KDF_CTX_new(kdf)) != NULL) {
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,

2
crypto/evp/p5_crpt2.c
View File

@ -40,7 +40,7 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
if (salt == NULL && saltlen == 0) if (salt == NULL && saltlen == 0)
salt = (unsigned char *)empty; salt = (unsigned char *)empty;
kdf = EVP_KDF_fetch(NULL, LN_id_pbkdf2, NULL); kdf = EVP_KDF_fetch(NULL, OSSL_KDF_NAME_PBKDF2, NULL);
kctx = EVP_KDF_CTX_new(kdf); kctx = EVP_KDF_CTX_new(kdf);
EVP_KDF_free(kdf); EVP_KDF_free(kdf);
if (kctx == NULL) if (kctx == NULL)

2
crypto/evp/pbe_scrypt.c
View File

@ -62,7 +62,7 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen,
if (maxmem == 0) if (maxmem == 0)
maxmem = SCRYPT_MAX_MEM; maxmem = SCRYPT_MAX_MEM;
kdf = EVP_KDF_fetch(NULL, SN_id_scrypt, NULL); kdf = EVP_KDF_fetch(NULL, OSSL_KDF_NAME_SCRYPT, NULL);
kctx = EVP_KDF_CTX_new(kdf); kctx = EVP_KDF_CTX_new(kdf);
EVP_KDF_free(kdf); EVP_KDF_free(kdf);
if (kctx == NULL) if (kctx == NULL)