From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 12 May 2022 12:54:08 +0000 (+0200)
Subject: Configure: Add disablable for QUIC, disabled by default
X-Git-Tag: openssl-3.2.0-alpha1~2570
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30b013291a502dce406708474a60fe58d5803e66;p=thirdparty%2Fopenssl.git

Configure: Add disablable for QUIC, disabled by default

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

diff --git a/Configure b/Configure
index ce0fcb6e51a..fa276dcd31a 100755
--- a/Configure
+++ b/Configure
@@ -91,6 +91,8 @@ EOF
 # zlib-dynamic  Like "zlib", but the zlib library is expected to be a shared
 #               library and will be loaded in run-time by the OpenSSL library.
 # sctp          include SCTP support
+# enable-quic   include QUIC support (currently just for developers as the
+#               implementation is by no means complete and usable)
 # no-uplink     Don't build support for UPLINK interface.
 # enable-weak-ssl-ciphers
 #               Enable weak ciphers that are disabled by default.
@@ -468,6 +470,7 @@ my @disablables = (
     "poly1305",
     "posix-io",
     "psk",
+    "quic",
     "rc2",
     "rc4",
     "rc5",
@@ -549,6 +552,7 @@ our %disabled = ( # "what"         => "comment"
                   "ktls"                => "default",
                   "md2"                 => "default",
                   "msan"                => "default",
+                  "quic"                => "default",
                   "rc5"                 => "default",
                   "sctp"                => "default",
                   "ssl3"                => "default",
@@ -589,7 +593,7 @@ my @disable_cascades = (
     "zlib"              => [ "zlib-dynamic" ],
     "des"               => [ "mdc2" ],
     "ec"                => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ],
-    "dgram"             => [ "dtls", "sctp" ],
+    "dgram"             => [ "dtls", "quic", "sctp" ],
     "sock"              => [ "dgram", "tfo" ],
     "dtls"              => [ @dtls ],
     sub { 0 == scalar grep { !$disabled{$_} } @dtls }
diff --git a/INSTALL.md b/INSTALL.md
index 8d7d7e466a2..f724478e503 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -882,6 +882,11 @@ Don't build test programs or run any tests.
 
 Build with support for TCP Fast Open (RFC7413). Supported on Linux, macOS and FreeBSD.
 
+### enable-quic
+
+Build with QUIC support. This is currently just for developers as the
+implementation is by no means complete and usable.
+
 ### no-threads
 
 Don't build with support for multi-threaded applications.