Commit 5a02ac6e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Revert OPENSSL_EXPERIMENTAL patch. 

Change it so JPAKE uses the standard OPENSSL_NO_JPAKE instead.
parent 14d4074e

CHANGES

+0 −6
Original line number Diff line number Diff line
@@ -9,12 +9,6 @@ 
     obligation to set up the dynamic locking callbacks.)

     [Sander Temme <sander@temme.net>]



  *) Update Configure code and WIN32 build scripts to support experimental

     code. This is surrounded by OPENSSL_EXPERIMENTAL_FOO and not compiled

     in by default. Using the configuration option "enable-experimental-foo"

     enables it. Use this option for JPAKE.

     [Steve Henson]



  *) Use correct exit code if there is an error in dgst command.

     [Steve Henson; problem pointed out by Roland Dirlewanger]

Configure

+2 −11
Original line number Diff line number Diff line
@@ -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";

apps/apps.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
#include <openssl/rsa.h>

#endif

#include <openssl/bn.h>

#ifdef OPENSSL_EXPERIMENTAL_JPAKE

#ifndef OPENSSL_NO_JPAKE

#include <openssl/jpake.h>

#endif
@@ -2338,7 +2338,7 @@ void policies_print(BIO *out, X509_STORE_CTX *ctx) 
		BIO_free(out);

	}



#ifdef OPENSSL_EXPERIMENTAL_JPAKE

#ifndef OPENSSL_NO_JPAKE



static JPAKE_CTX *jpake_init(const char *us, const char *them,

							 const char *secret)

apps/apps.h

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ X509_NAME *parse_name(char *str, long chtype, int multirdn); 
int args_verify(char ***pargs, int *pargc,

			int *badarg, BIO *err, X509_VERIFY_PARAM **pm);

void policies_print(BIO *out, X509_STORE_CTX *ctx);

#ifdef OPENSSL_EXPERIMENTAL_JPAKE

#ifndef OPENSSL_NO_JPAKE

void jpake_client_auth(BIO *out, BIO *conn, const char *secret);

void jpake_server_auth(BIO *out, BIO *conn, const char *secret);

#endif

apps/s_client.c

+3 −3
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ int MAIN(int argc, char **argv) 
	int peerlen = sizeof(peer);

	int enable_timeouts = 0 ;

	long mtu = 0;

#ifdef OPENSSL_EXPERIMENTAL_JPAKE

#ifndef OPENSSL_NO_JPAKE

	char *jpake_secret = NULL;

#endif
@@ -585,7 +585,7 @@ int MAIN(int argc, char **argv) 
			/* meth=TLSv1_client_method(); */

			}

#endif

#ifdef OPENSSL_EXPERIMENTAL_JPAKE

#ifndef OPENSSL_NO_JPAKE

		else if (strcmp(*argv,"-jpake") == 0)

			{

			if (--argc < 1) goto bad;
@@ -897,7 +897,7 @@ SSL_set_tlsext_status_ids(con, ids); 
#endif

		}

#endif

#ifdef OPENSSL_EXPERIMENTAL_JPAKE

#ifndef OPENSSL_NO_JPAKE

	if (jpake_secret)

		jpake_client_auth(bio_c_out, sbio, jpake_secret);

#endif