Unverified Commit f4a62382 authored by Johannes Schindelin's avatar Johannes Schindelin Committed by Daniel Stenberg
Browse files

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: default avatarJohannes Schindelin <johannes.schindelin@gmx.de>
parent dde4f5c8

lib/vtls/openssl.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

}