[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 120/173: polarssl, mbedtls: Fix detection of pendin
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 120/173: polarssl, mbedtls: Fix detection of pending data |
Date: |
Fri, 24 Feb 2017 14:02:22 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.53.1
in repository gnurl.
commit a7e4348cf8d9e3ca4ef7020de4540a7257bc5b30
Author: Michael Kaufmann <address@hidden>
AuthorDate: Wed Feb 8 22:09:31 2017 +0100
polarssl, mbedtls: Fix detection of pending data
Reported-by: Dan Fandrich
Bug: https://curl.haxx.se/mail/lib-2017-02/0032.html
---
lib/vtls/mbedtls.c | 4 +---
lib/vtls/polarssl.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index 748828023..07239bf26 100644
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
@@ -937,9 +937,7 @@ void Curl_mbedtls_cleanup(void)
int Curl_mbedtls_data_pending(const struct connectdata *conn, int sockindex)
{
- mbedtls_ssl_context *ssl =
- (mbedtls_ssl_context *)&conn->ssl[sockindex].ssl;
- return ssl->in_msglen != 0;
+ return mbedtls_ssl_get_bytes_avail(&conn->ssl[sockindex].ssl) != 0;
}
#endif /* USE_MBEDTLS */
diff --git a/lib/vtls/polarssl.c b/lib/vtls/polarssl.c
index 1a9421d82..e5346ce3d 100644
--- a/lib/vtls/polarssl.c
+++ b/lib/vtls/polarssl.c
@@ -819,9 +819,7 @@ void Curl_polarssl_cleanup(void)
int Curl_polarssl_data_pending(const struct connectdata *conn, int sockindex)
{
- ssl_context *ssl =
- (ssl_context *)&conn->ssl[sockindex].ssl;
- return ssl->in_msglen != 0;
+ return ssl_get_bytes_avail(&conn->ssl[sockindex].ssl) != 0;
}
#endif /* USE_POLARSSL */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 46/173: url: Fix parsing for when 'file' is the default protocol, (continued)
- [GNUnet-SVN] [gnurl] 46/173: url: Fix parsing for when 'file' is the default protocol, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 34/173: COPYING: update the generic copyright year range, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 94/173: TODO: remove "Support TLS v1.3", gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 100/173: docs: proofread README.netware README.win32, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 128/173: cmdline-opts/page-footer: ftp.sunet.se is no longer an FTP mirror, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 47/173: gnutls: check for alpn and ocsp in configure, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 82/173: sws: use SOCKERRNO, not errno, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 60/173: write-out.d: 'time_total' is not always shown with ms precision, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 63/173: THANKS-filter: Jiri Malak, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 56/173: CURLOPT_PREQUOTE.3: takes a struct curl_slist*, not a char*, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 120/173: polarssl, mbedtls: Fix detection of pending data,
gnunet <=
- [GNUnet-SVN] [gnurl] 30/173: wolfssl: support setting cipher list, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 81/173: KNOWN_BUGS: HTTP/2 server push enabled when no pushes can be accepted, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 85/173: vtls: fix PolarSSL non-blocking handling, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 80/173: *.rc: escape non-ASCII/non-UTF-8 character for clarity, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 64/173: addrinfo: fix compiler warning on offsetof() use, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 51/173: url: Refactor detect_proxy(), gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 50/173: url: Fix NO_PROXY env var to work properly with --proxy option., gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 68/173: TODO: send only part of --data, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 61/173: unix_socket: add support for abstract unix domain socket, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 92/173: telnet: fix windows compiler warnings, gnunet, 2017/02/24