[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 170/256: OpenSSL: fix yet another mistake while enc
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 170/256: OpenSSL: fix yet another mistake while encapsulating SSL backend data |
Date: |
Fri, 06 Oct 2017 19:44:21 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit f4a623825bf18bc3a6b11193230e44983d20446a
Author: Johannes Schindelin <address@hidden>
AuthorDate: Thu Sep 7 00:55:38 2017 +0200
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 <address@hidden>
---
lib/vtls/openssl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 205/256: travis: on mac, don't install openssl or libidn, (continued)
- [GNUnet-SVN] [gnurl] 205/256: travis: on mac, don't install openssl or libidn, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 247/256: test1153: verify quoted double-qoutes in PWD response, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 228/256: ntlm: move NTLM_NEEDS_NSS_INIT define into core NTLM header, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 142/256: schannel: return CURLE_SSL_CACERT on failed verification, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 122/256: runtests.pl: Apply strippart to upload too., gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 180/256: travis: add build without HTTP/SMTP/IMAP, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 113/256: unit1301: fix error message on first test, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 214/256: mime: fix an explicit null dereference (#1899), gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 194/256: tests: enable gssapi in travis-ci linux build, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 168/256: vtls: fix memory corruption, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 170/256: OpenSSL: fix yet another mistake while encapsulating SSL backend data,
gnunet <=
- [GNUnet-SVN] [gnurl] 206/256: cookies: reject oversized cookies, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 176/256: ossfuzz: add some more handled CURL options, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 155/256: fixup data/test1135, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 200/256: conversions: fix several compiler warnings, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 239/256: Set and use more necessary options when some protocols are disabled, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 173/256: configure: fix curl_off_t check's include order, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 181/256: Curl_checkheaders: make it available for IMAP and SMTP too, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 250/256: proxy: read the "no_proxy" variable only if necessary, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 191/256: URL: on connection re-use, still pick the new remote port, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 192/256: test1150: verify same host fetch using different ports over proxy, gnunet, 2017/10/06