Remove unused server code

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

diff --git a/doc/man3/OSSL_QUIC_client_method.pod b/doc/man3/OSSL_QUIC_client_method.pod
index 65d37e88b3c8bc36009b3276fc38c135bc7ae71b..eaae2b049d29430bb95177bfb5b3566cab9f13d6 100644 (file)
--- a/doc/man3/OSSL_QUIC_client_method.pod
+++ b/doc/man3/OSSL_QUIC_client_method.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-OSSL_QUIC_client_method, OSSL_QUIC_client_thread_method,
-OSSL_QUIC_server_method
+OSSL_QUIC_client_method, OSSL_QUIC_client_thread_method
 - Provide SSL_METHOD objects for QUIC enabled functions
 
 =head1 SYNOPSIS
@@ -12,7 +11,6 @@ OSSL_QUIC_server_method
 
  const SSL_METHOD *OSSL_QUIC_client_method(void);
  const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
- const SSL_METHOD *OSSL_QUIC_server_method(void);
 
 =head1 DESCRIPTION
 
@@ -27,10 +25,6 @@ The OSSL_QUIC_client_method() does not use threads and depends on
 nonblocking mode of operation and the application periodically calling SSL
 functions.
 
-The OSSL_QUIC_server_method() is currently experimental and unsupported.
-It is provided for testing purposes. It does not provide a QUIC server
-implementation compliant with the QUIC specification.
-
 =head1 RETURN VALUES
 
 These functions return pointers to the constant method objects.
@@ -41,8 +35,8 @@ L<SSL_CTX_new_ex(3)>
 
 =head1 HISTORY
 
-OSSL_QUIC_client_method(), OSSL_QUIC_client_thread_method(), and
-OSSL_QUIC_server_method() were added in OpenSSL 3.2.
+OSSL_QUIC_client_method() and OSSL_QUIC_client_thread_method() were added in
+OpenSSL 3.2.
 
 =head1 COPYRIGHT
 

diff --git a/include/openssl/quic.h b/include/openssl/quic.h
index 781971ad66d29cf522907d0a203de8ffbd74074a..a8798a9a44951b581b6919b17c05870747846229 100644 (file)
--- a/include/openssl/quic.h
+++ b/include/openssl/quic.h
@@ -28,12 +28,6 @@ __owur const SSL_METHOD *OSSL_QUIC_client_method(void);
  * Method used for thread-assisted QUIC client operation.
  */
 __owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
-/*
- * This method does not implement full server operation,
- * is used for testing, and is subject to change in later
- * releases.
- */
-__owur const SSL_METHOD *OSSL_QUIC_server_method(void);
 
 #  ifdef __cplusplus
 }

diff --git a/ssl/quic/quic_method.c b/ssl/quic/quic_method.c
index 2c769f1340e52235bf9fa0b759334f91f1357218..118f5a07c57cd50eabde3030d2b0b6b15969b22b 100644 (file)
--- a/ssl/quic/quic_method.c
+++ b/ssl/quic/quic_method.c
@@ -20,8 +20,3 @@ IMPLEMENT_quic_meth_func(OSSL_QUIC_ANY_VERSION,
                          OSSL_QUIC_client_thread_method,
                          ssl_undefined_function,
                          ossl_quic_connect, ssl3_undef_enc_method)
-
-IMPLEMENT_quic_meth_func(OSSL_QUIC_ANY_VERSION,
-                         OSSL_QUIC_server_method,
-                         ossl_quic_accept,
-                         ssl_undefined_function, ssl3_undef_enc_method)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index d78d70d7e6f020c204010f6fefebeea60ecd6242..1a3a3c1567772992185ea0e4f3dc3089bd3ee914 100644 (file)
--- 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 2795909820bd6a257fc86444dcb5b87694685abc..56b765ad8e7ff6c8138871e302ed37003d3aa6c3 100644 (file)
--- 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)))