1 files changed, 565 insertions, 73 deletions

diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index 7643930ee0..3d443da6fb 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -1,14 +1,11 @@
 #!/bin/sh
 #
-# config - this is a merge of minarch and GuessOS from the Apache Group
-#          which then automatically runs Configure from SSLeay after
-#          mapping the Apache names for OSs into SSLeay names
+# OpenSSL config: determine the operating system and run ./Configure
 #
-# 16-Sep-97 tjh         first cut of merged version
-#
-# Tim Hudson
-# tjh@cryptsoft.com
+# "config -h" for usage information.
 #
+#          this is a merge of minarch and GuessOS from the Apache Group.
+#          Originally written by Tim Hudson <tjh@cryptsoft.com>.
 
 # Original Apache Group comments on GuessOS
 
@@ -23,6 +20,31 @@
 # Be as similar to the output of config.guess/config.sub
 # as possible.
 
+PREFIX=""
+SUFFIX=""
+TEST="false"
+
+# pick up any command line args to config
+for i
+do
+case "$i" in 
+-d*) PREFIX="debug-";;
+-t*) TEST="true";;
+-h*) TEST="true"; cat <<EOF
+Usage: config [options]
+ -d     Add a debug- prefix to machine choice.
+ -t     Test mode, do not run the Configure perl script.
+ -h     This help.
+
+Any other text will be passed to the Configure perl script.
+See INSTALL for instructions.
+
+EOF
+;;
+*) options=$options" $i" ;;
+esac
+done
+
 # First get uname entries that we use below
 
 MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
@@ -52,8 +74,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
@@ -61,16 +93,38 @@ 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
+                fi
+                ;;
         esac
     fi
 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
         ;;
@@ -86,8 +140,8 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
     HP-UX:*)
         HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         case "$HPUXVER" in
-            10.*)
-                echo "${MACHINE}-hp-hpux10."; exit 0
+            1[0-9].*)   # HPUX 10 and 11 targets are unified
+                echo "${MACHINE}-hp-hpux10"; exit 0
                 ;;
             *)
                 echo "${MACHINE}-hp-hpux"; exit 0
@@ -95,12 +149,16 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         esac
         ;;
 
-    IRIX:*)
-        echo "${MACHINE}-sgi-irix"; exit 0
+    IRIX:5.*)
+        echo "mips2-sgi-irix"; exit 0
+        ;;
+
+    IRIX:6.*)
+        echo "mips3-sgi-irix"; exit 0
         ;;
 
     IRIX64:*)
-        echo "${MACHINE}-sgi-irix64"; exit 0
+        echo "mips4-sgi-irix64"; exit 0
         ;;
 
     Linux:[2-9].*)
@@ -111,28 +169,53 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "${MACHINE}-whatever-linux1"; exit 0
         ;;
 
+    GNU*)
+        echo "hurd-x86"; exit 0;
+        ;;
+
     LynxOS:*)
         echo "${MACHINE}-lynx-lynxos"; exit 0
         ;;
 
+    BSD/OS:4.*)  # BSD/OS always says 386
+        echo "i486-whatever-bsdi4"; exit 0
+        ;;
+
     BSD/386:*:*:*486*|BSD/OS:*:*:*:*486*)
-        echo "i486-whatever-bsdi"; exit 0
+        case `/sbin/sysctl -n hw.model` in
+            Pentium*)
+                echo "i586-whatever-bsdi"; exit 0
+                ;;
+            *)
+                echo "i386-whatever-bsdi"; exit 0
+                ;;
+            esac;
         ;;
 
     BSD/386:*|BSD/OS:*)
         echo "${MACHINE}-whatever-bsdi"; exit 0
         ;;
 
-    FreeBSD:*:*:*486*)
-        echo "i486-whatever-freebsd"; exit 0
-        ;;
-
     FreeBSD:*)
-        echo "${MACHINE}-whatever-freebsd"; exit 0
-        ;;
-
-    NetBSD:*:*:*486*)
-        echo "i486-whatever-netbsd"; exit 0
+        VERS=`echo ${RELEASE} | sed -e 's/[-(].*//'`
+        MACH=`sysctl -n hw.model`
+        ARCH='whatever'
+        case ${MACH} in
+           *386*       ) MACH="i386"     ;;
+           *486*       ) MACH="i486"     ;;
+           Pentium\ II*) MACH="i686"     ;;
+           Pentium*    ) MACH="i586"     ;;
+           Alpha*      ) MACH="alpha"    ;;
+           *           ) MACH="$MACHINE" ;;
+        esac
+        case ${MACH} in
+           i[0-9]86 ) ARCH="pc" ;;
+        esac
+        echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
+        ;;
+
+    NetBSD:*:*:*386*)
+        echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
         ;;
 
     NetBSD:*)
