diff options
| author | Matt Caswell <matt@openssl.org> | 2018-01-16 10:48:01 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-21 10:32:15 +0000 |
| commit | 041ddc366b6d18ee3993877a50299257e688c00c (patch) | |
| tree | bf52815856bc9109f2b0fce22236dd1c8ab20d91 /ssl/ssl_err.c | |
| parent | 8e4057768586961942851d89287f43969352127a (diff) | |
Check for alerts while waiting for a dry event
At a couple of points in a DTLS/SCTP handshake we need to wait for a dry
event before continuing. However if an alert has been sent by the peer
then we will never receive that dry event and an infinite loop results.
This commit changes things so that we attempt to read a message if we
are waiting for a dry event but haven't got one yet. This should never
succeed, but any alerts will be processed.
Fixes #4763
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5085)
Diffstat (limited to 'ssl/ssl_err.c')
| -rw-r--r-- | ssl/ssl_err.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index 3c2ebe1d18..580861eaed 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -48,6 +48,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_DTLS_GET_REASSEMBLED_MESSAGE), "dtls_get_reassembled_message"}, {ERR_FUNC(SSL_F_DTLS_PROCESS_HELLO_VERIFY), "dtls_process_hello_verify"}, + {ERR_FUNC(SSL_F_DTLS_WAIT_FOR_DRY), "dtls_wait_for_dry"}, {ERR_FUNC(SSL_F_OPENSSL_INIT_SSL), "OPENSSL_init_ssl"}, {ERR_FUNC(SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION), "ossl_statem_client_read_transition"}, |