generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure s_client and s_server work when read_ahead is set

Browse Source 
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>
This commit is contained in:
Matt Caswell
2016-02-12 13:33:45 +00:00
parent 49580f25b3
commit fd068d50c4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/s_client.c
View File

@@ -2183,7 +2183,7 @@ int s_client_main(int argc, char **argv)
} }
} }
ssl_pending = read_ssl && SSL_pending(con); ssl_pending = read_ssl && SSL_has_pending(con);
if (!ssl_pending) { if (!ssl_pending) {
#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) #if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)

4
apps/s_server.c
View File

@@ -2213,7 +2213,7 @@ static int sv_body(int s, int stype, unsigned char *context)
int read_from_sslcon; int read_from_sslcon;
read_from_terminal = 0; read_from_terminal = 0;
read_from_sslcon = SSL_pending(con) read_from_sslcon = SSL_has_pending(con)
|| (async && SSL_waiting_for_async(con)); || (async && SSL_waiting_for_async(con));
if (!read_from_sslcon) { if (!read_from_sslcon) {
@@ -2451,7 +2451,7 @@ static int sv_body(int s, int stype, unsigned char *context)
ascii2ebcdic(buf, buf, i); ascii2ebcdic(buf, buf, i);
#endif #endif
raw_write_stdout(buf, (unsigned int)i); raw_write_stdout(buf, (unsigned int)i);
if (SSL_pending(con)) if (SSL_has_pending(con))
goto again; goto again;
break; break;
case SSL_ERROR_WANT_ASYNC: case SSL_ERROR_WANT_ASYNC: