From 64115f05ac950390e80e3993703513cda439fca0 Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 9 Sep 2019 11:42:22 +1000 Subject: [PATCH] Usages of KDFs converted to use the name macros Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9814) --- crypto/dh/dh_kdf.c | 2 +- crypto/ec/ecdh_kdf.c | 2 +- crypto/evp/p5_crpt2.c | 2 +- crypto/evp/pbe_scrypt.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c index 781d34a94f..a1bbea3013 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c @@ -39,7 +39,7 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, if (oid_sn == NULL) 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) goto err; *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, diff --git a/crypto/ec/ecdh_kdf.c b/crypto/ec/ecdh_kdf.c index 55e676d20a..a19080940a 100644 --- a/crypto/ec/ecdh_kdf.c +++ b/crypto/ec/ecdh_kdf.c @@ -24,7 +24,7 @@ int ecdh_KDF_X9_63(unsigned char *out, size_t outlen, EVP_KDF_CTX *kctx = NULL; OSSL_PARAM params[4], *p = params; 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) { *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index c12d35c8ab..96a72730f3 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -40,7 +40,7 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, if (salt == NULL && saltlen == 0) 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); EVP_KDF_free(kdf); if (kctx == NULL) diff --git a/crypto/evp/pbe_scrypt.c b/crypto/evp/pbe_scrypt.c index 7a9f6f47a4..62b9687949 100644 --- a/crypto/evp/pbe_scrypt.c +++ b/crypto/evp/pbe_scrypt.c @@ -62,7 +62,7 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, if (maxmem == 0) 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); EVP_KDF_free(kdf); if (kctx == NULL) -- 2.34.1