make update

diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile
index d0ba63c606a1e002bc11f0b19da2bc8a6be8c309..51b6662945396ab2d7b27aed62ff7cb876e4eb65 100644 (file)
--- a/crypto/rsa/Makefile
+++ b/crypto/rsa/Makefile
@@ -184,6 +184,26 @@ rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rsa_pk1.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
 rsa_pk1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pk1.c
+rsa_pss.o: ../../e_os.h ../../include/openssl/aes.h
+rsa_pss.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+rsa_pss.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+rsa_pss.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+rsa_pss.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+rsa_pss.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
+rsa_pss.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+rsa_pss.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+rsa_pss.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+rsa_pss.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+rsa_pss.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+rsa_pss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rsa_pss.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+rsa_pss.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+rsa_pss.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+rsa_pss.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+rsa_pss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_pss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rsa_pss.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+rsa_pss.o: ../../include/openssl/ui_compat.h ../cryptlib.h rsa_pss.c
 rsa_saos.o: ../../e_os.h ../../include/openssl/aes.h
 rsa_saos.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 rsa_saos.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
@@ -237,3 +257,13 @@ rsa_ssl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rsa_ssl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
 rsa_ssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 rsa_ssl.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_ssl.c
+rsa_x931.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_x931.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_x931.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+rsa_x931.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+rsa_x931.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+rsa_x931.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+rsa_x931.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_x931.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+rsa_x931.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rsa_x931.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_x931.c

diff --git a/fips/sha/Makefile b/fips/sha/Makefile
index 0e64f0a87a402cb82c522a60c45252a1930c425d..a99bcdb48f2a11e454e690623a8047553b653965 100644 (file)
--- a/fips/sha/Makefile
+++ b/fips/sha/Makefile
@@ -116,15 +116,6 @@ fips_sha1dgst.o: ../../include/openssl/opensslv.h
 fips_sha1dgst.o: ../../include/openssl/safestack.h
 fips_sha1dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 fips_sha1dgst.o: fips_sha1dgst.c
-fips_shatest.o: ../../e_os.h ../../include/openssl/bio.h
-fips_shatest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_shatest.o: ../../include/openssl/err.h ../../include/openssl/fips.h
-fips_shatest.o: ../../include/openssl/fips_sha.h ../../include/openssl/lhash.h
-fips_shatest.o: ../../include/openssl/opensslconf.h
-fips_shatest.o: ../../include/openssl/opensslv.h
-fips_shatest.o: ../../include/openssl/safestack.h
-fips_shatest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_shatest.o: fips_shatest.c
 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
@@ -138,6 +129,29 @@ fips_sha512.o: ../../include/openssl/opensslconf.h
 fips_sha512.o: ../../include/openssl/opensslv.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/aes.h ../../include/openssl/asn1.h
+fips_shatest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+fips_shatest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+fips_shatest.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+fips_shatest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+fips_shatest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
+fips_shatest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_shatest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+fips_shatest.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+fips_shatest.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+fips_shatest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.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
+fips_shatest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+fips_shatest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+fips_shatest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+fips_shatest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+fips_shatest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+fips_shatest.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
+fips_shatest.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+fips_shatest.o: fips_shatest.c
 fips_standalone_sha1.o: ../../include/openssl/aes.h
 fips_standalone_sha1.o: ../../include/openssl/asn1.h
 fips_standalone_sha1.o: ../../include/openssl/bio.h

diff --git a/test/Makefile b/test/Makefile
index eae5c847ff963d9dabb21d84cb3ee92370f4dee0..9956a38fbe4b1b905316dd89cbc26d618777dbe0 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -687,12 +687,27 @@ fips_rsavtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 fips_rsavtest.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
 fips_rsavtest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 fips_rsavtest.o: ../include/openssl/x509v3.h fips_rsavtest.c
-fips_shatest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/crypto.h
-fips_shatest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-fips_shatest.o: ../include/openssl/fips.h ../include/openssl/fips_sha.h
-fips_shatest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-fips_shatest.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-fips_shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_shatest.o: ../include/openssl/aes.h ../include/openssl/asn1.h
+fips_shatest.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
+fips_shatest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+fips_shatest.o: ../include/openssl/cast.h ../include/openssl/conf.h
+fips_shatest.o: ../include/openssl/crypto.h ../include/openssl/des.h
+fips_shatest.o: ../include/openssl/des_old.h ../include/openssl/dh.h
+fips_shatest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+fips_shatest.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_shatest.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+fips_shatest.o: ../include/openssl/md2.h ../include/openssl/md4.h
+fips_shatest.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/pkcs7.h
+fips_shatest.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+fips_shatest.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+fips_shatest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+fips_shatest.o: ../include/openssl/sha.h ../include/openssl/stack.h
+fips_shatest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
+fips_shatest.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
+fips_shatest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h
 fips_shatest.o: fips_shatest.c
 hmactest.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
 hmactest.o: ../include/openssl/bio.h ../include/openssl/blowfish.h

diff --git a/util/libeay.num b/util/libeay.num
index 504c1ec6d049a2c190c823c7038f3e1e5cd44364..0bbdbe5117f9515c54dcb78d0ddf11b1bcda5db2 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2876,3 +2876,9 @@ EVP_sha256                              3315      EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA
 FIPS_selftest_hmac                      3316   EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_corrupt_rng                        3317   EXIST:OPENSSL_FIPS:FUNCTION:
 BN_mod_exp_mont_consttime               3318   EXIST::FUNCTION:
+RSA_X931_hash_id                        3319   EXIST::FUNCTION:RSA
+RSA_padding_check_X931                  3320   EXIST::FUNCTION:RSA
+RSA_verify_PKCS1_PSS                    3321   EXIST::FUNCTION:RSA
+RSA_padding_add_X931                    3322   EXIST::FUNCTION:RSA
+RSA_padding_add_PKCS1_PSS               3323   EXIST::FUNCTION:RSA
+PKCS1_MGF1                              3324   EXIST::FUNCTION:RSA