@@ -143,17 +226,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
-            423)
-                echo "${MACHINE}-qssl-qnx32"
+        case "$RELEASE" in
+            4*)
+                echo "${MACHINE}-whatever-qnx4"
+                ;;
+            6*)
+                echo "${MACHINE}-whatever-qnx6"
                 ;;
             *)
-                echo "${MACHINE}-qssl-qnx"
+                echo "${MACHINE}-whatever-qnx"
                 ;;
         esac
         exit 0
@@ -163,8 +264,24 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "i860-intel-osf1"; exit 0
         ;;
 
+    Rhapsody:*)
+        echo "ppc-apple-rhapsody"; exit 0
+        ;;
+
+    Darwin:*)
+        case "$MACHINE" in
+            Power*)
+                echo "ppc-apple-darwin${VERSION}"
+                ;;
+            *)
+                echo "i386-apple-darwin${VERSION}"
+                ;;
+        esac
+        exit 0
+        ;;
+
     SunOS:5.*)
-        echo "${MACHINE}-sun-solaris2"; exit 0
+        echo "${MACHINE}-whatever-solaris2"; exit 0
         ;;
 
     SunOS:*)
@@ -191,8 +308,12 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "${MACHINE}-unknown-ultrix"; exit 0
         ;;
 
-    SINIX*)
-        echo "${MACHINE}-sni-sysv4"; exit 0
+    SINIX*|ReliantUNIX*)
+        echo "${MACHINE}-siemens-sysv4"; exit 0
+        ;;
+
+    POSIX-BC*)
+        echo "${MACHINE}-siemens-sysv4"; exit 0   # Here, $MACHINE == "BS2000"
         ;;
 
     machten:*)
@@ -207,6 +328,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
 
 #
@@ -225,6 +369,9 @@ fi
 # Now NeXT
 ISNEXT=`hostinfo 2>/dev/null`
 case "$ISNEXT" in
+    *'NeXT Mach 3.3'*)
+        echo "whatever-next-nextstep3.3"; exit 0
+        ;;
     *NeXT*)
         echo "whatever-next-nextstep"; exit 0
         ;;
@@ -233,7 +380,7 @@ esac
 # At this point we gone through all the one's
 # we know of: Punt
 
-echo "${MACHINE}-whatever-${SYSTEM}|${RELEASE}|${VERSION}" 
+echo "${MACHINE}-whatever-${SYSTEM}" 
 exit 0
 ) 2>/dev/null | (
 
@@ -241,87 +388,432 @@ exit 0
 # this is where the translation occurs into SSLeay terms
 # ---------------------------------------------------------------------------
 
-PREFIX=""
-SUFFIX=""
-VERBOSE="false"
-TEST="false"
-
-# pick up any command line args to config
-for i
-do
-case "$i" in 
--d*) PREFIX="debug-";;
--v*) VERBOSE="true";;
--n*|-t*) TEST="true";;
-esac
-done
-
 # figure out if gcc is available and if so we use it otherwise
 # we fallback to whatever cc does on the system
-GCCVER=`gcc -v 2>&1`
-if [ $? = "0" ]; then
+GCCVER=`(gcc --version) 2>/dev/null`
+if [ "$GCCVER" != "" ]; then
   CC=gcc
+  # then strip off whatever prefix Cygnus prepends the number with...
+  GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'`
+  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
+  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
 else
   CC=cc
 fi
