diff options
| author | Tomas Mraz <tomas@openssl.org> | 2024-05-08 16:13:30 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-05-14 18:04:25 +0200 |
| commit | 0819feadec779e304e0161cf2f09aac5fd7d92f3 (patch) | |
| tree | b76ec0de6c837b31506a8b3acf586f8a2d703610 | |
| parent | 4cbbb203e2bc07bab06cef59c53e74cf0145c07e (diff) | |
quicapitest.c: Make test_ssl_trace to be insensitive to fips changes
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/24348)
(cherry picked from commit b727850545b74e4d1bd82519c202b3b4585443a2)
| -rw-r--r-- | test/quicapitest.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/test/quicapitest.c b/test/quicapitest.c index 90a418e5f1..6c593a9547 100644 --- a/test/quicapitest.c +++ b/test/quicapitest.c @@ -496,21 +496,15 @@ static int compare_with_file(BIO *membio) */ static int test_ssl_trace(void) { - SSL_CTX *cctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method()); + SSL_CTX *cctx = NULL; SSL *clientquic = NULL; QUIC_TSERVER *qtserv = NULL; int testresult = 0; - BIO *bio = BIO_new(BIO_s_mem()); - - /* - * Ensure we only configure ciphersuites that are available with both the - * default and fips providers to get the same output in both cases - */ - if (!TEST_true(SSL_CTX_set_ciphersuites(cctx, "TLS_AES_128_GCM_SHA256"))) - goto err; + BIO *bio = NULL; - if (!TEST_ptr(cctx) - || !TEST_ptr(bio) + if (!TEST_ptr(cctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method())) + || !TEST_ptr(bio = BIO_new(BIO_s_mem())) + || !TEST_true(SSL_CTX_set_ciphersuites(cctx, "TLS_AES_128_GCM_SHA256")) || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert, privkey, QTEST_FLAG_FAKE_TIME, @@ -524,8 +518,15 @@ static int test_ssl_trace(void) if (!TEST_true(qtest_create_quic_connection(qtserv, clientquic))) goto err; - if (!TEST_true(compare_with_file(bio))) - goto err; + /* Skip the comparison of the trace when the fips provider is used. */ + if (is_fips) { + /* Check whether there was something written. */ + if (!TEST_int_gt(BIO_pending(bio), 0)) + goto err; + } else { + if (!TEST_true(compare_with_file(bio))) + goto err; + } testresult = 1; err: |