diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-09-30 01:59:11 +0200 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2018-10-04 09:59:00 +0200 |
| commit | 6babfb216137ab3e13c3219b45ac669a1f514901 (patch) | |
| tree | b74bdc95180c730d5f2c75675b49643a26435f90 /util | |
| parent | acb03676c50edeace8732fc0ee3fc9d3277f7a77 (diff) | |
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@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/7331)
(cherry picked from commit 7e09c5eaa57295f87453286ffe25277c2f2bc73f)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 2 | ||||
| -rwxr-xr-x | util/mkdef.pl | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index c4460c98fa..bad3a3814e 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 657162b460..bcbb475832 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", |