[openssl] OpenSSL_1_1_1-stable update

Dr. Paul Dale pauli at openssl.org
Thu Mar 18 11:16:41 UTC 2021


The branch OpenSSL_1_1_1-stable has been updated
       via  8129ac6ac4c0ca3a488c225cde580ede7dabe874 (commit)
      from  081a7061f3da07318c4b0f5de67b82285630bf6b (commit)


- Log -----------------------------------------------------------------
commit 8129ac6ac4c0ca3a488c225cde580ede7dabe874
Author: Pauli <ppzgs1 at gmail.com>
Date:   Wed Mar 17 11:41:48 2021 +1000

    modes: fix coverity 1449860: overlapping memory copy
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14584)
    
    (cherry picked from commit 145f12d12dc83c737676883c625c2a95d34251ed)

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

Summary of changes:
 crypto/modes/cbc128.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c
index c85e37c6a5..4595b0f502 100644
--- a/crypto/modes/cbc128.c
+++ b/crypto/modes/cbc128.c
@@ -69,7 +69,8 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
         in += 16;
         out += 16;
     }
-    memcpy(ivec, iv, 16);
+    if (ivec != iv)
+        memcpy(ivec, iv, 16);
 }
 
 void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,


More information about the openssl-commits mailing list