1 files changed, 49 insertions, 38 deletions

diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index 3e9af7680a..b3bd96bbfc 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -74,34 +74,27 @@ if [ "x$XREL" != "x" ]; then
                 echo "whatever-whatever-sco5"; exit 0
                 ;;
             4.2MP)
-                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
+                case "x${VERSION}" in
+                    x2.0*) echo "whatever-whatever-unixware20"; exit 0 ;;
+                    x2.1*) echo "whatever-whatever-unixware21"; exit 0 ;;
+                    x2*)   echo "whatever-whatever-unixware2";  exit 0 ;;
+                esac
                 ;;
             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
+                echo "i386-whatever-unixware1"; exit 0
                 ;;
             5)
-                if [ "`echo x$VERSION | sed -e 's/\..*//'`" = "x7" ]; then
-                    echo "${MACHINE}-sco-unixware7"; exit 0
-                fi
+                case "x${VERSION}" in
+                    # We hardcode i586 in place of ${MACHINE} for the
+                    # following reason. The catch is that even though Pentium
+                    # is minimum requirement for platforms in question,
+                    # ${MACHINE} gets always assigned to i386. Now, problem
+                    # with i386 is that it makes ./config pass 386 to
+                    # ./Configure, which in turn makes make generate
+                    # inefficient SHA-1 (for this moment) code.
+                    x7*)  echo "i586-sco-unixware7";           exit 0 ;;
+                    x8*)  echo "i586-unkn-OpenUNIX${VERSION}"; exit 0 ;;
+                esac
                 ;;
         esac
     fi
@@ -196,7 +189,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "${MACHINE}-whatever-bsdi"; exit 0
         ;;
 
-    FreeBSD:*)
+    FreeBSD:*:*:*386*)
         VERS=`echo ${RELEASE} | sed -e 's/[-(].*//'`
         MACH=`sysctl -n hw.model`
         ARCH='whatever'
@@ -205,7 +198,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
            *486*       ) MACH="i486"     ;;
            Pentium\ II*) MACH="i686"     ;;
            Pentium*    ) MACH="i586"     ;;
-           Alpha*      ) MACH="alpha"    ;;
            *           ) MACH="$MACHINE" ;;
         esac
         case ${MACH} in
@@ -214,6 +206,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
         ;;
 
+    FreeBSD:*)
+        echo "${MACHINE}-whatever-freebsd"; 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
         ;;
@@ -351,6 +347,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
     *CRAY*)
        echo "j90-cray-unicos"; exit 0;
        ;;
+
+    NONSTOP_KERNEL*)
+       echo "nsr-tandem-nsk"; exit 0;
+       ;;
 esac
 
 #
@@ -457,6 +457,10 @@ if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
   fi
 fi
 
+if [ "${SYSTEM}" = "AIX" ]; then        # favor vendor cc over gcc
+    (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
+fi
+
 CCVER=${CCVER:-0}
 
 # read the output of the embedded GuessOS 
@@ -469,7 +473,7 @@ echo Operating system: $GUESSOS
 # more time that I want to waste at the moment
 case "$GUESSOS" in
   mips2-sgi-irix)
-        CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+        CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
         CPU=${CPU:-0}
         if [ $CPU -ge 4000 ]; then
                 options="$options -mips2"
@@ -477,7 +481,7 @@ case "$GUESSOS" in
         OUT="irix-$CC"
         ;;
   mips3-sgi-irix)
-        CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+        CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
         CPU=${CPU:-0}
         if [ $CPU -ge 5000 ]; then
                 options="$options -mips4"
@@ -493,7 +497,7 @@ case "$GUESSOS" in
           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=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
         CPU=${CPU:-0}
         if [ $CPU -ge 5000 ]; then
                 options="$options -mips4"
@@ -543,12 +547,13 @@ EOF
   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
+        echo "WARNING! 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 linux64-sparcv9' *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
         OUT="linux-sparcv9" ;;
   sparc-*-linux2)
         KARCH=`awk '/^type/{print$3}' /proc/cpuinfo`
@@ -581,6 +586,7 @@ EOF
   arm*-*-linux2) OUT="linux-elf-arm" ;;
   s390-*-linux2) OUT="linux-s390" ;;
   s390x-*-linux?) OUT="linux-s390x" ;;
+  x86_64-*-linux?) OUT="linux-x86_64" ;;
   *-*-linux2) OUT="linux-elf"
         if [ "$GCCVER" -gt 28 ]; then
           if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
@@ -634,6 +640,8 @@ EOF
   *86*-*-solaris2) OUT="solaris-x86-$CC" ;;
   *-*-sunos4) OUT="sunos-$CC" ;;
   alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
+  sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;;
+  ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
   *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
   *-freebsd[1-2]*) OUT="FreeBSD" ;;
   *86*-*-netbsd) OUT="NetBSD-x86" ;;
@@ -690,9 +698,11 @@ EOF
         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."
+             echo "WARNING! 64-bit ABI is the default configured ABI on HP-UXi."
+             echo "         If you wish to build 32-bit library, the you have to"
+             echo "         invoke './Configure hpux-ia32-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
              OUT="hpux64-ia64-cc"
@@ -725,6 +735,7 @@ EOF
   *-*-cygwin) OUT="Cygwin" ;;
   t3e-cray-unicosmk) OUT="cray-t3e" ;;
   j90-cray-unicos) OUT="cray-j90" ;;
+  nsr-tandem-nsk) OUT="tandem-c89" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
@@ -759,7 +770,7 @@ 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
+for i in bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 aes ripemd rsa sha
 do
   if [ ! -d crypto/$i ]
   then