Map new X509 verification errors to alert codes (Tom Wu <tom@arcot.com>).
[oweals/openssl.git] / config
diff --git a/config b/config
index af0686dff0cb911c52b0e542088e46eb6c501ad1..0903d99b4054dbe97dbc2cd337ddef0d5b74b8d9 100755 (executable)
--- a/config
+++ b/config
@@ -49,10 +49,18 @@ if [ "x$XREL" != "x" ]; then
                echo "whatever-whatever-sco5"; exit 0
                ;;
            4.2MP)
-               if [ "x$VERSION" = "x2.1.1" ]; then
+               if [ "x$VERSION" = "x2.01" ]; then
+                   echo "${MACHINE}-whatever-unixware201"; exit 0
+               elif [ "x$VERSION" = "x2.02" ]; then
+                   echo "${MACHINE}-whatever-unixware202"; exit 0
+               elif [ "x$VERSION" = "x2.03" ]; then
+                   echo "${MACHINE}-whatever-unixware203"; exit 0
+               elif [ "x$VERSION" = "x2.1.1" ]; then
                    echo "${MACHINE}-whatever-unixware211"; exit 0
                elif [ "x$VERSION" = "x2.1.2" ]; then
                    echo "${MACHINE}-whatever-unixware212"; exit 0
+               elif [ "x$VERSION" = "x2.1.3" ]; then
+                   echo "${MACHINE}-whatever-unixware213"; exit 0
                else
                    echo "${MACHINE}-whatever-unixware2"; exit 0
                fi
@@ -60,6 +68,11 @@ if [ "x$XREL" != "x" ]; then
            4.2)
                echo "whatever-whatever-unixware1"; exit 0
                ;;
+     OpenUNIX)
+               if [ "`echo x$VERSION | sed -e 's/\..*//'`" = "x8" ]; then
+                   echo "${MACHINE}-unknown-OpenUNIX${VERSION}"; exit 0
+               fi
+               ;;
            5)
                if [ "`echo x$VERSION | sed -e 's/\..*//'`" = "x7" ]; then
                    echo "${MACHINE}-sco-unixware7"; exit 0
@@ -71,10 +84,22 @@ fi
 # Now we simply scan though... In most cases, the SYSTEM info is enough
 #
 case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
+    MPE/iX:*)
+       MACHINE=`echo "$MACHINE" | sed -e 's/-/_/g'`
+       echo "parisc-hp-MPE/iX"; exit 0
+       ;;
     A/UX:*)
        echo "m68k-apple-aux3"; exit 0
        ;;
 
+    AIX:[3456789]:4:*)
+       echo "${MACHINE}-ibm-aix43"; exit 0
+       ;;
+
+    AIX:*:[56789]:*)
+       echo "${MACHINE}-ibm-aix43"; exit 0
+       ;;
+
     AIX:*)
        echo "${MACHINE}-ibm-aix"; exit 0
        ;;
@@ -164,7 +189,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         ;;
 
     NetBSD:*:*:*386*)
-        echo "`/usr/sbin/sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
+        echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
        ;;
 
     NetBSD:*)
@@ -175,20 +200,35 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-whatever-openbsd"; exit 0
        ;;
 
+    OpenUNIX:*)
+       echo "${MACHINE}-unknown-OpenUNIX${VERSION}"; exit 0
+       ;;
+
     OSF1:*:*:*alpha*)
-       echo "${MACHINE}-dec-osf"; exit 0
+       OSFMAJOR=`echo ${RELEASE}| sed -e 's/^V\([0-9]*\)\..*$/\1/'`
+       case "$OSFMAJOR" in
+           4|5)
+               echo "${MACHINE}-dec-tru64"; exit 0
+               ;;
+           1|2|3)
+               echo "${MACHINE}-dec-osf"; exit 0
+               ;;
+           *)
+               echo "${MACHINE}-dec-osf"; exit 0
+               ;;
+       esac
        ;;
 
     QNX:*)
-       case "$VERSION" in
-           425)
-               echo "${MACHINE}-qssl-qnx4"
+       case "$RELEASE" in
+           4*)
+               echo "${MACHINE}-whatever-qnx4"
                ;;
-           423)
-               echo "${MACHINE}-qssl-qnx32"
+           6*)
+               echo "${MACHINE}-whatever-qnx6"
                ;;
            *)
-               echo "${MACHINE}-qssl-qnx"
+               echo "${MACHINE}-whatever-qnx"
                ;;
        esac
        exit 0
@@ -202,8 +242,12 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "ppc-apple-rhapsody"; exit 0
        ;;
 
+    Darwin:*)
+       echo "ppc-apple-darwin"; exit 0
+       ;;
+
     SunOS:5.*)
-       echo "${MACHINE}-sun-solaris2"; exit 0
+       echo "${MACHINE}-whatever-solaris2"; exit 0
        ;;
 
     SunOS:*)
@@ -250,6 +294,29 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
        ;;
 
+    NEWS-OS:4.*)
+       echo "mips-sony-newsos4"; exit 0;
+       ;;
+
+    CYGWIN*)
+       case "$RELEASE" in
+           [bB]*|1.0|1.[12].*)
+               echo "${MACHINE}-whatever-cygwin_pre1.3"
+               ;;
+           *)
+               echo "${MACHINE}-whatever-cygwin"
+               ;;
+       esac
+       exit 0
+       ;;
+
+    *"CRAY T3E")
+       echo "t3e-cray-unicosmk"; exit 0;
+       ;;
+
+    *CRAY*)
+       echo "j90-cray-unicos"; exit 0;
+       ;;
 esac
 
 #
@@ -388,10 +455,16 @@ case "$GUESSOS" in
        ;;
   mips4-sgi-irix64)
        echo "WARNING! If you wish to build 64-bit library, then you have to"
-       echo "         invoke './Configre irix64-mips4-$CC' *manually*."
-       echo "         Type Ctrl-C if you don't want to continue."
+       echo "         invoke './Configure irix64-mips4-$CC' *manually*."
+       echo "         Type return if you want to continue, Ctrl-C to abort."
        read waste < /dev/tty
-       options="$options -mips4"
+        CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+        CPU=${CPU:-0}
+        if [ $CPU -ge 5000 ]; then
+                options="$options -mips4"
+        else
+                options="$options -mips3"
+        fi
        OUT="irix-mips3-$CC"
        ;;
   alpha-*-linux2)
@@ -408,43 +481,81 @@ case "$GUESSOS" in
            esac
        fi
        ;;
-  mips-*-linux?) OUT="linux-mips" ;;
+  mips-*-linux?)
+          cat >dummy.c <<EOF
+#include <stdio.h>  /* for printf() prototype */
+        int main (argc, argv) int argc; char *argv[]; {
+#ifdef __MIPSEB__
+  printf ("linux-%s\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("linux-%sel\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+       ${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}`
+       rm dummy dummy.c
+       ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   m68k-*-linux*) OUT="linux-m68k" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;
   ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
+  ppc-apple-darwin) OUT="darwin-ppc-cc" ;;
   sparc64-*-linux2)
        #Before we can uncomment following lines we have to wait at least
        #till 64-bit glibc for SPARC is operational:-(
        #echo "WARNING! If you wish to build 64-bit library, then you have to"
        #echo "         invoke './Configure linux64-sparcv9' *manually*."
-       #echo "         Type Ctrl-C if you don't want to continue."
+       #echo "         Type return if you want to continue, Ctrl-C to abort."
        #read waste < /dev/tty
        OUT="linux-sparcv9" ;;
   sparc-*-linux2)
-       KARCH=`awk '/type/{print$3}' /proc/cpuinfo`
+       KARCH=`awk '/^type/{print$3}' /proc/cpuinfo`
        case ${KARCH:-sun4} in
        sun4u*) OUT="linux-sparcv9" ;;
        sun4m)  OUT="linux-sparcv8" ;;
        sun4d)  OUT="linux-sparcv8" ;;
        *)      OUT="linux-sparcv7" ;;
        esac ;;
+  parisc-*-linux2)
+        CPUARCH=`awk '/cpu family/{print substr($5,1,3)}' /proc/cpuinfo`
+       CPUSCHEDULE=`awk '/^cpu.[       ]: PA/{print substr($3,3)}' /proc/cpuinfo`
+
+       # ??TODO ??  Model transformations
+       # 0. CPU Architecture for the 1.1 processor has letter suffixes. We strip that off
+       #    assuming no further arch. identification will ever be used by GCC.
+       # 1. I'm most concerned about whether is a 7300LC is closer to a 7100 versus a 7100LC.
+       # 2. The variant 64-bit processors cause concern should GCC support explicit schedulers
+       #    for these chips in the future.
+       #         PA7300LC -> 7100LC (1.1)
+       #         PA8200   -> 8000   (2.0)
+       #         PA8500   -> 8000   (2.0)
+       #         PA8600   -> 8000   (2.0)
+
+       CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8?00/8000/'`
+       # Finish Model transformations
+
+       options="$options -mschedule=$CPUSCHEDULE -march=$CPUARCH"
+       OUT="linux-parisc" ;;
   arm*-*-linux2) OUT="linux-elf-arm" ;;
+  s390-*-linux2) OUT="linux-s390" ;;
+  s390x-*-linux?) OUT="linux-s390x" ;;
   *-*-linux2) OUT="linux-elf" ;;
   *-*-linux1) OUT="linux-aout" ;;
