From b3bb779997ae620918b8467cc6a452725013e204 Mon Sep 17 00:00:00 2001 From: Richard Levitte <levitte@openssl.org> Date: Fri, 27 Nov 2015 14:47:08 +0100 Subject: [PATCH] make update Reviewed-by: Rich Salz <rsalz@openssl.org> --- crypto/asn1/Makefile | 8 +++++--- crypto/evp/Makefile | 35 +++++++++++++++++++---------------- crypto/hmac/Makefile | 1 + util/libeay.num | 36 +++++++++++++++++++++++++++++++++--- 4 files changed, 58 insertions(+), 22 deletions(-) diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile index a6f1bac313..3f59adc398 100644 --- a/crypto/asn1/Makefile +++ b/crypto/asn1/Makefile @@ -208,7 +208,7 @@ a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h a_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h a_sign.o: ../include/internal/asn1_int.h ../include/internal/cryptlib.h -a_sign.o: a_sign.c +a_sign.o: ../include/internal/evp_int.h a_sign.c a_strex.o: ../../e_os.h ../../include/openssl/asn1.h a_strex.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h a_strex.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -349,7 +349,8 @@ asn_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h asn_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h asn_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h asn_mime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -asn_mime.o: ../include/internal/cryptlib.h asn1_locl.h asn_mime.c +asn_mime.o: ../include/internal/cryptlib.h ../include/internal/evp_int.h +asn_mime.o: asn1_locl.h asn_mime.c asn_moid.o: ../../e_os.h ../../include/openssl/asn1.h asn_moid.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h asn_moid.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h @@ -689,7 +690,8 @@ x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h x_algor.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_algor.o: ../../include/openssl/x509_vfy.h x_algor.c +x_algor.o: ../../include/openssl/x509_vfy.h ../include/internal/evp_int.h +x_algor.o: x_algor.c x_bignum.o: ../../e_os.h ../../include/openssl/asn1.h x_bignum.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h x_bignum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index ee0998d9f9..3972dc8d80 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -111,7 +111,8 @@ bio_md.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h bio_md.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h bio_md.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h bio_md.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -bio_md.o: ../include/internal/cryptlib.h bio_md.c +bio_md.o: ../include/internal/cryptlib.h ../include/internal/evp_int.h bio_md.c +bio_md.o: evp_locl.h bio_ok.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h bio_ok.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h bio_ok.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -121,7 +122,7 @@ bio_ok.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h bio_ok.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h bio_ok.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h bio_ok.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h -bio_ok.o: bio_ok.c +bio_ok.o: ../include/internal/evp_int.h bio_ok.c c_all.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h c_all.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h c_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h @@ -173,7 +174,8 @@ digest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h digest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -digest.o: ../include/internal/cryptlib.h digest.c +digest.o: ../include/internal/cryptlib.h ../include/internal/evp_int.h digest.c +digest.o: evp_locl.h e_aes.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h e_aes.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h e_aes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -430,7 +432,7 @@ evp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h evp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h evp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h evp_lib.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h -evp_lib.o: evp_lib.c +evp_lib.o: ../include/internal/evp_int.h evp_lib.c evp_locl.h evp_pbe.o: ../../e_os.h ../../include/openssl/asn1.h evp_pbe.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h evp_pbe.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -481,7 +483,7 @@ m_md4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h m_md4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h m_md4.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h m_md4.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h -m_md4.o: m_md4.c +m_md4.o: ../include/internal/evp_int.h m_md4.c m_md5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_md5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_md5.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h @@ -495,7 +497,7 @@ m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h m_md5.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h -m_md5.o: m_md5.c +m_md5.o: ../include/internal/evp_int.h m_md5.c m_md5_sha1.o: ../../e_os.h ../../include/openssl/asn1.h m_md5_sha1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h m_md5_sha1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -510,7 +512,8 @@ m_md5_sha1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h m_md5_sha1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h m_md5_sha1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h m_md5_sha1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_md5_sha1.o: ../include/internal/cryptlib.h m_md5_sha1.c +m_md5_sha1.o: ../include/internal/cryptlib.h ../include/internal/evp_int.h +m_md5_sha1.o: m_md5_sha1.c m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_mdc2.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h @@ -524,7 +527,7 @@ m_mdc2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h m_mdc2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h m_mdc2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_mdc2.o: ../include/internal/cryptlib.h m_mdc2.c +m_mdc2.o: ../include/internal/cryptlib.h ../include/internal/evp_int.h m_mdc2.c m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_null.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h @@ -537,7 +540,7 @@ m_null.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h m_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h m_null.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h m_null.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h -m_null.o: m_null.c +m_null.o: ../include/internal/evp_int.h m_null.c m_ripemd.o: ../../e_os.h ../../include/openssl/asn1.h m_ripemd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h m_ripemd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -552,7 +555,7 @@ m_ripemd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h m_ripemd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h m_ripemd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h m_ripemd.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h -m_ripemd.o: m_ripemd.c +m_ripemd.o: ../include/internal/evp_int.h m_ripemd.c m_sha1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_sha1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_sha1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h @@ -562,7 +565,7 @@ m_sha1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h m_sha1.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h m_sha1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h m_sha1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -m_sha1.o: ../include/internal/cryptlib.h m_sha1.c +m_sha1.o: ../include/internal/cryptlib.h ../include/internal/evp_int.h m_sha1.c m_sigver.o: ../../e_os.h ../../include/openssl/asn1.h m_sigver.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h m_sigver.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -576,7 +579,7 @@ m_sigver.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h m_sigver.o: ../../include/openssl/sha.h ../../include/openssl/stack.h m_sigver.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h m_sigver.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h -m_sigver.o: ../include/internal/evp_int.h m_sigver.c +m_sigver.o: ../include/internal/evp_int.h evp_locl.h m_sigver.c m_wp.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h m_wp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h m_wp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h @@ -589,7 +592,7 @@ m_wp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h m_wp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h m_wp.o: ../../include/openssl/symhacks.h ../../include/openssl/whrlpool.h m_wp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_wp.o: ../include/internal/cryptlib.h m_wp.c +m_wp.o: ../include/internal/cryptlib.h ../include/internal/evp_int.h m_wp.c names.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h names.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h names.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h @@ -602,7 +605,7 @@ names.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h names.o: ../../include/openssl/sha.h ../../include/openssl/stack.h names.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h names.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h -names.o: names.c +names.o: ../include/internal/evp_int.h names.c p5_crpt.o: ../../e_os.h ../../include/openssl/asn1.h p5_crpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p5_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -712,7 +715,7 @@ p_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h p_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h p_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h p_sign.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h -p_sign.o: p_sign.c +p_sign.o: ../include/internal/evp_int.h p_sign.c p_verify.o: ../../e_os.h ../../include/openssl/asn1.h p_verify.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h p_verify.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -726,7 +729,7 @@ p_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h p_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h p_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h p_verify.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h -p_verify.o: p_verify.c +p_verify.o: ../include/internal/evp_int.h p_verify.c pmeth_fn.o: ../../e_os.h ../../include/openssl/asn1.h pmeth_fn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pmeth_fn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h diff --git a/crypto/hmac/Makefile b/crypto/hmac/Makefile index 934631aa17..a16e6203e0 100644 --- a/crypto/hmac/Makefile +++ b/crypto/hmac/Makefile @@ -95,3 +95,4 @@ hmac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h hmac.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h hmac.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h hmac.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h hmac.c +hmac.o: hmac_lcl.h diff --git a/util/libeay.num b/util/libeay.num index 72eedad881..8b7f29664f 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -2207,7 +2207,7 @@ OBJ_NAME_do_all_sorted 2743 EXIST::FUNCTION: i2d_OCSP_BASICRESP 2744 EXIST::FUNCTION: i2d_OCSP_RESPBYTES 2745 EXIST::FUNCTION: PKCS12_unpack_p7encdata 2746 EXIST::FUNCTION: -HMAC_CTX_init 2747 EXIST::FUNCTION: +HMAC_CTX_reset 2747 EXIST::FUNCTION: ENGINE_get_digest 2748 EXIST::FUNCTION:ENGINE OCSP_RESPONSE_print 2749 EXIST::FUNCTION: KRB5_TKTBODY_it 2750 NOEXIST::FUNCTION: @@ -2256,7 +2256,7 @@ CRYPTO_get_locked_mem_ex_funcs 2781 NOEXIST::FUNCTION: CRYPTO_get_locked_mem_ex_functions 2781 NOEXIST::FUNCTION: ASN1_TIME_check 2782 EXIST::FUNCTION: UI_get0_user_data 2783 EXIST::FUNCTION: -HMAC_CTX_cleanup 2784 EXIST::FUNCTION: +HMAC_CTX_cleanup 2784 NOEXIST::FUNCTION: DSA_up_ref 2785 EXIST::FUNCTION:DSA _ossl_odes_ede3_cfb64_encrypt 2786 NOEXIST::FUNCTION: _ossl_old_des_ede3_cfb64_encrypt 2786 NOEXIST::FUNCTION: @@ -2306,7 +2306,7 @@ OCSP_RESPDATA_free 2818 EXIST::FUNCTION: d2i_KRB5_TICKET 2819 NOEXIST::FUNCTION: OTHERNAME_it 2820 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: OTHERNAME_it 2820 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -EVP_MD_CTX_cleanup 2821 EXIST::FUNCTION: +EVP_MD_CTX_cleanup 2821 NOEXIST::FUNCTION: d2i_ASN1_GENERALSTRING 2822 EXIST::FUNCTION: X509_CRL_set_version 2823 EXIST::FUNCTION: BN_mod_sub 2824 EXIST::FUNCTION: @@ -4666,3 +4666,33 @@ ASYNC_init 5025 EXIST::FUNCTION: EVP_MD_CTX_ctrl 5026 EXIST::FUNCTION: EVP_md5_sha1 5027 EXIST::FUNCTION:MD5 CRYPTO_free_ex_index 5028 EXIST::FUNCTION: +EVP_MD_meth_set_copy 5029 EXIST::FUNCTION: +EVP_MD_meth_set_flags 5030 EXIST::FUNCTION: +EVP_MD_meth_set_input_blocksize 5031 EXIST::FUNCTION: +EVP_MD_meth_get_update 5032 EXIST::FUNCTION: +EVP_MD_meth_get_input_blocksize 5033 EXIST::FUNCTION: +EVP_MD_CTX_pkey_ctx 5034 EXIST::FUNCTION: +EVP_MD_meth_set_ctrl 5035 EXIST::FUNCTION: +EVP_MD_meth_get_init 5036 EXIST::FUNCTION: +EVP_MD_meth_new 5037 EXIST::FUNCTION: +EVP_MD_meth_get_ctrl 5038 EXIST::FUNCTION: +EVP_MD_CTX_update_fn 5039 EXIST::FUNCTION: +EVP_MD_meth_set_update 5040 EXIST::FUNCTION: +EVP_MD_meth_get_final 5041 EXIST::FUNCTION: +EVP_MD_CTX_md_data 5042 EXIST::FUNCTION: +EVP_MD_meth_set_app_datasize 5043 EXIST::FUNCTION: +EVP_MD_meth_set_result_size 5044 EXIST::FUNCTION: +EVP_MD_meth_set_final 5045 EXIST::FUNCTION: +EVP_MD_meth_get_result_size 5046 EXIST::FUNCTION: +EVP_MD_meth_get_flags 5047 EXIST::FUNCTION: +EVP_MD_meth_get_app_datasize 5048 EXIST::FUNCTION: +EVP_MD_meth_free 5049 EXIST::FUNCTION: +EVP_MD_meth_set_cleanup 5050 EXIST::FUNCTION: +EVP_MD_meth_get_cleanup 5051 EXIST::FUNCTION: +EVP_MD_meth_set_init 5052 EXIST::FUNCTION: +EVP_MD_meth_get_copy 5053 EXIST::FUNCTION: +EVP_MD_CTX_set_update_fn 5054 EXIST::FUNCTION: +EVP_MD_meth_dup 5055 EXIST::FUNCTION: +HMAC_size 5056 EXIST::FUNCTION: +HMAC_CTX_new 5057 EXIST::FUNCTION: +HMAC_CTX_free 5058 EXIST::FUNCTION: -- 2.25.1