From: Matt Caswell <matt@openssl.org>
Date: Tue, 1 Mar 2016 12:08:33 +0000 (+0000)
Subject: Ensure mk1mf.pl is aware of no-weak-ssl-ciphers option
X-Git-Tag: OpenSSL_1_0_2g~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=08d0ff54d0f49bbf836f081e7a8012fef090dc95;p=oweals%2Fopenssl.git

Ensure mk1mf.pl is aware of no-weak-ssl-ciphers option

Update mk1mf.pl to properly handle no-weak-ssl-ciphers

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 973ad75b11..2629a1c5dd 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -290,6 +290,7 @@ $cflags.=" -DOPENSSL_NO_HW"   if $no_hw;
 $cflags.=" -DOPENSSL_FIPS"    if $fips;
 $cflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;
 $cflags.=" -DOPENSSL_NO_EC2M"    if $no_ec2m;
+$cflags.=" -DOPENSSL_NO_WEAK_SSL_CIPHERS"   if $no_weak_ssl;
 $cflags.= " -DZLIB" if $zlib_opt;
 $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
 
@@ -1205,6 +1206,7 @@ sub read_options
 		"no-jpake" => \$no_jpake,
 		"no-ec2m" => \$no_ec2m,
 		"no-ec_nistp_64_gcc_128" => 0,
+		"no-weak-ssl-ciphers" => \$no_weak_ssl,
 		"no-err" => \$no_err,
 		"no-sock" => \$no_sock,
 		"no-krb5" => \$no_krb5,