Commit 840ceecbd6 for openssl.org
commit 840ceecbd6f310442dd8e3a7065d202ef56b75be
Author: GGAutomaton <gga7n@proton.me>
Date: Mon Apr 6 18:31:36 2026 -0700
test: reinitialize buffer length in test_EVP_SM2
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed May 6 16:51:02 2026
(Merged from https://github.com/openssl/openssl/pull/30614)
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 88c1561470..61d08c1374 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -2689,8 +2689,10 @@ static int test_EVP_SM2(void)
#ifndef OPENSSL_NO_X963KDF
uint8_t ciphertext[128];
size_t ctext_len = sizeof(ciphertext);
+ size_t ctext_len_param = 0;
uint8_t plaintext[8];
size_t ptext_len = sizeof(plaintext);
+ size_t ptext_len_param = 0;
OSSL_PARAM sparams[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
OSSL_PARAM gparams[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
int i;
@@ -2818,7 +2820,8 @@ static int test_EVP_SM2(void)
if (!TEST_true(EVP_PKEY_CTX_set_params(cctx, sparams)))
goto done;
- if (!TEST_true(EVP_PKEY_encrypt(cctx, ciphertext, &ctext_len, kMsg,
+ ctext_len_param = ctext_len;
+ if (!TEST_true(EVP_PKEY_encrypt(cctx, ciphertext, &ctext_len_param, kMsg,
sizeof(kMsg))))
goto done;
@@ -2828,8 +2831,9 @@ static int test_EVP_SM2(void)
if (!TEST_true(EVP_PKEY_CTX_set_params(cctx, sparams)))
goto done;
- if (!TEST_int_gt(EVP_PKEY_decrypt(cctx, plaintext, &ptext_len, ciphertext,
- ctext_len),
+ ptext_len_param = ptext_len;
+ if (!TEST_int_gt(EVP_PKEY_decrypt(cctx, plaintext, &ptext_len_param, ciphertext,
+ ctext_len_param),
0))
goto done;
@@ -2849,7 +2853,7 @@ static int test_EVP_SM2(void)
goto done;
}
- if (!TEST_true(ptext_len == sizeof(kMsg)))
+ if (!TEST_true(ptext_len_param == sizeof(kMsg)))
goto done;
if (!TEST_true(memcmp(plaintext, kMsg, sizeof(kMsg)) == 0))