[openssl] master update

tomas at openssl.org tomas at openssl.org
Tue Feb 1 16:48:17 UTC 2022


The branch master has been updated
       via  b375a8ac9b672bba8e651c11afd2e0a466563742 (commit)
      from  1751356267f64d5db8824cf4ff5b3496e15972da (commit)


- Log -----------------------------------------------------------------
commit b375a8ac9b672bba8e651c11afd2e0a466563742
Author: yangyangtiantianlonglong <yangtianlong1224 at 163.com>
Date:   Sat Jan 29 16:49:00 2022 +0800

    Revert dropped usage of var thiswr in do_ssl3_write()
    
    The var 'thiswr' is an unwanted modification,
    it was submitted in #5253.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17610)

-----------------------------------------------------------------------

Summary of changes:
 ssl/record/rec_layer_s3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index d26437f026..c8b078021b 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1105,7 +1105,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
         }
 
         /* header is added by the kernel when using offload */
-        SSL3_RECORD_add_length(&wr[j], SSL3_RT_HEADER_LENGTH);
+        SSL3_RECORD_add_length(thiswr, SSL3_RT_HEADER_LENGTH);
 
         if (create_empty_fragment) {
             /*


More information about the openssl-commits mailing list