diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-12 18:27:17 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-12 18:27:17 +0000 |
| commit | a1bb2d6c2fa4433b71c5657a14e2c531cf7057fe (patch) | |
| tree | 0e9bfa155f3c80aa8d0d8824740ca45e315e8fa1 /util | |
| parent | 81dde5e8fe0421169e26d5221c8f245e016c652b (diff) | |
Update mk1mf.pl for new JPAKE options. Update jpaketest.c for WIN32.
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 2f7a0b34ed..632e617097 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -242,7 +242,7 @@ $cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh; $cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine; $cflags.=" -DOPENSSL_NO_HW" if $no_hw; $cflags.=" -DOPENSSL_FIPS" if $fips; - +$cflags.=" -DOPENSSL_EXPERIMENTAL_JPAKE" if $jpake; $cflags.= " -DZLIB" if $zlib_opt; $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2; @@ -1022,6 +1022,7 @@ sub var_add return("") if $no_ec && $dir =~ /\/ec/; return("") if $no_cms && $dir =~ /\/cms/; return("") if !$fips && $dir =~ /^fips/; + return("") if !$jpake && $dir =~ /\/jpake/; if ($no_des && $dir =~ /\/des/) { if ($val =~ /read_pwd/) @@ -1319,6 +1320,8 @@ sub read_options "fips" => \$fips, "fipscanisterbuild" => [\$fips, \$fipscanisterbuild], "fipsdso" => [\$fips, \$fipscanisterbuild, \$fipsdso], + "no-experimental-jpake" => 0, + "enable-experimental-jpake" => \$jpake, ); if (exists $valid_options{$_}) |