diff --git a/src/ssl.c b/src/ssl.c
index 6edbdb791..bb2bd9276 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -8549,7 +8549,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
             case AES_192_CBC_TYPE :
             case AES_256_CBC_TYPE :
                 WOLFSSL_MSG("AES CBC");
-                memcpy(ctx->iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
+                XMEMCPY(ctx->iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
                 break;
 
 #ifdef WOLFSSL_AES_COUNTER
@@ -8557,7 +8557,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
             case AES_192_CTR_TYPE :
             case AES_256_CTR_TYPE :
                 WOLFSSL_MSG("AES CTR");
-                memcpy(ctx->iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
+                XMEMCPY(ctx->iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
                 break;
 #endif /* WOLFSSL_AES_COUNTER */
 
@@ -8566,19 +8566,19 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
 #ifndef NO_DES3
             case DES_CBC_TYPE :
                 WOLFSSL_MSG("DES CBC");
-                memcpy(ctx->iv, &ctx->cipher.des.reg, DES_BLOCK_SIZE);
+                XMEMCPY(ctx->iv, &ctx->cipher.des.reg, DES_BLOCK_SIZE);
                 break;
 
             case DES_EDE3_CBC_TYPE :
                 WOLFSSL_MSG("DES EDE3 CBC");
-                memcpy(ctx->iv, &ctx->cipher.des3.reg, DES_BLOCK_SIZE);
+                XMEMCPY(ctx->iv, &ctx->cipher.des3.reg, DES_BLOCK_SIZE);
                 break;
 #endif
 
 #ifdef HAVE_IDEA
             case IDEA_CBC_TYPE :
                 WOLFSSL_MSG("IDEA CBC");
-                memcpy(ctx->iv, &ctx->cipher.idea.reg, IDEA_BLOCK_SIZE);
+                XMEMCPY(ctx->iv, &ctx->cipher.idea.reg, IDEA_BLOCK_SIZE);
                 break;
 #endif
             case ARC4_TYPE :
@@ -8616,7 +8616,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
             case AES_192_CBC_TYPE :
             case AES_256_CBC_TYPE :
                 WOLFSSL_MSG("AES CBC");
-                memcpy(&ctx->cipher.aes.reg, ctx->iv, AES_BLOCK_SIZE);
+                XMEMCPY(&ctx->cipher.aes.reg, ctx->iv, AES_BLOCK_SIZE);
                 break;
 
 #ifdef WOLFSSL_AES_COUNTER
@@ -8624,7 +8624,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
             case AES_192_CTR_TYPE :
             case AES_256_CTR_TYPE :
                 WOLFSSL_MSG("AES CTR");
-                memcpy(&ctx->cipher.aes.reg, ctx->iv, AES_BLOCK_SIZE);
+                XMEMCPY(&ctx->cipher.aes.reg, ctx->iv, AES_BLOCK_SIZE);
                 break;
 #endif
 
@@ -8633,19 +8633,19 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
 #ifndef NO_DES3
             case DES_CBC_TYPE :
                 WOLFSSL_MSG("DES CBC");
-                memcpy(&ctx->cipher.des.reg, ctx->iv, DES_BLOCK_SIZE);
+                XMEMCPY(&ctx->cipher.des.reg, ctx->iv, DES_BLOCK_SIZE);
                 break;
 
             case DES_EDE3_CBC_TYPE :
                 WOLFSSL_MSG("DES EDE3 CBC");
-                memcpy(&ctx->cipher.des3.reg, ctx->iv, DES_BLOCK_SIZE);
+                XMEMCPY(&ctx->cipher.des3.reg, ctx->iv, DES_BLOCK_SIZE);
                 break;
 #endif
 
 #ifdef HAVE_IDEA
             case IDEA_CBC_TYPE :
                 WOLFSSL_MSG("IDEA CBC");
-                memcpy(&ctx->cipher.idea.reg, ctx->iv, IDEA_BLOCK_SIZE);
+                XMEMCPY(&ctx->cipher.idea.reg, ctx->iv, IDEA_BLOCK_SIZE);
                 break;
 #endif
             case ARC4_TYPE :
@@ -13500,7 +13500,7 @@ void wolfSSL_3des_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
     if (doset)
         wc_Des3_SetIV(&ctx->cipher.des3, iv);  /* OpenSSL compat, no ret */
     else
-        memcpy(iv, &ctx->cipher.des3.reg, DES_BLOCK_SIZE);
+        XMEMCPY(iv, &ctx->cipher.des3.reg, DES_BLOCK_SIZE);
 }
 
 #endif /* NO_DES3 */
@@ -13523,7 +13523,7 @@ void wolfSSL_aes_ctr_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
     if (doset)
         wc_AesSetIV(&ctx->cipher.aes, iv);  /* OpenSSL compat, no ret */
     else
-        memcpy(iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
+        XMEMCPY(iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
 }
 
 #endif /* NO_AES */
@@ -13832,7 +13832,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
     XMEMSET(*pem, 0, (*plen)+1);
 
     if (XMEMCPY(*pem, tmp, *plen) == NULL) {
-        WOLFSSL_MSG("memcpy failed");
+        WOLFSSL_MSG("XMEMCPY failed");
         XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER);
         XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         return SSL_FAILURE;
@@ -15210,7 +15210,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc,
     XMEMSET(*pem, 0, (*plen)+1);
 
     if (XMEMCPY(*pem, tmp, *plen) == NULL) {
-        WOLFSSL_MSG("memcpy failed");
+        WOLFSSL_MSG("XMEMCPY failed");
         XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER);
         XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         return SSL_FAILURE;
@@ -15385,7 +15385,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa,
     XMEMSET(*pem, 0, (*plen)+1);
 
     if (XMEMCPY(*pem, tmp, *plen) == NULL) {
-        WOLFSSL_MSG("memcpy failed");
+        WOLFSSL_MSG("XMEMCPY failed");
         XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER);
         XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         return SSL_FAILURE;
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index a1a42e12d..0b41d5d58 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -6218,7 +6218,7 @@ static int SetCertificatePolicies(byte *output,
 
     for (i = 0; i < nb_certpol; i++) {
         oidSz = sizeof(oid);
-        memset(oid, 0, oidSz);
+        XMEMSET(oid, 0, oidSz);
 
         ret = EncodePolicyOID(oid, &oidSz, input[i]);
         if (ret != 0)
diff --git a/wolfcrypt/src/camellia.c b/wolfcrypt/src/camellia.c
index 071019c6c..7d4caed92 100644
--- a/wolfcrypt/src/camellia.c
+++ b/wolfcrypt/src/camellia.c
@@ -1029,13 +1029,13 @@ static int camellia_setup192(const unsigned char *key, u32 *subkey)
     unsigned char kk[32];
     u32 krll, krlr, krrl,krrr;
 
-    memcpy(kk, key, 24);
-    memcpy((unsigned char *)&krll, key+16,4);
-    memcpy((unsigned char *)&krlr, key+20,4);
+    XMEMCPY(kk, key, 24);
+    XMEMCPY((unsigned char *)&krll, key+16,4);
+    XMEMCPY((unsigned char *)&krlr, key+20,4);
     krrl = ~krll;
     krrr = ~krlr;
-    memcpy(kk+24, (unsigned char *)&krrl, 4);
-    memcpy(kk+28, (unsigned char *)&krrr, 4);
+    XMEMCPY(kk+24, (unsigned char *)&krrl, 4);
+    XMEMCPY(kk+28, (unsigned char *)&krrr, 4);
 
     return camellia_setup256(kk, subkey);
 }
diff --git a/wolfcrypt/src/idea.c b/wolfcrypt/src/idea.c
index 8762bfc29..f7284c8ee 100644
--- a/wolfcrypt/src/idea.c
+++ b/wolfcrypt/src/idea.c
@@ -141,7 +141,7 @@ int wc_IdeaSetKey(Idea *idea, const byte* key, word16 keySz,
         word16  enckey[IDEA_SK_NUM];
 
         /* put encryption key in tmp buffer */
-        memcpy(enckey, idea->skey, sizeof(idea->skey));
+        XMEMCPY(enckey, idea->skey, sizeof(idea->skey));
 
         idx = 0;
 
diff --git a/wolfcrypt/src/wc_port.c b/wolfcrypt/src/wc_port.c
index 775195c55..dbbea9d06 100644
--- a/wolfcrypt/src/wc_port.c
+++ b/wolfcrypt/src/wc_port.c
@@ -461,7 +461,7 @@ int UnLockMutex(wolfSSL_Mutex *m)
           if(p) {
               ercd = get_mpl(ID_wolfssl_MPOOL, sz, (VP)&newp);
               if (ercd == E_OK) {
-                  memcpy(newp, p, sz) ;
+                  XMEMCPY(newp, p, sz) ;
                   ercd = rel_mpl(ID_wolfssl_MPOOL, (VP)p);
                   if (ercd == E_OK) {
                       return newp;
@@ -552,7 +552,7 @@ int UnLockMutex(wolfSSL_Mutex *m)
           if(p) {
               ercd = tk_get_mpl(ID_wolfssl_MPOOL, sz, (VP)&newp, TMO_FEVR);
               if (ercd == E_OK) {
-                  memcpy(newp, p, sz) ;
+                  XMEMCPY(newp, p, sz) ;
                   ercd = tk_rel_mpl(ID_wolfssl_MPOOL, (VP)p);
                   if (ercd == E_OK) {
                       return newp;