diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-06-04 10:23:42 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-13 17:28:00 +0200 |
| commit | cddbcf0d2887388d95d5b338b249ac3923be00f1 (patch) | |
| tree | 3cb441e2749fcdb6040cf31713b7d3f8007d1143 /include | |
| parent | ea9f6890eb54e4b9e8b81cc1318ca3a6fc0c8356 (diff) | |
Remove needless #ifndef OPENSSL_NO_SOCK for X509_{CRL_}load_http
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12638)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/x509.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/openssl/x509.h b/include/openssl/x509.h index d5b13ded0b..71a5f77301 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -383,12 +383,10 @@ int X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md, unsigned int *len); -# if !defined(OPENSSL_NO_SOCK) 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(url) X509_load_http(url, NULL, NULL, 0) 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) -# endif +# define X509_CRL_http_nbio(url) X509_CRL_load_http(url, NULL, NULL, 0) # ifndef OPENSSL_NO_STDIO X509 *d2i_X509_fp(FILE *fp, X509 **x509); |