crypto/ bcopy->memcpy

[David Hill]

Hello -

Here are a few bcopy to memcpy conversions for crypto/

Index: crypto/crypto.c
===================================================================
RCS file: /cvs/src/sys/crypto/crypto.c,v
retrieving revision 1.77
diff -u -p -r1.77 crypto.c
--- crypto/crypto.c     15 Sep 2016 02:00:17 -0000      1.77
+++ crypto/crypto.c     16 Sep 2016 17:40:04 -0000
@@ -254,7 +254,7 @@ crypto_get_driverid(u_int8_t flags)
                        return -1;
                }
 
-               bcopy(crypto_drivers, newdrv,
+               memcpy(newdrv, crypto_drivers,
                    crypto_drivers_num * sizeof(struct cryptocap));
                bzero(&newdrv[crypto_drivers_num],
                    crypto_drivers_num * sizeof(struct cryptocap));
Index: crypto/gmac.c
===================================================================
RCS file: /cvs/src/sys/crypto/gmac.c,v
retrieving revision 1.8
diff -u -p -r1.8 gmac.c
--- crypto/gmac.c       7 Nov 2015 17:46:49 -0000       1.8
+++ crypto/gmac.c       16 Sep 2016 17:40:04 -0000
@@ -144,7 +144,7 @@ AES_GMAC_Update(void *xctx, const uint8_
                        (*ghash_update)(&ctx->ghash, (uint8_t *)data,
                            len - plen);
                if (plen) {
-                       bcopy((uint8_t *)data + (len - plen), (uint8_t *)blk,
+                       memcpy((uint8_t *)blk, (uint8_t *)data + (len - plen),
                            plen);
                        (*ghash_update)(&ctx->ghash, (uint8_t *)blk,
                            GMAC_BLOCK_LEN);
Index: crypto/hmac.c
===================================================================
RCS file: /cvs/src/sys/crypto/hmac.c,v
retrieving revision 1.3
diff -u -p -r1.3 hmac.c
--- crypto/hmac.c       11 Jan 2011 15:42:05 -0000      1.3
+++ crypto/hmac.c       16 Sep 2016 17:40:04 -0000
@@ -46,7 +46,7 @@ HMAC_MD5_Init(HMAC_MD5_CTX *ctx, const u
        }
 
        bzero(k_ipad, MD5_BLOCK_LENGTH);
-       bcopy(ctx->key, k_ipad, ctx->key_len);
+       memcpy(k_ipad, ctx->key, ctx->key_len);
        for (i = 0; i < MD5_BLOCK_LENGTH; i++)
                k_ipad[i] ^= 0x36;
 
@@ -71,7 +71,7 @@ HMAC_MD5_Final(u_int8_t digest[MD5_DIGES
        MD5Final(digest, &ctx->ctx);
 
        bzero(k_opad, MD5_BLOCK_LENGTH);
-       bcopy(ctx->key, k_opad, ctx->key_len);
+       memcpy(k_opad, ctx->key, ctx->key_len);
        for (i = 0; i < MD5_BLOCK_LENGTH; i++)
                k_opad[i] ^= 0x5c;
 
@@ -100,7 +100,7 @@ HMAC_SHA1_Init(HMAC_SHA1_CTX *ctx, const
        }
 
        bzero(k_ipad, SHA1_BLOCK_LENGTH);
-       bcopy(ctx->key, k_ipad, ctx->key_len);
+       memcpy(k_ipad, ctx->key, ctx->key_len);
        for (i = 0; i < SHA1_BLOCK_LENGTH; i++)
                k_ipad[i] ^= 0x36;
 
@@ -125,7 +125,7 @@ HMAC_SHA1_Final(u_int8_t digest[SHA1_DIG
        SHA1Final(digest, &ctx->ctx);
 
        bzero(k_opad, SHA1_BLOCK_LENGTH);
-       bcopy(ctx->key, k_opad, ctx->key_len);
+       memcpy(k_opad, ctx->key, ctx->key_len);
        for (i = 0; i < SHA1_BLOCK_LENGTH; i++)
                k_opad[i] ^= 0x5c;
 
@@ -154,7 +154,7 @@ HMAC_SHA256_Init(HMAC_SHA256_CTX *ctx, c
        }
 
        bzero(k_ipad, SHA256_BLOCK_LENGTH);
-       bcopy(ctx->key, k_ipad, ctx->key_len);
+       memcpy(k_ipad, ctx->key, ctx->key_len);
        for (i = 0; i < SHA256_BLOCK_LENGTH; i++)
                k_ipad[i] ^= 0x36;
 
@@ -179,7 +179,7 @@ HMAC_SHA256_Final(u_int8_t digest[SHA256
        SHA256Final(digest, &ctx->ctx);
 
        bzero(k_opad, SHA256_BLOCK_LENGTH);
-       bcopy(ctx->key, k_opad, ctx->key_len);
+       memcpy(k_opad, ctx->key, ctx->key_len);
        for (i = 0; i < SHA256_BLOCK_LENGTH; i++)
                k_opad[i] ^= 0x5c;
 
Index: crypto/xform.c
===================================================================
RCS file: /cvs/src/sys/crypto/xform.c,v
retrieving revision 1.54
diff -u -p -r1.54 xform.c
--- crypto/xform.c      10 Dec 2015 21:00:51 -0000      1.54
+++ crypto/xform.c      16 Sep 2016 17:40:04 -0000
@@ -491,7 +491,7 @@ aes_xts_reinit(caddr_t key, u_int8_t *iv
         * Prepare tweak as E_k2(IV). IV is specified as LE representation
         * of a 64-bit block number which we allow to be passed in directly.
         */
-       bcopy(iv, &blocknum, AES_XTS_IVSIZE);
+       memcpy(&blocknum, iv, AES_XTS_IVSIZE);
        for (i = 0; i < AES_XTS_IVSIZE; i++) {
                ctx->tweak[i] = blocknum & 0xff;
                blocknum >>= 8;