diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/80-test_ssl_new.t | 5 | ||||
| -rw-r--r-- | test/ssl_test.c | 25 |
2 files changed, 1 insertions, 29 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index d78d70d7e6..1a3a3c1567 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -42,7 +42,7 @@ if (defined $ENV{SSL_TESTS}) { @conf_srcs = glob(srctop_file("test", "ssl-tests", "*.cnf.in")); # We hard-code the number of tests to double-check that the globbing above # finds all files as expected. - plan tests => 32; + plan tests => 31; } map { s/;.*// } @conf_srcs if $^O eq "VMS"; my @conf_files = map { basename($_, ".in") } @conf_srcs; @@ -64,7 +64,6 @@ if (!$no_tls && $no_tls_below1_3 && disabled("ec") && disabled("dh")) { } my $no_pre_tls1_3 = alldisabled(@all_pre_tls1_3); my $no_dtls = alldisabled(available_protocols("dtls")); -my $no_quic = disabled("quic"); my $no_npn = disabled("nextprotoneg"); my $no_ct = disabled("ct"); my $no_ec = disabled("ec"); @@ -129,8 +128,6 @@ my %skip = ( "25-cipher.cnf" => disabled("ec") || disabled("tls1_2"), "26-tls13_client_auth.cnf" => disabled("tls1_3") || ($no_ec && $no_dh), "29-dtls-sctp-label-bug.cnf" => disabled("sctp") || disabled("sock"), - # TODO(QUIC): Temporarily disabled during finalization of front-end API. - "31-quic.cnf" => 1 || $no_quic || $no_ec, "32-compressed-certificate.cnf" => disabled("comp") || disabled("tls1_3"), ); diff --git a/test/ssl_test.c b/test/ssl_test.c index 2795909820..56b765ad8e 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -14,9 +14,6 @@ #include <openssl/err.h> #include <openssl/ssl.h> #include <openssl/provider.h> -#ifndef OPENSSL_NO_QUIC -#include <openssl/quic.h> -#endif #include "helpers/handshake.h" #include "helpers/ssl_test_ctx.h" @@ -500,28 +497,6 @@ static int test_handshake(int idx) goto err; } } -#ifndef OPENSSL_NO_QUIC - if (test_ctx->method == SSL_TEST_METHOD_QUIC) { - server_ctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_server_method()); - if (test_ctx->extra.server.servername_callback != - SSL_TEST_SERVERNAME_CB_NONE) { - if (!TEST_ptr(server2_ctx = - SSL_CTX_new_ex(libctx, NULL, - OSSL_QUIC_server_method()))) - goto err; - } - client_ctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method()); - if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME) { - resume_server_ctx = SSL_CTX_new_ex(libctx, NULL, - OSSL_QUIC_server_method()); - resume_client_ctx = SSL_CTX_new_ex(libctx, NULL, - OSSL_QUIC_client_method()); - if (!TEST_ptr(resume_server_ctx) - || !TEST_ptr(resume_client_ctx)) - goto err; - } - } -#endif #ifdef OPENSSL_NO_AUTOLOAD_CONFIG if (!TEST_true(OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL))) |