diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-08-30 10:26:37 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-08-31 00:53:05 +0200 |
| commit | 5734f73f0d5d13f7b66de7e323da5ca9e7bb2b06 (patch) | |
| tree | b722936333a3cec1d6197bbae360d96fb8ef23ee | |
| parent | 5fbb4942926a8603d4442d0c8074051bd743e821 (diff) | |
| download | curl-5734f73f0d5d13f7b66de7e323da5ca9e7bb2b06.tar.gz | |
polarssl: fix multissl breakage
Reported-by: Dan Fandrich
Bug: https://curl.haxx.se/mail/lib-2017-08/0121.html
Closes #1843
| -rw-r--r-- | include/curl/curl.h | 4 | ||||
| -rw-r--r-- | lib/vtls/polarssl.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 0f06d20aa..63c6e17be 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -2236,7 +2236,7 @@ typedef enum { CURLSSLBACKEND_OBSOLETE4 = 4, /* Was QSOSSL. */ CURLSSLBACKEND_GSKIT = 5, CURLSSLBACKEND_POLARSSL = 6, - CURLSSLBACKEND_CYASSL = 7, + CURLSSLBACKEND_WOLFSSL = 7, CURLSSLBACKEND_SCHANNEL = 8, CURLSSLBACKEND_DARWINSSL = 9, CURLSSLBACKEND_AXTLS = 10, @@ -2246,7 +2246,7 @@ typedef enum { /* aliases for library clones and renames */ #define CURLSSLBACKEND_LIBRESSL CURLSSLBACKEND_OPENSSL #define CURLSSLBACKEND_BORINGSSL CURLSSLBACKEND_OPENSSL -#define CURLSSLBACKEND_WOLFSSL CURLSSLBACKEND_CYASSL +#define CURLSSLBACKEND_CYASSL CURLSSLBACKEND_WOLFSSL /* Information about the SSL library used and the respective internal SSL handle, which can be used to obtain further information regarding the diff --git a/lib/vtls/polarssl.c b/lib/vtls/polarssl.c index fdfd12ce5..22ff2dd63 100644 --- a/lib/vtls/polarssl.c +++ b/lib/vtls/polarssl.c @@ -30,9 +30,6 @@ #include "curl_setup.h" #ifdef USE_POLARSSL - -#elif defined USE_POLARSSL - #include <polarssl/net.h> #include <polarssl/ssl.h> #include <polarssl/certs.h> @@ -458,7 +455,7 @@ polarssl_connect_step2(struct connectdata *conn, { int ret; struct Curl_easy *data = conn->data; - struct ssl_connect_data* connssl = &BACKEND->ssl[sockindex]; + struct ssl_connect_data* connssl = &conn->ssl[sockindex]; char buffer[1024]; const char * const pinnedpubkey = SSL_IS_PROXY() ? data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY] : @@ -677,7 +674,7 @@ static ssize_t polarssl_send(struct connectdata *conn, static void Curl_polarssl_close(struct connectdata *conn, int sockindex) { - struct ssl_connect_data *connssl = &conn->sock[sockindex]; + struct ssl_connect_data *connssl = &conn->ssl[sockindex]; rsa_free(&BACKEND->rsa); x509_crt_free(&BACKEND->clicert); x509_crt_free(&BACKEND->cacert); |