[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  90d6f35162a9515287e75248e1f880cd1cc92c1f (commit)
      from  22646a075e75991b4e8f5d67171e45a6aead5b48 (commit)


- Log -----------------------------------------------------------------
commit 90d6f35162a9515287e75248e1f880cd1cc92c1f
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 22 10:01:38 2016 +0200

    mk1mf.pl: check for no-tls1 here as well
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/mk1mf.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 4eded5a..7a3ae11 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -277,6 +277,7 @@ $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
 $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
 $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 $cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
+$cflags.=" -DOPENSSL_NO_TLS1" if $no_tls1;
 $cflags.=" -DOPENSSL_NO_SRP" if $no_srp;
 $cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
@@ -1205,6 +1206,7 @@ sub read_options
 		"no-ssl3" => \$no_ssl3,
 		"no-ssl3-method" => 0,
 		"no-tlsext" => \$no_tlsext,
+		"no-tls1" => \$no_tls1,
 		"no-srp" => \$no_srp,
 		"no-cms" => \$no_cms,
 		"no-jpake" => \$no_jpake,