summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-07-13 17:19:12 +0100
committerMatt Caswell <matt@openssl.org>2021-07-16 11:31:36 +0100
commit97664088f3b332cfd462e3d209983115ef88cfc9 (patch)
tree963a9a80d50aa78e60428c6db316e6c27aee210b /ssl
parent657f3d030fce41600d3b9f8daf4cb98c8dc4ec3e (diff)
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)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/record/ssl3_buffer.c1
1 files changed, 0 insertions, 1 deletions
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;
}