commit fd068d50c4e19b6e860a303a6bec1c1803f5465e
author Matt Caswell <matt@openssl.org> Fri Feb 12 13:33:45 2016 +0000
committer Matt Caswell <matt@openssl.org> Mon Mar 07 21:39:27 2016 +0000
tree e12aa7b9a5fa9ea5d5a0c584746089c471ed271b
parent 49580f25b3e6239a277c9fc2708c0354f419ec17

Ensure s_client and s_server work when read_ahead is set

Previously s_client and s_server relied on using SSL_pending() which does
not take into account read_ahead. For read pipelining to work, read_ahead
gets set automatically. Therefore s_client and s_server have been
converted to use SSL_has_pending() instead.

Reviewed-by: Tim Hudson <tjh@openssl.org>

apps/s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index 27c8be8..ab22d42 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2183,7 +2183,7 @@
             }
         }
 
-        ssl_pending = read_ssl && SSL_pending(con);
+        ssl_pending = read_ssl && SSL_has_pending(con);
 
         if (!ssl_pending) {
 #if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)

apps/s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 22e9175..6e1c598 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2213,7 +2213,7 @@
         int read_from_sslcon;
 
         read_from_terminal = 0;
-        read_from_sslcon = SSL_pending(con)
+        read_from_sslcon = SSL_has_pending(con)
                            || (async && SSL_waiting_for_async(con));
 
         if (!read_from_sslcon) {
@@ -2451,7 +2451,7 @@
                     ascii2ebcdic(buf, buf, i);
 #endif
                     raw_write_stdout(buf, (unsigned int)i);
-                    if (SSL_pending(con))
+                    if (SSL_has_pending(con))
                         goto again;
                     break;
                 case SSL_ERROR_WANT_ASYNC: