Gentlemen -

Here are two patches for Cygwin32 builds against current snapshots.  The first patch 
changes the test scripts to use diff versus cmp (which seems to work much better in a 
CR/LF environment).  The second patch allows the config script to correctly identify 
and pass the required arguments to the Configure perl script.

All diffs were made with "diff -Naur" format against the 05 December 0.9.7-dev 
snapshot, and have been tested on WinNT 4.0 x86 (with Cygwin), RedHat 6.2  & 7.1 x86 
and SPARC Solaris 2.6 & 7 with success.

Michael Kobar                     [EMAIL PROTECTED]
Software Engineer                 860.434.4018 voice
Lymeware Corporation              801.383.9021 fax
                                  www.lymeware.com
diff -Naur openssl-SNAP-20011126/test/tcrl openssl-SNAP-20011126_lwc/test/tcrl
--- openssl-SNAP-20011126/test/tcrl     Sat Jan  2 14:01:40 1999
+++ openssl-SNAP-20011126_lwc/test/tcrl Tue Nov 27 14:23:05 2001
@@ -54,27 +54,27 @@
 $cmd -in f.p -inform p -outform p >ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp fff.p f.p
+diff fff.p f.p
 if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
+diff fff.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#cmp fff.p ff.p2
+#diff fff.p ff.p2
 #if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
+diff fff.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-#cmp f.t ff.t1
+#diff f.t ff.t1
 #if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t2
+#diff f.t ff.t2
 #if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t3
+#diff f.t ff.t3
 #if [ $? != 0 ]; then exit 1; fi
 
-cmp f.p ff.p1
+diff f.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#cmp f.p ff.p2
+#diff f.p ff.p2
 #if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
+diff f.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
 /bin/rm -f f.* ff.* fff.*
diff -Naur openssl-SNAP-20011126/test/testenc openssl-SNAP-20011126_lwc/test/testenc
--- openssl-SNAP-20011126/test/testenc  Sat Apr 10 23:00:16 1999
+++ openssl-SNAP-20011126_lwc/test/testenc      Tue Nov 27 14:18:40 2001
@@ -9,7 +9,7 @@
 echo cat
 $cmd enc < $test > $test.cipher
 $cmd enc < $test.cipher >$test.clear
-cmp $test $test.clear
+diff $test $test.clear
 if [ $? != 0 ]
 then
        exit 1
@@ -19,7 +19,7 @@
 echo base64
 $cmd enc -a -e < $test > $test.cipher
 $cmd enc -a -d < $test.cipher >$test.clear
-cmp $test $test.clear
+diff $test $test.clear
 if [ $? != 0 ]
 then
        exit 1
@@ -32,7 +32,7 @@
        echo $i
        $cmd $i -bufsize 113 -e -k test < $test > $test.$i.cipher
        $cmd $i -bufsize 157 -d -k test < $test.$i.cipher >$test.$i.clear
-       cmp $test $test.$i.clear
+       diff $test $test.$i.clear
        if [ $? != 0 ]
        then
                exit 1
@@ -43,7 +43,7 @@
        echo $i base64
        $cmd $i -bufsize 113 -a -e -k test < $test > $test.$i.cipher
        $cmd $i -bufsize 157 -a -d -k test < $test.$i.cipher >$test.$i.clear
-       cmp $test $test.$i.clear
+       diff $test $test.$i.clear
        if [ $? != 0 ]
        then
                exit 1
diff -Naur openssl-SNAP-20011126/test/tpkcs7 openssl-SNAP-20011126_lwc/test/tpkcs7
--- openssl-SNAP-20011126/test/tpkcs7   Sat Jan  2 14:01:40 1999
+++ openssl-SNAP-20011126_lwc/test/tpkcs7       Tue Nov 27 14:24:34 2001
@@ -35,16 +35,16 @@
 $cmd -in f.p -inform p -outform p >ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp fff.p f.p
+diff fff.p f.p
 if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
+diff fff.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
+diff fff.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp f.p ff.p1
+diff f.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
+diff f.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
 /bin/rm -f f.* ff.* fff.*
diff -Naur openssl-SNAP-20011126/test/tpkcs7d openssl-SNAP-20011126_lwc/test/tpkcs7d
--- openssl-SNAP-20011126/test/tpkcs7d  Sat Jan  2 14:01:41 1999
+++ openssl-SNAP-20011126_lwc/test/tpkcs7d      Tue Nov 27 14:24:54 2001
@@ -35,9 +35,9 @@
 $cmd -in f.p -inform p -outform p >ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp f.p ff.p1
+diff f.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
+diff f.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
 /bin/rm -f f.* ff.* fff.*
