Commit a071d72b authored by Roelof duToit's avatar Roelof duToit Committed by Matt Caswell
Browse files

Retry SSL_read on ERROR_WANT_READ. 


This resolves the retry issue in general, but also the specific case where a TLS 1.3 server sends a post-handshake NewSessionTicket message prior to appdata.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3925)
parent 96c9aee2

apps/s_time.c

+5 −5
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ int s_time_main(int argc, char **argv) 
                                   fmt_http_get_cmd, www_path);

            if (SSL_write(scon, buf, buf_len) <= 0)

                goto end;

            while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)

                bytes_read += i;

            while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || SSL_get_error(scon, i) == SSL_ERROR_WANT_READ)

                if (i > 0) bytes_read += i;

        }

#ifdef NO_SHUTDOWN

        SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
@@ -292,7 +292,7 @@ int s_time_main(int argc, char **argv) 
                               fmt_http_get_cmd, www_path);

        if (SSL_write(scon, buf, buf_len) <= 0)

            goto end;

        while (SSL_read(scon, buf, sizeof(buf)) > 0)

        while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || SSL_get_error(scon, i) == SSL_ERROR_WANT_READ)

            continue;

    }

#ifdef NO_SHUTDOWN
@@ -323,8 +323,8 @@ int s_time_main(int argc, char **argv) 
                         www_path);

            if (SSL_write(scon, buf, strlen(buf)) <= 0)

                goto end;

            while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)

                bytes_read += i;

            while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || SSL_get_error(scon, i) == SSL_ERROR_WANT_READ)

                if (i > 0) bytes_read += i;

        }

#ifdef NO_SHUTDOWN

        SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);