Make the TLSv1.3 downgrade mechanism a configurable option

Make it disabled by default. When TLSv1.3 is out of draft we can remove
this option and have it enabled all the time.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3022)

diff --git a/Configure b/Configure
index b7d669c11898e5a821fd5ad13308ee8dec2b6c5b..191fe73f9e77956bcb6826a2d76ff86cecce7c95 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -407,6 +407,7 @@ my @disablables = (
     "tests",
     "threads",
     "tls",
     "tests",
     "threads",
     "tls",

+    "tls13downgrade",

     "ts",
     "ubsan",
     "ui",
     "ts",
     "ubsan",
     "ui",


@@ -451,6 +452,7 @@ our %disabled = ( # "what"         => "comment"
                   "ubsan"              => "default",
           #TODO(TLS1.3): Temporarily disabled while this is a WIP
                  "tls1_3"              => "default",
                   "ubsan"              => "default",
           #TODO(TLS1.3): Temporarily disabled while this is a WIP
                  "tls1_3"              => "default",

+                 "tls13downgrade"      => "default",

                  "unit-test"           => "default",
                  "weak-ssl-ciphers"    => "default",
                  "zlib"                => "default",
                  "unit-test"           => "default",
                  "weak-ssl-ciphers"    => "default",
                  "zlib"                => "default",

diff --git a/INSTALL b/INSTALL
index d741b9f5a02cd8b5e0c87c18a9f52d001687b880..59486efbb423feabf7fdaa9463a5e4020ace2dc5 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -427,6 +427,16 @@
                    require additional system-dependent options! See "Note on
                    multi-threading" below.
 
                    require additional system-dependent options! See "Note on
                    multi-threading" below.
 

+  enable-tls13downgrade
+                   TODO(TLS1.3): Make this enabled by default and remove the
+                   option when TLSv1.3 is out of draft
+                   TLSv1.3 offers a downgrade protection mechanism. This is
+                   implemented but disabled by default. It should not typically
+                   be enabled except for testing purposes. Otherwise this could
+                   cause problems if a pre-RFC version of OpenSSL talks to an
+                   RFC implementation (it will erroneously be detected as a
+                   downgrade).
+

   no-ts
                    Don't build Time Stamping Authority support.
 
   no-ts
                    Don't build Time Stamping Authority support.