[prev in list] [next in list] [prev in thread] [next in thread]
List: openssl-cvs
Subject: [CVS] OpenSSL: OpenSSL_0_9_8-stable: openssl/ CHANGES Configure openss...
From: "Dr. Stephen Henson" <steve () openssl ! org>
Date: 2008-11-24 16:14:16
Message-ID: 20081124161416.8CFB91EAE8BA () master ! openssl ! org
[Download RAW message or body]
OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________________________
Server: cvs.openssl.org Name: Dr. Stephen Henson
Root: /v/openssl/cvs Email: steve@openssl.org
Module: openssl Date: 24-Nov-2008 17:14:16
Branch: OpenSSL_0_9_8-stable Handle: 2008112416141104
Modified files: (Branch: OpenSSL_0_9_8-stable)
openssl CHANGES Configure
openssl/apps apps.c apps.h s_client.c s_server.c
openssl/crypto/err err_all.c
openssl/crypto/jpake jpake.h jpaketest.c
openssl/util libeay.num mk1mf.pl mkdef.pl
Log:
Revert OPENSSL_EXPERIMENTAL patch.
Change it so JPAKE uses the standard OPENSSL_NO_JPAKE instead.
Summary:
Revision Changes Path
1.1238.2.128+0 -6 openssl/CHANGES
1.488.2.75 +2 -11 openssl/Configure
1.91.2.9 +2 -2 openssl/apps/apps.c
1.68.2.5 +1 -1 openssl/apps/apps.h
1.76.2.22 +3 -3 openssl/apps/s_client.c
1.97.2.12 +3 -3 openssl/apps/s_server.c
1.20.2.6 +2 -2 openssl/crypto/err/err_all.c
1.1.2.7 +2 -2 openssl/crypto/jpake/jpake.h
1.1.2.7 +1 -1 openssl/crypto/jpake/jpaketest.c
1.248.2.22 +20 -20 openssl/util/libeay.num
1.61.2.28 +3 -4 openssl/util/mk1mf.pl
1.92.2.16 +6 -16 openssl/util/mkdef.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openssl/CHANGES
============================================================================
$ cvs diff -u -r1.1238.2.127 -r1.1238.2.128 CHANGES
--- openssl/CHANGES 19 Nov 2008 14:08:05 -0000 1.1238.2.127
+++ openssl/CHANGES 24 Nov 2008 16:14:11 -0000 1.1238.2.128
@@ -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]
@@ .
patch -p0 <<'@@ .'
Index: openssl/Configure
============================================================================
$ cvs diff -u -r1.488.2.74 -r1.488.2.75 Configure
--- openssl/Configure 14 Nov 2008 00:18:22 -0000 1.488.2.74
+++ openssl/Configure 24 Nov 2008 16:14:12 -0000 1.488.2.75
@@ -588,7 +588,6 @@
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 @@
"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 @@
# 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 @@
{ $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 @@
$openssl_thread_defines .= $thread_defines;
}
-if ($jpake)
- {
- $openssl_other_defines .= "#define OPENSSL_EXPERIMENTAL_JPAKE\n";
- }
-
if ($zlib)
{
$cflags = "-DZLIB $cflags";
@@ .
patch -p0 <<'@@ .'
Index: openssl/apps/apps.c
============================================================================
$ cvs diff -u -r1.91.2.8 -r1.91.2.9 apps.c
--- openssl/apps/apps.c 12 Nov 2008 16:54:33 -0000 1.91.2.8
+++ openssl/apps/apps.c 24 Nov 2008 16:14:13 -0000 1.91.2.9
@@ -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 @@
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)
@@ .
patch -p0 <<'@@ .'
Index: openssl/apps/apps.h
============================================================================
$ cvs diff -u -r1.68.2.4 -r1.68.2.5 apps.h
--- openssl/apps/apps.h 12 Nov 2008 16:54:33 -0000 1.68.2.4
+++ openssl/apps/apps.h 24 Nov 2008 16:14:13 -0000 1.68.2.5
@@ -338,7 +338,7 @@
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
@@ .
patch -p0 <<'@@ .'
Index: openssl/apps/s_client.c
============================================================================
$ cvs diff -u -r1.76.2.21 -r1.76.2.22 s_client.c
--- openssl/apps/s_client.c 12 Nov 2008 16:54:34 -0000 1.76.2.21
+++ openssl/apps/s_client.c 24 Nov 2008 16:14:13 -0000 1.76.2.22
@@ -338,7 +338,7 @@
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 @@
/* 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 @@
#endif
}
#endif
-#ifdef OPENSSL_EXPERIMENTAL_JPAKE
+#ifndef OPENSSL_NO_JPAKE
if (jpake_secret)
jpake_client_auth(bio_c_out, sbio, jpake_secret);
#endif
@@ .
patch -p0 <<'@@ .'
Index: openssl/apps/s_server.c
============================================================================
$ cvs diff -u -r1.97.2.11 -r1.97.2.12 s_server.c
--- openssl/apps/s_server.c 12 Nov 2008 16:54:34 -0000 1.97.2.11
+++ openssl/apps/s_server.c 24 Nov 2008 16:14:13 -0000 1.97.2.12
@@ -742,7 +742,7 @@
#endif
int MAIN(int, char **);
-#ifdef OPENSSL_EXPERIMENTAL_JPAKE
+#ifndef OPENSSL_NO_JPAKE
static char *jpake_secret = NULL;
#endif
@@ -1076,7 +1076,7 @@
}
#endif
-#ifdef OPENSSL_EXPERIMENTAL_JPAKE
+#ifndef OPENSSL_NO_JPAKE
else if (strcmp(*argv,"-jpake") == 0)
{
if (--argc < 1) goto bad;
@@ -1684,7 +1684,7 @@
test=BIO_new(BIO_f_nbio_test());
sbio=BIO_push(test,sbio);
}
-#ifdef OPENSSL_EXPERIMENTAL_JPAKE
+#ifndef OPENSSL_NO_JPAKE
if(jpake_secret)
jpake_server_auth(bio_s_out, sbio, jpake_secret);
#endif
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/err/err_all.c
============================================================================
$ cvs diff -u -r1.20.2.5 -r1.20.2.6 err_all.c
--- openssl/crypto/err/err_all.c 12 Nov 2008 16:54:34 -0000 1.20.2.5
+++ openssl/crypto/err/err_all.c 24 Nov 2008 16:14:14 -0000 1.20.2.6
@@ -101,7 +101,7 @@
#ifndef OPENSSL_NO_CMS
#include <openssl/cms.h>
#endif
-#ifdef OPENSSL_EXPERIMENTAL_JPAKE
+#ifndef OPENSSL_NO_JPAKE
#include <openssl/jpake.h>
#endif
@@ -154,7 +154,7 @@
#ifndef OPENSSL_NO_CMS
ERR_load_CMS_strings();
#endif
-#ifdef OPENSSL_EXPERIMENTAL_JPAKE
+#ifndef OPENSSL_NO_JPAKE
ERR_load_JPAKE_strings();
#endif
#endif
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/jpake/jpake.h
============================================================================
$ cvs diff -u -r1.1.2.6 -r1.1.2.7 jpake.h
--- openssl/crypto/jpake/jpake.h 13 Nov 2008 15:08:33 -0000 1.1.2.6
+++ openssl/crypto/jpake/jpake.h 24 Nov 2008 16:14:14 -0000 1.1.2.7
@@ -10,8 +10,8 @@
#include <openssl/opensslconf.h>
-#ifndef OPENSSL_EXPERIMENTAL_JPAKE
-#error JPAKE is disabled
+#ifdef OPENSSL_NO_JPAKE
+#error JPAKE is disabled.
#endif
#ifdef __cplusplus
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/jpake/jpaketest.c
============================================================================
$ cvs diff -u -r1.1.2.6 -r1.1.2.7 jpaketest.c
--- openssl/crypto/jpake/jpaketest.c 13 Nov 2008 15:08:33 -0000 1.1.2.6
+++ openssl/crypto/jpake/jpaketest.c 24 Nov 2008 16:14:14 -0000 1.1.2.7
@@ -1,6 +1,6 @@
#include <openssl/err.h>
-#ifndef OPENSSL_EXPERIMENTAL_JPAKE
+#ifdef OPENSSL_NO_JPAKE
int main(int argc, char *argv[])
{
printf("No J-PAKE support\n");
@@ .
patch -p0 <<'@@ .'
Index: openssl/util/libeay.num
============================================================================
$ cvs diff -u -r1.248.2.21 -r1.248.2.22 libeay.num
--- openssl/util/libeay.num 12 Nov 2008 16:54:35 -0000 1.248.2.21
+++ openssl/util/libeay.num 24 Nov 2008 16:14:15 -0000 1.248.2.22
@@ -3702,23 +3702,23 @@
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 @@ .
patch -p0 <<'@@ .'
Index: openssl/util/mk1mf.pl
============================================================================
$ cvs diff -u -r1.61.2.27 -r1.61.2.28 mk1mf.pl
--- openssl/util/mk1mf.pl 12 Nov 2008 18:27:17 -0000 1.61.2.27
+++ openssl/util/mk1mf.pl 24 Nov 2008 16:14:15 -0000 1.61.2.28
@@ -233,6 +233,7 @@
$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_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 @@
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 @@
"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 @@
"fips" => \$fips,
"fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
"fipsdso" => [\$fips, \$fipscanisterbuild, \$fipsdso],
- "no-experimental-jpake" => 0,
- "enable-experimental-jpake" => \$jpake,
);
if (exists $valid_options{$_})
@@ .
patch -p0 <<'@@ .'
Index: openssl/util/mkdef.pl
============================================================================
$ cvs diff -u -r1.92.2.15 -r1.92.2.16 mkdef.pl
--- openssl/util/mkdef.pl 12 Nov 2008 16:54:35 -0000 1.92.2.15
+++ openssl/util/mkdef.pl 24 Nov 2008 16:14:15 -0000 1.92.2.16
@@ -79,8 +79,7 @@
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 @@
"CMS",
# CryptoAPI Engine
"CAPIENG",
+ # JPAKE
+ "JPAKE",
# Deprecated functions
"DEPRECATED" );
@@ -123,7 +124,7 @@
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 @@
$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 @@
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 @@
$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 @@
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 @@
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 @@
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
@@ .
______________________________________________________________________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List openssl-cvs@openssl.org
Automated List Manager majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic