From: Dr. Stephen Henson Date: Tue, 22 Sep 2015 16:09:11 +0000 (+0100) Subject: make update X-Git-Tag: OpenSSL_1_1_0-pre1~534 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e15a18de96b8c948cc69df35aba7e1e245f6c999;p=oweals%2Fopenssl.git make update Reviewed-by: Rich Salz --- diff --git a/crypto/ts/Makefile b/crypto/ts/Makefile index 76d1aeac72..754b89a617 100644 --- a/crypto/ts/Makefile +++ b/crypto/ts/Makefile @@ -207,7 +207,7 @@ ts_rsp_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h ts_rsp_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h ts_rsp_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ts_rsp_sign.o: ../../include/openssl/x509v3.h ../include/internal/cryptlib.h -ts_rsp_sign.o: ts_lcl.h ts_rsp_sign.c +ts_rsp_sign.o: ../include/internal/x509_int.h ts_lcl.h ts_rsp_sign.c ts_rsp_utils.o: ../../e_os.h ../../include/openssl/asn1.h ts_rsp_utils.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h ts_rsp_utils.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h @@ -243,7 +243,7 @@ ts_rsp_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h ts_rsp_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h ts_rsp_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h ts_rsp_verify.o: ../../include/openssl/x509v3.h ../include/internal/cryptlib.h -ts_rsp_verify.o: ts_lcl.h ts_rsp_verify.c +ts_rsp_verify.o: ../include/internal/x509_int.h ts_lcl.h ts_rsp_verify.c ts_verify_ctx.o: ../../e_os.h ../../include/openssl/asn1.h ts_verify_ctx.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h ts_verify_ctx.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile index 72a53db89a..ba0c87e9cf 100644 --- a/crypto/x509/Makefile +++ b/crypto/x509/Makefile @@ -133,19 +133,18 @@ t_req.o: ../include/internal/cryptlib.h t_req.c t_x509.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h t_x509.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h t_x509.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -t_x509.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -t_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -t_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -t_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -t_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -t_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -t_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +t_x509.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +t_x509.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +t_x509.o: ../../include/openssl/err.h ../../include/openssl/evp.h +t_x509.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +t_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +t_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +t_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h t_x509.o: ../include/internal/asn1_int.h ../include/internal/cryptlib.h -t_x509.o: t_x509.c +t_x509.o: ../include/internal/x509_int.h t_x509.c t_x509a.o: ../../e_os.h ../../include/openssl/asn1.h t_x509a.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h t_x509a.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -315,7 +314,7 @@ x509_set.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h x509_set.o: ../../include/openssl/sha.h ../../include/openssl/stack.h x509_set.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_set.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h -x509_set.o: x509_set.c +x509_set.o: ../include/internal/x509_int.h x509_set.c x509_trs.o: ../../e_os.h ../../include/openssl/asn1.h x509_trs.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509_trs.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h @@ -557,7 +556,7 @@ x_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h x_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h x_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h x_x509.o: ../../include/openssl/x509v3.h ../include/internal/cryptlib.h -x_x509.o: x_x509.c +x_x509.o: ../include/internal/x509_int.h x_x509.c x_x509a.o: ../../e_os.h ../../include/openssl/asn1.h x_x509a.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h x_x509a.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile index a80ec98354..5460af46f1 100644 --- a/crypto/x509v3/Makefile +++ b/crypto/x509v3/Makefile @@ -84,7 +84,8 @@ pcy_cache.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h pcy_cache.o: ../../include/openssl/sha.h ../../include/openssl/stack.h pcy_cache.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pcy_cache.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_cache.o: ../include/internal/cryptlib.h pcy_cache.c pcy_int.h +pcy_cache.o: ../include/internal/cryptlib.h ../include/internal/x509_int.h +pcy_cache.o: pcy_cache.c pcy_int.h pcy_data.o: ../../e_os.h ../../include/openssl/asn1.h pcy_data.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pcy_data.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h @@ -126,7 +127,8 @@ pcy_map.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h pcy_map.o: ../../include/openssl/sha.h ../../include/openssl/stack.h pcy_map.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pcy_map.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_map.o: ../include/internal/cryptlib.h pcy_int.h pcy_map.c +pcy_map.o: ../include/internal/cryptlib.h ../include/internal/x509_int.h +pcy_map.o: pcy_int.h pcy_map.c pcy_node.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h pcy_node.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h pcy_node.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h @@ -168,7 +170,7 @@ v3_addr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h v3_addr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h v3_addr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h v3_addr.o: ../../include/openssl/x509v3.h ../include/internal/cryptlib.h -v3_addr.o: ext_dat.h v3_addr.c +v3_addr.o: ../include/internal/x509_int.h ext_dat.h v3_addr.c v3_akey.o: ../../e_os.h ../../include/openssl/asn1.h v3_akey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_akey.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h @@ -227,7 +229,8 @@ v3_asid.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h v3_asid.o: ../../include/openssl/sha.h ../../include/openssl/stack.h v3_asid.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h v3_asid.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_asid.o: ../include/internal/cryptlib.h ext_dat.h v3_asid.c +v3_asid.o: ../include/internal/cryptlib.h ../include/internal/x509_int.h +v3_asid.o: ext_dat.h v3_asid.c v3_bcons.o: ../../e_os.h ../../include/openssl/asn1.h v3_bcons.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h v3_bcons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h @@ -519,7 +522,7 @@ v3_purp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h v3_purp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h v3_purp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h v3_purp.o: ../../include/openssl/x509v3.h ../include/internal/cryptlib.h -v3_purp.o: v3_purp.c +v3_purp.o: ../include/internal/x509_int.h v3_purp.c v3_scts.o: ../../e_os.h ../../include/openssl/asn1.h v3_scts.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h v3_scts.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h diff --git a/util/libeay.num b/util/libeay.num index 1e5be8e850..1ae0f8eab7 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4629,3 +4629,14 @@ EVP_PKEY_meth_get_sign 4987 EXIST::FUNCTION: EVP_PKEY_meth_get_copy 4988 EXIST::FUNCTION: EVP_PKEY_meth_get_verify_recover 4989 EXIST::FUNCTION: EVP_PKEY_meth_get_encrypt 4990 EXIST::FUNCTION: +X509_get0_subject_key_id 4991 EXIST::FUNCTION: +i2d_re_X509_CRL_tbs 4992 EXIST::FUNCTION: +X509_REQ_get_X509_PUBKEY 4993 EXIST::FUNCTION: +X509_REQ_get0_signature 4994 EXIST::FUNCTION: +X509_REVOKED_get0_revocationDate 4995 EXIST::FUNCTION: +X509_REVOKED_get0_serialNumber 4996 EXIST::FUNCTION: +X509_CRL_get0_extensions 4997 EXIST::FUNCTION: +X509_REQ_get_signature_nid 4998 EXIST::FUNCTION: +X509_CRL_get_signature_nid 5000 EXIST::FUNCTION: +i2d_re_X509_REQ_tbs 5001 EXIST::FUNCTION: +X509_REVOKED_get0_extensions 5002 EXIST::FUNCTION: