Add JPAKE.

7 files changed, 92 insertions, 83 deletions

diff --git a/fips/aes/Makefile b/fips/aes/Makefile
index dff1b97efa..403525d4c0 100644
--- a/fips/aes/Makefile
+++ b/fips/aes/Makefile
@@ -101,10 +101,11 @@ fips_aes_selftest.o: ../../include/openssl/stack.h
 fips_aes_selftest.o: ../../include/openssl/symhacks.h fips_aes_selftest.c
 fips_aesavs.o: ../../e_os.h ../../include/openssl/aes.h
 fips_aesavs.o: ../../include/openssl/asn1.h ../../include/openssl/bio.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: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_aesavs.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.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
 fips_aesavs.o: ../../include/openssl/opensslconf.h
 fips_aesavs.o: ../../include/openssl/opensslv.h
 fips_aesavs.o: ../../include/openssl/ossl_typ.h
diff --git a/fips/des/Makefile b/fips/des/Makefile
index 9b34c0af2d..ba1d0952b9 100644
--- a/fips/des/Makefile
+++ b/fips/des/Makefile
@@ -97,12 +97,12 @@ 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.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
-fips_desmovs.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_desmovs.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_desmovs.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-fips_desmovs.o: ../../include/openssl/objects.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
 fips_desmovs.o: ../../include/openssl/opensslv.h
 fips_desmovs.o: ../../include/openssl/ossl_typ.h
diff --git a/fips/dh/Makefile b/fips/dh/Makefile
index a4e2e7738a..2d3833a822 100644
--- a/fips/dh/Makefile
+++ b/fips/dh/Makefile
@@ -105,8 +105,9 @@ fips_dh_key.o: ../../include/openssl/opensslv.h
 fips_dh_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 fips_dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 fips_dh_key.o: ../../include/openssl/symhacks.h fips_dh_key.c
-fips_dh_lib.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-fips_dh_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_dh_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+fips_dh_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+fips_dh_lib.o: ../../include/openssl/e_os2.h
 fips_dh_lib.o: ../../include/openssl/opensslconf.h
 fips_dh_lib.o: ../../include/openssl/opensslv.h
 fips_dh_lib.o: ../../include/openssl/ossl_typ.h
diff --git a/fips/dsa/Makefile b/fips/dsa/Makefile
index 0a9f8c29d0..251615e9ad 100644
--- a/fips/dsa/Makefile
+++ b/fips/dsa/Makefile
@@ -110,8 +110,9 @@ fips_dsa_key.o: ../../include/openssl/opensslv.h
 fips_dsa_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 fips_dsa_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 fips_dsa_key.o: ../../include/openssl/symhacks.h ../fips_locl.h fips_dsa_key.c
-fips_dsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-fips_dsa_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_dsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+fips_dsa_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
+fips_dsa_lib.o: ../../include/openssl/e_os2.h
 fips_dsa_lib.o: ../../include/openssl/opensslconf.h
 fips_dsa_lib.o: ../../include/openssl/opensslv.h
 fips_dsa_lib.o: ../../include/openssl/ossl_typ.h
@@ -122,9 +123,9 @@ fips_dsa_ossl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 fips_dsa_ossl.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
 fips_dsa_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
 fips_dsa_ossl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-fips_dsa_ossl.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
-fips_dsa_ossl.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_dsa_ossl.o: ../../include/openssl/obj_mac.h
+fips_dsa_ossl.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+fips_dsa_ossl.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_dsa_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 fips_dsa_ossl.o: ../../include/openssl/objects.h
 fips_dsa_ossl.o: ../../include/openssl/opensslconf.h
 fips_dsa_ossl.o: ../../include/openssl/opensslv.h
@@ -134,10 +135,10 @@ fips_dsa_ossl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 fips_dsa_ossl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 fips_dsa_ossl.o: ../../include/openssl/x509_vfy.h fips_dsa_ossl.c
 fips_dsa_selftest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_dsa_selftest.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.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/bn.h ../../include/openssl/crypto.h
+fips_dsa_selftest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_dsa_selftest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+fips_dsa_selftest.o: ../../include/openssl/fips.h ../../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
@@ -147,10 +148,11 @@ 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/bn.h ../../include/openssl/crypto.h
+fips_dsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+fips_dsa_sign.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
+fips_dsa_sign.o: ../../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
@@ -159,15 +161,16 @@ 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/asn1.h
-fips_dsatest.o: ../../include/openssl/bio.h ../../include/openssl/buffer.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/ec.h
-fips_dsatest.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-fips_dsatest.o: ../../include/openssl/engine.h ../../include/openssl/err.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/bio.h ../../include/openssl/bn.h
+fips_dsatest.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+fips_dsatest.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+fips_dsatest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_dsatest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+fips_dsatest.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+fips_dsatest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+fips_dsatest.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
+fips_dsatest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+fips_dsatest.o: ../../include/openssl/objects.h
 fips_dsatest.o: ../../include/openssl/opensslconf.h
 fips_dsatest.o: ../../include/openssl/opensslv.h
 fips_dsatest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
diff --git a/fips/hmac/Makefile b/fips/hmac/Makefile
index bc8d825e0c..be230ade9d 100644
--- a/fips/hmac/Makefile
+++ b/fips/hmac/Makefile
@@ -106,13 +106,13 @@ fips_hmac_selftest.o: ../../include/openssl/safestack.h
 fips_hmac_selftest.o: ../../include/openssl/stack.h
 fips_hmac_selftest.o: ../../include/openssl/symhacks.h fips_hmac_selftest.c
 fips_hmactest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_hmactest.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
-fips_hmactest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_hmactest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-fips_hmactest.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-fips_hmactest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_hmactest.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h
-fips_hmactest.o: ../../include/openssl/obj_mac.h
+fips_hmactest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+fips_hmactest.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+fips_hmactest.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+fips_hmactest.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.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
 fips_hmactest.o: ../../include/openssl/opensslconf.h
 fips_hmactest.o: ../../include/openssl/opensslv.h
diff --git a/fips/rsa/Makefile b/fips/rsa/Makefile
index aadb2f9064..da28c13aa6 100644
--- a/fips/rsa/Makefile
+++ b/fips/rsa/Makefile
@@ -116,17 +116,18 @@ fips_rsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
 fips_rsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 fips_rsa_gen.o: ../../include/openssl/symhacks.h ../fips_locl.h fips_rsa_gen.c
 fips_rsa_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsa_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_rsa_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-fips_rsa_lib.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_rsa_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+fips_rsa_lib.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+fips_rsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+fips_rsa_lib.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_rsa_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+fips_rsa_lib.o: ../../include/openssl/objects.h
 fips_rsa_lib.o: ../../include/openssl/opensslconf.h
 fips_rsa_lib.o: ../../include/openssl/opensslv.h
 fips_rsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
 fips_rsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 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/bn.h ../../include/openssl/crypto.h
 fips_rsa_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 fips_rsa_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
 fips_rsa_selftest.o: ../../include/openssl/lhash.h
@@ -162,50 +163,53 @@ fips_rsa_x931g.o: ../../include/openssl/safestack.h
 fips_rsa_x931g.o: ../../include/openssl/stack.h
 fips_rsa_x931g.o: ../../include/openssl/symhacks.h fips_rsa_x931g.c
 fips_rsagtest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsagtest.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
-fips_rsagtest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_rsagtest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-fips_rsagtest.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-fips_rsagtest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_rsagtest.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h
-fips_rsagtest.o: ../../include/openssl/obj_mac.h
+fips_rsagtest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+fips_rsagtest.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+fips_rsagtest.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+fips_rsagtest.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.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
 fips_rsagtest.o: ../../include/openssl/opensslconf.h
 fips_rsagtest.o: ../../include/openssl/opensslv.h
 fips_rsagtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-fips_rsagtest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-fips_rsagtest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_rsagtest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+fips_rsagtest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+fips_rsagtest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+fips_rsagtest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+fips_rsagtest.o: ../../include/openssl/x509_vfy.h
 fips_rsagtest.o: ../../include/openssl/x509v3.h ../fips_utl.h fips_rsagtest.c
 fips_rsastest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsastest.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
-fips_rsastest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_rsastest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-fips_rsastest.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-fips_rsastest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_rsastest.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h
-fips_rsastest.o: ../../include/openssl/obj_mac.h
+fips_rsastest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+fips_rsastest.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+fips_rsastest.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+fips_rsastest.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.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
 fips_rsastest.o: ../../include/openssl/opensslconf.h
 fips_rsastest.o: ../../include/openssl/opensslv.h
 fips_rsastest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-fips_rsastest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-fips_rsastest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_rsastest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+fips_rsastest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+fips_rsastest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+fips_rsastest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+fips_rsastest.o: ../../include/openssl/x509_vfy.h
 fips_rsastest.o: ../../include/openssl/x509v3.h ../fips_utl.h fips_rsastest.c
 fips_rsavtest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsavtest.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
-fips_rsavtest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_rsavtest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-fips_rsavtest.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-fips_rsavtest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_rsavtest.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h
-fips_rsavtest.o: ../../include/openssl/obj_mac.h
+fips_rsavtest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+fips_rsavtest.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+fips_rsavtest.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+fips_rsavtest.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.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
 fips_rsavtest.o: ../../include/openssl/opensslconf.h
 fips_rsavtest.o: ../../include/openssl/opensslv.h
 fips_rsavtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-fips_rsavtest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-fips_rsavtest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_rsavtest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+fips_rsavtest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+fips_rsavtest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+fips_rsavtest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+fips_rsavtest.o: ../../include/openssl/x509_vfy.h
 fips_rsavtest.o: ../../include/openssl/x509v3.h ../fips_utl.h fips_rsavtest.c
diff --git a/fips/sha/Makefile b/fips/sha/Makefile
index 00b4cfa49d..a661640bc6 100644
--- a/fips/sha/Makefile
+++ b/fips/sha/Makefile
@@ -126,13 +126,13 @@ fips_sha1_selftest.o: ../../include/openssl/safestack.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_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
-fips_shatest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-fips_shatest.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-fips_shatest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_shatest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-fips_shatest.o: ../../include/openssl/objects.h
+fips_shatest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+fips_shatest.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+fips_shatest.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+fips_shatest.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.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
 fips_shatest.o: ../../include/openssl/opensslv.h
 fips_shatest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h