diff options
| author | Daniel Fiala <daniel@openssl.org> | 2022-03-29 20:32:42 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-04-05 09:19:17 +0200 |
| commit | f593f32eede30ead69e0a16e47a564a664171283 (patch) | |
| tree | 8c95afb24ae2d466fa902061b1f689ea3364b088 /include | |
| parent | b625e21e67666213ffd3ba6b1f2cd8a847ba6b66 (diff) | |
Redefine macro X509_http_nbio to avoid using ocsp.h
The functions used from ocsp.h are actually just aliases
for functions from http.h. Use them directly to avoid
including ocsp.h.
Fixes openssl#17148
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17980)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/x509.h.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/x509.h.in b/include/openssl/x509.h.in index aee3a44dc2..74d50c6d81 100644 --- a/include/openssl/x509.h.in +++ b/include/openssl/x509.h.in @@ -358,11 +358,11 @@ int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, 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); # ifndef OPENSSL_NO_DEPRECATED_3_0 -# include <openssl/ocsp.h> /* OCSP_REQ_CTX_nbio_d2i */ +# include <openssl/http.h> /* OSSL_HTTP_REQ_CTX_nbio_d2i */ # define X509_http_nbio(rctx, pcert) \ - OCSP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509)) + OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509)) # define X509_CRL_http_nbio(rctx, pcrl) \ - OCSP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL)) + OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL)) # endif # ifndef OPENSSL_NO_STDIO |