Fix no-ssl-trace
authorMatt Caswell <matt@openssl.org>
Tue, 26 Sep 2023 11:14:56 +0000 (12:14 +0100)
committerMatt Caswell <matt@openssl.org>
Thu, 28 Sep 2023 08:49:49 +0000 (09:49 +0100)
Ensure we use OPENSSL_NO_SSL_TRACE guards where appropriate.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22193)

test/helpers/quictestlib.c

index 8d71d6002f6607e7e55ca9de15f4b4630c376423..514bb6422a79016fc97816223f495e1494a066e1 100644 (file)
@@ -98,6 +98,7 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
             return 0;
     }
 
+#ifndef OPENSSL_NO_SSL_TRACE
     if ((flags & QTEST_FLAG_CLIENT_TRACE) != 0) {
         tmpbio = BIO_new_fp(stdout, BIO_NOCLOSE);
         if (!TEST_ptr(tmpbio))
@@ -106,6 +107,7 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
         SSL_set_msg_callback(*cssl, SSL_trace);
         SSL_set_msg_callback_arg(*cssl, tmpbio);
     }
+#endif
     if (tracebio != NULL)
         *tracebio = tmpbio;