[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a22c01244beec045662e0e0e048783dc70a7b8d1 (commit)
      from  9ae720b4dc30ab52b20965c5d6f60ecc6169b8c8 (commit)


- Log -----------------------------------------------------------------
commit a22c01244beec045662e0e0e048783dc70a7b8d1
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Nov 17 15:17:36 2015 +0100

    make update
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/Makefile | 2 +-
 util/libeay.num      | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile
index bb86d44..a728701 100644
--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@@ -144,7 +144,7 @@ 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: ../include/internal/x509_int.h t_x509.c
+t_x509.o: t_x509.c
 x509_att.o: ../../e_os.h ../../include/openssl/asn1.h
 x509_att.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 x509_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
diff --git a/util/libeay.num b/util/libeay.num
index ddcf594..3c462a0 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1556,7 +1556,7 @@ X509_STORE_CTX_purpose_inherit          1976	EXIST::FUNCTION:
 PEM_read_RSA_PUBKEY                     1977	EXIST::FUNCTION:RSA
 d2i_X509_AUX                            1980	EXIST::FUNCTION:
 i2d_DSA_PUBKEY                          1981	EXIST::FUNCTION:DSA
-X509_CERT_AUX_print                     1982	EXIST::FUNCTION:
+X509_CERT_AUX_print                     1982	NOEXIST::FUNCTION:
 PEM_read_DSA_PUBKEY                     1984	EXIST::FUNCTION:DSA
 i2d_RSA_PUBKEY_bio                      1985	EXIST::FUNCTION:RSA
 ASN1_BIT_STRING_num_asc                 1986	EXIST::FUNCTION:
@@ -4640,3 +4640,10 @@ X509_REQ_get_signature_nid              4999	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:
+X509_get0_tbs_sigalg                    5003	EXIST::FUNCTION:
+X509_trusted                            5004	EXIST::FUNCTION:
+X509_get0_reject_objects                5005	EXIST::FUNCTION:
+X509_get0_extensions                    5006	EXIST::FUNCTION:
+X509_get0_trust_objects                 5007	EXIST::FUNCTION:
+X509_get0_uids                          5008	EXIST::FUNCTION:
+X509_aux_print                          5009	EXIST::FUNCTION:STDIO