Revert OPENSSL_EXPERIMENTAL patch.

Change it so JPAKE uses the standard OPENSSL_NO_JPAKE instead.

1 files changed, 2 insertions, 11 deletions

diff --git a/Configure b/Configure
index bc515a3e56..3c9205a966 100755
--- a/Configure
+++ b/Configure
@@ -588,7 +588,6 @@ my $no_threads=0;
 my $threads=0;
 my $no_shared=0; # but "no-shared" is default
 my $zlib=1;      # but "no-zlib" is default
-my $jpake=1;      # but "no-jpake" is default
 my $no_krb5=0;   # but "no-krb5" is implied unless "--with-krb5-..." is used
 my $no_rfc3779=1; # but "no-rfc3779" is default
 my $montasm=1;   # but "no-montasm" is default
@@ -629,7 +628,7 @@ my %disabled = ( # "what"         => "comment"
                  "camellia"       => "default",
                  "capieng"        => "default",
                  "cms"            => "default",
-                 "experimental-jpake"          => "default",
+                 "jpake"          => "default",
                  "gmp"            => "default",
                  "mdc2"           => "default",
                  "montasm"        => "default", # explicit option in 0.9.8 only (implicitly enabled in 0.9.9)
@@ -647,8 +646,7 @@ my %disabled = ( # "what"         => "comment"
 # For symmetry, "disable-..." is a synonym for "no-...".
 
 # This is what $depflags will look like with the above default:
-my $default_depflags = "-DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_TLSEXT ";
-
+my $default_depflags = " -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_TLSEXT ";
 
 my $no_sse2=0;
 
@@ -977,8 +975,6 @@ foreach (sort (keys %disabled))
 		{ $no_threads = 1; }
 	elsif (/^shared$/)
 		{ $no_shared = 1; }
-	elsif (/^experimental-jpake$/)
-		{ $jpake = 0; push @skip, "jpake"}
 	elsif (/^zlib$/)
 		{ $zlib = 0; }
 	elsif (/^montasm$/)
@@ -1216,11 +1212,6 @@ if ($threads)
 	$openssl_thread_defines .= $thread_defines;
 	}
 
-if ($jpake)
-	{
-	$openssl_other_defines .= "#define OPENSSL_EXPERIMENTAL_JPAKE\n";
-	}
-
 if ($zlib)
 	{
 	$cflags = "-DZLIB $cflags";