diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-09-30 01:59:11 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-09-30 19:46:19 +0200 |
| commit | 7e09c5eaa57295f87453286ffe25277c2f2bc73f (patch) | |
| tree | efd3003fef5e7bb106e768e825ad0caddb11d16f | |
| parent | 8bf366519661e12fd894dc5420f5b64dccfd7ecd (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)
| -rw-r--r-- | crypto/bio/bss_log.c | 5 | ||||
| -rw-r--r-- | include/openssl/ocsp.h | 3 | ||||
| -rw-r--r-- | util/libcrypto.num | 2 | ||||
| -rwxr-xr-x | util/mkdef.pl | 10 |
4 files changed, 6 insertions, 14 deletions
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 4324f24126..e9ab932ec2 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 937b32271b..0a17166b5b 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/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", |