From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 15 Apr 2005 11:27:29 +0000 (+0000)
Subject: Update hash checking in makefiles to use new perl script.
X-Git-Tag: BEN_FIPS_TEST_8~89
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b99daf76a7c364152e6c4bfa07e3781ae0db054b;p=oweals%2Fopenssl.git

Update hash checking in makefiles to use new perl script.
---

diff --git a/fips/Makefile b/fips/Makefile
index 63e4cf82be..2b09e03344 100644
--- a/fips/Makefile
+++ b/fips/Makefile
@@ -51,7 +51,7 @@ all:
 	fi
 
 check:
-	TOP=`pwd`/$(TOP) ./fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
+	$(PERL) ../util/checkhash.pl
 
 subdirs:
 	@for i in $(FDIRS) ;\
diff --git a/fips/aes/Makefile b/fips/aes/Makefile
index fce5eeb5f7..c12c796897 100644
--- a/fips/aes/Makefile
+++ b/fips/aes/Makefile
@@ -36,10 +36,7 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
 
-all:	check lib
-
-check:
-	TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
+all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
diff --git a/fips/des/Makefile b/fips/des/Makefile
index 87a5329d53..4a73ac227b 100644
--- a/fips/des/Makefile
+++ b/fips/des/Makefile
@@ -37,10 +37,7 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
 
-all:	check lib
-
-check:
-	TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
+all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
diff --git a/fips/dh/Makefile b/fips/dh/Makefile
index 10b40aa9f6..590090d0ce 100644
--- a/fips/dh/Makefile
+++ b/fips/dh/Makefile
@@ -35,16 +35,13 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
 
-all:	check lib
+all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@sleep 2; touch lib
 
-check:
-	TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
diff --git a/fips/dsa/Makefile b/fips/dsa/Makefile
index 0cc5704ed1..71c6cc3720 100644
--- a/fips/dsa/Makefile
+++ b/fips/dsa/Makefile
@@ -35,16 +35,13 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
 
-all:	check lib
+all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@sleep 2; touch lib
 
-check:
-	TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
diff --git a/fips/rand/Makefile b/fips/rand/Makefile
index c8922abc77..e11a5b3154 100644
--- a/fips/rand/Makefile
+++ b/fips/rand/Makefile
@@ -35,10 +35,7 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd $(TOP); $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all)
 
-all:	check lib
-
-check:
-	TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
+all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
diff --git a/fips/rsa/Makefile b/fips/rsa/Makefile
index bb20f86442..bc52bb9726 100644
--- a/fips/rsa/Makefile
+++ b/fips/rsa/Makefile
@@ -35,16 +35,13 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
 
-all:	check lib
+all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@sleep 2; touch lib
 
-check:
-	TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
diff --git a/fips/sha1/Makefile b/fips/sha1/Makefile
index 1fa25b32be..224ff65ea0 100644
--- a/fips/sha1/Makefile
+++ b/fips/sha1/Makefile
@@ -37,13 +37,7 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd $(TOP); $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all)
 
-all:	check_standalone check lib
-
-check:
-	TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(LIBSRC) $(HEADER)
-
-check_standalone: fips_standalone_sha1
-	TOP=`pwd`/$(TOP) ../fips_check_sha1 standalone.sha1 $(SRC) $(HEADER)
+all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)