diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2016-05-03 18:02:01 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2016-05-03 18:02:01 +0000 |
| commit | 47b11f985b9e0ff561a67e19674de6fbcf79281d (patch) | |
| tree | da6c0490c1781cf42777777890fc53da00f780ed /util/mk1mf.pl | |
| parent | 8f9fae4c4537bd423d1a266b3280c396a2e90f44 (diff) | |
Import OpenSSL 1.0.1t.vendor/openssl/1.0.1t
Notes
svn path=/vendor-crypto/openssl/dist-1.0.1/; revision=298993
svn path=/vendor-crypto/openssl/1.0.1t/; revision=298994; tag=vendor/openssl/1.0.1t
Diffstat (limited to 'util/mk1mf.pl')
| -rwxr-xr-x | util/mk1mf.pl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index e5fe37c426f6..8c7780a1bd7c 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -282,8 +282,9 @@ $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; +$cflags.=" -DZLIB" if $zlib_opt; +$cflags.=" -DZLIB_SHARED" if $zlib_opt == 2; +$cflags.=" -DOPENSSL_NO_COMP" if $no_comp; if ($no_static_engine) { @@ -780,6 +781,7 @@ sub var_add return("") if $no_gost && $dir =~ /\/ccgost/; return("") if $no_cms && $dir =~ /\/cms/; return("") if $no_jpake && $dir =~ /\/jpake/; + return("") if $no_comp && $dir =~ /\/comp/; if ($no_des && $dir =~ /\/des/) { if ($val =~ /read_pwd/) @@ -1115,6 +1117,7 @@ sub read_options "nw-mwasm" => \$nw_mwasm, "gaswin" => \$gaswin, "no-ssl2" => \$no_ssl2, + "no-ssl2-method" => 0, "no-ssl3" => \$no_ssl3, "no-ssl3-method" => 0, "no-tlsext" => \$no_tlsext, @@ -1156,6 +1159,7 @@ sub read_options "no-unit-test" => 0, "no-zlib" => 0, "no-zlib-dynamic" => 0, + "no-comp" => \$no_comp, "fips" => \$fips ); @@ -1173,7 +1177,6 @@ sub read_options } } } - elsif (/^no-comp$/) { $xcflags = "-DOPENSSL_NO_COMP $xcflags"; } elsif (/^enable-zlib$/) { $zlib_opt = 1 if $zlib_opt == 0 } elsif (/^enable-zlib-dynamic$/) { |