Add support for experimental code, not compiled in by default and

with OPENSSL_EXPERIMENTAL_FOO around it. Make JPAKE experimental.

2 files changed, 36 insertions, 23 deletions

diff --git a/util/libeay.num b/util/libeay.num
index 989f5e3ea1..d6cf383972 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3701,24 +3701,24 @@ FIPS_dsa_sig_encode                     4089	EXIST:OPENSSL_FIPS:FUNCTION:DSA
 CRYPTO_dbg_remove_all_info              4090	EXIST::FUNCTION:
 OPENSSL_init                            4091	EXIST::FUNCTION:
 private_Camellia_set_key                4092	EXIST:OPENSSL_FIPS:FUNCTION:CAMELLIA
-JPAKE_STEP3A_process                    4093	EXIST::FUNCTION:
-JPAKE_STEP1_release                     4094	EXIST::FUNCTION:
-JPAKE_get_shared_key                    4095	EXIST::FUNCTION:
-JPAKE_STEP3B_init                       4096	EXIST::FUNCTION:
-JPAKE_STEP1_generate                    4097	EXIST::FUNCTION:
-JPAKE_STEP1_init                        4098	EXIST::FUNCTION:
-JPAKE_STEP3B_process                    4099	EXIST::FUNCTION:
-JPAKE_STEP2_generate                    4100	EXIST::FUNCTION:
-JPAKE_CTX_new                           4101	EXIST::FUNCTION:
-JPAKE_CTX_free                          4102	EXIST::FUNCTION:
-JPAKE_STEP3B_release                    4103	EXIST::FUNCTION:
-JPAKE_STEP3A_release                    4104	EXIST::FUNCTION:
-JPAKE_STEP2_process                     4105	EXIST::FUNCTION:
-CRYPTO_strdup                           4106	EXIST::FUNCTION:
-JPAKE_STEP3B_generate                   4107	EXIST::FUNCTION:
-JPAKE_STEP1_process                     4108	EXIST::FUNCTION:
-JPAKE_STEP3A_generate                   4109	EXIST::FUNCTION:
-JPAKE_STEP2_release                     4110	EXIST::FUNCTION:
-JPAKE_STEP3A_init                       4111	EXIST::FUNCTION:
-ERR_load_JPAKE_strings                  4112	EXIST::FUNCTION:
-JPAKE_STEP2_init                        4113	EXIST::FUNCTION:
+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:
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 1507a8b499..fca62e4b3e 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -79,7 +79,8 @@ my $OS2=0;
 my $safe_stack_def = 0;
 
 my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
-			"EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS" );
+			"EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS", 
+			"OPENSSL_EXPERIMENTAL_JPAKE" );
 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",
@@ -151,7 +152,10 @@ foreach (@ARGV, split(/ /, $options))
  			 || $_ eq "enable-zlib-dynamic") {
  		$zlib = 1;
 	}
- 
+
+	if ($_ eq "enable-experimental-jpake") {
+ 		$jpake = 1;
+	}
 
 	$do_ssl=1 if $_ eq "ssleay";
 	if ($_ eq "ssl") {
@@ -552,6 +556,10 @@ 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/) {
@@ -561,6 +569,8 @@ 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;
 					}
@@ -1099,6 +1109,9 @@ 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