[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  84e52be15006a12ae9d48aadab7f017eefdc4957 (commit)
       via  65b1ff4a14b44c293d5488c68502e50e8f05981e (commit)
      from  18295f0c2db084fe00d935d8506d6e964f652d21 (commit)


- Log -----------------------------------------------------------------
commit 84e52be15006a12ae9d48aadab7f017eefdc4957
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Feb 14 19:42:10 2016 +0100

    make update
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 65b1ff4a14b44c293d5488c68502e50e8f05981e
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Feb 14 19:37:10 2016 +0100

    Don't use libcrypto private headers with mkdef.pl
    
    Three header files from crypto/include/internal were used by
    util/mkdef.pl.  This should never be needed.  Some test program used
    these, which made it a valid reason at the time to make the some
    internal symbols public in the shared libraries, but that's not the
    case any more.
    
    However, to be able to link libssl.so, some symbols found in
    include/internal headers still need to be made public.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 util/libeay.num | 14 +++++++-------
 util/mkdef.pl   |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/util/libeay.num b/util/libeay.num
index e6a0c57..0ca9f7b 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4201,8 +4201,8 @@ ASN1_item_sign_ctx                      4671	1_1_0	EXIST::FUNCTION:
 EC_GFp_nistp521_method                  4672	1_1_0	EXIST:!WIN32:FUNCTION:EC,EC_NISTP_64_GCC_128
 EC_GFp_nistp256_method                  4673	1_1_0	EXIST:!WIN32:FUNCTION:EC,EC_NISTP_64_GCC_128
 OPENSSL_stderr                          4674	1_1_0	NOEXIST::FUNCTION:
-OPENSSL_cpuid_setup                     4675	1_1_0	EXIST::FUNCTION:
-OPENSSL_showfatal                       4676	1_1_0	EXIST::FUNCTION:
+OPENSSL_cpuid_setup                     4675	1_1_0	NOEXIST::FUNCTION:
+OPENSSL_showfatal                       4676	1_1_0	NOEXIST::FUNCTION:
 BIO_new_dgram_sctp                      4677	1_1_0	EXIST::FUNCTION:SCTP
 BIO_dgram_sctp_msg_waiting              4678	1_1_0	EXIST::FUNCTION:SCTP
 BIO_dgram_sctp_wait_for_dry             4679	1_1_0	EXIST::FUNCTION:SCTP
@@ -4602,11 +4602,11 @@ EC_KEY_METHOD_get_verify                5079	1_1_0	EXIST::FUNCTION:EC
 ENGINE_unregister_EC                    5080	1_1_0	EXIST::FUNCTION:ENGINE
 EC_KEY_METHOD_get_sign                  5081	1_1_0	EXIST::FUNCTION:EC
 EC_KEY_METHOD_get_compute_key           5082	1_1_0	EXIST::FUNCTION:EC
-Poly1305_Init                           5083	1_1_0	EXIST::FUNCTION:POLY1305
-ChaCha20_ctr32                          5084	1_1_0	EXIST::FUNCTION:CHACHA
-Poly1305_ctx_size                       5085	1_1_0	EXIST::FUNCTION:POLY1305
-Poly1305_Update                         5086	1_1_0	EXIST::FUNCTION:POLY1305
-Poly1305_Final                          5087	1_1_0	EXIST::FUNCTION:POLY1305
+Poly1305_Init                           5083	1_1_0	NOEXIST::FUNCTION:
+ChaCha20_ctr32                          5084	1_1_0	NOEXIST::FUNCTION:
+Poly1305_ctx_size                       5085	1_1_0	NOEXIST::FUNCTION:
+Poly1305_Update                         5086	1_1_0	NOEXIST::FUNCTION:
+Poly1305_Final                          5087	1_1_0	NOEXIST::FUNCTION:
 EVP_chacha20_poly1305                   5088	1_1_0	EXIST::FUNCTION:CHACHA,POLY1305
 EVP_chacha20                            5089	1_1_0	EXIST::FUNCTION:CHACHA
 TLS_FEATURE_free                        5093	1_1_0	EXIST::FUNCTION:
diff --git a/util/mkdef.pl b/util/mkdef.pl
index b5ebc18..2de27c0 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -234,10 +234,9 @@ my $ssl="include/openssl/ssl.h";
 $ssl.=" include/openssl/tls1.h";
 $ssl.=" include/openssl/srtp.h";
 
+# We use headers found in include/openssl and include/internal only.
+# The latter is needed so libssl.so/.dll/.exe can link properly.
 my $crypto ="include/openssl/crypto.h";
-$crypto.=" crypto/include/internal/cryptlib.h";
-$crypto.=" crypto/include/internal/chacha.h"; # unless $no_chacha;
-$crypto.=" crypto/include/internal/poly1305.h"; # unless $no_poly1305;
 $crypto.=" include/internal/o_dir.h";
 $crypto.=" include/internal/o_str.h";
 $crypto.=" include/openssl/des.h" ; # unless $no_des;