Massive constification.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index bf14830cafa98c67bff5a547ac665cff3ff7f282..98ff3eceaa124adbf45e64e6e1bad6f3bec5936f 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -83,6 +83,7 @@ my %table=(
 "purify",      "purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",
 "debug",       "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::",
 "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",
 "dist",                "cc:-O -DNOPROTO::::",
 
@@ -151,7 +152,7 @@ my %table=(
 "linux-elf",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
 "debug-linux-elf","gcc:-DREF_CHECK -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall:-lefence:BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
 "linux-aout",  "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
-"linux-mips",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wuninitialized:::BN_LLONG:",
+"linux-mips",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wuninitialized::BN_LLONG:::",
 "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::::",
 "NetBSD-sparc",        "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 "NetBSD-m68",  "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
@@ -236,9 +237,9 @@ 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.
+## # 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.
@@ -294,6 +295,11 @@ foreach (@ARGV)
                { $no_asm=1; }
        elsif ($_ =~ /^386$/)
                { $processor=386; }
+       elsif ($_ =~ /^rsaref$/)
+               {
+               $libs.= "-lRSAglue -lrsaref ";
+               $flags.= "-DRSAref ";
+               }
        elsif ($_ =~ /^-/)
                {
                if ($_ =~ /^-[lL](.*)$/)
@@ -636,12 +642,12 @@ if(defined $misc_table{$target}) {
                $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";
+## #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
@@ -652,23 +658,23 @@ if($date_fix) {
        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);
+## 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);
 
 
 }
@@ -731,7 +737,8 @@ sub which
                {
                if (-x "$path/$name")
                        {
-                       return "$path/$name";
+                       return "$path/$name" unless ($name eq "perl" and
+                        system("$path/$name -e " . '\'exit($]<5.0);\''));
                        }
                }
        }