diff options
| author | Pauli <paul.dale@oracle.com> | 2019-09-09 11:42:22 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-11 10:22:49 +1000 |
| commit | 64115f05ac950390e80e3993703513cda439fca0 (patch) | |
| tree | e80f206381b4642abfa34a337f252945165405a1 /crypto | |
| parent | 69333af49d8ddba6b551506ddbbccea73aee4a6b (diff) | |
| download | openssl-64115f05ac950390e80e3993703513cda439fca0.zip openssl-64115f05ac950390e80e3993703513cda439fca0.tar.gz openssl-64115f05ac950390e80e3993703513cda439fca0.tar.bz2 | |
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)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/dh/dh_kdf.c | 2 | ||||
| -rw-r--r-- | crypto/ec/ecdh_kdf.c | 2 | ||||
| -rw-r--r-- | crypto/evp/p5_crpt2.c | 2 | ||||
| -rw-r--r-- | 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 781d34a..a1bbea3 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 55e676d..a190809 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 c12d35c..96a7273 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 7a9f6f4..62b9687 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) |