Commit 79bd20fd authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from stable-branch.

parent d0c36288

CHANGES

+0 −6
Original line number Diff line number Diff line
@@ -734,12 +734,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

+0 −9
Original line number Diff line number Diff line
@@ -611,7 +611,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 $no_asm=0;
@@ -648,7 +647,6 @@ my $perl; 


my %disabled = ( # "what"         => "comment"

		 "gmp"		  => "default",

                 #"experimental-jpake"          => "default",

                 "mdc2"           => "default",

                 "rc5"            => "default",

		 "rfc3779"	  => "default",
@@ -929,8 +927,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 (/^static-engine$/)
@@ -1172,11 +1168,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
@@ -137,7 +137,7 @@ 
#include <openssl/rsa.h>

#endif

#include <openssl/bn.h>

#ifdef OPENSSL_EXPERIMENTAL_JPAKE

#ifndef OPENSSL_NO_JPAKE

#include <openssl/jpake.h>

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

	}



#if defined(OPENSSL_EXPERIMENTAL_JPAKE) && !defined(OPENSSL_NO_PSK)

#if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)



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

							 const char *secret)

apps/apps.h

+3 −1
Original line number Diff line number Diff line
@@ -308,8 +308,10 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in); 
int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value);

int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,

			const char *algname, ENGINE *e, int do_param);

#ifdef OPENSSL_EXPERIMENTAL_JPAKE

#ifndef OPENSSL_NO_PSK

extern char *psk_key;

#endif

#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

+9 −5
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static void sc_usage(void) 
#ifndef OPENSSL_NO_PSK

	BIO_printf(bio_err," -psk_identity arg - PSK identity\n");

	BIO_printf(bio_err," -psk arg      - PSK in hex (without 0x)\n");

# ifdef OPENSSL_EXPERIMENTAL_JPAKE

# ifndef OPENSSL_NO_JPAKE

	BIO_printf(bio_err," -jpake arg    - JPAKE secret to use\n");

# endif

#endif
@@ -432,7 +432,7 @@ int MAIN(int argc, char **argv) 
	int peerlen = sizeof(peer);

	int enable_timeouts = 0 ;

	long socket_mtu = 0;

#ifdef OPENSSL_EXPERIMENTAL_JPAKE

#ifndef OPENSSL_NO_JPAKE

	char *jpake_secret = NULL;

#endif
@@ -704,7 +704,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;
@@ -727,7 +727,7 @@ bad: 
		goto end;

		}



#if defined(OPENSSL_EXPERIMENTAL_JPAKE) && !defined(OPENSSL_NO_PSK)

#if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)

	if (jpake_secret)

		{

		if (psk_key)
@@ -845,7 +845,11 @@ bad: 
#endif



#ifndef OPENSSL_NO_PSK

#ifdef OPENSSL_NO_JPAKE

	if (psk_key != NULL)

#else

	if (psk_key != NULL || jpake_secret)

#endif

		{

		if (c_debug)

			BIO_printf(bio_c_out, "PSK key given or JPAKE in use, setting client callback\n");
@@ -1049,7 +1053,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