+GCCVER=${GCCVER:-0}
+
+if [ "$SYSTEM" = "SunOS" ]; then
+  if [ $GCCVER -ge 30 ]; then
+    # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
+    # to be working, at the very least 'make test' passes...
+    if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
+      GCC_ARCH="-m64"
+    else
+      GCC_ARCH="-m32"
+    fi
+  fi
+  # check for WorkShop C, expected output is "cc: blah-blah C x.x"
+  CCVER=`(cc -V 2>&1) 2>/dev/null | \
+        egrep -e '^cc: .* C [0-9]\.[0-9]' | \
+        sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
+  CCVER=${CCVER:-0}
+  if [ $CCVER -gt 40 ]; then
+    CC=cc       # overrides gcc!!!
+    if [ $CCVER -eq 50 ]; then
+      echo "WARNING! Detected WorkShop C 5.0. Do make sure you have"
+      echo "         patch #107357-01 or later applied."
+      sleep 5
+    fi
+  elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then
+    CC=sc3
+  fi
+fi
+
+if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
+  # check for Compaq C, expected output is "blah-blah C Vx.x"
+  CCCVER=`(ccc -V 2>&1) 2>/dev/null | \
+        egrep -e '.* C V[0-9]\.[0-9]' | \
+        sed 's/.* C V\([0-9]\)\.\([0-9]\).*/\1\2/'`
+  CCCVER=${CCCVER:-0}
+  if [ $CCCVER -gt 60 ]; then
+    CC=ccc      # overrides gcc!!! well, ccc outperforms inoticeably
+                # only on hash routines and des, otherwise gcc (2.95)
+                # keeps along rather tight...
+  fi
+fi
+
+CCVER=${CCVER:-0}
 
 # read the output of the embedded GuessOS 
 read GUESSOS
 
-if [ "$VERBOSE" = "true" ]; then
-  echo GUESSOS $GUESSOS
-fi
+echo Operating system: $GUESSOS
 
 # now map the output into SSLeay terms ... really should hack into the
 # script above so we end up with values in vars but that would take
 # more time that I want to waste at the moment
 case "$GUESSOS" in
-  *-*-linux2) OUT="linux-elf" ;;
-  *-*-linux) OUT="linux-aout" ;;
-  sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;;
-  *86*-sun-solaris2) OUT="solaris-x86-$CC" ;;
+  mips2-sgi-irix)
+        CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+        CPU=${CPU:-0}
+        if [ $CPU -ge 4000 ]; then
+                options="$options -mips2"
+        fi
+        OUT="irix-$CC"
+        ;;
+  mips3-sgi-irix)
+        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"
+        ;;
+  mips4-sgi-irix64)
+        echo "WARNING! If you wish to build 64-bit library, then you have to"
+        echo "         invoke './Configure irix64-mips4-$CC' *manually*."
+        if [ "$TEST" = "false" ]; then
+          echo "         You have about 5 seconds to press Ctrl-C to abort."
+          (stty -icanon min 0 time 50; read waste) < /dev/tty
+        fi
+        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)
+        ISA=`awk '/cpu model/{print$4}' /proc/cpuinfo`
+        case ${ISA:-generic} in
+        *[67])  OUT="linux-alpha+bwx-$CC" ;;
+        *)      OUT="linux-alpha-$CC" ;;
+        esac
+        if [ "$CC" = "gcc" ]; then
+            case ${ISA:-generic} in
+            EV5|EV45)           options="$options -mcpu=ev5";;
+            EV56|PCA56)         options="$options -mcpu=ev56";;
+            EV6|EV67|PCA57)     options="$options -mcpu=ev6";;
+            esac
+        fi
+        ;;
+  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
+        ;;
+  ppc64-*-linux2)
+        #Use the standard target for PPC architecture until we create a
+        #special one for the 64bit architecture.
+        OUT="linux-ppc" ;;
+  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" ;;
+  i386-apple-darwin*) OUT="darwin-i386-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 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`
+        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"
+        if [ "$GCCVER" -gt 28 ]; then
+          if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
+            OUT="linux-pentium"
+          fi
+          if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then
+            OUT="linux-ppro"
+          fi
+          if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then
+            OUT="linux-k6"
+          fi
+        fi ;;
+  *-*-linux1) OUT="linux-aout" ;;
+  sun4u*-*-solaris2)
+        OUT="solaris-sparcv9-$CC"
+        ISA64=`(isalist) 2>/dev/null | grep sparcv9`
+        if [ "$ISA64" != "" ]; then
+            if [ "$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*."
+                if [ "$TEST" = "false" ]; then
+                  echo "         You have about 5 seconds to press Ctrl-C to abort."
+                  (stty -icanon min 0 time 50; read waste) < /dev/tty
+                fi
+            elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
+                # $GCC_ARCH denotes default ABI chosen by compiler driver
+                # (first one found on the $PATH). I assume that user
+                # expects certain consistency with the rest of his builds
+                # and therefore switch over to 64-bit. <appro>
+                OUT="solaris64-sparcv9-gcc"
+                echo "WARNING! If you wish to build 32-bit library, then you have to"
+                echo "         invoke './Configure solaris-sparcv9-gcc' *manually*."
+                if [ "$TEST" = "false" ]; then
+                  echo "         You have about 5 seconds to press Ctrl-C to abort."
+                  (stty -icanon min 0 time 50; read waste) < /dev/tty
+                fi
+            elif [ "$GCC_ARCH" = "-m32" ]; then
+                echo "NOTICE! If you *know* that your GNU C supports 64-bit/V9 ABI"
+                echo "        and wish to build 64-bit library, then you have to"
+                echo "        invoke './Configure solaris64-sparcv9-gcc' *manually*."
+                if [ "$TEST" = "false" ]; then
+                  echo "         You have about 5 seconds to press Ctrl-C to abort."
+                  (stty -icanon min 0 time 50; read waste) < /dev/tty
+                fi
+            fi
+        fi
+        ;;
+  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" ;;
-  *-freebsd) OUT="FreeBSD" ;;
+  alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
+  *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
+  *-freebsd[1-2]*) OUT="FreeBSD" ;;
   *86*-*-netbsd) OUT="NetBSD-x86" ;;
   sun3*-*-netbsd) OUT="NetBSD-m68" ;;
   *-*-netbsd) OUT="NetBSD-sparc" ;;
