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

Properly handle duplicated messages from the next epoch 



Since 3884b47b we may attempt to buffer a record from the next epoch
that has already been buffered. Prior to that this never occurred.

We simply ignore a failure to buffer a duplicated record.

Fixes #6902

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7415)
parent 880d1c76

ssl/d1_pkt.c

+1 −3
Original line number Diff line number Diff line
@@ -293,14 +293,12 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) 
        return (-1);

    }



    /* insert should not fail, since duplicates are dropped */

    if (pqueue_insert(queue->q, item) == NULL) {

        SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR);

        /* Must be a duplicate so ignore it */

        if (rdata->rbuf.buf != NULL)

            OPENSSL_free(rdata->rbuf.buf);

        OPENSSL_free(rdata);

        pitem_free(item);

        return (-1);

    }



    return (1);