Commit ad962252 authored by Matt Caswell's avatar Matt Caswell
Browse files

Only auto-retry for DTLS if configured to do so 



Otherwise we may end up in a hang when using blocking sockets

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6170)
parent 6f6da2fe

ssl/record/rec_layer_d1.c

+12 −0
Original line number Diff line number Diff line
@@ -664,6 +664,18 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
                    return -1;

            }

            SSL3_RECORD_set_length(rr, 0);

            if (!(s->mode & SSL_MODE_AUTO_RETRY)) {

                if (SSL3_BUFFER_get_left(&s->rlayer.rbuf) == 0) {

                    /* no read-ahead left? */

                    BIO *bio;



                    s->rwstate = SSL_READING;

                    bio = SSL_get_rbio(s);

                    BIO_clear_retry_flags(bio);

                    BIO_set_retry_read(bio);

                    return -1;

                }

            }

            goto start;

        }