diff -Naur openssl-SNAP-20011126/test/treq openssl-SNAP-20011126_lwc/test/treq
--- openssl-SNAP-20011126/test/treq     Mon Mar 13 15:01:54 2000
+++ openssl-SNAP-20011126_lwc/test/treq Tue Nov 27 14:23:46 2001
@@ -59,27 +59,27 @@
 $cmd -in f.p -inform p -outform p >ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp fff.p f.p
+diff fff.p f.p
 if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
+diff fff.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#cmp fff.p ff.p2
+#diff fff.p ff.p2
 #if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
+diff fff.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-#cmp f.t ff.t1
+#diff f.t ff.t1
 #if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t2
+#diff f.t ff.t2
 #if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t3
+#diff f.t ff.t3
 #if [ $? != 0 ]; then exit 1; fi
 
-cmp f.p ff.p1
+diff f.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#cmp f.p ff.p2
+#diff f.p ff.p2
 #if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
+diff f.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
 /bin/rm -f f.* ff.* fff.*
diff -Naur openssl-SNAP-20011126/test/trsa openssl-SNAP-20011126_lwc/test/trsa
--- openssl-SNAP-20011126/test/trsa     Mon Mar 13 16:00:55 2000
+++ openssl-SNAP-20011126_lwc/test/trsa Tue Nov 27 13:57:05 2001
@@ -59,27 +59,27 @@
 $cmd -in f.p -inform p -outform p >ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp fff.p f.p
+diff fff.p f.p
 if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
+diff fff.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#cmp fff.p ff.p2
+#diff fff.p ff.p2
 #if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
+diff fff.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-#cmp f.t ff.t1
+#diff f.t ff.t1
 #if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t2
+#diff f.t ff.t2
 #if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t3
+#diff f.t ff.t3
 #if [ $? != 0 ]; then exit 1; fi
 
-cmp f.p ff.p1
+diff f.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#cmp f.p ff.p2
+#diff f.p ff.p2
 #if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
+diff f.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
 /bin/rm -f f.* ff.* fff.*
diff -Naur openssl-SNAP-20011126/test/tsid openssl-SNAP-20011126_lwc/test/tsid
--- openssl-SNAP-20011126/test/tsid     Sat Jan  2 14:01:41 1999
+++ openssl-SNAP-20011126_lwc/test/tsid Tue Nov 27 13:56:39 2001
@@ -54,27 +54,27 @@
 $cmd -in f.p -inform p -outform p >ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp fff.p f.p
+diff fff.p f.p
 if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
+diff fff.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#cmp fff.p ff.p2
+#diff fff.p ff.p2
 #if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
+diff fff.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-#cmp f.t ff.t1
+#diff f.t ff.t1
 #if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t2
+#diff f.t ff.t2
 #if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t3
+#diff f.t ff.t3
 #if [ $? != 0 ]; then exit 1; fi
 
-cmp f.p ff.p1
+diff f.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#cmp f.p ff.p2
+#diff f.p ff.p2
 #if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
+diff f.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
 /bin/rm -f f.* ff.* fff.*
diff -Naur openssl-SNAP-20011126/test/tx509 openssl-SNAP-20011126_lwc/test/tx509
--- openssl-SNAP-20011126/test/tx509    Sat Jan  2 14:01:41 1999
+++ openssl-SNAP-20011126_lwc/test/tx509        Tue Nov 27 13:56:25 2001
@@ -54,27 +54,27 @@
 $cmd -in f.p -inform p -outform p >ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp fff.p f.p
+diff fff.p f.p
 if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
+diff fff.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p2
+diff fff.p ff.p2
 if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
+diff fff.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp f.n ff.n1
+diff f.n ff.n1
 if [ $? != 0 ]; then exit 1; fi
-cmp f.n ff.n2
+diff f.n ff.n2
 if [ $? != 0 ]; then exit 1; fi
-cmp f.n ff.n3
+diff f.n ff.n3
 if [ $? != 0 ]; then exit 1; fi
 
-cmp f.p ff.p1
+diff f.p ff.p1
 if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p2
+diff f.p ff.p2
 if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
+diff f.p ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
 /bin/rm -f f.* ff.* fff.*
diff -Naur openssl-SNAP-20011205/config openssl-SNAP-20011205_lwc/config
--- openssl-SNAP-20011205/config        Fri Nov 30 05:00:12 2001
+++ openssl-SNAP-20011205_lwc/config    Thu Dec  6 13:03:57 2001
@@ -332,6 +332,10 @@
        echo "mips-sony-newsos4"; exit 0;
        ;;
 
+    CYGWIN*)
+       echo "${MACHINE}-whatever-cygwin32"; exit 0
+       ;;
+
 esac
 
 #
@@ -645,6 +649,8 @@
   # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;
   mips-sony-newsos4) OUT="newsos4-gcc" ;;
+  *-*-cygwin32) OUT="CygWin32"
+               options="$options no-threads no-asm" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 

Reply via email to