Unverified Commit 5734f73f authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

polarssl: fix multissl breakage 

Reported-by: Dan Fandrich
Bug: https://curl.haxx.se/mail/lib-2017-08/0121.html
Closes #1843
parent 5fbb4942

include/curl/curl.h

+2 −2
Original line number Diff line number Diff line
@@ -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

lib/vtls/polarssl.c

+2 −5
Original line number Diff line number Diff line
@@ -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);