diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-02-13 06:49:05 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-02-18 16:58:17 +0100 |
| commit | 3262300a2c2351c6706f37b89fef015430988a31 (patch) | |
| tree | 4caae10f143f2f4e8ace562540109d7893a73a00 /test/evp_kdf_test.c | |
| parent | 247a1786e25dbf77548168572e383d57aa743af4 (diff) | |
Adjust the few places where the string length was confused
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14168)
Diffstat (limited to 'test/evp_kdf_test.c')
| -rw-r--r-- | test/evp_kdf_test.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/test/evp_kdf_test.c b/test/evp_kdf_test.c index 621351f187..cb387bc71d 100644 --- a/test/evp_kdf_test.c +++ b/test/evp_kdf_test.c @@ -638,7 +638,7 @@ static int test_kdf_ss_hash(void) }; *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, - (char *)"sha224", sizeof("sha224")); + (char *)"sha224", 0); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, z, sizeof(z)); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, other, sizeof(other)); @@ -692,7 +692,7 @@ static int test_kdf_x963(void) }; *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, - (char *)"sha512", sizeof("sha512")); + (char *)"sha512", 0); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, z, sizeof(z)); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, shared, sizeof(shared)); @@ -1135,10 +1135,9 @@ static int test_kdf_ss_hmac(void) }; *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MAC, - (char *)OSSL_MAC_NAME_HMAC, - sizeof(OSSL_MAC_NAME_HMAC)); + (char *)OSSL_MAC_NAME_HMAC, 0); *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, - (char *)"sha256", sizeof("sha256")); + (char *)"sha256", 0); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, z, sizeof(z)); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, other, sizeof(other)); @@ -1182,8 +1181,7 @@ static int test_kdf_ss_kmac(void) }; *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MAC, - (char *)OSSL_MAC_NAME_KMAC128, - sizeof(OSSL_MAC_NAME_KMAC128)); + (char *)OSSL_MAC_NAME_KMAC128, 0); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, z, sizeof(z)); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, other, sizeof(other)); @@ -1239,7 +1237,7 @@ static int test_kdf_sshkdf(void) }; *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, - (char *)"sha256", sizeof("sha256")); + (char *)"sha256", 0); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, key, sizeof(key)); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SSHKDF_XCGHASH, @@ -1247,7 +1245,7 @@ static int test_kdf_sshkdf(void) *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SSHKDF_SESSION_ID, sessid, sizeof(sessid)); *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_SSHKDF_TYPE, - kdftype, sizeof(kdftype)); + kdftype, 0); *p = OSSL_PARAM_construct_end(); ret = @@ -1368,8 +1366,7 @@ static int test_kdf_krb5kdf(void) }; *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_CIPHER, - (char *)"AES-128-CBC", - sizeof("AES-128-CBC")); + (char *)"AES-128-CBC", 0); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, key, sizeof(key)); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_CONSTANT, |