Update dependencies.

crypto/des/Makefile

@@ -156,7 +156,7 @@ des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-des_enc.o: des_enc.c des_locl.h
+des_enc.o: des_enc.c des_locl.h ncbc_enc.c
 des_lib.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 des_lib.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 des_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h

crypto/dsa/Makefile

@@ -80,8 +80,8 @@ dsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 dsa_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dsa_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/fips.h
-dsa_asn1.o: ../../include/openssl/opensslconf.h
+dsa_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 dsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 dsa_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_asn1.c

crypto/evp/Makefile

@@ -293,7 +293,15 @@ e_rc5.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 e_rc5.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 e_rc5.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 e_rc5.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc5.c
-e_seed.o: ../../include/openssl/opensslconf.h e_seed.c
+e_seed.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+e_seed.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+e_seed.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+e_seed.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
+e_seed.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+e_seed.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_seed.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+e_seed.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+e_seed.o: e_seed.c
 e_xcbc_d.o: ../../e_os.h ../../include/openssl/asn1.h
 e_xcbc_d.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 e_xcbc_d.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
@@ -306,6 +314,17 @@ e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 e_xcbc_d.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 e_xcbc_d.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_xcbc_d.c
+enc_min.o: ../../e_os.h ../../include/openssl/asn1.h
+enc_min.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+enc_min.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+enc_min.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+enc_min.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+enc_min.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+enc_min.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+enc_min.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+enc_min.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+enc_min.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+enc_min.o: ../cryptlib.h enc_min.c evp_locl.h
 encode.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 encode.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 encode.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -325,6 +344,21 @@ evp_acnf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 evp_acnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 evp_acnf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 evp_acnf.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_acnf.c
+evp_cnf.o: ../../e_os.h ../../include/openssl/asn1.h
+evp_cnf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+evp_cnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+evp_cnf.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
+evp_cnf.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+evp_cnf.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+evp_cnf.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+evp_cnf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+evp_cnf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+evp_cnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+evp_cnf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+evp_cnf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_cnf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+evp_cnf.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+evp_cnf.o: ../cryptlib.h evp_cnf.c
 evp_enc.o: ../../e_os.h ../../include/openssl/asn1.h
 evp_enc.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 evp_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

crypto/sha/Makefile

@@ -108,16 +108,23 @@ sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 sha1_one.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 sha1_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 sha1_one.o: sha1_one.c
-sha1dgst.o: ../../include/openssl/opensslconf.h
+sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-sha1dgst.o: ../../include/openssl/opensslv.h sha1dgst.c
+sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
+sha1dgst.o: ../md32_common.h sha1dgst.c sha_locl.h
 sha256.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 sha256.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h
 sha256.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 sha256.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 sha256.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-sha256.o: sha256.c
+sha256.o: ../md32_common.h sha256.c
-sha512.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h
+sha512.o: ../../e_os.h ../../include/openssl/bio.h
-sha512.o: sha512.c
+sha512.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+sha512.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+sha512.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
+sha512.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+sha512.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+sha512.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+sha512.o: ../../include/openssl/symhacks.h ../cryptlib.h sha512.c
 sha_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 sha_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 sha_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h

fips-1.0/Makefile

@@ -197,6 +197,7 @@ fips.o: ../include/openssl/hmac.h ../include/openssl/lhash.h
 fips.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 fips.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 fips.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
-fips.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+fips.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-fips.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
+fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-fips.o: ../include/openssl/ui_compat.h fips.c fips_locl.h
+fips.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h fips.c
+fips.o: fips_locl.h

fips-1.0/aes/Makefile

@@ -86,14 +86,13 @@ clean:
 	rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff testlist
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-fips_aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
+fips_aes_selftest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_aes_core.o: ../../include/openssl/fips.h
-fips_aes_core.o: ../../include/openssl/opensslconf.h fips_aes_core.c
-fips_aes_core.o: fips_aes_locl.h
-fips_aes_selftest.o: ../../include/openssl/aes.h ../../include/openssl/bio.h
 fips_aes_selftest.o: ../../include/openssl/crypto.h
 fips_aes_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_aes_selftest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
+fips_aes_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_aes_selftest.o: ../../include/openssl/lhash.h
+fips_aes_selftest.o: ../../include/openssl/obj_mac.h
+fips_aes_selftest.o: ../../include/openssl/objects.h
 fips_aes_selftest.o: ../../include/openssl/opensslconf.h
 fips_aes_selftest.o: ../../include/openssl/opensslv.h
 fips_aes_selftest.o: ../../include/openssl/ossl_typ.h

fips-1.0/des/Makefile

@@ -83,28 +83,19 @@ clean:
 	rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff testlist
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-fips_des_enc.o: ../../e_os.h ../../include/openssl/des.h
+fips_des_selftest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
+fips_des_selftest.o: ../../include/openssl/crypto.h
-fips_des_enc.o: ../../include/openssl/fips.h
-fips_des_enc.o: ../../include/openssl/opensslconf.h
-fips_des_enc.o: ../../include/openssl/ossl_typ.h
-fips_des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_des_enc.o: ../../include/openssl/ui_compat.h fips_des_enc.c
-fips_des_enc.o: fips_des_locl.h
-fips_des_selftest.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-fips_des_selftest.o: ../../include/openssl/des.h
-fips_des_selftest.o: ../../include/openssl/des_old.h
 fips_des_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_des_selftest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
+fips_des_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_des_selftest.o: ../../include/openssl/lhash.h
+fips_des_selftest.o: ../../include/openssl/obj_mac.h
+fips_des_selftest.o: ../../include/openssl/objects.h
 fips_des_selftest.o: ../../include/openssl/opensslconf.h
 fips_des_selftest.o: ../../include/openssl/opensslv.h
 fips_des_selftest.o: ../../include/openssl/ossl_typ.h
 fips_des_selftest.o: ../../include/openssl/safestack.h
 fips_des_selftest.o: ../../include/openssl/stack.h
-fips_des_selftest.o: ../../include/openssl/symhacks.h
+fips_des_selftest.o: ../../include/openssl/symhacks.h fips_des_selftest.c
-fips_des_selftest.o: ../../include/openssl/ui.h
-fips_des_selftest.o: ../../include/openssl/ui_compat.h fips_des_selftest.c
 fips_desmovs.o: ../../e_os.h ../../include/openssl/asn1.h
 fips_desmovs.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 fips_desmovs.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
@@ -118,12 +109,3 @@ fips_desmovs.o: ../../include/openssl/ossl_typ.h
 fips_desmovs.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 fips_desmovs.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 fips_desmovs.o: ../../include/openssl/ui_compat.h ../fips_utl.h fips_desmovs.c
-fips_set_key.o: ../../e_os.h ../../include/openssl/des.h
-fips_set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
-fips_set_key.o: ../../include/openssl/fips.h
-fips_set_key.o: ../../include/openssl/opensslconf.h
-fips_set_key.o: ../../include/openssl/ossl_typ.h
-fips_set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_set_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_set_key.o: ../../include/openssl/ui_compat.h fips_des_locl.h
-fips_set_key.o: fips_set_key.c

fips-1.0/dh/Makefile

@@ -99,7 +99,7 @@ fips_dh_gen.o: ../../include/openssl/symhacks.h fips_dh_gen.c
 fips_dh_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 fips_dh_key.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
 fips_dh_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_dh_key.o: ../../include/openssl/lhash.h
+fips_dh_key.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
 fips_dh_key.o: ../../include/openssl/opensslconf.h
 fips_dh_key.o: ../../include/openssl/opensslv.h
 fips_dh_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h

fips-1.0/dsa/Makefile

@@ -99,10 +99,12 @@ fips_dsa_gen.o: ../../include/openssl/opensslv.h
 fips_dsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 fips_dsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 fips_dsa_gen.o: ../../include/openssl/symhacks.h fips_dsa_gen.c
-fips_dsa_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+fips_dsa_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_dsa_key.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
+fips_dsa_key.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_dsa_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+fips_dsa_key.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_dsa_key.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 fips_dsa_key.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
+fips_dsa_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 fips_dsa_key.o: ../../include/openssl/opensslconf.h
 fips_dsa_key.o: ../../include/openssl/opensslv.h
 fips_dsa_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
@@ -125,16 +127,31 @@ fips_dsa_ossl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 fips_dsa_ossl.o: ../../include/openssl/safestack.h
 fips_dsa_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 fips_dsa_ossl.o: fips_dsa_ossl.c
-fips_dsa_selftest.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+fips_dsa_selftest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_dsa_selftest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_dsa_selftest.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
-fips_dsa_selftest.o: ../../include/openssl/err.h ../../include/openssl/fips.h
+fips_dsa_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+fips_dsa_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
 fips_dsa_selftest.o: ../../include/openssl/lhash.h
+fips_dsa_selftest.o: ../../include/openssl/obj_mac.h
+fips_dsa_selftest.o: ../../include/openssl/objects.h
 fips_dsa_selftest.o: ../../include/openssl/opensslconf.h
 fips_dsa_selftest.o: ../../include/openssl/opensslv.h
 fips_dsa_selftest.o: ../../include/openssl/ossl_typ.h
 fips_dsa_selftest.o: ../../include/openssl/safestack.h
 fips_dsa_selftest.o: ../../include/openssl/stack.h
 fips_dsa_selftest.o: ../../include/openssl/symhacks.h fips_dsa_selftest.c
+fips_dsa_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+fips_dsa_sign.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
+fips_dsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+fips_dsa_sign.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_dsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+fips_dsa_sign.o: ../../include/openssl/objects.h
+fips_dsa_sign.o: ../../include/openssl/opensslconf.h
+fips_dsa_sign.o: ../../include/openssl/opensslv.h
+fips_dsa_sign.o: ../../include/openssl/ossl_typ.h
+fips_dsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+fips_dsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+fips_dsa_sign.o: fips_dsa_sign.c
 fips_dsatest.o: ../../e_os.h ../../include/openssl/bio.h
 fips_dsatest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 fips_dsatest.o: ../../include/openssl/des_old.h ../../include/openssl/dsa.h
@@ -147,11 +164,14 @@ 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 ../../include/openssl/ui.h
 fips_dsatest.o: ../../include/openssl/ui_compat.h ../fips_utl.h fips_dsatest.c
-fips_dssvs.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+fips_dssvs.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_dssvs.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
+fips_dssvs.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_dssvs.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+fips_dssvs.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_dssvs.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 fips_dssvs.o: ../../include/openssl/fips.h ../../include/openssl/fips_sha.h
-fips_dssvs.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+fips_dssvs.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+fips_dssvs.o: ../../include/openssl/objects.h
+fips_dssvs.o: ../../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_utl.h fips_dssvs.c

fips-1.0/rand/Makefile

@@ -92,8 +92,8 @@ fips_rand.o: ../../e_os.h ../../include/openssl/aes.h
 fips_rand.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 fips_rand.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 fips_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rand.o: ../../include/openssl/fips_rand.h ../../include/openssl/lhash.h
+fips_rand.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
-fips_rand.o: ../../include/openssl/opensslconf.h
+fips_rand.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 fips_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 fips_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 fips_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

fips-1.0/rsa/Makefile

@@ -107,7 +107,9 @@ fips_rsa_eay.o: fips_rsa_eay.c
 fips_rsa_gen.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 fips_rsa_gen.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 fips_rsa_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rsa_gen.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
+fips_rsa_gen.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_rsa_gen.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+fips_rsa_gen.o: ../../include/openssl/objects.h
 fips_rsa_gen.o: ../../include/openssl/opensslconf.h
 fips_rsa_gen.o: ../../include/openssl/opensslv.h
 fips_rsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
@@ -126,9 +128,11 @@ fips_rsa_lib.o: ../../include/openssl/symhacks.h fips_rsa_lib.c
 fips_rsa_selftest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 fips_rsa_selftest.o: ../../include/openssl/crypto.h
 fips_rsa_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rsa_selftest.o: ../../include/openssl/fips.h
+fips_rsa_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
 fips_rsa_selftest.o: ../../include/openssl/fips_sha.h
 fips_rsa_selftest.o: ../../include/openssl/lhash.h
+fips_rsa_selftest.o: ../../include/openssl/obj_mac.h
+fips_rsa_selftest.o: ../../include/openssl/objects.h
 fips_rsa_selftest.o: ../../include/openssl/opensslconf.h
 fips_rsa_selftest.o: ../../include/openssl/opensslv.h
 fips_rsa_selftest.o: ../../include/openssl/ossl_typ.h
@@ -145,7 +149,7 @@ fips_rsa_sign.o: ../../include/openssl/objects.h
 fips_rsa_sign.o: ../../include/openssl/opensslconf.h
 fips_rsa_sign.o: ../../include/openssl/opensslv.h
 fips_rsa_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
-fips_rsa_sign.o: ../../include/openssl/safestack.h
+fips_rsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 fips_rsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 fips_rsa_sign.o: fips_rsa_sign.c
 fips_rsa_x931g.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

fips-1.0/sha/Makefile

@@ -115,41 +115,19 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-fips_sha1_selftest.o: ../../include/openssl/bio.h
+fips_sha1_selftest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 fips_sha1_selftest.o: ../../include/openssl/crypto.h
 fips_sha1_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_sha1_selftest.o: ../../include/openssl/fips.h
+fips_sha1_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_sha1_selftest.o: ../../include/openssl/fips_sha.h
 fips_sha1_selftest.o: ../../include/openssl/lhash.h
+fips_sha1_selftest.o: ../../include/openssl/obj_mac.h
+fips_sha1_selftest.o: ../../include/openssl/objects.h
 fips_sha1_selftest.o: ../../include/openssl/opensslconf.h
 fips_sha1_selftest.o: ../../include/openssl/opensslv.h
 fips_sha1_selftest.o: ../../include/openssl/ossl_typ.h
 fips_sha1_selftest.o: ../../include/openssl/safestack.h
-fips_sha1_selftest.o: ../../include/openssl/stack.h
+fips_sha1_selftest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 fips_sha1_selftest.o: ../../include/openssl/symhacks.h fips_sha1_selftest.c
-fips_sha1dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_sha1dgst.o: ../../include/openssl/fips.h ../../include/openssl/fips_sha.h
-fips_sha1dgst.o: ../../include/openssl/opensslconf.h
-fips_sha1dgst.o: ../../include/openssl/opensslv.h
-fips_sha1dgst.o: ../../include/openssl/ossl_typ.h
-fips_sha1dgst.o: ../../include/openssl/safestack.h
-fips_sha1dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_sha1dgst.o: fips_md32_common.h fips_sha1dgst.c fips_sha_locl.h
-fips_sha256.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_sha256.o: ../../include/openssl/fips.h ../../include/openssl/fips_sha.h
-fips_sha256.o: ../../include/openssl/opensslconf.h
-fips_sha256.o: ../../include/openssl/opensslv.h
-fips_sha256.o: ../../include/openssl/ossl_typ.h
-fips_sha256.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_sha256.o: ../../include/openssl/symhacks.h fips_md32_common.h
-fips_sha256.o: fips_sha256.c
-fips_sha512.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_sha512.o: ../../include/openssl/fips.h ../../include/openssl/fips_sha.h
-fips_sha512.o: ../../include/openssl/opensslconf.h
-fips_sha512.o: ../../include/openssl/opensslv.h
-fips_sha512.o: ../../include/openssl/ossl_typ.h
-fips_sha512.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_sha512.o: ../../include/openssl/symhacks.h fips_sha512.c
 fips_shatest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 fips_shatest.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
 fips_shatest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

test/Makefile

@@ -666,11 +666,13 @@ 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 ../include/openssl/ui.h
 fips_dsatest.o: ../include/openssl/ui_compat.h fips_dsatest.c
-fips_dssvs.o: ../fips-1.0/fips_utl.h ../include/openssl/bio.h
+fips_dssvs.o: ../fips-1.0/fips_utl.h ../include/openssl/asn1.h
-fips_dssvs.o: ../include/openssl/bn.h ../include/openssl/crypto.h
+fips_dssvs.o: ../include/openssl/bio.h ../include/openssl/bn.h
-fips_dssvs.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+fips_dssvs.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
-fips_dssvs.o: ../include/openssl/err.h ../include/openssl/fips.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/fips_sha.h ../include/openssl/lhash.h
+fips_dssvs.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 fips_dssvs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 fips_dssvs.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 fips_dssvs.o: ../include/openssl/stack.h ../include/openssl/symhacks.h