summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-03-01 12:08:33 +0000
committerMatt Caswell <matt@openssl.org>2016-03-01 12:41:49 +0000
commit08d0ff54d0f49bbf836f081e7a8012fef090dc95 (patch)
treec980749cdd74a50a0127ff35bfef6c6014edec67
parent248808c8406c113d00ab45368ab03bfa66411d00 (diff)
downloadopenssl-new-08d0ff54d0f49bbf836f081e7a8012fef090dc95.tar.gz
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>
-rwxr-xr-xutil/mk1mf.pl2
1 files changed, 2 insertions, 0 deletions
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,