Adapt FIPS sub-tree for mingw.

diff --git a/fips/fips_check_sha1 b/fips/fips_check_sha1
index bc3f24a32425a88164bf04bb07299cedbcca945d..d60404a51c23dc5641dc4146c57b33774c01204f 100755 (executable)
--- a/fips/fips_check_sha1
+++ b/fips/fips_check_sha1
@@ -5,4 +5,4 @@ shift
 
 egrep 'define OPENSSL_FIPS' $TOP/include/openssl/opensslconf.h > /dev/null || exit 0
 
-$TOP/fips/sha1/fips_standalone_sha1 $@ | diff $FP - || { echo; echo "*** Your source code does not match the FIPS validated source ***"; echo; exit 1; }
+$TOP/fips/sha1/fips_standalone_sha1 $@ | diff -w $FP - || { echo; echo "*** Your source code does not match the FIPS validated source ***"; echo; exit 1; }

diff --git a/fips/openssl_fips_fingerprint b/fips/openssl_fips_fingerprint
index de0e91a360f042e136d24b7e4dbbd4717deb4b09..285ddc07ac59de5977ba56034d2e8aaa8f67f7b8 100755 (executable)
--- a/fips/openssl_fips_fingerprint
+++ b/fips/openssl_fips_fingerprint
@@ -18,7 +18,7 @@ else
 fi
 
 echo "Checking library fingerprint for $lib"
-openssl sha1 -hmac etaonrishdlcupfm $lib | sed "s/(.*\//(/" | diff $lib.sha1 - || { echo "$libs fingerprint mismatch"; exit 1; }
+openssl sha1 -hmac etaonrishdlcupfm $lib | sed "s/(.*\//(/" | diff -w $lib.sha1 - || { echo "$libs fingerprint mismatch"; exit 1; }
 
 [ -x $exe.exe ] && exe=$exe.exe
 

diff --git a/fips/sha1/Makefile b/fips/sha1/Makefile
index bb2631cda1cbe16131be6797798bb547df82a991..e5e4251643c1b969a52f5c85071533ebca6132f1 100644 (file)
--- a/fips/sha1/Makefile
+++ b/fips/sha1/Makefile
@@ -60,7 +60,7 @@ files:
 links:
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-       @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)
+       cp $(TESTDATA) $(TOP)/test
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install: