generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from stable-branch.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2008-11-24 17:27:08 +00:00
parent d0c3628834
commit 79bd20fd17
11 changed files with 41 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -734,12 +734,6 @@
obligation to set up the dynamic locking callbacks.) obligation to set up the dynamic locking callbacks.)
[Sander Temme <sander@temme.net>] [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. *) Use correct exit code if there is an error in dgst command.
[Steve Henson; problem pointed out by Roland Dirlewanger] [Steve Henson; problem pointed out by Roland Dirlewanger]

9
Configure
View File

@ -611,7 +611,6 @@ my $no_threads=0;
my $threads=0; my $threads=0;
my $no_shared=0; # but "no-shared" is default my $no_shared=0; # but "no-shared" is default
my $zlib=1; # but "no-zlib" 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_krb5=0; # but "no-krb5" is implied unless "--with-krb5-..." is used
my $no_rfc3779=1; # but "no-rfc3779" is default my $no_rfc3779=1; # but "no-rfc3779" is default
my $no_asm=0; my $no_asm=0;
@ -648,7 +647,6 @@ my $perl;
my %disabled = ( # "what" => "comment" my %disabled = ( # "what" => "comment"
"gmp" => "default", "gmp" => "default",
#"experimental-jpake" => "default",
"mdc2" => "default", "mdc2" => "default",
"rc5" => "default", "rc5" => "default",
"rfc3779" => "default", "rfc3779" => "default",
@ -929,8 +927,6 @@ foreach (sort (keys %disabled))
{ $no_threads = 1; } { $no_threads = 1; }
elsif (/^shared$/) elsif (/^shared$/)
{ $no_shared = 1; } { $no_shared = 1; }
elsif (/^experimental-jpake$/)
{ $jpake = 0; push @skip, "jpake"}
elsif (/^zlib$/) elsif (/^zlib$/)
{ $zlib = 0; } { $zlib = 0; }
elsif (/^static-engine$/) elsif (/^static-engine$/)
@ -1172,11 +1168,6 @@ if ($threads)
$openssl_thread_defines .= $thread_defines; $openssl_thread_defines .= $thread_defines;
} }
if ($jpake)
{
$openssl_other_defines .= "#define OPENSSL_EXPERIMENTAL_JPAKE\n";
}
if ($zlib) if ($zlib)
{ {
$cflags = "-DZLIB $cflags"; $cflags = "-DZLIB $cflags";

4
apps/apps.c
View File

@ -137,7 +137,7 @@
#include <openssl/rsa.h> #include <openssl/rsa.h>
#endif #endif
#include <openssl/bn.h> #include <openssl/bn.h>
#ifdef OPENSSL_EXPERIMENTAL_JPAKE #ifndef OPENSSL_NO_JPAKE
#include <openssl/jpake.h> #include <openssl/jpake.h>
#endif #endif
@ -2381,7 +2381,7 @@ void policies_print(BIO *out, X509_STORE_CTX *ctx)
BIO_free(out); 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, static JPAKE_CTX *jpake_init(const char *us, const char *them,
const char *secret) const char *secret)

4
apps/apps.h
View File

@ -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 pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value);
int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx, int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
const char *algname, ENGINE *e, int do_param); const char *algname, ENGINE *e, int do_param);
#ifdef OPENSSL_EXPERIMENTAL_JPAKE #ifndef OPENSSL_NO_PSK
extern char *psk_key; extern char *psk_key;
#endif
#ifndef OPENSSL_NO_JPAKE
void jpake_client_auth(BIO *out, BIO *conn, const char *secret); void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
void jpake_server_auth(BIO *out, BIO *conn, const char *secret); void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
#endif #endif

14
apps/s_client.c
View File

@ -312,7 +312,7 @@ static void sc_usage(void)
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
BIO_printf(bio_err," -psk_identity arg - PSK identity\n"); BIO_printf(bio_err," -psk_identity arg - PSK identity\n");
BIO_printf(bio_err," -psk arg - PSK in hex (without 0x)\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"); BIO_printf(bio_err," -jpake arg - JPAKE secret to use\n");
# endif # endif
#endif #endif
@ -432,7 +432,7 @@ int MAIN(int argc, char **argv)
int peerlen = sizeof(peer); int peerlen = sizeof(peer);
int enable_timeouts = 0 ; int enable_timeouts = 0 ;
long socket_mtu = 0; long socket_mtu = 0;
#ifdef OPENSSL_EXPERIMENTAL_JPAKE #ifndef OPENSSL_NO_JPAKE
char *jpake_secret = NULL; char *jpake_secret = NULL;
#endif #endif
@ -704,7 +704,7 @@ int MAIN(int argc, char **argv)
/* meth=TLSv1_client_method(); */ /* meth=TLSv1_client_method(); */
} }
#endif #endif
#ifdef OPENSSL_EXPERIMENTAL_JPAKE #ifndef OPENSSL_NO_JPAKE
else if (strcmp(*argv,"-jpake") == 0) else if (strcmp(*argv,"-jpake") == 0)
{ {
if (--argc < 1) goto bad; if (--argc < 1) goto bad;
@ -727,7 +727,7 @@ bad:
goto end; goto end;
} }
#if defined(OPENSSL_EXPERIMENTAL_JPAKE) && !defined(OPENSSL_NO_PSK) #if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)
if (jpake_secret) if (jpake_secret)
{ {
if (psk_key) if (psk_key)
@ -845,7 +845,11 @@ bad:
#endif #endif
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
#ifdef OPENSSL_NO_JPAKE
if (psk_key != NULL)
#else
if (psk_key != NULL || jpake_secret) if (psk_key != NULL || jpake_secret)
#endif
{ {
if (c_debug) if (c_debug)
BIO_printf(bio_c_out, "PSK key given or JPAKE in use, setting client callback\n"); 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
} }
#endif #endif
#ifdef OPENSSL_EXPERIMENTAL_JPAKE #ifndef OPENSSL_NO_JPAKE
if (jpake_secret) if (jpake_secret)
jpake_client_auth(bio_c_out, sbio, jpake_secret); jpake_client_auth(bio_c_out, sbio, jpake_secret);
#endif #endif

14
apps/s_server.c
View File

@ -450,7 +450,7 @@ static void sv_usage(void)
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
BIO_printf(bio_err," -psk_hint arg - PSK identity hint to use\n"); BIO_printf(bio_err," -psk_hint arg - PSK identity hint to use\n");
BIO_printf(bio_err," -psk arg - PSK in hex (without 0x)\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"); BIO_printf(bio_err," -jpake arg - JPAKE secret to use\n");
# endif # endif
#endif #endif
@ -827,7 +827,7 @@ BIO_printf(err, "cert_status: received %d ids\n", sk_OCSP_RESPID_num(ids));
int MAIN(int, char **); int MAIN(int, char **);
#ifdef OPENSSL_EXPERIMENTAL_JPAKE #ifndef OPENSSL_NO_JPAKE
static char *jpake_secret = NULL; static char *jpake_secret = NULL;
#endif #endif
@ -1189,7 +1189,7 @@ int MAIN(int argc, char *argv[])
} }
#endif #endif
#if defined(OPENSSL_EXPERIMENTAL_JPAKE) && !defined(OPENSSL_NO_PSK) #if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)
else if (strcmp(*argv,"-jpake") == 0) else if (strcmp(*argv,"-jpake") == 0)
{ {
if (--argc < 1) goto bad; if (--argc < 1) goto bad;
@ -1212,7 +1212,7 @@ bad:
goto end; goto end;
} }
#if defined(OPENSSL_EXPERIMENTAL_JPAKE) && !defined(OPENSSL_NO_PSK) #if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)
if (jpake_secret) if (jpake_secret)
{ {
if (psk_key) if (psk_key)
@ -1616,7 +1616,11 @@ bad:
#endif #endif
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
#ifdef OPENSSL_NO_JPAKE
if (psk_key != NULL)
#else
if (psk_key != NULL || jpake_secret) if (psk_key != NULL || jpake_secret)
#endif
{ {
if (s_debug) if (s_debug)
BIO_printf(bio_s_out, "PSK key given or JPAKE in use, setting server callback\n"); BIO_printf(bio_s_out, "PSK key given or JPAKE in use, setting server callback\n");
@ -1843,7 +1847,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
test=BIO_new(BIO_f_nbio_test()); test=BIO_new(BIO_f_nbio_test());
sbio=BIO_push(test,sbio); sbio=BIO_push(test,sbio);
} }
#ifdef OPENSSL_EXPERIMENTAL_JPAKE #ifndef OPENSSL_NO_JPAKE
if(jpake_secret) if(jpake_secret)
jpake_server_auth(bio_s_out, sbio, jpake_secret); jpake_server_auth(bio_s_out, sbio, jpake_secret);
#endif #endif

4
crypto/err/err_all.c
View File

@ -99,7 +99,7 @@
#ifndef OPENSSL_NO_CMS #ifndef OPENSSL_NO_CMS
#include <openssl/cms.h> #include <openssl/cms.h>
#endif #endif
#ifdef OPENSSL_EXPERIMENTAL_JPAKE #ifndef OPENSSL_NO_JPAKE
#include <openssl/jpake.h> #include <openssl/jpake.h>
#endif #endif
@ -151,7 +151,7 @@ void ERR_load_crypto_strings(void)
#ifndef OPENSSL_NO_CMS #ifndef OPENSSL_NO_CMS
ERR_load_CMS_strings(); ERR_load_CMS_strings();
#endif #endif
#ifdef OPENSSL_EXPERIMENTAL_JPAKE #ifndef OPENSSL_NO_JPAKE
ERR_load_JPAKE_strings(); ERR_load_JPAKE_strings();
#endif #endif
#endif #endif

4
crypto/jpake/jpake.h
View File

@ -10,6 +10,10 @@
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
#ifdef OPENSSL_NO_JPAKE
#error JPAKE is disabled.
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

4
crypto/jpake/jpaketest.c
View File

@ -1,4 +1,6 @@
#ifndef OPENSSL_EXPERIMENTAL_JPAKE
#include <openssl/opensslconf.h>
#ifdef OPENSSL_NO_JPAKE
#include <stdio.h> #include <stdio.h>

7
util/mk1mf.pl
View File

@ -266,7 +266,7 @@ $cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
$cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh; $cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
$cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine; $cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine;
$cflags.=" -DOPENSSL_NO_HW" if $no_hw; $cflags.=" -DOPENSSL_NO_HW" if $no_hw;
$cflags.=" -DOPENSSL_EXPERIMENTAL_JPAKE" if $jpake; $cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake;
$cflags.= " -DZLIB" if $zlib_opt; $cflags.= " -DZLIB" if $zlib_opt;
$cflags.= " -DZLIB_SHARED" if $zlib_opt == 2; $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
@ -706,7 +706,7 @@ sub var_add
return("") if $no_dh && $dir =~ /\/dh/; return("") if $no_dh && $dir =~ /\/dh/;
return("") if $no_ec && $dir =~ /\/ec/; return("") if $no_ec && $dir =~ /\/ec/;
return("") if $no_cms && $dir =~ /\/cms/; return("") if $no_cms && $dir =~ /\/cms/;
return("") if !$jpake && $dir =~ /\/jpake/; return("") if $no_jpake && $dir =~ /\/jpake/;
if ($no_des && $dir =~ /\/des/) if ($no_des && $dir =~ /\/des/)
{ {
if ($val =~ /read_pwd/) if ($val =~ /read_pwd/)
@ -1037,6 +1037,7 @@ sub read_options
"no-ssl3" => \$no_ssl3, "no-ssl3" => \$no_ssl3,
"no-tlsext" => \$no_tlsext, "no-tlsext" => \$no_tlsext,
"no-cms" => \$no_cms, "no-cms" => \$no_cms,
"no-jpake" => \$no_jpake,
"no-err" => \$no_err, "no-err" => \$no_err,
"no-sock" => \$no_sock, "no-sock" => \$no_sock,
"no-krb5" => \$no_krb5, "no-krb5" => \$no_krb5,
@ -1063,8 +1064,6 @@ sub read_options
"no-shared" => 0, "no-shared" => 0,
"no-zlib" => 0, "no-zlib" => 0,
"no-zlib-dynamic" => 0, "no-zlib-dynamic" => 0,
"no-experimental-jpake" => 0,
"enable-experimental-jpake" => \$jpake,
); );
if (exists $valid_options{$_}) if (exists $valid_options{$_})

23
util/mkdef.pl
View File

@ -79,8 +79,7 @@ my $OS2=0;
my $safe_stack_def = 0; my $safe_stack_def = 0;
my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT", my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
"EXPORT_VAR_AS_FUNCTION", "ZLIB", "EXPORT_VAR_AS_FUNCTION", "ZLIB" );
"OPENSSL_EXPERIMENTAL_JPAKE" );
my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" ); my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
@ -104,6 +103,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"CMS", "CMS",
# CryptoAPI Engine # CryptoAPI Engine
"CAPIENG", "CAPIENG",
# JPAKE
"JPAKE",
# Deprecated functions # Deprecated functions
"DEPRECATED" ); "DEPRECATED" );
@ -124,6 +125,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_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
my $no_jpake;
my $zlib; my $zlib;
@ -152,10 +154,6 @@ foreach (@ARGV, split(/ /, $options))
$zlib = 1; $zlib = 1;
} }
if ($_ eq "enable-experimental-jpake") {
$jpake = 1;
}
$do_ssl=1 if $_ eq "ssleay"; $do_ssl=1 if $_ eq "ssleay";
if ($_ eq "ssl") { if ($_ eq "ssl") {
$do_ssl=1; $do_ssl=1;
@ -216,6 +214,7 @@ foreach (@ARGV, split(/ /, $options))
elsif (/^no-tlsext$/) { $no_tlsext=1; } elsif (/^no-tlsext$/) { $no_tlsext=1; }
elsif (/^no-cms$/) { $no_cms=1; } elsif (/^no-cms$/) { $no_cms=1; }
elsif (/^no-capieng$/) { $no_capieng=1; } elsif (/^no-capieng$/) { $no_capieng=1; }
elsif (/^no-jpake$/) { $no_jpake=1; }
} }
@ -556,10 +555,6 @@ sub do_defs
$tag{$tag[$tag_i]}=2; $tag{$tag[$tag_i]}=2;
print STDERR "DEBUG: $file: chaged tag $1 = 2\n" if $debug; 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--; $tag_i--;
} }
} elsif (/^\#\s*endif/) { } elsif (/^\#\s*endif/) {
@ -569,8 +564,6 @@ sub do_defs
print STDERR "DEBUG: \$t=\"$t\"\n" if $debug; print STDERR "DEBUG: \$t=\"$t\"\n" if $debug;
if ($tag{$t}==2) { if ($tag{$t}==2) {
$tag{$t}=-1; $tag{$t}=-1;
} elsif ($tag{$t}==-2) {
$tag{$t}=1;
} else { } else {
$tag{$t}=0; $tag{$t}=0;
} }
@ -1107,11 +1100,6 @@ sub is_valid
return 1; return 1;
} }
if ($keyword eq "ZLIB" && $zlib) { return 1; } if ($keyword eq "ZLIB" && $zlib) { return 1; }
if ($keyword eq "OPENSSL_EXPERIMENTAL_JPAKE" && $jpake) {
return 1;
}
return 0; return 0;
} else { } else {
# algorithms # algorithms
@ -1158,6 +1146,7 @@ sub is_valid
if ($keyword eq "PSK" && $no_psk) { return 0; } if ($keyword eq "PSK" && $no_psk) { return 0; }
if ($keyword eq "CMS" && $no_cms) { return 0; } if ($keyword eq "CMS" && $no_cms) { return 0; }
if ($keyword eq "CAPIENG" && $no_capieng) { 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; } if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
# Nothing recognise as true # Nothing recognise as true