[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

Richard Levitte levitte at openssl.org
Thu Oct 4 08:00:03 UTC 2018


The branch OpenSSL_1_1_1-stable has been updated
       via  236119c48ecaac933fc52d7cbfd8d9214d216122 (commit)
       via  6babfb216137ab3e13c3219b45ac669a1f514901 (commit)
      from  acb03676c50edeace8732fc0ee3fc9d3277f7a77 (commit)


- Log -----------------------------------------------------------------
commit 236119c48ecaac933fc52d7cbfd8d9214d216122
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 30 02:18:47 2018 +0200

    Clean out aliases in include/openssl/symhacks.h
    
    Only a few clashing ones remain
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    (Merged from https://github.com/openssl/openssl/pull/7331)
    
    (cherry picked from commit b44882a0bd0717e0aab84f5dc3ef81ab673155e9)

commit 6babfb216137ab3e13c3219b45ac669a1f514901
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 30 01:59:11 2018 +0200

    Small cleanup (util/mkdef.pl, crypto/bio/bss_log.c, include/openssl/ocsp.h)
    
    BIO_s_log() is declared for everyone, so should return NULL when not
    actually implemented.  Also, it had explicit platform limitations in
    util/mkdef.pl that didn't correspond to what was actually in code.
    While at it, a few other hard coded things that have lost their
    relevance were removed.
    
    include/openssl/ocsp.h had a few duplicate declarations.
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    (Merged from https://github.com/openssl/openssl/pull/7331)
    
    (cherry picked from commit 7e09c5eaa57295f87453286ffe25277c2f2bc73f)

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

Summary of changes:
 crypto/bio/bss_log.c       |  5 +++++
 include/openssl/ocsp.h     |  3 ---
 include/openssl/symhacks.h | 15 ---------------
 util/libcrypto.num         |  2 +-
 util/mkdef.pl              | 10 ----------
 5 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index 4324f24..e9ab932 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -408,4 +408,9 @@ static void xcloselog(BIO *bp)
 
 # endif                         /* Unix */
 
+#else                           /* NO_SYSLOG */
+const BIO_METHOD *BIO_s_log(void)
+{
+    return NULL;
+}
 #endif                          /* NO_SYSLOG */
diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h
index 937b322..0a17166 100644
--- a/include/openssl/ocsp.h
+++ b/include/openssl/ocsp.h
@@ -93,7 +93,6 @@ typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES;
 #  define V_OCSP_RESPID_KEY  1
 
 DEFINE_STACK_OF(OCSP_RESPID)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
 
 typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO;
 
@@ -162,8 +161,6 @@ int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it,
 int OCSP_REQ_CTX_nbio_d2i(OCSP_REQ_CTX *rctx, ASN1_VALUE **pval,
                           const ASN1_ITEM *it);
 BIO *OCSP_REQ_CTX_get0_mem_bio(OCSP_REQ_CTX *rctx);
-int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it,
-                     ASN1_VALUE *val);
 int OCSP_REQ_CTX_http(OCSP_REQ_CTX *rctx, const char *op, const char *path);
 int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req);
 int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx,
diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h
index caf1f1a..b6d68ef 100644
--- a/include/openssl/symhacks.h
+++ b/include/openssl/symhacks.h
@@ -28,21 +28,6 @@
 #  undef i2d_ECPKPARAMETERS
 #  define i2d_ECPKPARAMETERS                      i2d_UC_ECPKPARAMETERS
 
-/*
- * These functions do not seem to exist! However, I'm paranoid... Original
- * command in x509v3.h: These functions are being redefined in another
- * directory, and clash when the linker is case-insensitive, so let's hide
- * them a little, by giving them an extra 'o' at the beginning of the name...
- */
-#  undef X509v3_cleanup_extensions
-#  define X509v3_cleanup_extensions               oX509v3_cleanup_extensions
-#  undef X509v3_add_extension
-#  define X509v3_add_extension                    oX509v3_add_extension
-#  undef X509v3_add_netscape_extensions
-#  define X509v3_add_netscape_extensions          oX509v3_add_netscape_extensions
-#  undef X509v3_add_standard_extensions
-#  define X509v3_add_standard_extensions          oX509v3_add_standard_extensions
-
 /* This one clashes with CMS_data_create */
 #  undef cms_Data_create
 #  define cms_Data_create                         priv_cms_Data_create
diff --git a/util/libcrypto.num b/util/libcrypto.num
index c4460c9..bad3a38 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -282,7 +282,7 @@ TS_REQ_free                             282	1_1_0	EXIST::FUNCTION:TS
 PEM_read_DHparams                       283	1_1_0	EXIST::FUNCTION:DH,STDIO
 RSA_private_decrypt                     284	1_1_0	EXIST::FUNCTION:RSA
 X509V3_EXT_get_nid                      285	1_1_0	EXIST::FUNCTION:
-BIO_s_log                               286	1_1_0	EXIST:!WIN32,!macintosh:FUNCTION:
+BIO_s_log                               286	1_1_0	EXIST::FUNCTION:
 EC_POINT_set_to_infinity                287	1_1_0	EXIST::FUNCTION:EC
 EVP_des_ede_ofb                         288	1_1_0	EXIST::FUNCTION:DES
 ECDH_KDF_X9_62                          289	1_1_0	EXIST::FUNCTION:EC
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 657162b..bcbb475 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -936,16 +936,6 @@ sub do_defs
 		}
 	}
 
-	# Prune the returned symbols
-
-        delete $syms{"bn_dump1"};
-	$platform{"BIO_s_log"} .= ",!WIN32,!macintosh";
-
-	$platform{"PEM_read_NS_CERT_SEQ"} = "VMS";
-	$platform{"PEM_write_NS_CERT_SEQ"} = "VMS";
-	$platform{"PEM_read_P8_PRIV_KEY_INFO"} = "VMS";
-	$platform{"PEM_write_P8_PRIV_KEY_INFO"} = "VMS";
-
 	# Info we know about
 
 	push @ret, map { $_."\\".&info_string($_,"EXIST",


More information about the openssl-commits mailing list