From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 6 Sep 2017 22:55:38 +0000 (+0200)
Subject: OpenSSL: fix yet another mistake while encapsulating SSL backend data
X-Git-Tag: curl-7_56_0~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4a623825bf18bc3a6b11193230e44983d20446a;p=curl

OpenSSL: fix yet another mistake while encapsulating SSL backend data

Another mistake in my manual fixups of the largely mechanical
search-and-replace ("connssl->" -> "BACKEND->"), just like the previous
commit concerning HTTPS proxies (and hence not caught during my
earlier testing).

Fixes #1855
Closes #1871

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index c3b935f38..3472c2492 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -3366,10 +3366,12 @@ static bool Curl_ossl_data_pending(const struct connectdata *conn,
                                    int connindex)
 {
   const struct ssl_connect_data *connssl = &conn->ssl[connindex];
+  const struct ssl_connect_data *proxyssl = &conn->proxy_ssl[connindex];
   if(BACKEND->handle)
     /* SSL is in use */
     return (0 != SSL_pending(BACKEND->handle) ||
-           (BACKEND->handle && 0 != SSL_pending(BACKEND->handle))) ?
+           (proxyssl->backend->handle &&
+            0 != SSL_pending(proxyssl->backend->handle))) ?
            TRUE : FALSE;
   return FALSE;
 }