diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2022-01-08 10:40:21 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2022-01-08 14:39:12 +0100 |
| commit | 1bb406c7ed51f37065b9061443f26abd77c88104 (patch) | |
| tree | 10eb72d7932423f37ccf532da32927b4a6f4b7cd | |
| parent | 40eec3f80ef8830006c7bf212a121577eaf23e67 (diff) | |
| download | curl-1bb406c7ed51f37065b9061443f26abd77c88104.tar.gz | |
openssl.h: avoid including OpenSSL headers here
... by instead using the struct version of the typedef'ed pointer. To
fix build errors when both Schannel and OpenSSL are enabled.
Fixes #8240
Reported-by: Jan Ehrhardt
Closes #8246
| -rw-r--r-- | lib/vtls/openssl.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h index 28058453c..7df642bc9 100644 --- a/lib/vtls/openssl.h +++ b/lib/vtls/openssl.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -30,11 +30,17 @@ * and ngtcp2.c */ -#include <openssl/x509v3.h> #include "urldata.h" +/* + * In an effort to avoid using 'X509 *' here, we instead use the struct + * x509_st version of the type so that we can forward-declare it here without + * having to include <openssl/x509v3.h>. Including that header causes name + * conflicts when libcurl is built with both Schannel and OpenSSL support. + */ +struct x509_st; CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn, - X509 *server_cert); + struct x509_st *server_cert); extern const struct Curl_ssl Curl_ssl_openssl; #endif /* USE_OPENSSL */ |