36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 97664088f3b332cfd462e3d209983115ef88cfc9 Mon Sep 17 00:00:00 2001
|
|
From: Matt Caswell <matt@openssl.org>
|
|
Date: Tue, 13 Jul 2021 17:19:12 +0100
|
|
Subject: [PATCH] Don't reset the packet pointer in ssl3_setup_read_buffer
|
|
|
|
Sometimes this function gets called when the buffers have already been
|
|
set up. If there is already a partial packet in the read buffer then the
|
|
packet pointer will be set to an incorrect value. The packet pointer already
|
|
gets reset to the correct value when we first read a packet anyway, so we
|
|
don't also need to do it in ssl3_setup_read_buffer.
|
|
|
|
Fixes #13729
|
|
|
|
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
|
|
Reviewed-by: Tomas Mraz <tomas@openssl.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/16098)
|
|
---
|
|
ssl/record/ssl3_buffer.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/ssl/record/ssl3_buffer.c b/ssl/record/ssl3_buffer.c
|
|
index 9b2a6964c6..c99f5bd249 100644
|
|
--- a/ssl/record/ssl3_buffer.c
|
|
+++ b/ssl/record/ssl3_buffer.c
|
|
@@ -74,7 +74,6 @@ int ssl3_setup_read_buffer(SSL *s)
|
|
b->len = len;
|
|
}
|
|
|
|
- RECORD_LAYER_set_packet(&s->rlayer, &(b->buf[0]));
|
|
return 1;
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|