Use memmove instead of memcpy.

[openssl.git] / crypto / modes / wrap128.c

diff --git a/crypto/modes/wrap128.c b/crypto/modes/wrap128.c
index 18785320f29ffa9a320ff400151f8b5ee58088bd..384978371af2a0c6b0123566233f3f3a2dae9fed 100644 (file)
--- a/crypto/modes/wrap128.c
+++ b/crypto/modes/wrap128.c
@@ -1,5 +1,6 @@
 /* crypto/modes/wrap128.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
 /* ====================================================================
@@ -10,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -55,86 +56,83 @@
 #include <openssl/modes.h>
 
 static const unsigned char default_iv[] = {
-  0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+    0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
 };
-/* Input size limit: lower than maximum of standards but far larger than
+
+/*
+ * Input size limit: lower than maximum of standards but far larger than
  * anything that will be used in practice.
  */
 #define CRYPTO128_WRAP_MAX (1UL << 31)
 
 size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, size_t inlen, block128_f block)
-       {
-       unsigned char *A, B[16], *R;
-       size_t i, j, t;
-       if ((inlen & 0x7) || (inlen < 8) || (inlen > CRYPTO128_WRAP_MAX))
-               return 0;
-       A = B;
-       t = 1;
-       memcpy(out + 8, in, inlen);
-       if (!iv)
-               iv = default_iv;
+                       unsigned char *out,
+                       const unsigned char *in, size_t inlen,
+                       block128_f block)
+{
+    unsigned char *A, B[16], *R;
+    size_t i, j, t;
+    if ((inlen & 0x7) || (inlen < 8) || (inlen > CRYPTO128_WRAP_MAX))
+        return 0;
+    A = B;
+    t = 1;
+    memmove(out + 8, in, inlen);
+    if (!iv)
+        iv = default_iv;
 
-       memcpy(A, iv, 8);
+    memcpy(A, iv, 8);
 
-       for (j = 0; j < 6; j++)
-               {
-               R = out + 8;
-               for (i = 0; i < inlen; i += 8, t++, R += 8)
-                       {
-                       memcpy(B + 8, R, 8);
-                       block(B, B, key);
-                       A[7] ^= (unsigned char)(t & 0xff);
-                       if (t > 0xff)   
-                               {
-                               A[6] ^= (unsigned char)((t >> 8) & 0xff);
-                               A[5] ^= (unsigned char)((t >> 16) & 0xff);
-                               A[4] ^= (unsigned char)((t >> 24) & 0xff);
-                               }
-                       memcpy(R, B + 8, 8);
-                       }
-               }
-       memcpy(out, A, 8);
-       return inlen + 8;
-       }
+    for (j = 0; j < 6; j++) {
+        R = out + 8;
+        for (i = 0; i < inlen; i += 8, t++, R += 8) {
+            memcpy(B + 8, R, 8);
+            block(B, B, key);
+            A[7] ^= (unsigned char)(t & 0xff);
+            if (t > 0xff) {
+                A[6] ^= (unsigned char)((t >> 8) & 0xff);
+                A[5] ^= (unsigned char)((t >> 16) & 0xff);
+                A[4] ^= (unsigned char)((t >> 24) & 0xff);
+            }
+            memcpy(R, B + 8, 8);
+        }
+    }
+    memcpy(out, A, 8);
+    return inlen + 8;
+}
 
 size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, size_t inlen, block128_f block)
-       {
-       unsigned char *A, B[16], *R;
-       size_t i, j, t;
-       inlen -= 8;
-       if ((inlen & 0x7) || (inlen < 8) || (inlen > CRYPTO128_WRAP_MAX))
-               return 0;
-       A = B;
-       t =  6 * (inlen >> 3);
-       memcpy(A, in, 8);
-       memcpy(out, in + 8, inlen);
-       for (j = 0; j < 6; j++)
-               {
-               R = out + inlen - 8;
-               for (i = 0; i < inlen; i += 8, t--, R -= 8)
-                       {
-                       A[7] ^= (unsigned char)(t & 0xff);
-                       if (t > 0xff)   
-                               {
-                               A[6] ^= (unsigned char)((t >> 8) & 0xff);
-                               A[5] ^= (unsigned char)((t >> 16) & 0xff);
-                               A[4] ^= (unsigned char)((t >> 24) & 0xff);
-                               }
-                       memcpy(B + 8, R, 8);
-                       block(B, B, key);
-                       memcpy(R, B + 8, 8);
-                       }
-               }
-       if (!iv)
-               iv = default_iv;
-       if (memcmp(A, iv, 8))
-               {
-               OPENSSL_cleanse(out, inlen);
-               return 0;
-               }
-       return inlen;
-       }
+                         unsigned char *out,
+                         const unsigned char *in, size_t inlen,
+                         block128_f block)
+{
+    unsigned char *A, B[16], *R;
+    size_t i, j, t;
+    inlen -= 8;
+    if ((inlen & 0x7) || (inlen < 16) || (inlen > CRYPTO128_WRAP_MAX))
+        return 0;
+    A = B;
+    t = 6 * (inlen >> 3);
+    memcpy(A, in, 8);
+    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) {
+            A[7] ^= (unsigned char)(t & 0xff);
+            if (t > 0xff) {
+                A[6] ^= (unsigned char)((t >> 8) & 0xff);
+                A[5] ^= (unsigned char)((t >> 16) & 0xff);
+                A[4] ^= (unsigned char)((t >> 24) & 0xff);
+            }
+            memcpy(B + 8, R, 8);
+            block(B, B, key);
+            memcpy(R, B + 8, 8);
+        }
+    }
+    if (!iv)
+        iv = default_iv;
+    if (memcmp(A, iv, 8)) {
+        OPENSSL_cleanse(out, inlen);
+        return 0;
+    }
+    return inlen;
+}