Skip to content

Commit

Permalink
OpenSSL: fix yet another mistake while encapsulating SSL backend data
Browse files Browse the repository at this point in the history
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).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Sep 6, 2017
1 parent ba37014 commit 281b30c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/vtls/openssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 281b30c

Please sign in to comment.