the final byte of a pkcs7 padded plaintext can never be 0

[openssl.git] / config

diff --git a/config b/config
index 4a8c185bd50db90bea08b01e2e93e737254ee052..7008a1a659942072ddbfde814e28ffa020cb9ae0 100755 (executable)
--- a/config
+++ b/config
@@ -84,7 +84,7 @@ if [ "x$XREL" != "x" ]; then
            4.2)
                echo "whatever-whatever-unixware1"; exit 0
                ;;
-           5)
+           5*)
                case "x${VERSION}" in
                    # We hardcode i586 in place of ${MACHINE} for the
                    # following reason. The catch is that even though Pentium
@@ -93,8 +93,7 @@ if [ "x$XREL" != "x" ]; then
                    # 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 ;;
+                   x[678]*)  echo "i586-sco-unixware7"; exit 0 ;;
                esac
                ;;
        esac
@@ -654,15 +653,20 @@ case "$GUESSOS" in
        ;;
   *-*-sunos4)          OUT="sunos-$CC" ;;
 
-  *86*-*-bsdi4)                OUT="bsdi-elf-gcc"; options="$options no-sse2" ;;
+  *86*-*-bsdi4)                OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
   alpha*-*-*bsd*)      OUT="BSD-generic64; options="$options -DL_ENDIAN" ;;
   powerpc64-*-*bsd*)   OUT="BSD-generic64; options="$options -DB_ENDIAN" ;;
   sparc64-*-*bsd*)     OUT="BSD-sparc64" ;;
   ia64-*-*bsd*)                OUT="BSD-ia64" ;;
   amd64-*-*bsd*)       OUT="BSD-x86_64" ;;
-  *86*-*-*bsd*)                # assume highest libc.so.* version is the one in effect
-                       libc=`(ls /usr/lib/libc.so.* /lib/libc.so.* | tail -1) 2>/dev/null`
-                       case "`(file $libc) 2>/dev/null`" in
+  *86*-*-*bsd*)                # mimic ld behaviour when it's looking for libc...
+                       if [ -L /usr/lib/libc.so ]; then        # [Free|Net]BSD
+                           libc=/usr/lib/libc.so
+                       else                                    # OpenBSD
+                           # ld searches for highest libc.so.* and so do we
+                           libc=`(ls /usr/lib/libc.so.* | tail -1) 2>/dev/null`
+                       fi
+                       case "`(file -L $libc) 2>/dev/null`" in
                        *ELF*)  OUT="BSD-x86-elf" ;;
                        *)      OUT="BSD-x86"; options="$options no-sse2" ;;
                        esac ;;
@@ -670,14 +674,13 @@ case "$GUESSOS" in
 
   *-*-osf)             OUT="osf1-alpha-cc" ;;
   *-*-tru64)           OUT="tru64-alpha-cc" ;;
-  *-*-OpenUNIX*)
+  *-*-[Uu]nix[Ww]are7)
        if [ "$CC" = "gcc" ]; then
-         OUT="OpenUNIX-8-gcc" 
+         OUT="unixware-7-gcc" ; options="$options no-sse2"
        else    
-         OUT="OpenUNIX-8" 
+         OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
        fi
        ;;
-  *-*-[Uu]nix[Ww]are7) OUT="unixware-7"; options="$options no-sse2" ;;
   *-*-[Uu]nix[Ww]are20*) OUT="unixware-2.0"; options="$options no-sse2 no-sha512" ;;
   *-*-[Uu]nix[Ww]are21*) OUT="unixware-2.1"; options="$options no-sse2 no-sha512" ;;
   *-*-vos)