make update

diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl
index 459a0693ed961e399a9248a8e4016d024bd27f7f..9516ba5ab88618c74273382985a7ed6ae8ab4e67 100644 (file)
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -210,6 +210,14 @@ bn_ctx.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bn_ctx.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 bn_ctx.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 bn_ctx.o: ../cryptlib.h bn_ctx.c bn_lcl.h
+bn_depr.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
+bn_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+bn_depr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+bn_depr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+bn_depr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bn_depr.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+bn_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+bn_depr.o: ../cryptlib.h bn_depr.c bn_lcl.h
 bn_div.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
 bn_div.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bn_div.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl
index c1ed5ad92037691901e791e0510b7dceffed2356..c1ccf0060acd4c66c99c5091e49cd8a361624118 100644 (file)
--- a/crypto/dh/Makefile.ssl
+++ b/crypto/dh/Makefile.ssl
@@ -97,6 +97,14 @@ dh_check.o: ../../include/openssl/opensslconf.h
 dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 dh_check.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 dh_check.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_check.c
+dh_depr.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
+dh_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+dh_depr.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
+dh_depr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dh_depr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+dh_depr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+dh_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+dh_depr.o: ../cryptlib.h dh_depr.c
 dh_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dh_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
 dh_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl
index 93808285f7228d375c28c5696935927c53e07e6b..0162771ee39960c24e6b2a119a32a910d79557b2 100644 (file)
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -91,6 +91,27 @@ dsa_asn1.o: ../../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
+dsa_depr.o: ../../e_os.h ../../include/openssl/aes.h
+dsa_depr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+dsa_depr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+dsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+dsa_depr.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+dsa_depr.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
+dsa_depr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+dsa_depr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+dsa_depr.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+dsa_depr.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+dsa_depr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+dsa_depr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+dsa_depr.o: ../../include/openssl/opensslconf.h
+dsa_depr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dsa_depr.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+dsa_depr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+dsa_depr.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+dsa_depr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+dsa_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+dsa_depr.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+dsa_depr.o: ../cryptlib.h dsa_depr.c
 dsa_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dsa_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
 dsa_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl
index eeb0c9115c150f9f67896575e9f68ec98e904651..f038f7b7714fa47488446fbae3668452bcc8ff96 100644 (file)
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@@ -101,6 +101,15 @@ rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_chk.o: rsa_chk.c
+rsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+rsa_depr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+rsa_depr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+rsa_depr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_depr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+rsa_depr.o: ../cryptlib.h rsa_depr.c
 rsa_eay.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_eay.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 rsa_eay.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

diff --git a/util/libeay.num b/util/libeay.num
index dc2cedc1e22be1f4dd0706fe7267c7926f6f73cc..069c13d0bd4ab2d6bcb57ebb4c373a329dec8e4d 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -123,10 +123,10 @@ BN_dup                                  128       EXIST::FUNCTION:
 BN_free                                 129    EXIST::FUNCTION:
 BN_from_montgomery                      130    EXIST::FUNCTION:
 BN_gcd                                  131    EXIST::FUNCTION:
-BN_generate_prime                       132    EXIST::FUNCTION:
+BN_generate_prime                       132    EXIST::FUNCTION:DEPRECATED
 BN_get_word                             133    EXIST::FUNCTION:
 BN_is_bit_set                           134    EXIST::FUNCTION:
-BN_is_prime                             135    EXIST::FUNCTION:
+BN_is_prime                             135    EXIST::FUNCTION:DEPRECATED
 BN_lshift                               136    EXIST::FUNCTION:
 BN_lshift1                              137    EXIST::FUNCTION:
 BN_mask_bits                            138    EXIST::FUNCTION:
@@ -193,14 +193,14 @@ DH_check                                200       EXIST::FUNCTION:DH
 DH_compute_key                          201    EXIST::FUNCTION:DH
 DH_free                                 202    EXIST::FUNCTION:DH
 DH_generate_key                         203    EXIST::FUNCTION:DH
-DH_generate_parameters                  204    EXIST::FUNCTION:DH
+DH_generate_parameters                  204    EXIST::FUNCTION:DEPRECATED,DH
 DH_new                                  205    EXIST::FUNCTION:DH
 DH_size                                 206    EXIST::FUNCTION:DH
 DHparams_print                          207    EXIST::FUNCTION:BIO,DH
 DHparams_print_fp                       208    EXIST::FUNCTION:DH,FP_API
 DSA_free                                209    EXIST::FUNCTION:DSA
 DSA_generate_key                        210    EXIST::FUNCTION:DSA
-DSA_generate_parameters                 211    EXIST::FUNCTION:DSA
+DSA_generate_parameters                 211    EXIST::FUNCTION:DEPRECATED,DSA
 DSA_is_prime                            212    NOEXIST::FUNCTION:
 DSA_new                                 213    EXIST::FUNCTION:DSA
 DSA_print                               214    EXIST::FUNCTION:BIO,DSA
@@ -474,7 +474,7 @@ RSAPrivateKey_dup                       481 EXIST::FUNCTION:RSA
 RSAPublicKey_dup                        482    EXIST::FUNCTION:RSA
 RSA_PKCS1_SSLeay                        483    EXIST::FUNCTION:RSA
 RSA_free                                484    EXIST::FUNCTION:RSA
-RSA_generate_key                        485    EXIST::FUNCTION:RSA
+RSA_generate_key                        485    EXIST::FUNCTION:DEPRECATED,RSA
 RSA_new                                 486    EXIST::FUNCTION:RSA
 RSA_new_method                          487    EXIST::FUNCTION:RSA
 RSA_print                               488    EXIST::FUNCTION:BIO,RSA
@@ -1744,7 +1744,7 @@ X509_REQ_add1_attr_by_txt               2217      EXIST::FUNCTION:
 X509_ATTRIBUTE_create_by_txt            2218   EXIST::FUNCTION:
 X509at_add1_attr_by_txt                 2219   EXIST::FUNCTION:
 BN_pseudo_rand                          2239   EXIST::FUNCTION:
-BN_is_prime_fasttest                    2240   EXIST::FUNCTION:
+BN_is_prime_fasttest                    2240   EXIST::FUNCTION:DEPRECATED
 BN_CTX_end                              2241   EXIST::FUNCTION:
 BN_CTX_start                            2242   EXIST::FUNCTION:
 BN_CTX_get                              2243   EXIST::FUNCTION:
@@ -2988,3 +2988,10 @@ DSO_merge                               3422     EXIST::FUNCTION:
 EC_POINT_hex2point                      3423   EXIST::FUNCTION:EC
 BN_GF2m_mod_inv_arr                     3424   EXIST::FUNCTION:
 ENGINE_unregister_ECDSA                 3425   EXIST::FUNCTION:
+BN_GENCB_call                           3426   EXIST::FUNCTION:
+BN_is_prime_ex                          3427   EXIST::FUNCTION:
+RSA_generate_key_ex                     3428   EXIST::FUNCTION:RSA
+DSA_generate_parameters_ex              3429   EXIST::FUNCTION:DSA
+BN_generate_prime_ex                    3430   EXIST::FUNCTION:
+DH_generate_parameters_ex               3431   EXIST::FUNCTION:DH
+BN_is_prime_fasttest_ex                 3432   EXIST::FUNCTION: