Implement FIPS CMAC.

* fips/fips_test_suite.c, fips/fipsalgtest.pl, test/Makefile: Hook in
  test cases and build test program.

1 files changed, 164 insertions, 61 deletions

diff --git a/test/Makefile b/test/Makefile
index af45836..e22878b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -80,6 +80,7 @@ FIPS_DHVS=	fips_dhvs
 FIPS_ECDHVS=	fips_ecdhvs
 FIPS_ECDSAVS=	fips_ecdsavs
 FIPS_TEST_SUITE=fips_test_suite
+FIPS_CMACTEST=	fips_cmactest
 
 TESTS=		alltests
 
@@ -101,7 +102,7 @@ FIPSEXE=$(FIPS_SHATEST)$(EXE_EXT) $(FIPS_DESTEST)$(EXE_EXT) \
 	$(FIPS_RNGVS)$(EXE_EXT) $(FIPS_DRBGVS)$(EXE_EXT) \
 	$(FIPS_DHVS)$(EXE_EXT)  $(FIPS_TEST_SUITE)$(EXE_EXT)  \
 	$(FIPS_GCMTEST)$(EXE_EXT) $(FIPS_ECDSAVS)$(EXE_EXT) \
-	$(FIPS_ECDHVS)$(EXE_EXT)
+	$(FIPS_ECDHVS)$(EXE_EXT) $(FIPS_CMACTEST)$(EXE_EXT)
 
 # $(METHTEST)$(EXE_EXT)
 
@@ -118,7 +119,8 @@ OBJ=	$(BNTEST).o $(ECTEST).o  $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
 	$(FIPS_RSASTEST).o $(FIPS_RSAGTEST).o $(FIPS_GCMTEST).o \
 	$(FIPS_DSSVS).o $(FIPS_DSATEST).o $(FIPS_RNGVS).o $(FIPS_DRBGVS).o \
 	$(FIPS_TEST_SUITE).o $(FIPS_DHVS).o $(FIPS_ECDSAVS).o \
-	$(FIPS_ECDHVS).o $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o
+	$(FIPS_ECDHVS).o $(FIPS_CMACTEST).o \
+	$(EVPTEST).o $(IGETEST).o $(JPAKETEST).o
 SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
 	$(MD2TEST).c  $(MD4TEST).c $(MD5TEST).c \
 	$(HMACTEST).c $(WPTEST).c \
@@ -131,7 +133,8 @@ SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
 	$(FIPS_RSASTEST).c $(FIPS_RSAGTEST).c $(FIPS_GCMTEST).c \
 	$(FIPS_DSSVS).c $(FIPS_DSATEST).c $(FIPS_RNGVS).c $(FIPS_DRBGVS).c \
 	$(FIPS_TEST_SUITE).c $(FIPS_DHVS).c $(FIPS_ECDSAVS).c \
-	$(FIPS_ECDHVS).c $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c
+	$(FIPS_ECDHVS).c $(FIPS_CMACTEST).c \
+	$(EVPTEST).c $(IGETEST).c $(JPAKETEST).c
 
 EXHEADER= 
 HEADER=	$(EXHEADER)
@@ -498,6 +501,9 @@ $(FIPS_DRBGVS)$(EXE_EXT): $(FIPS_DRBGVS).o $(DLIBCRYPTO)
 $(FIPS_TEST_SUITE)$(EXE_EXT): $(FIPS_TEST_SUITE).o $(DLIBCRYPTO)
 	@target=$(FIPS_TEST_SUITE); $(FIPS_BUILD_CMD)
 
+$(FIPS_CMACTEST)$(EXE_EXT): $(FIPS_CMACTEST).o $(DLIBCRYPTO)
+	@target=$(FIPS_CMACTEST); $(FIPS_BUILD_CMD)
+
 $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
 	@target=$(RMDTEST); $(BUILD_CMD)
 
@@ -694,108 +700,205 @@ exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 exptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
 exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 exptest.o: ../include/openssl/symhacks.h exptest.c
-fips_aesavs.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
-fips_aesavs.o: ../include/openssl/bio.h ../include/openssl/bn.h
-fips_aesavs.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-fips_aesavs.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_aesavs.o: ../e_os.h ../fips/fips_utl.h ../include/openssl/aes.h
+fips_aesavs.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+fips_aesavs.o: ../include/openssl/bn.h ../include/openssl/crypto.h
+fips_aesavs.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+fips_aesavs.o: ../include/openssl/evp.h ../include/openssl/fips.h
 fips_aesavs.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 fips_aesavs.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 fips_aesavs.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 fips_aesavs.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 fips_aesavs.o: ../include/openssl/symhacks.h fips_aesavs.c
-fips_desmovs.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-fips_desmovs.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-fips_desmovs.o: ../include/openssl/des.h ../include/openssl/des_old.h
-fips_desmovs.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-fips_desmovs.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+fips_cmactest.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_cmactest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_cmactest.o: ../include/openssl/cmac.h ../include/openssl/crypto.h
+fips_cmactest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+fips_cmactest.o: ../include/openssl/evp.h ../include/openssl/fips.h
+fips_cmactest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+fips_cmactest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+fips_cmactest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+fips_cmactest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+fips_cmactest.o: ../include/openssl/symhacks.h fips_cmactest.c
+fips_desmovs.o: ../e_os.h ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_desmovs.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_desmovs.o: ../include/openssl/crypto.h ../include/openssl/des.h
+fips_desmovs.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
+fips_desmovs.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_desmovs.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 fips_desmovs.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 fips_desmovs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 fips_desmovs.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 fips_desmovs.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 fips_desmovs.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
 fips_desmovs.o: fips_desmovs.c
-fips_dhvs.o: ../include/openssl/opensslconf.h fips_dhvs.c
-fips_drbgvs.o: ../include/openssl/opensslconf.h fips_drbgvs.c
-fips_dsatest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-fips_dsatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
+fips_dhvs.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_dhvs.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_dhvs.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+fips_dhvs.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+fips_dhvs.o: ../include/openssl/evp.h ../include/openssl/fips.h
+fips_dhvs.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+fips_dhvs.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+fips_dhvs.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+fips_dhvs.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+fips_dhvs.o: ../include/openssl/symhacks.h fips_dhvs.c
+fips_drbgvs.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_drbgvs.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_drbgvs.o: ../include/openssl/crypto.h ../include/openssl/des.h
+fips_drbgvs.o: ../include/openssl/des_old.h ../include/openssl/dsa.h
+fips_drbgvs.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+fips_drbgvs.o: ../include/openssl/evp.h ../include/openssl/fips.h
+fips_drbgvs.o: ../include/openssl/fips_rand.h ../include/openssl/lhash.h
+fips_drbgvs.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+fips_drbgvs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+fips_drbgvs.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+fips_drbgvs.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_drbgvs.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
+fips_drbgvs.o: fips_drbgvs.c
+fips_dsatest.o: ../e_os.h ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_dsatest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_dsatest.o: ../include/openssl/crypto.h ../include/openssl/des.h
+fips_dsatest.o: ../include/openssl/des_old.h ../include/openssl/dsa.h
 fips_dsatest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-fips_dsatest.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+fips_dsatest.o: ../include/openssl/evp.h ../include/openssl/fips.h
+fips_dsatest.o: ../include/openssl/fips_rand.h ../include/openssl/lhash.h
 fips_dsatest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 fips_dsatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 fips_dsatest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
 fips_dsatest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-fips_dsatest.o: ../include/openssl/symhacks.h fips_dsatest.c
-fips_dssvs.o: ../include/openssl/opensslconf.h fips_dssvs.c
-fips_ecdhvs.o: ../include/openssl/opensslconf.h fips_ecdhvs.c
-fips_ecdsavs.o: ../include/openssl/opensslconf.h fips_ecdsavs.c
-fips_gcmtest.o: ../include/openssl/opensslconf.h fips_gcmtest.c
-fips_hmactest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-fips_hmactest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-fips_hmactest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-fips_hmactest.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+fips_dsatest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
+fips_dsatest.o: ../include/openssl/ui_compat.h fips_dsatest.c
+fips_dssvs.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_dssvs.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_dssvs.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
+fips_dssvs.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+fips_dssvs.o: ../include/openssl/evp.h ../include/openssl/fips.h
+fips_dssvs.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+fips_dssvs.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+fips_dssvs.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+fips_dssvs.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+fips_dssvs.o: ../include/openssl/symhacks.h fips_dssvs.c
+fips_ecdhvs.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_ecdhvs.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_ecdhvs.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+fips_ecdhvs.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+fips_ecdhvs.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_ecdhvs.o: ../include/openssl/fips.h ../include/openssl/lhash.h
+fips_ecdhvs.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+fips_ecdhvs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+fips_ecdhvs.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+fips_ecdhvs.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_ecdhvs.o: fips_ecdhvs.c
+fips_ecdsavs.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_ecdsavs.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_ecdsavs.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+fips_ecdsavs.o: ../include/openssl/ec.h ../include/openssl/ecdsa.h
+fips_ecdsavs.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_ecdsavs.o: ../include/openssl/fips.h ../include/openssl/lhash.h
+fips_ecdsavs.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+fips_ecdsavs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+fips_ecdsavs.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+fips_ecdsavs.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_ecdsavs.o: fips_ecdsavs.c
+fips_gcmtest.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_gcmtest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_gcmtest.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
+fips_gcmtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+fips_gcmtest.o: ../include/openssl/evp.h ../include/openssl/fips.h
+fips_gcmtest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+fips_gcmtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+fips_gcmtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+fips_gcmtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+fips_gcmtest.o: ../include/openssl/symhacks.h fips_gcmtest.c
+fips_hmactest.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_hmactest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_hmactest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+fips_hmactest.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_hmactest.o: ../include/openssl/fips.h ../include/openssl/hmac.h
 fips_hmactest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 fips_hmactest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 fips_hmactest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 fips_hmactest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 fips_hmactest.o: ../include/openssl/symhacks.h fips_hmactest.c
