diff options
author | Ulf Möller <ulf@openssl.org> | 1999-04-21 17:31:05 +0000 |
---|---|---|
committer | Ulf Möller <ulf@openssl.org> | 1999-04-21 17:31:05 +0000 |
commit | 8e10f2b3ac1cb5ba9de832981ce32ac49c71fdee (patch) | |
tree | e47416b5a59301c6506e6db838687370ab3e9556 | |
parent | cb145b995bb7d8afedb4acefc828e23617563d1c (diff) |
Move all autogenerated header file parts to crypto/opensslconf.h.
-rw-r--r-- | CHANGES | 3 | ||||
-rwxr-xr-x | Configure | 223 | ||||
-rw-r--r-- | STATUS | 18 | ||||
-rw-r--r-- | crypto/bf/bf_locl.h (renamed from crypto/bf/bf_locl.org) | 34 | ||||
-rw-r--r-- | crypto/bn/bn.h (renamed from crypto/bn/bn.org) | 29 | ||||
-rw-r--r-- | crypto/des/des.h (renamed from crypto/des/des.org) | 21 | ||||
-rw-r--r-- | crypto/des/des_locl.h (renamed from crypto/des/des_locl.org) | 78 | ||||
-rw-r--r-- | crypto/idea/idea.h (renamed from crypto/idea/idea.org) | 11 | ||||
-rw-r--r-- | crypto/md2/md2.h (renamed from crypto/md2/md2.org) | 12 | ||||
-rw-r--r-- | crypto/objects/obj_dat.h | 2 | ||||
-rw-r--r-- | crypto/pem/pem.h | 8 | ||||
-rw-r--r-- | crypto/rc2/rc2.h (renamed from crypto/rc2/rc2.org) | 12 | ||||
-rw-r--r-- | crypto/rc4/rc4.h (renamed from crypto/rc4/rc4.org) | 12 | ||||
-rw-r--r-- | crypto/rc4/rc4_locl.h | 4 | ||||
-rw-r--r-- | crypto/rc4/rc4_locl.org | 70 |
15 files changed, 44 insertions, 493 deletions
@@ -5,6 +5,9 @@ Changes between 0.9.2b and 0.9.3 + *) Move the autogenerated header file parts to crypto/opensslconf.h. + [Ulf Möller] + *) Fix new 56-bit DES export ciphersuites: they were using 7 bytes instead of 8 of keying material. Merlin has also confirmed interop with this fix between OpenSSL and Baltimore C/SSL 2.0 and J/SSL 2.0. @@ -91,17 +91,16 @@ my %table=( "debug-ben", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror -pipe:::::", "debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe:::::", "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", -"debug-solaris-sparc-gcc","gcc:-O3 -g -mv8 -Wall -DB_ENDIAN:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:::", "dist", "cc:-O:::::", # Basic configs that should work on any box "gcc", "gcc:-O3::BN_LLONG:::", "cc", "cc:-O:::::", - # Solaris setups "solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN:-lsocket -lnsl:BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_sol_asm", "solaris-sparc-gcc","gcc:-O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:asm/sparcv8.o::", +"debug-solaris-sparc-gcc","gcc:-O3 -g -mv8 -Wall -DB_ENDIAN:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:::", # DO NOT use /xO[34] on sparc with SC3.0. # It is broken, and will not pass the tests @@ -223,11 +222,11 @@ my %table=( "VC-WIN32","cl:::BN_LLONG RC4_INDEX ${x86_gcc_opts}:::", "VC-WIN16","cl:::MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT:::", "VC-W31-16","cl:::BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX SIXTEEN_BIT:::", -"VC-W31-32","cl:::MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT:::", +"VC-W31-32","cl:::BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT:::", "VC-MSDOS","cl:::BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX SIXTEEN_BIT:::", # Borland C++ 4.5 -"BC-32","bcc32:::DES_PTR RC4_INDEX:::", +"BC-32","bcc32:::BN_LLONG DES_PTR RC4_INDEX:::", "BC-16","bcc:::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::", # CygWin32 @@ -246,25 +245,10 @@ my %table=( ); -# Miscellaneous hacks: this is designed to allow environments where the "one -# makefile" option does not auto build all files. -## # The first six fields are the hard coded versions of the stuff generated by -## # ctx_size for pem.h: that is EVP_ENCODE_CTX_SIZE, EVP_MD_SIZE EVP_MD_CTX_SIZE, -## # EVP_CIPHER_SIZE, EVP_CIPHER_CTX_SIZE and EVP_MAX_MD_SIZE respectively. -# If the seventh field is 1 then auto generate -# crypto/date.h -# Need to add Win16 and others here. - -my %misc_table = ( -"VC-WIN32", "96:60:152:40:4212:20:1", -"VC-NT", "96:60:152:40:4212:20:1" -); - my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32 BC-16 CygWin32); my $no_asm=0; -my $postfix="org"; my $Makefile="Makefile.ssl"; my $des_locl="crypto/des/des_locl.h"; my $des ="crypto/des/des.h"; @@ -481,10 +465,8 @@ foreach (sort split(/\s+/,$bn_ops)) ($b64l,$b64,$b32,$b16,$b8)=(0,0,0,0,1) if /EIGHT_BIT/; } -((my $in=$bn) =~ s/\.([^.]+)/.$postfix/); -my $n=&file_new($bn); -open(IN,"<".$in) || die "unable to read $bn:$!\n"; -open(OUT,">$n") || die "unable to read $n:$!\n"; +open(IN,'<crypto/opensslconf.h.in') || die "unable to read crypto/opensslconf.h.in:$!\n"; +open(OUT,'>crypto/opensslconf.h') || die "unable to create crypto/opensslconf.h:$!\n"; while (<IN>) { if (/^#((define)|(undef))\s+SIXTY_FOUR_BIT_LONG/) @@ -499,38 +481,10 @@ while (<IN>) { printf OUT "#%s EIGHT_BIT\n",($b8)?"define":"undef"; } elsif (/^#((define)|(undef))\s+BN_LLONG\s*$/) { printf OUT "#%s BN_LLONG\n",($bn_ll)?"define":"undef"; } - else - { print OUT $_; } - } -close(IN); -close(OUT); -&Rename($bn,&file_old($bn)); -&Rename($n,$bn); - -(($in=$des) =~ s/\.([^.]+)/.$postfix/); -$n=&file_new($des); -open(IN,"<".$in) || die "unable to read $des:$!\n"; -open(OUT,">$n") || die "unable to read $n:$!\n"; -while (<IN>) - { - if (/^\#define\s+DES_LONG\s+.*/) + elsif (/^\#define\s+DES_LONG\s+.*/) { printf OUT "#define DES_LONG unsigned %s\n", ($des_int)?'int':'long'; } - else - { print OUT $_; } - } -close(IN); -close(OUT); -&Rename($des,&file_old($des)); -&Rename($n,$des); - -(($in=$des_locl) =~ s/\.([^.]+)/.$postfix/); -$n=&file_new($des_locl); -open(IN,"<".$in) || die "unable to read $des_locl:$!\n"; -open(OUT,">$n") || die "unable to read $n:$!\n"; -while (<IN>) - { - if (/^\#(define|undef)\s+DES_PTR/) + elsif (/^\#(define|undef)\s+DES_PTR/) { printf OUT "#%s DES_PTR\n",($des_ptr)?'define':'undef'; } elsif (/^\#(define|undef)\s+DES_RISC1/) { printf OUT "#%s DES_RISC1\n",($des_risc1)?'define':'undef'; } @@ -538,158 +492,28 @@ while (<IN>) { printf OUT "#%s DES_RISC2\n",($des_risc2)?'define':'undef'; } elsif (/^\#(define|undef)\s+DES_UNROLL/) { printf OUT "#%s DES_UNROLL\n",($des_unroll)?'define':'undef'; } - else - { print OUT $_; } - } -close(IN); -close(OUT); -&Rename($des_locl,&file_old($des_locl)); -&Rename($n,$des_locl); - -(($in=$rc4) =~ s/\.([^.]+)/.$postfix/); -$n=&file_new($rc4); -open(IN,"<".$in) || die "unable to read $rc4:$!\n"; -open(OUT,">$n") || die "unable to read $n:$!\n"; -while (<IN>) - { - if (/^#define\s+RC4_INT\s/) + elsif (/^#define\s+RC4_INT\s/) { printf OUT "#define RC4_INT unsigned %s\n",$type[$rc4_int]; } - else - { print OUT $_; } - } -close(IN); -close(OUT); -&Rename($rc4,&file_old($rc4)); -&Rename($n,$rc4); - -(($in=$rc4_locl) =~ s/\.([^.]+)/.$postfix/); -$n=&file_new($rc4_locl); -open(IN,"<".$in) || die "unable to read $rc4_locl:$!\n"; -open(OUT,">$n") || die "unable to read $n:$!\n"; -while (<IN>) - { - if (/^#((define)|(undef))\s+RC4_INDEX/) + elsif (/^#((define)|(undef))\s+RC4_INDEX/) { printf OUT "#%s RC4_INDEX\n",($rc4_idx)?"define":"undef"; } - else - { print OUT $_; } - } -close(IN); -close(OUT); -&Rename($rc4_locl,&file_old($rc4_locl)); -&Rename($n,$rc4_locl); - -(($in=$md2) =~ s/\.([^.]+)/.$postfix/); -$n=&file_new($md2); -open(IN,"<".$in) || die "unable to read $bn:$!\n"; -open(OUT,">$n") || die "unable to read $n:$!\n"; -while (<IN>) - { - if (/^#define\s+MD2_INT\s/) + elsif (/^#define\s+MD2_INT\s/) { printf OUT "#define MD2_INT unsigned %s\n",$type[$md2_int]; } - else - { print OUT $_; } - } -close(IN); -close(OUT); -&Rename($md2,&file_old($md2)); -&Rename($n,$md2); - -(($in=$idea) =~ s/\.([^.]+)/.$postfix/); -$n=&file_new($idea); -open(IN,"<".$in) || die "unable to read $idea:$!\n"; -open(OUT,">$n") || die "unable to read $n:$!\n"; -while (<IN>) - { - if (/^#define\s+IDEA_INT\s/) + elsif (/^#define\s+IDEA_INT\s/) {printf OUT "#define IDEA_INT unsigned %s\n",$type[$idea_int];} - else - { print OUT $_; } - } -close(IN); -close(OUT); -&Rename($idea,&file_old($idea)); -&Rename($n,$idea); - -(($in=$rc2) =~ s/\.([^.]+)/.$postfix/); -$n=&file_new($rc2); -open(IN,"<".$in) || die "unable to read $rc2:$!\n"; -open(OUT,">$n") || die "unable to read $n:$!\n"; -while (<IN>) - { - if (/^#define\s+RC2_INT\s/) + elsif (/^#define\s+RC2_INT\s/) {printf OUT "#define RC2_INT unsigned %s\n",$type[$rc2_int];} - else - { print OUT $_; } - } -close(IN); -close(OUT); -&Rename($rc2,&file_old($rc2)); -&Rename($n,$rc2); - -(($in=$bf) =~ s/\.([^.]+)/.$postfix/); -$n=&file_new($bf); -open(IN,"<".$in) || die "unable to read $bf:$!\n"; -open(OUT,">$n") || die "unable to read $n:$!\n"; -while (<IN>) - { - if (/^#(define|undef)\s+BF_PTR/) + elsif (/^#(define|undef)\s+BF_PTR/) { printf OUT "#undef BF_PTR\n" if $bf_ptr == 0; printf OUT "#define BF_PTR\n" if $bf_ptr == 1; printf OUT "#define BF_PTR2\n" if $bf_ptr == 2; - } + } else { print OUT $_; } } -close(IN); -close(OUT); -&Rename($bf,&file_old($bf)); -&Rename($n,$bf); - -# Now the miscellaneous fixups - -if(defined $misc_table{$target}) { - my ($enc_ctx, $md_size, $md_ctx_size, $cipher_size, $cipher_ctx_size, - $max_md_size, $date_fix) = - split(/\s*:\s*/,$misc_table{$target} . ":", -1); - -## #print "EVP_ENCODE_CTX_SIZE $enc_ctx\n"; -## #print "EVP_MD_SIZE $md_size\n"; -## #print "EVP_MD_CTX_SIZE $md_ctx_size\n"; -## #print "EVP_CIPHER_SIZE $cipher_size\n"; -## #print "EVP_CIPHER_CTX_SIZE $cipher_ctx_size\n"; -## #print "EVP_MAX_MD_SIZE $max_md_size\n"; -#printf "Date fix: %s\n", $date_fix ? "Yes" : "No"; # Fix the date -if($date_fix) { - open (OUT,">crypto/date.h") || die "Can't open date.h"; - printf OUT "#define DATE \"%s\"\n", scalar gmtime(); - close(OUT); -} - -## open (IN, "crypto/pem/pem.org") || die "Can't open crypto/pem/pem.org"; -## open (OUT, ">crypto/pem/pem.h") || die "Can't create crypto/pem/pem.h"; -## -## # Now fix up pem.h -## while(<IN>) { -## chop; -## s/^(#define EVP_ENCODE_CTX_SIZE).*$/$1 $enc_ctx/; -## s/^(#define EVP_MD_SIZE).*$/$1 $md_size/; -## s/^(#define EVP_MD_CTX_SIZE).*$/$1 $md_ctx_size/; -## s/^(#define EVP_CIPHER_SIZE).*$/$1 $cipher_size/; -## s/^(#define EVP_CIPHER_CTX_SIZE).*$/$1 $cipher_ctx_size/; -## s/^(#define EVP_MAX_MD_SIZE).*$/$1 $max_md_size/; -## print OUT "$_\n"; -## } -## -## close (IN); -## close (OUT); - - -} - print "SIXTY_FOUR_BIT_LONG mode\n" if $b64l; print "SIXTY_FOUR_BIT mode\n" if $b64; print "THIRTY_TWO_BIT mode\n" if $b32; @@ -709,6 +533,12 @@ print "RC2 uses u$type[$rc2_int]\n" if $rc2_int != $def_int; print "BF_PTR used\n" if $bf_ptr == 1; print "BF_PTR2 used\n" if $bf_ptr == 2; +if($IsWindows) { + open (OUT,">crypto/date.h") || die "Can't open date.h"; + printf OUT "#define DATE \"%s\"\n", scalar gmtime(); + close(OUT); +} + system 'make -f Makefile.ssl links' if !$IsWindows; exit(0); @@ -727,19 +557,6 @@ sub bad_target print STDERR "\n"; } -sub Rename - { - my($from,$to)=@_; - unlink($to); - if(!rename($from,$to)) - { - -e $from && die "unable to rename $from to $to:$!\n"; - } - } - -sub file_new { my($a)=@_; $a =~ s/(\.[^.]+$|$)/.new/; $a; } -sub file_old { my($a)=@_; $a =~ s/(\.[^.]+$|$)/.old/; $a; } - sub which { my($name)=@_; @@ -1,6 +1,6 @@ OpenSSL STATUS Last modified at - ______________ $Date: 1999/04/16 23:57:00 $ + ______________ $Date: 1999/04/21 17:30:41 $ DEVELOPMENT STATE @@ -14,12 +14,8 @@ o Compilation warnings: ctype-related int vs. char o Compilation error: "unsigned long*" and "int*" under AIX - o Undefined BN symbols in assembler stuff on Solaris - (see posting "openssl-SNAP-19990308-2130 on Solaris-2.6 SC4" in openssl-dev) - o BN assembler code in r3000.s, mips*.s and pa-risc*.s is broken o BSD/OS: assembler functions must not have leading underscores - o Niels Poppe reports that RSA fails with alpha.s - o exptest fails with irix64-* + o exptest and rsa_oaep_test fail with irix64-* (Don Badrak <dbadrak@geo.census.gov>: "Re: Problems to compile openssl on IRIX 6.2", openssl-users) o BN_add test fails on Caldera OpenLinux 1.3 @@ -31,13 +27,10 @@ AVAILABLE PATCHES o OCSP (titchenert@certco.com) - o unsigned vs. non-unsigned (levitte@stacken.kth.se) o Install prefix for packagers (dharris@drh.net) o getenv in ca.c and x509_def.c (jaltman@watsun.cc.columbia.edu) o linux dynamic libs (colin@field.medicine.adelaide.edu.au) o MingW support (niklas@canit.se) - o SPARC v8 assembler implementations of bn_asm.c - (appro@fy.chalmers.se) IN PROGRESS @@ -99,13 +92,6 @@ itself. Then we can avoid a lot of those platform checks which are currently in Configure. - 2. The xxx.org -> xxx.h generation: - It's not obvious for which file xxx.org is the source. - Suggestion: Rename xxx.org to xxx.h.in (Autoconf style), this way - one sees that xxx.h.in is the input for xxx.h - - Status: Mark +1 - o The installation under "make install" produces a very installation layout: $prefix/certs and $prefix/private dirs. That's not nice. Ralf suggests to move the two certs and private dirs either diff --git a/crypto/bf/bf_locl.org b/crypto/bf/bf_locl.h index bd62084032..418ff04fde 100644 --- a/crypto/bf/bf_locl.org +++ b/crypto/bf/bf_locl.h @@ -56,27 +56,9 @@ * [including the GNU Public Licence.] */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify bf_locl.org since bf_locl.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - -/* Special defines which change the way the code is built depending on the - CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find - even newer MIPS CPU's, but at the moment one size fits all for - optimization options. Older Sparc's work better with only UNROLL, but - there's no way to tell at compile time what it is you're running on */ - -#if defined( sun ) /* Newer Sparc's */ -# define BF_PTR -#elif defined( __ultrix ) /* Older MIPS */ -# define BF_PTR -#elif defined( __sgi ) /* Newer MIPS */ -# define BF_PTR -#endif /* Systems-specific speed defines */ +#ifndef _HEADER_BF_LOCL_H +#define _HEADER_BF_LOCL_H +#include "opensslconf.h" /* BF_PTR, BF_PTR2 */ #undef c2l #define c2l(c,l) (l =((unsigned long)(*((c)++))) , \ @@ -169,14 +151,6 @@ /* This is actually a big endian algorithm, the most significate byte * is used to lookup array 0 */ -/* use BF_PTR2 for intel boxes, - * BF_PTR for sparc and MIPS/SGI - * use nothing for Alpha and HP. - */ -#if !defined(BF_PTR) && !defined(BF_PTR2) -#undef BF_PTR -#endif - #define BF_M 0x3fc #define BF_0 22L #define BF_1 14L @@ -228,3 +202,5 @@ S[0x0200+((int)(R>> 8L)&0xff)])+ \ S[0x0300+((int)(R )&0xff)])&0xffffffffL; #endif + +#endif diff --git a/crypto/bn/bn.org b/crypto/bn/bn.h index 393fae5a64..136bf55569 100644 --- a/crypto/bn/bn.org +++ b/crypto/bn/bn.h @@ -56,27 +56,15 @@ * [including the GNU Public Licence.] */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify bn.org since bn.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - #ifndef HEADER_BN_H #define HEADER_BN_H +#include "opensslconf.h" + #ifdef __cplusplus extern "C" { #endif -#undef BN_LLONG - -#ifdef WIN32 -#define BN_LLONG /* This comment stops Configure mutilating things */ -#endif - #define BN_MUL_COMBA #define BN_SQR_COMBA #define BN_RECURSION @@ -98,17 +86,6 @@ extern "C" { #define BN_DIV2W #endif -/* Only one for the following should be defined */ -/* The prime number generation stuff may not work when - * EIGHT_BIT but I don't care since I've only used this mode - * for debuging the bignum libraries */ -#undef SIXTY_FOUR_BIT_LONG -#undef SIXTY_FOUR_BIT -#define THIRTY_TWO_BIT -#undef SIXTEEN_BIT -#undef EIGHT_BIT - - /* assuming long is 64bit - this is the DEC Alpha * unsigned long long is only 64 bits :-(, don't define * BN_LLONG for the DEC Alpha */ @@ -138,7 +115,7 @@ extern "C" { * assember code :-). Do NOT define BN_ULLONG. */ #ifdef SIXTY_FOUR_BIT -#undef BN_LLONG +#define BN_LLONG /* #define BN_ULLONG unsigned long long */ #define BN_ULONG unsigned long long #define BN_LONG long long diff --git a/crypto/des/des.org b/crypto/des/des.h index 0e84c6eaac..c9f67921d3 100644 --- a/crypto/des/des.org +++ b/crypto/des/des.h @@ -56,14 +56,6 @@ * [including the GNU Public Licence.] */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify des.org since des.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - #ifndef HEADER_DES_H #define HEADER_DES_H @@ -72,12 +64,7 @@ extern "C" { #endif #include <stdio.h> - -/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a - * %20 speed up (longs are 8 bytes, int's are 4). */ -#ifndef DES_LONG -#define DES_LONG unsigned long -#endif +#include "opensslconf.h" /* DES_LONG */ typedef unsigned char des_cblock[8]; typedef unsigned char *des_cblocks; /* Unfortunately there's no way to say that @@ -145,12 +132,6 @@ extern int des_check_key; /* defaults to false */ extern int des_rw_mode; /* defaults to DES_PCBC_MODE */ extern int des_set_weak_key_flag; /* set the weak key flag */ -/* The next line is used to disable full ANSI prototypes, if your - * compiler has problems with the prototypes, make sure this line always - * evaluates to true :-) */ -#if defined(MSDOS) || defined(__STDC__) -#undef NOPROTO -#endif #ifndef NOPROTO const char *des_options(void); void des_ecb3_encrypt(const des_cblock input, des_cblock output, diff --git a/crypto/des/des_locl.org b/crypto/des/des_locl.h index c9e8be3add..d01c704244 100644 --- a/crypto/des/des_locl.org +++ b/crypto/des/des_locl.h @@ -56,14 +56,6 @@ * [including the GNU Public Licence.] */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify des_locl.org since des_locl.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - #ifndef HEADER_DES_LOCL_H #define HEADER_DES_LOCL_H @@ -80,75 +72,7 @@ #endif #include "des.h" -#ifndef DES_DEFAULT_OPTIONS -/* the following is tweaked from a config script, that is why it is a - * protected undef/define */ -#ifndef DES_PTR -#undef DES_PTR -#endif - -/* This helps C compiler generate the correct code for multiple functional - * units. It reduces register dependancies at the expense of 2 more - * registers */ -#ifndef DES_RISC1 -#undef DES_RISC1 -#endif - -#ifndef DES_RISC2 -#undef DES_RISC2 -#endif - -#if defined(DES_RISC1) && defined(DES_RISC2) -YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! -#endif - -/* Unroll the inner loop, this sometimes helps, sometimes hinders. - * Very mucy CPU dependant */ -#ifndef DES_UNROLL -#undef DES_UNROLL -#endif - -/* These default values were supplied by - * Peter Gutman <pgut001@cs.auckland.ac.nz> - * They are only used if nothing else has been defined */ -#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) -/* Special defines which change the way the code is built depending on the - CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find - even newer MIPS CPU's, but at the moment one size fits all for - optimization options. Older Sparc's work better with only UNROLL, but - there's no way to tell at compile time what it is you're running on */ - -#if defined( sun ) /* Newer Sparc's */ -# define DES_PTR -# define DES_RISC1 -# define DES_UNROLL -#elif defined( __ultrix ) /* Older MIPS */ -# define DES_PTR -# define DES_RISC2 -# define DES_UNROLL -#elif defined( __osf1__ ) /* Alpha */ -# define DES_PTR -# define DES_RISC2 -#elif defined ( _AIX ) /* RS6000 */ - /* Unknown */ -#elif defined( __hpux ) /* HP-PA */ - /* Unknown */ -#elif defined( __aux ) /* 68K */ - /* Unknown */ -#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ -# define DES_UNROLL -#elif defined( __sgi ) /* Newer MIPS */ -# define DES_PTR -# define DES_RISC2 -# define DES_UNROLL -#elif defined( i386 ) /* x86 boxes, should be gcc */ -# define DES_PTR -# define DES_RISC1 -# define DES_UNROLL -#endif /* Systems-specific speed defines */ -#endif - -#endif /* DES_DEFAULT_OPTIONS */ +#include "opensslconf.h" #ifdef MSDOS /* Visual C++ 2.1 (Windows NT/95) */ #include <stdlib.h> diff --git a/crypto/idea/idea.org b/crypto/idea/idea.h index 5b3084fada..59a9fa3622 100644 --- a/crypto/idea/idea.org +++ b/crypto/idea/idea.h @@ -56,15 +56,6 @@ * [including the GNU Public Licence.] */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify idea.org since idea.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - - #ifndef HEADER_IDEA_H #define HEADER_IDEA_H @@ -75,7 +66,7 @@ extern "C" { #define IDEA_ENCRYPT 1 #define IDEA_DECRYPT 0 -#define IDEA_INT unsigned int +#include "opensslconf.h" /* IDEA_INT */ #define IDEA_BLOCK 8 #define IDEA_KEY_LENGTH 16 diff --git a/crypto/md2/md2.org b/crypto/md2/md2.h index de0c7c3532..1a0079fa27 100644 --- a/crypto/md2/md2.org +++ b/crypto/md2/md2.h @@ -56,15 +56,6 @@ * [including the GNU Public Licence.] */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify md2.org since md2.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - - #ifndef HEADER_MD2_H #define HEADER_MD2_H @@ -74,8 +65,7 @@ extern "C" { #define MD2_DIGEST_LENGTH 16 #define MD2_BLOCK 16 - -#define MD2_INT unsigned int +#include "opensslconf.h" /* MD2_INT */ typedef struct MD2state_st { diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 10a6304af5..03ba60c255 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -761,8 +761,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[19]),/* OBJ_rsa 2 5 8 1 1 */ &(nid_objs[96]),/* OBJ_mdc2WithRSA 2 5 8 3 100 */ &(nid_objs[95]),/* OBJ_mdc2 2 5 8 3 101 */ -&(nid_objs[124]),/* OBJ_rle_compression 1 1 1 1 666.1 */ &(nid_objs[125]),/* OBJ_zlib_compression 1 1 1 1 666.2 */ +&(nid_objs[124]),/* OBJ_rle_compression 1 1 1 1 666.1 */ &(nid_objs[104]),/* OBJ_md5WithRSA 1 3 14 3 2 3 */ &(nid_objs[29]),/* OBJ_des_ecb 1 3 14 3 2 6 */ &(nid_objs[31]),/* OBJ_des_cbc 1 3 14 3 2 7 */ diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index fa6495176d..c85942a5c3 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -56,14 +56,6 @@ * [including the GNU Public Licence.] */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify pem.org since pem.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - #ifndef HEADER_PEM_H #define HEADER_PEM_H diff --git a/crypto/rc2/rc2.org b/crypto/rc2/rc2.h index 37354cfa62..507a89698e 100644 --- a/crypto/rc2/rc2.org +++ b/crypto/rc2/rc2.h @@ -56,14 +56,6 @@ * [including the GNU Public Licence.] */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify rc2.org since rc2.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - #ifndef HEADER_RC2_H #define HEADER_RC2_H @@ -74,9 +66,7 @@ extern "C" { #define RC2_ENCRYPT 1 #define RC2_DECRYPT 0 -/* I need to put in a mod for the alpha - eay */ -#define RC2_INT unsigned short - +#include "opensslconf.h" /* RC2_INT */ #define RC2_BLOCK 8 #define RC2_KEY_LENGTH 16 diff --git a/crypto/rc4/rc4.org b/crypto/rc4/rc4.h index bf5fd3d404..7dee7320a1 100644 --- a/crypto/rc4/rc4.org +++ b/crypto/rc4/rc4.h @@ -56,14 +56,6 @@ * [including the GNU Public Licence.] */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify rc4.org since rc4.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - #ifndef HEADER_RC4_H #define HEADER_RC4_H @@ -71,9 +63,7 @@ extern "C" { #endif -/* using int types make the structure larger but make the code faster - * on most boxes I have tested - up to %20 faster. */ -#define RC4_INT unsigned int +#include "opensslconf.h" /* RC4_INT */ typedef struct rc4_key_st { diff --git a/crypto/rc4/rc4_locl.h b/crypto/rc4/rc4_locl.h new file mode 100644 index 0000000000..ecce6b91dd --- /dev/null +++ b/crypto/rc4/rc4_locl.h @@ -0,0 +1,4 @@ +#ifndef _HEADER_RC4_LOCL_H +#define _HEADER_RC4_LOCL_H +#include "opensslconf.h" +#endif diff --git a/crypto/rc4/rc4_locl.org b/crypto/rc4/rc4_locl.org deleted file mode 100644 index 1ef4455fb7..0000000000 --- a/crypto/rc4/rc4_locl.org +++ /dev/null @@ -1,70 +0,0 @@ -/* crypto/rc4/rc4_locl.org */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - * - * Always modify bf_locl.org since bf_locl.h is automatically generated from - * it during SSLeay configuration. - * - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING - */ - -/* if this is defined data[i] is used instead of *data, this is a %20 - * speedup on x86 */ -#undef RC4_INDEX - |