]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Don't reset the packet pointer in ssl3_setup_read_buffer
authorMatt Caswell <matt@openssl.org>
Tue, 13 Jul 2021 16:19:12 +0000 (17:19 +0100)
committerTomas Mraz <tomas@openssl.org>
Fri, 16 Jul 2021 10:20:20 +0000 (12:20 +0200)
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: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16077)

ssl/record/ssl3_buffer.c

index 861610a08b3e34787f78afe879bfa22bf362cd11..daa175d98cba070d4c65327f983fcc63420d699b 100644 (file)
@@ -73,7 +73,6 @@ int ssl3_setup_read_buffer(SSL *s)
         b->len = len;
     }
 
-    RECORD_LAYER_set_packet(&s->rlayer, &(b->buf[0]));
     return 1;
 }