-  *86*-*-openbsd) OUT="OpenBSD-x86" ;;
   alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
-  *-*-openbsd) OUT="OpenBSD-bigendian" ;;
-  *-*-osf) OUT="alpha-$CC" ;;
-  *-*-unixware*) OUT="unixware-2.0" ;;
-  *-sni-sysv4) OUT="SINIX" ;;
+  *86*-*-openbsd) OUT="OpenBSD-i386" ;;
+  m68k*-*-openbsd) OUT="OpenBSD-m68k" ;;
+  m88k*-*-openbsd) OUT="OpenBSD-m88k" ;;
+  mips*-*-openbsd) OUT="OpenBSD-mips" ;;
+  pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
+  powerpc*-*-openbsd) OUT="OpenBSD-powerpc" ;;
+  sparc64*-*-openbsd) OUT="OpenBSD-sparc64" ;;
+  sparc*-*-openbsd) OUT="OpenBSD-sparc" ;;
+  vax*-*-openbsd) OUT="OpenBSD-vax" ;;
+  hppa*-*-openbsd) OUT="OpenBSD-hppa" ;;
+  *-*-openbsd) OUT="OpenBSD" ;;
+  *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
+  *-*-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" ;;
+  *-*-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" ;;
+  *-hpux1*)
+        OUT="hpux-parisc-$CC"
+        KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
+        KERNEL_BITS=${KERNEL_BITS:-32}
+        CPU_VERSION=`(getconf CPU_VERSION) 2>/dev/null`
+        CPU_VERSION=${CPU_VERSION:-0}
+        # See <sys/unistd.h> for further info on CPU_VERSION.
+        if   [ $CPU_VERSION -ge 768 ]; then     # IA-64 CPU
+             echo "NOTICE! 64-bit is the only ABI currently operational on HP-UXi."
+             echo "        Post request to openssl-dev@openssl.org for 32-bit support."
+             if [ "$TEST" = "false" ]; then
+                (stty -icanon min 0 time 50; read waste) < /dev/tty
+             fi
+             OUT="hpux64-ia64-cc"
+        elif [ $CPU_VERSION -ge 532 ]; then     # PA-RISC 2.x CPU
+             if [ "$CC" = "cc" ]; then
+                OUT="hpux-parisc2-cc" # can't we have hpux-parisc2-gcc?
+             fi
+             if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
+                echo "WARNING! If you wish to build 64-bit library then you have to"
+                echo "         invoke './Configure hpux64-parisc2-cc' *manually*."
+                if [ "$TEST" = "false" ]; then
+                  echo "         You have about 5 seconds to press Ctrl-C to abort."
+                  (stty -icanon min 0 time 50; read waste) < /dev/tty
+                fi
+             fi
+        elif [ $CPU_VERSION -ge 528 ]; then     # PA-RISC 1.1+ CPU
+             :
+        elif [ $CPU_VERSION -ge 523 ]; then     # PA-RISC 1.0 CPU
+             :
+        else                                    # Motorola(?) CPU
+             OUT="hpux-$CC"
+        fi
+        options="$options -D_REENTRANT" ;;
+  *-hpux)       OUT="hpux-parisc-$CC" ;;
   # these are all covered by the catchall below
-  # *-hpux) OUT="hpux-$CC" ;;
   # *-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
 
