polarssl, mbedtls: Fix detection of pending data

Reported-by: Dan Fandrich Bug: https://curl.haxx.se/mail/lib-2017-02/0032.html
curl · Feb 8, 2017 · a7e4348 · a7e4348
1 parent 3cc2229
commit a7e4348
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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 */