-fips_randtest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h
-fips_randtest.o: ../include/openssl/crypto.h ../include/openssl/des.h
-fips_randtest.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
-fips_randtest.o: ../include/openssl/err.h ../include/openssl/fips_rand.h
+fips_randtest.o: ../e_os.h ../fips/fips_utl.h ../include/openssl/bio.h
+fips_randtest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
+fips_randtest.o: ../include/openssl/des.h ../include/openssl/des_old.h
+fips_randtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+fips_randtest.o: ../include/openssl/fips.h ../include/openssl/fips_rand.h
 fips_randtest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
 fips_randtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 fips_randtest.o: ../include/openssl/rand.h ../include/openssl/safestack.h
 fips_randtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 fips_randtest.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
 fips_randtest.o: fips_randtest.c
-fips_rngvs.o: ../include/openssl/opensslconf.h fips_rngvs.c
-fips_rsagtest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-fips_rsagtest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-fips_rsagtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-fips_rsagtest.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+fips_rngvs.o: ../fips/fips_utl.h ../include/openssl/bio.h
+fips_rngvs.o: ../include/openssl/bn.h ../include/openssl/crypto.h
+fips_rngvs.o: ../include/openssl/des.h ../include/openssl/des_old.h
+fips_rngvs.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+fips_rngvs.o: ../include/openssl/err.h ../include/openssl/fips.h
+fips_rngvs.o: ../include/openssl/fips_rand.h ../include/openssl/lhash.h
+fips_rngvs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+fips_rngvs.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+fips_rngvs.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+fips_rngvs.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
+fips_rngvs.o: ../include/openssl/ui_compat.h fips_rngvs.c
+fips_rsagtest.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_rsagtest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_rsagtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+fips_rsagtest.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_rsagtest.o: ../include/openssl/fips.h ../include/openssl/hmac.h
 fips_rsagtest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 fips_rsagtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 fips_rsagtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-fips_rsagtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-fips_rsagtest.o: ../include/openssl/symhacks.h fips_rsagtest.c
-fips_rsastest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-fips_rsastest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-fips_rsastest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-fips_rsastest.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+fips_rsagtest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+fips_rsagtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_rsagtest.o: fips_rsagtest.c
+fips_rsastest.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_rsastest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_rsastest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+fips_rsastest.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_rsastest.o: ../include/openssl/fips.h ../include/openssl/hmac.h
 fips_rsastest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 fips_rsastest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 fips_rsastest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-fips_rsastest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-fips_rsastest.o: ../include/openssl/symhacks.h fips_rsastest.c
-fips_rsavtest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-fips_rsavtest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-fips_rsavtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-fips_rsavtest.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+fips_rsastest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+fips_rsastest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_rsastest.o: fips_rsastest.c
+fips_rsavtest.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_rsavtest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_rsavtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+fips_rsavtest.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_rsavtest.o: ../include/openssl/fips.h ../include/openssl/hmac.h
 fips_rsavtest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 fips_rsavtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 fips_rsavtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-fips_rsavtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-fips_rsavtest.o: ../include/openssl/symhacks.h fips_rsavtest.c
-fips_shatest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-fips_shatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-fips_shatest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-fips_shatest.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+fips_rsavtest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+fips_rsavtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_rsavtest.o: fips_rsavtest.c
+fips_shatest.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_shatest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_shatest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+fips_shatest.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_shatest.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 fips_shatest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 fips_shatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 fips_shatest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 fips_shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 fips_shatest.o: fips_shatest.c
-fips_test_suite.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-fips_test_suite.o: ../include/openssl/bn.h ../include/openssl/crypto.h
+fips_test_suite.o: ../fips/fips_utl.h ../include/openssl/asn1.h
+fips_test_suite.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_test_suite.o: ../include/openssl/cmac.h ../include/openssl/crypto.h
+fips_test_suite.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 fips_test_suite.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-fips_test_suite.o: ../include/openssl/evp.h ../include/openssl/hmac.h
-fips_test_suite.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-fips_test_suite.o: ../include/openssl/objects.h
+fips_test_suite.o: ../include/openssl/evp.h ../include/openssl/fips.h
+fips_test_suite.o: ../include/openssl/hmac.h ../include/openssl/lhash.h
+fips_test_suite.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 fips_test_suite.o: ../include/openssl/opensslconf.h
 fips_test_suite.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-fips_test_suite.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-fips_test_suite.o: ../include/openssl/sha.h ../include/openssl/stack.h
-fips_test_suite.o: ../include/openssl/symhacks.h fips_test_suite.c
+fips_test_suite.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+fips_test_suite.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+fips_test_suite.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_test_suite.o: fips_test_suite.c
 hmactest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 hmactest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 hmactest.o: ../include/openssl/evp.h ../include/openssl/hmac.h