Fix not backwards-compat X509_http_nbio() and X509_CRL_http_nbio()

Provides partial fix of #13127.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13960)
This commit is contained in:
Dr. David von Oheimb 2021-01-25 19:25:18 +01:00 committed by Dr. David von Oheimb
parent 673474b164
commit 8e71614797
2 changed files with 8 additions and 4 deletions

View File

@ -15,8 +15,8 @@ X509_CRL_http_nbio
X509 *X509_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
X509_CRL *X509_CRL_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
#define X509_http_nbio(url)
#define X509_CRL_http_nbio(url)
#define X509_http_nbio(rctx, pcert)
#define X509_CRL_http_nbio(rctx, pcrl)
=head1 DESCRIPTION

View File

@ -403,9 +403,13 @@ int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
unsigned char *md, unsigned int *len);
X509 *X509_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
# define X509_http_nbio(url) X509_load_http(url, NULL, NULL, 0)
# define X509_http_nbio(rctx, pcert) \
OSSL_HTTP_REQ_CTX_sendreq_d2i(rctx, (ASN1_VALUE **)(pcert), \
ASN1_ITEM_rptr(X509))
X509_CRL *X509_CRL_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
# define X509_CRL_http_nbio(url) X509_CRL_load_http(url, NULL, NULL, 0)
# define X509_CRL_http_nbio(rctx, pcrl) \
OSSL_HTTP_REQ_CTX_sendreq_d2i(rctx, (ASN1_VALUE **)(pcrl), \
ASN1_ITEM_rptr(X509_CRL))
# ifndef OPENSSL_NO_STDIO
X509 *d2i_X509_fp(FILE *fp, X509 **x509);