Revert OPENSSL_EXPERIMENTAL patch.

Change it so JPAKE uses the standard OPENSSL_NO_JPAKE instead.

3 files changed, 29 insertions, 40 deletions

diff --git a/util/libeay.num b/util/libeay.num
index d6cf383972..7ca5da160d 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3702,23 +3702,23 @@ CRYPTO_dbg_remove_all_info              4090	EXIST::FUNCTION:
 OPENSSL_init                            4091	EXIST::FUNCTION:
 private_Camellia_set_key                4092	EXIST:OPENSSL_FIPS:FUNCTION:CAMELLIA
 CRYPTO_strdup                           4093	EXIST::FUNCTION:
-JPAKE_STEP3A_process                    4094	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP1_release                     4095	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_get_shared_key                    4096	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP3B_init                       4097	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP1_generate                    4098	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP1_init                        4099	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP3B_process                    4100	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP2_generate                    4101	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_CTX_new                           4102	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_CTX_free                          4103	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP3B_release                    4104	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP3A_release                    4105	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP2_process                     4106	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP3B_generate                   4107	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP1_process                     4108	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP3A_generate                   4109	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP2_release                     4110	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP3A_init                       4111	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-ERR_load_JPAKE_strings                  4112	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
-JPAKE_STEP2_init                        4113	EXIST:OPENSSL_EXPERIMENTAL_JPAKE:FUNCTION:
+JPAKE_STEP3A_process                    4094	EXIST::FUNCTION:JPAKE
+JPAKE_STEP1_release                     4095	EXIST::FUNCTION:JPAKE
+JPAKE_get_shared_key                    4096	EXIST::FUNCTION:JPAKE
+JPAKE_STEP3B_init                       4097	EXIST::FUNCTION:JPAKE
+JPAKE_STEP1_generate                    4098	EXIST::FUNCTION:JPAKE
+JPAKE_STEP1_init                        4099	EXIST::FUNCTION:JPAKE
+JPAKE_STEP3B_process                    4100	EXIST::FUNCTION:JPAKE
+JPAKE_STEP2_generate                    4101	EXIST::FUNCTION:JPAKE
+JPAKE_CTX_new                           4102	EXIST::FUNCTION:JPAKE
+JPAKE_CTX_free                          4103	EXIST::FUNCTION:JPAKE
+JPAKE_STEP3B_release                    4104	EXIST::FUNCTION:JPAKE
+JPAKE_STEP3A_release                    4105	EXIST::FUNCTION:JPAKE
+JPAKE_STEP2_process                     4106	EXIST::FUNCTION:JPAKE
+JPAKE_STEP3B_generate                   4107	EXIST::FUNCTION:JPAKE
+JPAKE_STEP1_process                     4108	EXIST::FUNCTION:JPAKE
+JPAKE_STEP3A_generate                   4109	EXIST::FUNCTION:JPAKE
+JPAKE_STEP2_release                     4110	EXIST::FUNCTION:JPAKE
+JPAKE_STEP3A_init                       4111	EXIST::FUNCTION:JPAKE
+ERR_load_JPAKE_strings                  4112	EXIST::FUNCTION:JPAKE
+JPAKE_STEP2_init                        4113	EXIST::FUNCTION:JPAKE
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 632e617097..10b4c9bcb8 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -233,6 +233,7 @@ $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
 $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 $cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
 $cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
+$cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake;
 $cflags.=" -DOPENSSL_NO_CAPIENG" if $no_capieng;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
 $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
@@ -242,7 +243,6 @@ $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;
 
@@ -1021,8 +1021,8 @@ sub var_add
 	return("") if $no_dh   && $dir =~ /\/dh/;
 	return("") if $no_ec   && $dir =~ /\/ec/;
 	return("") if $no_cms  && $dir =~ /\/cms/;
+	return("") if $no_jpake  && $dir =~ /\/jpake/;
 	return("") if !$fips   && $dir =~ /^fips/;
