From 535178f415cda713dda7a4e7ccc75d48b4316efe Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 10 Dec 2004 16:30:34 +0000 Subject: [PATCH] Adapt FIPS sub-tree for mingw. --- fips/fips_check_sha1 | 2 +- fips/openssl_fips_fingerprint | 2 +- fips/sha1/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fips/fips_check_sha1 b/fips/fips_check_sha1 index bc3f24a324..d60404a51c 100755 --- 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 de0e91a360..285ddc07ac 100755 --- 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 bb2631cda1..e5e4251643 100644 --- 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: -- 2.25.1