root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Implement Configure option pattern "experimental-foo" 

(specifically, "experimental-jpake").
This commit is contained in:
Bodo Möller 2008-12-02 01:21:06 +00:00
parent cef3e62d2b
commit 505ed2b076
5 changed files with 78 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@ -12,8 +12,12 @@
*) 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]
*) Add JPAKE support, including demo authentication in s_client and *) Tweak Configure so that you need to say "experimental-jpake" to enable
s_server. JPAKE, and need to use -DOPENSSL_EXPERIMENTAL_JPAKE in applications.
[Bodo Moeller]
*) Add experimental JPAKE support, including demo authentication in
s_client and s_server.
[Ben Laurie] [Ben Laurie]
*) Set the comparison function in v3_addr_canonize(). *) Set the comparison function in v3_addr_canonize().

82
Configure
View File

@ -12,7 +12,7 @@ print STDERR "Warning: perl module strict not found.\n" if ($@);
# see INSTALL for instructions. # see INSTALL for instructions.
my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
# Options: # Options:
# #
@ -624,12 +624,12 @@ my $fips=0;
# All of the following is disabled by default (RC5 was enabled before 0.9.8): # All of the following is disabled by default (RC5 was enabled before 0.9.8):
my %disabled = ( # "what" => "comment" my %disabled = ( # "what" => "comment" [or special keyword "experimental"]
"camellia" => "default", "camellia" => "default",
"capieng" => "default", "capieng" => "default",
"cms" => "default", "cms" => "default",
"jpake" => "default",
"gmp" => "default", "gmp" => "default",
"jpake" => "experimental",
"mdc2" => "default", "mdc2" => "default",
"montasm" => "default", # explicit option in 0.9.8 only (implicitly enabled in 0.9.9) "montasm" => "default", # explicit option in 0.9.8 only (implicitly enabled in 0.9.9)
"rc5" => "default", "rc5" => "default",
@ -640,13 +640,21 @@ my %disabled = ( # "what" => "comment"
"zlib" => "default", "zlib" => "default",
"zlib-dynamic" => "default" "zlib-dynamic" => "default"
); );
my @experimental = ();
# Additional "no-..." options will be collected in %disabled. # This is what $depflags will look like with the above defaults
# To remove something from %disabled, use e.g. "enable-rc5". # (we need this to see if we should advise the user to run "make depend"):
# For symmetry, "disable-..." is a synonym for "no-...". 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";
# Explicit "no-..." options will be collected in %disabled along with the defaults.
# To remove something from %disabled, use "enable-foo" (unless it's experimental).
# For symmetry, "disable-foo" is a synonym for "no-foo".
# For features called "experimental" here, a more explicit "experimental-foo" is needed to enable.
# We will collect such requests in @experimental.
# To avoid accidental use of experimental features, applications will have to use -DOPENSSL_EXPERIMENTAL_FOO.
# 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_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_TLSEXT ";
my $no_sse2=0; my $no_sse2=0;
@ -654,6 +662,7 @@ my $no_sse2=0;
my $flags; my $flags;
my $depflags; my $depflags;
my $openssl_experimental_defines;
my $openssl_algorithm_defines; my $openssl_algorithm_defines;
my $openssl_thread_defines; my $openssl_thread_defines;
my $openssl_sys_defines=""; my $openssl_sys_defines="";
@ -674,6 +683,7 @@ while($argv_unprocessed)
{ {
$flags=""; $flags="";
$depflags=""; $depflags="";
$openssl_experimental_defines="";
$openssl_algorithm_defines=""; $openssl_algorithm_defines="";
$openssl_thread_defines=""; $openssl_thread_defines="";
$openssl_sys_defines=""; $openssl_sys_defines="";
@ -699,25 +709,35 @@ PROCESS_ARGS:
if (/^no-(.+)$/ || /^disable-(.+)$/) if (/^no-(.+)$/ || /^disable-(.+)$/)
{ {
if ($1 eq "ssl") if (!($disabled{$1} eq "experimental"))
{ {
$disabled{"ssl2"} = "option(ssl)"; if ($1 eq "ssl")
$disabled{"ssl3"} = "option(ssl)"; {
} $disabled{"ssl2"} = "option(ssl)";
elsif ($1 eq "tls") $disabled{"ssl3"} = "option(ssl)";
{ }
$disabled{"tls1"} = "option(tls)" elsif ($1 eq "tls")
} {
else $disabled{"tls1"} = "option(tls)"
{ }
$disabled{$1} = "option"; else
{
$disabled{$1} = "option";
}
} }
} }
elsif (/^enable-(.+)$/) elsif (/^enable-(.+)$/ || /^experimental-(.+)$/)
{ {
delete $disabled{$1}; my $algo = $1;
if ($disabled{$algo} eq "experimental")
{
die "You are requesting an experimental feature; please say 'experimental-$algo' if you are sure\n"
unless (/^experimental-/);
push @experimental, $algo;
}
delete $disabled{$algo};
$threads = 1 if ($1 eq "threads"); $threads = 1 if ($algo eq "threads");
} }
elsif (/^--test-sanity$/) elsif (/^--test-sanity$/)
{ {
@ -962,6 +982,15 @@ if ($fips)
"$cpuid_obj:$bn_obj:$aes_obj:$des_obj:$sha1_obj" eq "::::"); "$cpuid_obj:$bn_obj:$aes_obj:$des_obj:$sha1_obj" eq "::::");
} }
foreach (sort @experimental)
{
my $ALGO;
($ALGO = $_) =~ tr/[a-z]/[A-Z]/;
# opensslconf.h will set OPENSSL_NO_... unless OPENSSL_EXPERIMENTAL_... is defined
$openssl_experimental_defines .= "#define OPENSSL_NO_$ALGO\n";
$cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO";
}
foreach (sort (keys %disabled)) foreach (sort (keys %disabled))
{ {
@ -1012,7 +1041,7 @@ foreach (sort (keys %disabled))
push @skip, $algo; push @skip, $algo;
print " (skip dir)"; print " (skip dir)";
$depflags .="-DOPENSSL_NO_$ALGO "; $depflags .= " -DOPENSSL_NO_$ALGO";
} }
} }
} }
@ -1432,7 +1461,7 @@ while (<IN>)
s/^CC=.*$/CC= $cc/; s/^CC=.*$/CC= $cc/;
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc"; s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
s/^CFLAG=.*$/CFLAG= $cflags/; s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG= $depflags/; s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/; s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/;
s/^EX_LIBS=.*$/EX_LIBS= $lflags/; s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/; s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/;
@ -1576,6 +1605,7 @@ print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configur
print OUT "/* OpenSSL was configured with the following options: */\n"; print OUT "/* OpenSSL was configured with the following options: */\n";
my $openssl_algorithm_defines_trans = $openssl_algorithm_defines; my $openssl_algorithm_defines_trans = $openssl_algorithm_defines;
$openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n# define OPENSSL_NO_$1\n# endif\n#endif/mg;
$openssl_algorithm_defines_trans =~ s/^\s*#\s*define\s+OPENSSL_(.*)/# if defined(OPENSSL_$1) \&\& !defined($1)\n# define $1\n# endif/mg; $openssl_algorithm_defines_trans =~ s/^\s*#\s*define\s+OPENSSL_(.*)/# if defined(OPENSSL_$1) \&\& !defined($1)\n# define $1\n# endif/mg;
$openssl_algorithm_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg; $openssl_algorithm_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;
$openssl_algorithm_defines = " /* no ciphers excluded */\n" if $openssl_algorithm_defines eq ""; $openssl_algorithm_defines = " /* no ciphers excluded */\n" if $openssl_algorithm_defines eq "";
@ -1584,8 +1614,10 @@ $openssl_sys_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/
$openssl_other_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg; $openssl_other_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;
print OUT $openssl_sys_defines; print OUT $openssl_sys_defines;
print OUT "#ifndef OPENSSL_DOING_MAKEDEPEND\n\n"; print OUT "#ifndef OPENSSL_DOING_MAKEDEPEND\n\n";
print OUT $openssl_experimental_defines;
print OUT "\n";
print OUT $openssl_algorithm_defines; print OUT $openssl_algorithm_defines;
print OUT "\n#endif /* OPENSSL_DOING_MAKEDEPEND */\n"; print OUT "\n#endif /* OPENSSL_DOING_MAKEDEPEND */\n\n";
print OUT $openssl_thread_defines; print OUT $openssl_thread_defines;
print OUT $openssl_other_defines,"\n"; print OUT $openssl_other_defines,"\n";

8
crypto/jpake/jpaketest.c
View File

@ -1,13 +1,19 @@
#include <openssl/err.h> #include <openssl/opensslconf.h>
#ifdef OPENSSL_NO_JPAKE #ifdef OPENSSL_NO_JPAKE
#include <stdio.h>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
printf("No J-PAKE support\n"); printf("No J-PAKE support\n");
return(0); return(0);
} }
#else #else
#include <openssl/jpake.h> #include <openssl/jpake.h>
#include <openssl/err.h>
static void showbn(const char *name, const BIGNUM *bn) static void showbn(const char *name, const BIGNUM *bn)
{ {

7
crypto/opensslconf.h.in
View File

@ -2,8 +2,11 @@
#ifdef OPENSSL_DOING_MAKEDEPEND #ifdef OPENSSL_DOING_MAKEDEPEND
/* Include any symbols here which have to be explicitly set to enable a /* Include any symbols here that have to be explicitly set to enable a feature
* feature. For example OPENSSL_EXPERIMENTAL_FOO * that should be visible to makedepend.
*
* [Our "make depend" doesn't actually look at this, we use actual build settings
* instead; we want to make it easy to remove subdirectories with disabled algorithms.]
*/ */
#ifndef OPENSSL_FIPS #ifndef OPENSSL_FIPS

13
test/Makefile
View File

@ -835,11 +835,7 @@ ideatest.o: ../include/openssl/opensslconf.h ideatest.c
igetest.o: ../include/openssl/aes.h ../include/openssl/e_os2.h igetest.o: ../include/openssl/aes.h ../include/openssl/e_os2.h
igetest.o: ../include/openssl/opensslconf.h ../include/openssl/ossl_typ.h igetest.o: ../include/openssl/opensslconf.h ../include/openssl/ossl_typ.h
igetest.o: ../include/openssl/rand.h igetest.c igetest.o: ../include/openssl/rand.h igetest.c
jpaketest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h jpaketest.o: ../include/openssl/opensslconf.h jpaketest.c
jpaketest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
jpaketest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
jpaketest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
jpaketest.o: ../include/openssl/symhacks.h jpaketest.c
md2test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h md2test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
md2test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h md2test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
md2test.o: ../include/openssl/evp.h ../include/openssl/fips.h md2test.o: ../include/openssl/evp.h ../include/openssl/fips.h
@ -877,11 +873,8 @@ rc2test.o: ../include/openssl/opensslconf.h ../include/openssl/rc2.h rc2test.c
rc4test.o: ../e_os.h ../include/openssl/e_os2.h rc4test.o: ../e_os.h ../include/openssl/e_os2.h
rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h
rc4test.o: ../include/openssl/sha.h rc4test.c rc4test.o: ../include/openssl/sha.h rc4test.c
rc5test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h rc5test.o: ../e_os.h ../include/openssl/e_os2.h
rc5test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h rc5test.o: ../include/openssl/opensslconf.h rc5test.c
rc5test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
rc5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
rc5test.o: ../include/openssl/symhacks.h rc5test.c
rmdtest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h rmdtest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
rmdtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h rmdtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
rmdtest.o: ../include/openssl/evp.h ../include/openssl/fips.h rmdtest.o: ../include/openssl/evp.h ../include/openssl/fips.h