check return value of BIO_write in PKCS7_decrypt

[openssl.git] / config

diff --git a/config b/config
index d2b155aa44c1fb343c33635d9edaa49907a16686..851a1611368482f2c93e0922d26c476514c99be6 100755 (executable)
--- a/config
+++ b/config
@@ -538,7 +538,7 @@ case "$GUESSOS" in
   ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
   ppc-apple-darwin*)
        ISA64=`(sysctl -n hw.optional.64bitops) 2>/dev/null`
-       if [ "$ISA64" = "1" ]; then
+       if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
            echo "WARNING! If you wish to build 64-bit library, then you have to"
            echo "         invoke './Configure darwin64-ppc-cc' *manually*."
            if [ "$TEST" = "false" -a -t 1 ]; then
@@ -546,10 +546,14 @@ case "$GUESSOS" in
              (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
            fi
        fi
-       OUT="darwin-ppc-cc" ;;
+       if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
+           OUT="darwin64-ppc-cc"
+       else
+           OUT="darwin-ppc-cc"
+       fi ;;
   i?86-apple-darwin*)
        ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
-       if [ "$ISA64" = "1" ]; then
+       if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
            echo "WARNING! If you wish to build 64-bit library, then you have to"
            echo "         invoke './Configure darwin64-x86_64-cc' *manually*."
            if [ "$TEST" = "false" -a -t 1 ]; then
@@ -557,7 +561,17 @@ case "$GUESSOS" in
              (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
            fi
        fi
-       OUT="darwin-i386-cc" ;;
+       if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
+           OUT="darwin64-x86_64-cc"
+       else
+           OUT="darwin-i386-cc"
+       fi ;;
+  armv6+7-*-iphoneos)
+       options="$options -arch%20armv6 -arch%20armv7"
+       OUT="iphoneos-cross" ;;
+  *-*-iphoneos)
+       options="$options -arch%20${MACHINE}"
+       OUT="iphoneos-cross" ;;
   alpha-*-linux2)
         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
        case ${ISA:-generic} in
@@ -664,7 +678,7 @@ case "$GUESSOS" in
   sun4[uv]*-*-solaris2)
        OUT="solaris-sparcv9-$CC"
        ISA64=`(isalist) 2>/dev/null | grep sparcv9`
-       if [ "$ISA64" != "" ]; then
+       if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; 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*."
@@ -694,13 +708,16 @@ case "$GUESSOS" in
                fi
            fi
        fi
+       if [ "$ISA64" != "" -a "$KERNEL_BITS" = "64" ]; then
+           OUT="solaris64-sparcv9-$CC"
+       fi
        ;;
   sun4m-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4d-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4*-*-solaris2)    OUT="solaris-sparcv7-$CC" ;;
   *86*-*-solaris2)
        ISA64=`(isalist) 2>/dev/null | grep amd64`
-       if [ "$ISA64" != "" ]; then
+       if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
            OUT="solaris64-x86_64-$CC"
        else
            OUT="solaris-x86-$CC"