diff options
| author | dartraiden <wowemuh@gmail.com> | 2022-06-10 01:53:35 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2022-06-10 02:24:49 +0300 |
| commit | 39de82f0732a81d4dc96197bab4ca585a52c353a (patch) | |
| tree | 8755c2bc4e9779166f30484f2d94c97c87e910a5 /libs/libcurl/src/vtls/openssl.h | |
| parent | 3c5f696829216c7a113f71ff9099178c11817aca (diff) | |
libcurl: update to 7.83.1
Diffstat (limited to 'libs/libcurl/src/vtls/openssl.h')
| -rw-r--r-- | libs/libcurl/src/vtls/openssl.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/libs/libcurl/src/vtls/openssl.h b/libs/libcurl/src/vtls/openssl.h index 28058453c0..0a7536ea3e 100644 --- a/libs/libcurl/src/vtls/openssl.h +++ b/libs/libcurl/src/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,12 +30,26 @@ * 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; +struct ssl_ctx_st; +CURLcode Curl_ossl_set_client_cert(struct Curl_easy *data, + struct ssl_ctx_st *ctx, char *cert_file, + const struct curl_blob *cert_blob, + const char *cert_type, char *key_file, + const struct curl_blob *key_blob, + const char *key_type, char *key_passwd); + #endif /* USE_OPENSSL */ #endif /* HEADER_CURL_SSLUSE_H */ |