GitHub/openssl
1
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2026-05-07 20:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

evp_test.c: Check error stack for new errors and not stale ones

Browse Source 
The error stack might have stale entries but
we are interested only in those coming from the
EVP call being tested.

Fixes #30454

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Fri Apr  3 15:49:52 2026
(Merged from https://github.com/openssl/openssl/pull/30669)
This commit is contained in:
Tomas Mraz
2026-04-02 11:08:56 +02:00
parent d711845efb
commit 35868991d1
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/evp_test.c
+11 -2
View File
@@ -1273,18 +1273,23 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
if (expected->iv != NULL) {
/* Some (e.g., GCM) tests use IVs longer than EVP_MAX_IV_LENGTH. */
unsigned char iv[128];
ERR_set_mark();
if (!TEST_true(EVP_CIPHER_CTX_get_updated_iv(ctx_base, iv, sizeof(iv)))
|| ((EVP_CIPHER_get_flags(expected->cipher) & EVP_CIPH_CUSTOM_IV) == 0
&& !TEST_mem_eq(expected->iv, expected->iv_len, iv,
expected->iv_len))) {
t->err = "INVALID_IV";
ERR_clear_last_mark();
goto err;
} else {
if (fips_no_silent_error && !TEST_false(ERR_peek_error())) {
if (fips_no_silent_error && !TEST_int_eq(ERR_count_to_mark(), 0)) {
t->err = "GET_UPDATED_IV_SILENT_ERROR";
ERR_clear_last_mark();
goto err;
}
}
ERR_clear_last_mark();
}
/* Test that the cipher dup functions correctly if it is supported */
@@ -1571,17 +1576,21 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
if (expected->next_iv != NULL) {
/* Some (e.g., GCM) tests use IVs longer than EVP_MAX_IV_LENGTH. */
unsigned char iv[128];
ERR_set_mark();
if (!TEST_true(EVP_CIPHER_CTX_get_updated_iv(ctx, iv, sizeof(iv)))
|| !TEST_mem_eq(expected->next_iv, expected->iv_len, iv,
expected->iv_len)) {
t->err = "INVALID_NEXT_IV";
ERR_clear_last_mark();
goto err;
} else {
if (fips_no_silent_error && !TEST_false(ERR_peek_error())) {
if (fips_no_silent_error && !TEST_int_eq(ERR_count_to_mark(), 0)) {
t->err = "GET_UPDATED_IV_SILENT_ERROR";
ERR_clear_last_mark();
goto err;
}
}
ERR_clear_last_mark();
}
t->err = NULL;