From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 24 Feb 2026 07:22:10 +0000 (+0100)
Subject: ech_test.c: Fix the test with disabled CHACHA20-POLY1305
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67badef7bc068e29a2506c538411f8b2de7e7396;p=thirdparty%2Fopenssl.git

ech_test.c: Fix the test with disabled CHACHA20-POLY1305

Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
MergeDate: Wed Feb 25 08:15:21 2026
(Merged from https://github.com/openssl/openssl/pull/30152)
---

diff --git a/test/ech_test.c b/test/ech_test.c
index 4098c218e2..86750d7e40 100644
--- a/test/ech_test.c
+++ b/test/ech_test.c
@@ -857,7 +857,9 @@ static const char *kdf_str_list[] = {
 static const char *aead_str_list[] = {
     "aes-128-gcm",
     "aes-256-gcm",
+#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
     "chacha20-poly1305",
+#endif
 };
 
 typedef enum OPTION_choice {
@@ -1816,7 +1818,7 @@ static int ech_grease_test(int idx)
     /* 3rd time, fail to set a bad grease suite, then set a good one */
     if (idx == 2 && !TEST_false(SSL_ech_set1_grease_suite(clientssl, "notanhpkesuite")))
         goto end;
-    if (idx == 2 && !TEST_true(SSL_ech_set1_grease_suite(clientssl, "x25519,2,3")))
+    if (idx == 2 && !TEST_true(SSL_ech_set1_grease_suite(clientssl, "x25519,hkdf-sha384,aes-256-gcm")))
         goto end;
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
             SSL_ERROR_NONE)))