From 4c37778a4e8d59124b761a63a08ca0512b7067d2 Mon Sep 17 00:00:00 2001 From: slontis Date: Mon, 19 Aug 2024 13:52:24 +1000 Subject: [PATCH] CI: Fix GCM IV check in acvp_test for crosstest Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/25223) --- test/acvp_test.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test/acvp_test.c b/test/acvp_test.c index 44f7249505a..6ff7046d911 100644 --- a/test/acvp_test.c +++ b/test/acvp_test.c @@ -885,16 +885,21 @@ static int aes_gcm_enc_dec(const char *alg, { OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END }; + OSSL_PARAM *p = params; unsigned int iv_generated = -1; + const OSSL_PARAM *gettables = EVP_CIPHER_CTX_gettable_params(ctx); + const char *ivgenkey = OSSL_CIPHER_PARAM_AEAD_IV_GENERATED; + int ivgen = (OSSL_PARAM_locate_const(gettables, ivgenkey) != NULL); - params[0] = OSSL_PARAM_construct_uint(OSSL_CIPHER_PARAM_AEAD_IV_GENERATED, - &iv_generated); + if (ivgen != 0) + *p++ = OSSL_PARAM_construct_uint(ivgenkey, &iv_generated); if (outiv != NULL) - params[1] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV, - outiv, iv_len); + *p = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV, + outiv, iv_len); if (!TEST_true(EVP_CIPHER_CTX_get_params(ctx, params))) goto err; - if (!TEST_uint_eq(iv_generated, (enc == 0 || iv != NULL ? 0 : 1))) + if (ivgen != 0 + && !TEST_uint_eq(iv_generated, (enc == 0 || iv != NULL ? 0 : 1))) goto err; } if (out_len != NULL) -- 2.47.2