-  sun4u*-sun-solaris2)
+  sun4u*-*-solaris2)
        ISA64=`(isalist) 2>/dev/null | grep sparcv9`
        if [ "$ISA64" != "" -a "$CC" = "cc" -a $CCVER -ge 50 ]; then
                echo "WARNING! If you wish to build 64-bit library, then you have to"
                echo "         invoke './Configure solaris64-sparcv9-cc' *manually*."
-               echo "         Type Ctrl-C if you don't want to continue."
+               echo "         Type return if you want to continue, Ctrl-C to abort."
                read waste < /dev/tty
        fi
        OUT="solaris-sparcv9-$CC" ;;
-  sun4m-sun-solaris2)  OUT="solaris-sparcv8-$CC" ;;
-  sun4d-sun-solaris2)  OUT="solaris-sparcv8-$CC" ;;
-  sun4*-sun-solaris2)  OUT="solaris-sparcv7-$CC" ;;
-  *86*-sun-solaris2) OUT="solaris-x86-$CC" ;;
+  sun4m-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
+  sun4d-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
+  sun4*-*-solaris2)    OUT="solaris-sparcv7-$CC" ;;
+  *86*-*-solaris2) OUT="solaris-x86-$CC" ;;
   *-*-sunos4) OUT="sunos-$CC" ;;
   alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
   *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
@@ -457,13 +568,24 @@ case "$GUESSOS" in
   pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
   *-*-openbsd) OUT="OpenBSD" ;;
   *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
-  *-*-osf) OUT="alpha-cc" ;;
+  *-*-osf) OUT="alphaold-cc" ;;
+  *-*-tru64) OUT="alpha-cc" ;;
+  *-*-OpenUNIX*)
+       if [ "$CC" = "gcc" ]; then
+         OUT="OpenUNIX-8-gcc" 
+       else    
+         OUT="OpenUNIX-8" 
+       fi
+       ;;
   *-*-unixware7) OUT="unixware-7" ;;
   *-*-UnixWare7) OUT="unixware-7" ;;
   *-*-Unixware7) OUT="unixware-7" ;;
-  *-*-unixware[1-2]*) OUT="unixware-2.0" ;;
-  *-*-UnixWare[1-2]*) OUT="unixware-2.0" ;;
-  *-*-Unixware[1-2]*) OUT="unixware-2.0" ;;
+  *-*-unixware20*) OUT="unixware-2.0" ;;
+  *-*-unixware21*) OUT="unixware-2.1" ;;
+  *-*-UnixWare20*) OUT="unixware-2.0" ;;
+  *-*-UnixWare21*) OUT="unixware-2.1" ;;
+  *-*-Unixware20*) OUT="unixware-2.0" ;;
+  *-*-Unixware21*) OUT="unixware-2.1" ;;
   BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
@@ -473,6 +595,11 @@ case "$GUESSOS" in
   # these are all covered by the catchall below
   # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;
+  mips-sony-newsos4) OUT="newsos4-gcc" ;;
+  *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
+  *-*-cygwin) OUT="Cygwin" ;;
+  t3e-cray-unicosmk) OUT="cray-t3e" ;;
+  j90-cray-unicos) OUT="cray-j90" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
@@ -496,23 +623,12 @@ then
   sleep 5
   OUT=linux-sparcv8
 fi
-# To start with $OUT is never i86pc-sun-solaris2. Secondly why
-# ban *all* assembler implementation if it can't stand only one,
-# SHA-0 implementation.
-#if [ "$OUT" = "i86pc-sun-solaris2" ]
-#then
-#  ASM=`as -V /dev/null 2>&1`
-#  case "$ASM" in
-#    GNU*) ;;
-#    *) options="$options no-asm" ; echo "WARNING: You need the GNU assembler to use OpenSSL assembler code." ; echo "Sun as is not supported on Solaris x86." ;;
-#  esac
-#fi
 
 case "$GUESSOS" in
   i386-*) options="$options 386" ;;
 esac
 
-for i in bf cast des dh dsa hmac md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha
+for i in bf cast des dh dsa hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha
 do
   if [ ! -d crypto/$i ]
   then
@@ -562,7 +678,7 @@ OUT="$PREFIX$OUT"
 
 $PERL ./Configure LIST | grep "$OUT" > /dev/null
 if [ $? = "0" ]; then
-  #echo Configuring for $OUT
+  echo Configuring for $OUT
 
   if [ "$TEST" = "true" ]; then
     echo $PERL ./Configure $OUT $options