From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 12 Nov 2008 18:52:58 +0000 (+0000)
Subject: mk1mf.pl update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~159
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4e50072d56d54c1d3504e8187cb0dc7531c8b3ea;p=oweals%2Fopenssl.git

mk1mf.pl update from stable branch.
---

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{$_})