The branch OpenSSL_1_0_2-stable has been updated
via f1e5009c1c95b708b9ba21c23693f95468089419 (commit)
from 880d1c76ed9916cddb97fe05fb4c144f0f6f1012 (commit)
- Log -----------------------------------------------------------------
commit f1e5009c1c95b708b9ba21c23693f95468089419
Author: Matt Caswell <[email protected]>
Date: Tue Oct 16 17:08:11 2018 +0100
Properly handle duplicated messages from the next epoch
Since 3884b47b7c 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: Paul Dale <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/7415)
-----------------------------------------------------------------------
Summary of changes:
ssl/d1_pkt.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index f5deddf..23aa9db 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -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);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
