Commit 5b79813b authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix SSL_pending() for DTLS 



DTLS was not correctly returning the number of pending bytes left in
a call to SSL_pending(). This makes the detection of truncated packets
almost impossible.

Fixes #5478

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

ssl/record/rec_layer_d1.c

+2 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
    /* get new packet if necessary */

    if ((SSL3_RECORD_get_length(rr) == 0)

        || (s->rlayer.rstate == SSL_ST_READ_BODY)) {

        RECORD_LAYER_set_numrpipes(&s->rlayer, 0);

        iret = dtls1_get_record(s);

        if (iret <= 0) {

            iret = dtls1_read_failed(s, iret);
@@ -430,6 +431,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
            else

                goto start;

        }

        RECORD_LAYER_set_numrpipes(&s->rlayer, 1);

    }



    /*