moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

polarssl: fix multissl breakage 

Reported-by: Dan Fandrich
Bug: https://curl.haxx.se/mail/lib-2017-08/0121.html
Closes #1843
This commit is contained in:
Daniel Stenberg 2017-08-30 10:26:37 +02:00
parent 5fbb494292
commit 5734f73f0d
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/curl/curl.h
View File

@ -2236,7 +2236,7 @@ typedef enum {
CURLSSLBACKEND_OBSOLETE4 = 4, /* Was QSOSSL. */ CURLSSLBACKEND_OBSOLETE4 = 4, /* Was QSOSSL. */
CURLSSLBACKEND_GSKIT = 5, CURLSSLBACKEND_GSKIT = 5,
CURLSSLBACKEND_POLARSSL = 6, CURLSSLBACKEND_POLARSSL = 6,
CURLSSLBACKEND_CYASSL = 7, CURLSSLBACKEND_WOLFSSL = 7,
CURLSSLBACKEND_SCHANNEL = 8, CURLSSLBACKEND_SCHANNEL = 8,
CURLSSLBACKEND_DARWINSSL = 9, CURLSSLBACKEND_DARWINSSL = 9,
CURLSSLBACKEND_AXTLS = 10, CURLSSLBACKEND_AXTLS = 10,
@ -2246,7 +2246,7 @@ typedef enum {
/* aliases for library clones and renames */ /* aliases for library clones and renames */
#define CURLSSLBACKEND_LIBRESSL CURLSSLBACKEND_OPENSSL #define CURLSSLBACKEND_LIBRESSL CURLSSLBACKEND_OPENSSL
#define CURLSSLBACKEND_BORINGSSL 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 /* Information about the SSL library used and the respective internal SSL
handle, which can be used to obtain further information regarding the handle, which can be used to obtain further information regarding the

7
lib/vtls/polarssl.c
View File

@ -30,9 +30,6 @@
#include "curl_setup.h" #include "curl_setup.h"
#ifdef USE_POLARSSL #ifdef USE_POLARSSL
#elif defined USE_POLARSSL
#include <polarssl/net.h> #include <polarssl/net.h>
#include <polarssl/ssl.h> #include <polarssl/ssl.h>
#include <polarssl/certs.h> #include <polarssl/certs.h>
@ -458,7 +455,7 @@ polarssl_connect_step2(struct connectdata *conn,
{ {
int ret; int ret;
struct Curl_easy *data = conn->data; 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]; char buffer[1024];
const char * const pinnedpubkey = SSL_IS_PROXY() ? const char * const pinnedpubkey = SSL_IS_PROXY() ?
data->set.str[STRING_SSL_PINNEDPUBLICKEY_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) 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); rsa_free(&BACKEND->rsa);
x509_crt_free(&BACKEND->clicert); x509_crt_free(&BACKEND->clicert);
x509_crt_free(&BACKEND->cacert); x509_crt_free(&BACKEND->cacert);