From 8b6ffd40401bd3b78538cb8d496db0c6926185b0 Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 5 Feb 2020 15:13:49 +1000 Subject: Params: change UTF8 construct calls to avoid explicit strlen(3) calls. It is better, safer and smaller to let the library routine handle the strlen(3) call. Added a note to the documentation suggesting this. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/11019) --- crypto/dh/dh_kdf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto/dh/dh_kdf.c') diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c index a1bbea3013..23bc8acb73 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c @@ -43,14 +43,14 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, if ((kctx = EVP_KDF_CTX_new(kdf)) == NULL) goto err; *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, - (char *)mdname, strlen(mdname) + 1); + (char *)mdname, 0); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, (unsigned char *)Z, Zlen); if (ukm != NULL) *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_UKM, (unsigned char *)ukm, ukmlen); *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_CEK_ALG, - (char *)oid_sn, strlen(oid_sn) + 1); + (char *)oid_sn, 0); *p = OSSL_PARAM_construct_end(); ret = EVP_KDF_CTX_set_params(kctx, params) > 0 && EVP_KDF_derive(kctx, out, outlen) > 0; -- cgit v1.2.3