1 files changed, 249 insertions, 44 deletions

diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index d22836f80f..a7a40e04db 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -20,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"
@@ -68,6 +93,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
@@ -110,10 +140,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
     HP-UX:*)
         HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         case "$HPUXVER" in
-            11.*)
-                echo "${MACHINE}-hp-hpux11"; exit 0
-                ;;
-            10.*)
+            1[0-9].*)   # HPUX 10 and 11 targets are unified
                 echo "${MACHINE}-hp-hpux10"; exit 0
                 ;;
             *)
@@ -142,6 +169,10 @@ 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
         ;;
@@ -195,15 +226,33 @@ 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
+        case "$RELEASE" in
             4*)
                 echo "${MACHINE}-whatever-qnx4"
                 ;;
+            6*)
+                echo "${MACHINE}-whatever-qnx6"
+                ;;
             *)
                 echo "${MACHINE}-whatever-qnx"
                 ;;
@@ -219,6 +268,18 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         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}-whatever-solaris2"; exit 0
         ;;
@@ -271,6 +332,25 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         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
 
 #
@@ -308,31 +388,6 @@ exit 0
 # this is where the translation occurs into SSLeay terms
 # ---------------------------------------------------------------------------
 
-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
-
 # figure out if gcc is available and if so we use it otherwise
 # we fallback to whatever cc does on the system
 GCCVER=`(gcc --version) 2>/dev/null`
@@ -345,8 +400,18 @@ if [ "$GCCVER" != "" ]; then
 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]' | \
@@ -377,7 +442,6 @@ if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
   fi
 fi
 
-GCCVER=${GCCVER:-0}
 CCVER=${CCVER:-0}
 
 # read the output of the embedded GuessOS 
@@ -410,8 +474,10 @@ case "$GUESSOS" in
   mips4-sgi-irix64)
         echo "WARNING! If you wish to build 64-bit library, then you have to"
         echo "         invoke './Configure irix64-mips4-$CC' *manually*."
-        echo "         Type return if you want to continue, Ctrl-C to abort."
-        read waste < /dev/tty
+        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
@@ -435,10 +501,27 @@ 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" ;;
   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:-(
@@ -455,19 +538,76 @@ case "$GUESSOS" in
         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" ;;
-  *-*-linux2) OUT="linux-elf" ;;
+  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" != "" -a "$CC" = "cc" -a $CCVER -ge 50 ]; then
+        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*."
-                echo "         Type return if you want to continue, Ctrl-C to abort."
-                read waste < /dev/tty
+                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
-        OUT="solaris-sparcv9-$CC" ;;
+        ;;
   sun4m-*-solaris2)     OUT="solaris-sparcv8-$CC" ;;
   sun4d-*-solaris2)     OUT="solaris-sparcv8-$CC" ;;
   sun4*-*-solaris2)     OUT="solaris-sparcv7-$CC" ;;
@@ -485,7 +625,15 @@ case "$GUESSOS" in
   vax*-*-openbsd) OUT="OpenBSD-vax" ;;
   *-*-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" ;;
@@ -498,13 +646,49 @@ case "$GUESSOS" in
   BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
-  *-hpux1*)     OUT="hpux-parisc-$CC"
-                options="$options -D_REENTRANT" ;;
+  *-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
   # *-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
 
@@ -539,7 +723,7 @@ 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 ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 rijndael ripemd rsa sha
 do
   if [ ! -d crypto/$i ]
   then
@@ -547,6 +731,27 @@ do
   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