-	return("") if !$jpake  && $dir =~ /\/jpake/;
 	if ($no_des && $dir =~ /\/des/)
 		{
 		if ($val =~ /read_pwd/)
@@ -1290,6 +1290,7 @@ sub read_options
 		"no-ssl3" => \$no_ssl3,
 		"no-tlsext" => \$no_tlsext,
 		"no-cms" => \$no_cms,
+		"no-jpake" => \$no_jpake,
 		"no-capieng" => \$no_capieng,
 		"no-err" => \$no_err,
 		"no-sock" => \$no_sock,
@@ -1320,8 +1321,6 @@ sub read_options
 		"fips" => \$fips,
 		"fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
 		"fipsdso" => [\$fips, \$fipscanisterbuild, \$fipsdso],
-		"no-experimental-jpake" => 0,
-		"enable-experimental-jpake" => \$jpake,
 		);
 
 	if (exists $valid_options{$_})
diff --git a/util/mkdef.pl b/util/mkdef.pl
index fca62e4b3e..5ae9ebb619 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -79,8 +79,7 @@ my $OS2=0;
 my $safe_stack_def = 0;
 
 my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
-			"EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS", 
-			"OPENSSL_EXPERIMENTAL_JPAKE" );
+			"EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS"); 
 my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
 			 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
@@ -103,6 +102,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
 			 "CMS",
 			 # CryptoAPI Engine
 			 "CAPIENG",
+			 # JPAKE
+			 "JPAKE",
 			 # Deprecated functions
 			 "DEPRECATED" );
 
@@ -123,7 +124,7 @@ my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
 my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_camellia;
 my $no_seed;
 my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated;
-my $no_rfc3779; my $no_tlsext; my $no_cms; my $no_capieng;
+my $no_rfc3779; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake;
 my $fips;
 
 
@@ -153,10 +154,6 @@ foreach (@ARGV, split(/ /, $options))
  		$zlib = 1;
 	}
 
-	if ($_ eq "enable-experimental-jpake") {
- 		$jpake = 1;
-	}
-
 	$do_ssl=1 if $_ eq "ssleay";
 	if ($_ eq "ssl") {
 		$do_ssl=1; 
@@ -216,6 +213,7 @@ foreach (@ARGV, split(/ /, $options))
 	elsif (/^no-tlsext$/)	{ $no_tlsext=1; }
 	elsif (/^no-cms$/)	{ $no_cms=1; }
 	elsif (/^no-capieng$/)	{ $no_capieng=1; }
+	elsif (/^no-jpake$/)	{ $no_jpake=1; }
 	}
 
 
@@ -556,10 +554,6 @@ sub do_defs
 						$tag{$tag[$tag_i]}=2;
 						print STDERR "DEBUG: $file: chaged tag $1 = 2\n" if $debug;
 					}
-					if ($tag[$tag_i] eq "OPENSSL_EXPERIMENTAL_".$1) {
-						$tag{$tag[$tag_i]}=-2;
-						print STDERR "DEBUG: $file: chaged tag $1 = -2\n" if $debug;
-					}
 					$tag_i--;
 				}
 			} elsif (/^\#\s*endif/) {
@@ -569,8 +563,6 @@ sub do_defs
 					print STDERR "DEBUG: \$t=\"$t\"\n" if $debug;
 					if ($tag{$t}==2) {
 						$tag{$t}=-1;
-					} elsif ($tag{$t}==-2) {
-						$tag{$t}=1;
 					} else {
 						$tag{$t}=0;
 					}
@@ -1109,9 +1101,6 @@ sub is_valid
 				return 1;
 			}
 			if ($keyword eq "ZLIB" && $zlib) { return 1; }
-			if ($keyword eq "OPENSSL_EXPERIMENTAL_JPAKE" && $jpake) {
-				return 1;
-			}
 			return 0;
 		} else {
 			# algorithms
@@ -1156,6 +1145,7 @@ sub is_valid
 			if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
 			if ($keyword eq "CMS" && $no_cms) { return 0; }
 			if ($keyword eq "CAPIENG" && $no_capieng) { return 0; }
+			if ($keyword eq "JPAKE" && $no_jpake) { return 0; }
 			if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
 
 			# Nothing recognise as true