diff options
| author | Curl Upstream <curl-library@cool.haxx.se> | 2016-08-03 06:37:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-03 18:26:29 (GMT) |
| commit | 202adcfe056681109fe61569ecdb3bd69f0b4f97 (patch) | |
| tree | babb186f9f5f5e1345c61a2b2a4b955a9bae7849 /lib/vtls/cyassl.h | |
| parent | 7ec709d3d7cc988d4cf6dc2c49713d4c55f09542 (diff) | |
| download | CMake-202adcfe056681109fe61569ecdb3bd69f0b4f97.zip CMake-202adcfe056681109fe61569ecdb3bd69f0b4f97.tar.gz CMake-202adcfe056681109fe61569ecdb3bd69f0b4f97.tar.bz2 | |
curl 2016-08-03 (f2cb3a01)
Code extracted from:
https://github.com/bagder/curl.git
at commit f2cb3a01192d36395d16acec6cdb93446ca6fd45 (curl-7_50_1).
Diffstat (limited to 'lib/vtls/cyassl.h')
| -rw-r--r-- | lib/vtls/cyassl.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/lib/vtls/cyassl.h b/lib/vtls/cyassl.h index 167de74..508dfaa 100644 --- a/lib/vtls/cyassl.h +++ b/lib/vtls/cyassl.h @@ -7,11 +7,11 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, 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 - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is @@ -25,6 +25,18 @@ #ifdef USE_CYASSL +/* KEEP_PEER_CERT is a product of the presence of build time symbol + OPENSSL_EXTRA without NO_CERTS, depending on the version. KEEP_PEER_CERT is + in wolfSSL's settings.h, and the latter two are build time symbols in + options.h. */ +#ifndef KEEP_PEER_CERT +#if defined(HAVE_CYASSL_GET_PEER_CERTIFICATE) || \ + defined(HAVE_WOLFSSL_GET_PEER_CERTIFICATE) || \ + (defined(OPENSSL_EXTRA) && !defined(NO_CERTS)) +#define KEEP_PEER_CERT +#endif +#endif + CURLcode Curl_cyassl_connect(struct connectdata *conn, int sockindex); bool Curl_cyassl_data_pending(const struct connectdata* conn, int connindex); int Curl_cyassl_shutdown(struct connectdata* conn, int sockindex); @@ -39,7 +51,7 @@ int Curl_cyassl_init(void); CURLcode Curl_cyassl_connect_nonblocking(struct connectdata *conn, int sockindex, bool *done); -int Curl_cyassl_random(struct SessionHandle *data, +int Curl_cyassl_random(struct Curl_easy *data, unsigned char *entropy, size_t length); void Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */ @@ -53,6 +65,11 @@ void Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */ /* this backend supports CURLOPT_SSL_CTX_* */ #define have_curlssl_ssl_ctx 1 +#ifdef KEEP_PEER_CERT +/* this backend supports CURLOPT_PINNEDPUBLICKEY */ +#define have_curlssl_pinnedpubkey 1 +#endif + /* API setup for CyaSSL */ #define curlssl_init Curl_cyassl_init #define curlssl_cleanup() Curl_nop_stmt |