From: Michael Kaufmann <mail@michael-kaufmann.ch>
Date: Wed, 8 Feb 2017 21:09:31 +0000 (+0100)
Subject: polarssl, mbedtls: Fix detection of pending data
X-Git-Tag: curl-7_53_0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7e4348cf8d9e3ca4ef7020de4540a7257bc5b30;p=thirdparty%2Fcurl.git

polarssl, mbedtls: Fix detection of pending data

Reported-by: Dan Fandrich
Bug: https://curl.haxx.se/mail/lib-2017-02/0032.html
---

diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index 7488280238..07239bf266 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 1a9421d821..e5346ce3dc 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 */