diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-24 20:27:08 +0300 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-24 20:27:08 +0300 |
| commit | 79bd20fd1755d0d8a6d1d758b2f8858643621923 (patch) | |
| tree | 06725a9fe6fee39c9d637a410dab64043d16b862 /util/mk1mf.pl | |
| parent | d0c36288341ca75328eeb4cc33bce6a7d3f65c51 (diff) | |
Update from stable-branch.
Diffstat (limited to 'util/mk1mf.pl')
| -rwxr-xr-x | util/mk1mf.pl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 0751413c08..22ef39627b 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.=" -DOPENSSL_NO_JPAKE" if $no_jpake; $cflags.= " -DZLIB" if $zlib_opt; $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2; @@ -706,7 +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/; + return("") if $no_jpake && $dir =~ /\/jpake/; if ($no_des && $dir =~ /\/des/) { if ($val =~ /read_pwd/) @@ -1037,6 +1037,7 @@ sub read_options "no-ssl3" => \$no_ssl3, "no-tlsext" => \$no_tlsext, "no-cms" => \$no_cms, + "no-jpake" => \$no_jpake, "no-err" => \$no_err, "no-sock" => \$no_sock, "no-krb5" => \$no_krb5, @@ -1063,8 +1064,6 @@ 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{$_}) |