+# NB: This atalla support has been superceded by the ENGINE support
+# That contains its own header and definitions anyway. Support can
+# be enabled or disabled on any supported platform without external
+# headers, eg. by adding the "hw-atalla" switch to ./config or
+# perl Configure
+#
+# See whether we can compile Atalla support
+#if [ -f /usr/include/atasi.h ]
+#then
+#  options="$options -DATALLA"
+#fi
+
+# gcc < 2.8 does not support -mcpu=ultrasparc
+if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
+then
+  echo "WARNING! Do consider upgrading to gcc-2.8 or later."
+  sleep 5
+  OUT=solaris-sparcv9-gcc27
+fi
+if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ]
+then
+  echo "WARNING! Falling down to 'linux-sparcv8'."
+  echo "         Upgrade to gcc-2.8 or later."
+  sleep 5
+  OUT=linux-sparcv8
+fi
+
+case "$GUESSOS" in
+  i386-*) options="$options 386" ;;
+esac
+
+for i in bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 rijndael ripemd rsa sha
+do
+  if [ ! -d crypto/$i ]
+  then
+    options="$options no-$i"
+  fi
+done
+
+# Discover Kerberos 5 (since it's still a prototype, we don't
+# do any guesses yet, that's why this section is commented away.
+#if [ -d /usr/kerberos ]; then
+#    krb5_dir=/usr/kerberos
+#    if [ \( -f $krb5_dir/lib/libgssapi_krb5.a -o -f $krb5_dir/lib/libgssapi_krb5.so* \)\
+#       -a \( -f $krb5_dir/lib/libkrb5.a -o -f $krb5_dir/lib/libkrb5.so* \)\
+#       -a \( -f $krb5_dir/lib/libcom_err.a -o -f $krb5_dir/lib/libcom_err.so* \)\
+#       -a \( -f $krb5_dir/lib/libk5crypto.a -o -f $krb5_dir/lib/libk5crypto.so* \)\
+#       -a \( -f $krb5_dir/include/krb5.h \) ]; then
+#       options="$options --with-krb5-flavor=MIT"
+#    fi
+#elif [ -d /usr/heimdal ]; then
+#    krb5_dir=/usr/heimdal
+#    if [ \( -f $krb5_dir/lib/libgssapi.a -o -f $krb5_dir/lib/libgssapi.so* \)\
+#       -a \( -f $krb5_dir/lib/libkrb5.a -o -f $krb5_dir/lib/libkrb5.so* \)\
+#       -a \( -f $krb5_dir/lib/libcom_err.a -o -f $krb5_dir/lib/libcom_err.so* \)\
+#       -a \( -f $krb5_dir/include/krb5.h \) ]; then
+#       options="$options --with-krb5-flavor=Heimdal"
+#    fi
+#fi
+
 if [ -z "$OUT" ]; then
   OUT="$CC"
 fi
 
+if [ ".$PERL" = . ] ; then
+        for i in . `echo $PATH | sed 's/:/ /g'`; do
+                if [ -f "$i/perl5" ] ; then
+                        PERL="$i/perl5"
+                        break;
+                fi;
+        done
+fi
+
+if [ ".$PERL" = . ] ; then
+        for i in . `echo $PATH | sed 's/:/ /g'`; do
+                if [ -f "$i/perl" ] ; then
+                        if "$i/perl" -e 'exit($]<5.0)'; then
+                                PERL="$i/perl"
+                                break;
+                        fi;
+                fi;
+        done
+fi
+
+if [ ".$PERL" = . ] ; then
+        echo "You need Perl 5."
+        exit 1
+fi
+
 # run Configure to check to see if we need to specify the 
 # compiler for the platform ... in which case we add it on
 # the end ... otherwise we leave it off
-./Configure 2>&1 | grep '$OUT-$CC' > /dev/null
+
+$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null
 if [ $? = "0" ]; then
   OUT="$OUT-$CC"
 fi
 
 OUT="$PREFIX$OUT"
 
-# at this point we have the answer ... which we could check again
-# and then fallback to a vanilla SSLeay build but then this script
-# wouldn't get updated
-echo Configuring for $OUT
+$PERL ./Configure LIST | grep "$OUT" > /dev/null
+if [ $? = "0" ]; then
+  echo Configuring for $OUT
 
-if [ "$TEST" = "true" ]; then
-  echo ./Configure -DNO_IDEA $OUT
+  if [ "$TEST" = "true" ]; then
+    echo $PERL ./Configure $OUT $options
+  else
+    $PERL ./Configure $OUT $options
+  fi
 else
-  ./Configure -DNO_IDEA $OUT
+  echo "This system ($OUT) is not supported. See file INSTALL for details."
 fi
-
 )
-