diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-12 18:52:58 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-12 18:52:58 +0000 |
| commit | 4e50072d56d54c1d3504e8187cb0dc7531c8b3ea (patch) | |
| tree | 63dce37cc5f68cb6195f16acfa8d90f9c42ca194 /util | |
| parent | dd9557a8ba0e4974fa85d0fc1a86e213290eafe3 (diff) | |
mk1mf.pl update from stable branch.
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 93d10a59e9..0751413c08 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -266,7 +266,7 @@ $cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa; $cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh; $cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine; $cflags.=" -DOPENSSL_NO_HW" if $no_hw; - +$cflags.=" -DOPENSSL_EXPERIMENTAL_JPAKE" if $jpake; $cflags.= " -DZLIB" if $zlib_opt; $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2; @@ -706,6 +706,7 @@ sub var_add return("") if $no_dh && $dir =~ /\/dh/; return("") if $no_ec && $dir =~ /\/ec/; return("") if $no_cms && $dir =~ /\/cms/; + return("") if !$jpake && $dir =~ /\/jpake/; if ($no_des && $dir =~ /\/des/) { if ($val =~ /read_pwd/) @@ -1062,6 +1063,8 @@ sub read_options "no-shared" => 0, "no-zlib" => 0, "no-zlib-dynamic" => 0, + "no-experimental-jpake" => 0, + "enable-experimental-jpake" => \$jpake, ); if (exists $valid_options{$_}) |