diff options
| author | Pauli <paul.dale@oracle.com> | 2019-09-04 19:27:08 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-04 19:41:22 +1000 |
| commit | 7f588d20cd9ed2bb0ee2577a4523453964f532b0 (patch) | |
| tree | 02b81ea1b5152c87e1b0ebe802dc2581df6fcfa5 /crypto/kdf | |
| parent | 550f974a09942ace37cf3cf14021ea5e51e6dd11 (diff) | |
OSSL_PARAM_construct_utf8_string computes the string length.
If the passed string length is zero, the function computes the string length
from the passed string.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9760)
Diffstat (limited to 'crypto/kdf')
| -rw-r--r-- | crypto/kdf/sskdf.c | 3 | ||||
| -rw-r--r-- | crypto/kdf/tls1_prf.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/crypto/kdf/sskdf.c b/crypto/kdf/sskdf.c index 916a06e5a1..b20eff2865 100644 --- a/crypto/kdf/sskdf.c +++ b/crypto/kdf/sskdf.c @@ -223,8 +223,7 @@ static int SSKDF_mac_kdm(EVP_MAC *kdf_mac, const EVP_MD *hmac_md, const char *mdname = EVP_MD_name(hmac_md); params[params_n++] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, - (char *)mdname, - strlen(mdname) + 1); + (char *)mdname, 0); } params[params_n++] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, (void *)salt, diff --git a/crypto/kdf/tls1_prf.c b/crypto/kdf/tls1_prf.c index f5d2314681..edd7f05ce0 100644 --- a/crypto/kdf/tls1_prf.c +++ b/crypto/kdf/tls1_prf.c @@ -252,8 +252,7 @@ static int tls1_prf_P_hash(const EVP_MD *md, mac_flags = EVP_MD_CTX_FLAG_NON_FIPS_ALLOW; params[0] = OSSL_PARAM_construct_int(OSSL_MAC_PARAM_FLAGS, &mac_flags); params[1] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, - (char *)mdname, - strlen(mdname) + 1); + (char *)mdname, 0); params[2] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, (void *)sec, sec_len); params[3] = OSSL_PARAM_construct_end(); |