From: Matt Caswell <matt@openssl.org>
Date: Thu, 6 Jul 2023 09:15:25 +0000 (+0100)
Subject: Don't run the ssl trace test if no-ecx
X-Git-Tag: openssl-3.2.0-alpha1~494
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47ef3b9fc03c92f6a387927f1b8b0fe1014eb646;p=thirdparty%2Fopenssl.git

Don't run the ssl trace test if no-ecx

no-ecx causes SSL_trace to give different output. The test compares
the output to a reference sample - so we disable it in the case of no-ecx.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/21372)
---

diff --git a/test/quicapitest.c b/test/quicapitest.c
index 4ed10a33fc5..d7eb9192bd0 100644
--- a/test/quicapitest.c
+++ b/test/quicapitest.c
@@ -31,7 +31,7 @@ static int is_fips = 0;
 /* The ssltrace test assumes some options are switched on/off */
 #if !defined(OPENSSL_NO_SSL_TRACE) && !defined(OPENSSL_NO_EC) \
     && defined(OPENSSL_NO_ZLIB) && defined(OPENSSL_NO_BROTLI) \
-    && defined(OPENSSL_NO_ZSTD)
+    && defined(OPENSSL_NO_ZSTD) && !defined(OPENSSL_NO_ECX)
 # define DO_SSL_TRACE_TEST
 #endif