[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

Dr. Stephen Henson steve at openssl.org
Fri Sep 11 23:51:39 UTC 2015


The branch OpenSSL_1_0_2-stable has been updated
       via  eac2b837d63fbac8acb3a9d1f65a2d8379edfc93 (commit)
      from  ce5ae63ab2f3a85795462cf91e8be3f1be013992 (commit)


- Log -----------------------------------------------------------------
commit eac2b837d63fbac8acb3a9d1f65a2d8379edfc93
Author: John Foley <foleyj at cisco.com>
Date:   Sat Sep 12 00:11:23 2015 +0100

    Use memmove instead of memcpy.
    
    PR#4036
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 crypto/modes/wrap128.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/modes/wrap128.c b/crypto/modes/wrap128.c
index 4dcaf03..3849783 100644
--- a/crypto/modes/wrap128.c
+++ b/crypto/modes/wrap128.c
@@ -76,7 +76,7 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
         return 0;
     A = B;
     t = 1;
-    memcpy(out + 8, in, inlen);
+    memmove(out + 8, in, inlen);
     if (!iv)
         iv = default_iv;
 
@@ -113,7 +113,7 @@ size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
     A = B;
     t = 6 * (inlen >> 3);
     memcpy(A, in, 8);
-    memcpy(out, in + 8, inlen);
+    memmove(out, in + 8, inlen);
     for (j = 0; j < 6; j++) {
         R = out + inlen - 8;
         for (i = 0; i < inlen; i += 8, t--, R -= 8) {


More information about the openssl-commits mailing list