diff options
| author | Pauli <paul.dale@oracle.com> | 2019-09-09 11:36:48 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-11 10:22:49 +1000 |
| commit | 1732c260db11273792ea465e29c2018b7bab52e5 (patch) | |
| tree | 75a889763cca5a29c6fd0500729671bd6fbe77d6 /ssl | |
| parent | d810cc197737cc34fac60eee04720ad3fb0088bf (diff) | |
Convert SSL functions to use KDF names not SN_ strings
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9814)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/t1_enc.c | 2 | ||||
| -rw-r--r-- | ssl/tls13_enc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 6726d8fb7d..fc082530db 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -46,7 +46,7 @@ static int tls1_PRF(SSL *s, SSLerr(SSL_F_TLS1_PRF, ERR_R_INTERNAL_ERROR); return 0; } - kdf = EVP_KDF_fetch(NULL, SN_tls1_prf, NULL); + kdf = EVP_KDF_fetch(NULL, OSSL_KDF_NAME_TLS1_PRF, NULL); if (kdf == NULL) goto err; kctx = EVP_KDF_CTX_new(kdf); diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index f7c472d1fb..2339a05aad 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -36,7 +36,7 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret, #else static const unsigned char label_prefix[] = "tls13 "; #endif - EVP_KDF *kdf = EVP_KDF_fetch(NULL, SN_hkdf, NULL); + EVP_KDF *kdf = EVP_KDF_fetch(NULL, OSSL_KDF_NAME_HKDF, NULL); EVP_KDF_CTX *kctx; OSSL_PARAM params[5], *p = params; int mode = EVP_PKEY_HKDEF_MODE_EXPAND_ONLY; @@ -194,7 +194,7 @@ int tls13_generate_secret(SSL *s, const EVP_MD *md, #endif unsigned char preextractsec[EVP_MAX_MD_SIZE]; - kdf = EVP_KDF_fetch(NULL, SN_hkdf, NULL); + kdf = EVP_KDF_fetch(NULL, OSSL_KDF_NAME_HKDF, NULL); kctx = EVP_KDF_CTX_new(kdf); EVP_KDF_free(kdf); if (kctx == NULL) { |