Limit the support of the "backward compatible" ssl2 handshake to only be

used if TLS 1.0 is enabled. Sugessted/discussed with jsing@ and bcook@.
ok guenther@ sthen@

2 files changed, 18 insertions, 2 deletions

diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
index 2e63cfc830..ed476c70d1 100644
--- a/src/lib/libssl/s23_srvr.c
+++ b/src/lib/libssl/s23_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_srvr.c,v 1.46 2015/10/25 15:49:04 doug Exp $ */
+/* $OpenBSD: s23_srvr.c,v 1.47 2016/07/16 04:42:35 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -352,6 +352,14 @@ ssl23_get_client_hello(SSL *s)
                 /* we have SSLv3/TLSv1 in an SSLv2 header
                  * (other cases skip this state) */
 
+                /*
+                 * Limit the support of "backward compatible" headers
+                 * only to "backward" versions of TLS. If we have moved
+                 * on to modernity, just say no.
+                 */
+                if (s->options & SSL_OP_NO_TLSv1)
+                        goto unsupported;
+
                 type = 2;
                 p = s->packet;
                 v[0] = p[3]; /* == SSL3_VERSION_MAJOR */
diff --git a/src/lib/libssl/src/ssl/s23_srvr.c b/src/lib/libssl/src/ssl/s23_srvr.c
index 2e63cfc830..ed476c70d1 100644
--- a/src/lib/libssl/src/ssl/s23_srvr.c
+++ b/src/lib/libssl/src/ssl/s23_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_srvr.c,v 1.46 2015/10/25 15:49:04 doug Exp $ */
+/* $OpenBSD: s23_srvr.c,v 1.47 2016/07/16 04:42:35 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -352,6 +352,14 @@ ssl23_get_client_hello(SSL *s)
                 /* we have SSLv3/TLSv1 in an SSLv2 header
                  * (other cases skip this state) */
 
+                /*
+                 * Limit the support of "backward compatible" headers
+                 * only to "backward" versions of TLS. If we have moved
+                 * on to modernity, just say no.
+                 */
+                if (s->options & SSL_OP_NO_TLSv1)
+                        goto unsupported;
+
                 type = 2;
                 p = s->packet;
                 v[0] = p[3]; /* == SSL3_VERSION_MAJOR */