Some versions of openssl have an SSL_pending function that erroneously

returns bytes when there is a non-application record pending.

I have no idea when/why this would even happen, but let's catch it and
make sure tor_tls_get_pending_bytes stays correct.

svn:r1727

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 738556d24704223cee9ff5f53e9fcc9ff20bab52..e46b1a9097eed78c6d790c754efb69201029e80b 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -603,7 +603,14 @@ int
 tor_tls_get_pending_bytes(tor_tls *tls)
 {
   tor_assert(tls);
+#if OPENSSL_VERSION_NUMBER < 0x0090700fl
+  if (tls->ssl->rstate == SSL_ST_READ_BODY)
+    return 0;
+  if (tls->ssl->s3->rrec.type != SSL3_RT_APPLICATION_DATA)
+    return 0;
+#endif
   return SSL_pending(tls->ssl);
+
 }
 
 /* Return the number of bytes read across the underlying socket. */