From 5734f73f0d5d13f7b66de7e323da5ca9e7bb2b06 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 30 Aug 2017 10:26:37 +0200
Subject: polarssl: fix multissl breakage

Reported-by: Dan Fandrich
Bug: https://curl.haxx.se/mail/lib-2017-08/0121.html
Closes #1843
---
 lib/vtls/polarssl.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib/vtls/polarssl.c')

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);
-- 
cgit v1.2.3