mirror of https://github.com/openssl/openssl
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)
This commit is contained in:
parent
d810cc1977
commit
1732c260db
|
@ -46,7 +46,7 @@ static int tls1_PRF(SSL *s,
|
||||||
SSLerr(SSL_F_TLS1_PRF, ERR_R_INTERNAL_ERROR);
|
SSLerr(SSL_F_TLS1_PRF, ERR_R_INTERNAL_ERROR);
|
||||||
return 0;
|
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)
|
if (kdf == NULL)
|
||||||
goto err;
|
goto err;
|
||||||
kctx = EVP_KDF_CTX_new(kdf);
|
kctx = EVP_KDF_CTX_new(kdf);
|
||||||
|
|
|
@ -36,7 +36,7 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
|
||||||
#else
|
#else
|
||||||
static const unsigned char label_prefix[] = "tls13 ";
|
static const unsigned char label_prefix[] = "tls13 ";
|
||||||
#endif
|
#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;
|
EVP_KDF_CTX *kctx;
|
||||||
OSSL_PARAM params[5], *p = params;
|
OSSL_PARAM params[5], *p = params;
|
||||||
int mode = EVP_PKEY_HKDEF_MODE_EXPAND_ONLY;
|
int mode = EVP_PKEY_HKDEF_MODE_EXPAND_ONLY;
|
||||||
|
@ -194,7 +194,7 @@ int tls13_generate_secret(SSL *s, const EVP_MD *md,
|
||||||
#endif
|
#endif
|
||||||
unsigned char preextractsec[EVP_MAX_MD_SIZE];
|
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);
|
kctx = EVP_KDF_CTX_new(kdf);
|
||||||
EVP_KDF_free(kdf);
|
EVP_KDF_free(kdf);
|
||||||
if (kctx == NULL) {
|
if (kctx == NULL) {
|
||||||
|
|
Loading…
Reference in New Issue