TLS/SSL and crypto library
Revision | d4d986441132212c24107fc6163fd9ba28bec1e4 (tree) |
---|---|
Zeit | 2017-07-14 19:19:07 |
Autor | Roelof duToit <r@duto...> |
Commiter | Matt Caswell |
Update PR#3925
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3925)
@@ -234,7 +234,9 @@ int s_time_main(int argc, char **argv) | ||
234 | 234 | fmt_http_get_cmd, www_path); |
235 | 235 | if (SSL_write(scon, buf, buf_len) <= 0) |
236 | 236 | goto end; |
237 | - while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || SSL_get_error(scon, i) == SSL_ERROR_WANT_READ) | |
237 | + while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || | |
238 | + SSL_get_error(scon, i) == SSL_ERROR_WANT_READ || | |
239 | + SSL_get_error(scon, i) == SSL_ERROR_WANT_WRITE) | |
238 | 240 | if (i > 0) bytes_read += i; |
239 | 241 | } |
240 | 242 | #ifdef NO_SHUTDOWN |
@@ -292,7 +294,9 @@ int s_time_main(int argc, char **argv) | ||
292 | 294 | fmt_http_get_cmd, www_path); |
293 | 295 | if (SSL_write(scon, buf, buf_len) <= 0) |
294 | 296 | goto end; |
295 | - while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || SSL_get_error(scon, i) == SSL_ERROR_WANT_READ) | |
297 | + while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || | |
298 | + SSL_get_error(scon, i) == SSL_ERROR_WANT_READ || | |
299 | + SSL_get_error(scon, i) == SSL_ERROR_WANT_WRITE) | |
296 | 300 | continue; |
297 | 301 | } |
298 | 302 | #ifdef NO_SHUTDOWN |
@@ -323,7 +327,9 @@ int s_time_main(int argc, char **argv) | ||
323 | 327 | www_path); |
324 | 328 | if (SSL_write(scon, buf, strlen(buf)) <= 0) |
325 | 329 | goto end; |
326 | - while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || SSL_get_error(scon, i) == SSL_ERROR_WANT_READ) | |
330 | + while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || | |
331 | + SSL_get_error(scon, i) == SSL_ERROR_WANT_READ || | |
332 | + SSL_get_error(scon, i) == SSL_ERROR_WANT_WRITE) | |
327 | 333 | if (i > 0) bytes_read += i; |
328 | 334 | } |
329 | 335 | #ifdef NO_SHUTDOWN |