Update hash checking in makefiles to use new perl script.

diff --git a/fips/Makefile b/fips/Makefile
index 63e4cf82be3bcce6f08d2f6ac3a5e512b6656f81..2b09e03344b403ea38a8fcacbfa61490be720615 100644 (file)
--- 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 fce5eeb5f74c1addd3a8c07fb9495380f0f001fc..c12c796897f73599a6f07d03e126729db7769eec 100644 (file)
--- 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 87a5329d53bb81467a6596adf4bb0d9918128146..4a73ac227b4806d905379131ef37481323eaf222 100644 (file)
--- 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 10b40aa9f67155f1ca7486b3b304a7e915b1563c..590090d0ce9e57ff032e21313efdaf403ac44ad6 100644 (file)
--- 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 0cc5704ed13febcfb23f3640a333ee107cb2f948..71c6cc3720035677e1161de9880ede4255cf628c 100644 (file)
--- 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 c8922abc77a4f6ad206dea02db805d26654095f9..e11a5b3154375fa6f5ac4ea027d854ec2ec72daf 100644 (file)
--- 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 bb20f86442fe80093dcee5645a84190dcfc41a2b..bc52bb972675f01c8342a5806dd41ba9261b7bea 100644 (file)
--- 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 1fa25b32be120c60e13175eb7d06596391b6907d..224ff65ea043a01c988e7f0d1b1b24b753c7da84 100644 (file)
--- 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)