fips/*/Makefile updates to accomodate new VSes.

fips/des/Makefile

@@ -72,17 +72,9 @@ fips_desmovs: fips_desmovs.o $(TOP)/libcrypto.a
 	TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_desmovs
 
 fips_test: top_fips_desmovs
-	find ../testvectors/des/req -name '*.req' > testlist
-	-rm -rf ../testvectors/des/rsp
-	mkdir ../testvectors/des/rsp
-	./fips_desmovs -d testlist
-	find ../testvectors/des2/req -name '*.req' > testlist
-	-rm -rf ../testvectors/des2/rsp
-	mkdir ../testvectors/des2/rsp
-	./fips_desmovs -d testlist
-	find ../testvectors/des3/req -name '*.req' > testlist
-	-rm -rf ../testvectors/des3/rsp
-	mkdir ../testvectors/des3/rsp
+	find ../testvectors/tdes/req -name '*.req' > testlist
+	-rm -rf ../testvectors/tdes/rsp
+	mkdir ../testvectors/tdes/rsp
 	./fips_desmovs -d testlist
 
 lint:

fips/rand/Makefile

@@ -75,8 +75,8 @@ A=../testvectors/rng/rsp
 fips_test: top_fips_rngvs
 	-rm -rf $(A)
 	mkdir $(A)
-	./fips_rngvs mct < $(Q)/MCT.req > $(A)/MCT.rsp
-	./fips_rngvs vst < $(Q)/VST.req > $(A)/VST.rsp
+	./fips_rngvs mct < $(Q)/ANSI931_TDES2MCT.req > $(A)/ANSI931_TDES2MCT.rsp
+	./fips_rngvs vst < $(Q)/ANSI931_TDES2VST.req > $(A)/ANSI931_TDES2VST.rsp
 
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff

fips/sha/Makefile

@@ -79,10 +79,31 @@ fips_shatest: fips_shatest.o $(TOP)/libcrypto.a
 	$(CC) $(CFLAGS) -o fips_shatest fips_shatest.o $(PEX_LIBS) $(TOP)/libcrypto.a $(EX_LIBS)
 	TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_shatest
 
+Q=../testvectors/sha/req
+A=../testvectors/sha/rsp
+
+VECTORS = SHA1LongMsg \
+	SHA1Monte \
+	SHA1ShortMsg \
+	SHA224LongMsg \
+	SHA224Monte \
+	SHA224ShortMsg \
+	SHA256LongMsg \
+	SHA256Monte \
+	SHA256ShortMsg \
+	SHA384LongMsg \
+	SHA384Monte \
+	SHA384ShortMsg \
+	SHA512LongMsg \
+	SHA512Monte \
+	SHA512ShortMsg
+
 fips_test: top_fips_shatest
-	-rm -rf ../testvectors/sha/rsp
-	mkdir ../testvectors/sha/rsp
-	./fips_shatest ../testvectors/sha/req/sha.req  > ../testvectors/sha/rsp/sha.rsp
+	-rm -rf $(A)
+	mkdir $(A)
+	for file in $(VECTORS); do \
+		./fips_shatest $(Q)/$$file.req $(A)/$$file.rsp; \
+	done
 
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff