always use GNUNET_memcpy

12 files changed, 98 insertions, 98 deletions

diff --git a/src/util/amount.c b/src/util/amount.c
index d5698e8b6..dfe10b07e 100644
--- a/src/util/amount.c
+++ b/src/util/amount.c
@@ -72,9 +72,9 @@ TALER_string_to_amount (const char *str,
   }
 
   GNUNET_assert (TALER_CURRENCY_LEN > (colon - str));
-  memcpy (amount->currency,
-          str,
-          colon - str);
+  GNUNET_memcpy (amount->currency,
+                 str,
+                 colon - str);
   /* 0-terminate *and* normalize buffer by setting everything to '\0' */
   memset (&amount->currency [colon - str],
           0,
@@ -193,9 +193,9 @@ TALER_amount_hton (struct TALER_AmountNBO *res,
                  TALER_amount_is_valid (d));
   res->value = GNUNET_htonll (d->value);
   res->fraction = htonl (d->fraction);
-  memcpy (res->currency,
-          d->currency,
-          TALER_CURRENCY_LEN);
+  GNUNET_memcpy (res->currency,
+                 d->currency,
+                 TALER_CURRENCY_LEN);
 }
 
 
@@ -205,9 +205,9 @@ TALER_amount_ntoh (struct TALER_Amount *res,
 {
   res->value = GNUNET_ntohll (dn->value);
   res->fraction = ntohl (dn->fraction);
-  memcpy (res->currency,
-          dn->currency,
-          TALER_CURRENCY_LEN);
+  GNUNET_memcpy (res->currency,
+                 dn->currency,
+                 TALER_CURRENCY_LEN);
   GNUNET_assert (GNUNET_YES ==
                  TALER_amount_is_valid (res));
 }
@@ -225,9 +225,9 @@ TALER_amount_set_zero (const char *cur,
   memset (amount,
           0,
           sizeof (struct TALER_Amount));
-  memcpy (amount->currency,
-          cur,
-          slen);
+  GNUNET_memcpy (amount->currency,
+                 cur,
+                 slen);
   return GNUNET_OK;
 }
 
@@ -680,9 +680,9 @@ TALER_amount_multiply (struct TALER_Amount *result,
   if (GNUNET_SYSERR ==
       TALER_amount_normalize (&in))
     return TALER_AAR_INVALID_NORMALIZATION_FAILED;
-  memcpy (result->currency,
-          amount->currency,
-          TALER_CURRENCY_LEN);
+  GNUNET_memcpy (result->currency,
+                 amount->currency,
+                 TALER_CURRENCY_LEN);
   if ( (0 == factor) ||
        ( (0 == in.value) &&
          (0 == in.fraction) ) )
diff --git a/src/util/crypto_confirmation.c b/src/util/crypto_confirmation.c
index e52562e3e..bbdf701ec 100644
--- a/src/util/crypto_confirmation.c
+++ b/src/util/crypto_confirmation.c
@@ -90,9 +90,9 @@ compute_totp (struct GNUNET_TIME_Timestamp ts,
     mc = gcry_md_read (md,
                        GCRY_MD_SHA1);
     GNUNET_assert (NULL != mc);
-    memcpy (hmac,
-            mc,
-            sizeof (hmac));
+    GNUNET_memcpy (hmac,
+                   mc,
+                   sizeof (hmac));
     gcry_md_close (md);
   }
 
diff --git a/src/util/crypto_contract.c b/src/util/crypto_contract.c
index 3bfe9eb89..bec34c983 100644
--- a/src/util/crypto_contract.c
+++ b/src/util/crypto_contract.c
@@ -131,9 +131,9 @@ blob_encrypt (const struct NonceP *nonce,
                     + data_size;
   *res_size = ciphertext_size;
   *res = GNUNET_malloc (ciphertext_size);
-  memcpy (*res,
-          nonce,
-          crypto_secretbox_NONCEBYTES);
+  GNUNET_memcpy (*res,
+                 nonce,
+                 crypto_secretbox_NONCEBYTES);
   GNUNET_assert (0 ==
                  crypto_secretbox_easy (*res + crypto_secretbox_NONCEBYTES,
                                         data,
@@ -274,9 +274,9 @@ TALER_CRYPTO_contract_encrypt_for_merge (
   hdr->header.ctype = htonl (TALER_EXCHANGE_CONTRACT_PAYMENT_OFFER);
   hdr->header.clen = htonl ((uint32_t) clen);
   hdr->merge_priv = *merge_priv;
-  memcpy (&hdr[1],
-          xbuf,
-          cbuf_size);
+  GNUNET_memcpy (&hdr[1],
+                 xbuf,
+                 cbuf_size);
   GNUNET_free (xbuf);
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
                               &nonce,
@@ -423,9 +423,9 @@ TALER_CRYPTO_contract_encrypt_for_deposit (
   hdr = GNUNET_malloc (sizeof (*hdr) + cbuf_size);
   hdr->ctype = htonl (TALER_EXCHANGE_CONTRACT_PAYMENT_REQUEST);
   hdr->clen = htonl ((uint32_t) clen);
-  memcpy (&hdr[1],
-          xbuf,
-          cbuf_size);
+  GNUNET_memcpy (&hdr[1],
+                 xbuf,
+                 cbuf_size);
   GNUNET_free (xbuf);
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
                               &nonce,
@@ -441,12 +441,12 @@ TALER_CRYPTO_contract_encrypt_for_deposit (
   GNUNET_free (hdr);
   /* prepend purse_pub */
   *econtract = GNUNET_malloc (xecontract_size + sizeof (*purse_pub));
-  memcpy (*econtract,
-          purse_pub,
-          sizeof (*purse_pub));
-  memcpy (sizeof (*purse_pub) + *econtract,
-          xecontract,
-          xecontract_size);
+  GNUNET_memcpy (*econtract,
+                 purse_pub,
+                 sizeof (*purse_pub));
+  GNUNET_memcpy (sizeof (*purse_pub) + *econtract,
+                 xecontract,
+                 xecontract_size);
   *econtract_size = xecontract_size + sizeof (*purse_pub);
   GNUNET_free (xecontract);
 }
@@ -573,9 +573,9 @@ TALER_CRYPTO_kyc_attributes_encrypt (
   cbuf_size = compressBound (clen);
   xbuf = GNUNET_malloc (cbuf_size + sizeof (uint32_t));
   belen = htonl ((uint32_t) clen);
-  memcpy (xbuf,
-          &belen,
-          sizeof (belen));
+  GNUNET_memcpy (xbuf,
+                 &belen,
+                 sizeof (belen));
   ret = compress (xbuf + 4,
                   &cbuf_size,
                   (const Bytef *) cstr,
@@ -623,9 +623,9 @@ TALER_CRYPTO_kyc_attributes_decrypt (
     GNUNET_break_op (0);
     return NULL;
   }
-  memcpy (&belen,
-          xhdr,
-          sizeof (belen));
+  GNUNET_memcpy (&belen,
+                 xhdr,
+                 sizeof (belen));
   clen = ntohl (belen);
   if (clen >= GNUNET_MAX_MALLOC_CHECKED)
   {
diff --git a/src/util/crypto_helper_esign.c b/src/util/crypto_helper_esign.c
index 5a9ad74e2..5b04d0ead 100644
--- a/src/util/crypto_helper_esign.c
+++ b/src/util/crypto_helper_esign.c
@@ -357,9 +357,9 @@ TALER_CRYPTO_helper_esign_sign_ (
     sr->header.size = htons (sizeof (buf));
     sr->header.type = htons (TALER_HELPER_EDDSA_MT_REQ_SIGN);
     sr->reserved = htonl (0);
-    memcpy (&sr->purpose,
-            purpose,
-            purpose_size);
+    GNUNET_memcpy (&sr->purpose,
+                   purpose,
+                   purpose_size);
     if (GNUNET_OK !=
         TALER_crypto_helper_send_all (esh->sock,
                                       buf,
diff --git a/src/util/crypto_helper_rsa.c b/src/util/crypto_helper_rsa.c
index efded50a1..4098a846b 100644
--- a/src/util/crypto_helper_rsa.c
+++ b/src/util/crypto_helper_rsa.c
@@ -417,9 +417,9 @@ TALER_CRYPTO_helper_rsa_sign (
     sr->header.type = htons (TALER_HELPER_RSA_MT_REQ_SIGN);
     sr->reserved = htonl (0);
     sr->h_rsa = *rsr->h_rsa;
-    memcpy (&sr[1],
-            rsr->msg,
-            rsr->msg_size);
+    GNUNET_memcpy (&sr[1],
+                   rsr->msg,
+                   rsr->msg_size);
     if (GNUNET_OK !=
         TALER_crypto_helper_send_all (dh->sock,
                                       buf,
@@ -655,9 +655,9 @@ TALER_CRYPTO_helper_rsa_batch_sign (
         sr->header.size = htons (sizeof (*sr) + rsr->msg_size);
         sr->reserved = htonl (0);
         sr->h_rsa = *rsr->h_rsa;
-        memcpy (&sr[1],
-                rsr->msg,
-                rsr->msg_size);
+        GNUNET_memcpy (&sr[1],
+                       rsr->msg,
+                       rsr->msg_size);
         wbuf += sizeof (*sr) + rsr->msg_size;
       }
       GNUNET_assert (wbuf == &obuf[mlen]);
diff --git a/src/util/exchange_signatures.c b/src/util/exchange_signatures.c
index d8bf716c7..6f8ebdaff 100644
--- a/src/util/exchange_signatures.c
+++ b/src/util/exchange_signatures.c
@@ -1177,10 +1177,10 @@ TALER_exchange_online_denomination_expired_sign (
   };
 
   /* strncpy would create a compiler warning */
-  memcpy (dua.operation,
-          op,
-          GNUNET_MIN (sizeof (dua.operation),
-                      strlen (op)));
+  GNUNET_memcpy (dua.operation,
+                 op,
+                 GNUNET_MIN (sizeof (dua.operation),
+                             strlen (op)));
   return scb (&dua.purpose,
               pub,
               sig);
@@ -1204,10 +1204,10 @@ TALER_exchange_online_denomination_expired_verify (
   };
 
   /* strncpy would create a compiler warning */
-  memcpy (dua.operation,
-          op,
-          GNUNET_MIN (sizeof (dua.operation),
-                      strlen (op)));
+  GNUNET_memcpy (dua.operation,
+                 op,
+                 GNUNET_MIN (sizeof (dua.operation),
+                             strlen (op)));
   return
     GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_EXCHANGE_AFFIRM_DENOM_EXPIRED,
                                 &dua,
diff --git a/src/util/iban.c b/src/util/iban.c
index efd8c4282..c2274d3cb 100644
--- a/src/util/iban.c
+++ b/src/util/iban.c
@@ -233,9 +233,9 @@ TALER_iban_validate (const char *iban)
     return GNUNET_strdup ("IBAN number too short to be valid");
   if (len > 34)
     return GNUNET_strdup ("IBAN number too long to be valid");
-  memcpy (cc, iban, 2);
-  memcpy (ibancpy, iban + 4, len - 4);
-  memcpy (ibancpy + len - 4, iban, 4);
+  GNUNET_memcpy (cc, iban, 2);
+  GNUNET_memcpy (ibancpy, iban + 4, len - 4);
+  GNUNET_memcpy (ibancpy + len - 4, iban, 4);
   ibancpy[len] = '\0';
   cc_entry.code = cc;
   cc_entry.english = NULL;
diff --git a/src/util/payto.c b/src/util/payto.c
index 81664b1df..9b0e83e85 100644
--- a/src/util/payto.c
+++ b/src/util/payto.c
@@ -267,9 +267,9 @@ TALER_payto_hash (const char *payto,
                       &sha512);
   GNUNET_static_assert (sizeof (sha512) > sizeof (*h_payto));
   /* truncate */
-  memcpy (h_payto,
-          &sha512,
-          sizeof (*h_payto));
+  GNUNET_memcpy (h_payto,
+                 &sha512,
+                 sizeof (*h_payto));
 }
 
 
diff --git a/src/util/taler-exchange-secmod-cs.c b/src/util/taler-exchange-secmod-cs.c
index 2cdf09adf..ed0eba15d 100644
--- a/src/util/taler-exchange-secmod-cs.c
+++ b/src/util/taler-exchange-secmod-cs.c
@@ -423,9 +423,9 @@ generate_response (struct DenominationKey *dk)
                                  &an->secm_sig);
   an->secm_pub = TES_smpub;
   p = (void *) &an[1];
-  memcpy (p,
-          denom->section,
-          nlen);
+  GNUNET_memcpy (p,
+                 denom->section,
+                 nlen);
   dk->an = an;
 }
 
@@ -1373,9 +1373,9 @@ cs_client_init (struct TES_Client *client)
          NULL != dk;
          dk = dk->next)
     {
-      memcpy (&buf[obs],
-              dk->an,
-              ntohs (dk->an->header.size));
+      GNUNET_memcpy (&buf[obs],
+                     dk->an,
+                     ntohs (dk->an->header.size));
       obs += ntohs (dk->an->header.size);
     }
   }
@@ -1472,18 +1472,18 @@ cs_update_client_keys (struct TES_Client *client)
           .h_cs = key->h_cs
         };
 
-        memcpy (&buf[obs],
-                &pn,
-                sizeof (pn));
+        GNUNET_memcpy (&buf[obs],
+                       &pn,
+                       sizeof (pn));
         GNUNET_assert (obs + sizeof (pn)
                        > obs);
         obs += sizeof (pn);
       }
       else
       {
-        memcpy (&buf[obs],
-                key->an,
-                ntohs (key->an->header.size));
+        GNUNET_memcpy (&buf[obs],
+                       key->an,
+                       ntohs (key->an->header.size));
         GNUNET_assert (obs + ntohs (key->an->header.size)
                        > obs);
         obs += ntohs (key->an->header.size);
diff --git a/src/util/taler-exchange-secmod-eddsa.c b/src/util/taler-exchange-secmod-eddsa.c
index e07e9a71d..3b78e71df 100644
--- a/src/util/taler-exchange-secmod-eddsa.c
+++ b/src/util/taler-exchange-secmod-eddsa.c
@@ -826,9 +826,9 @@ parse_key (const char *filename,
                 filename);
     return GNUNET_SYSERR;
   }
-  memcpy (&priv,
-          buf,
-          buf_size);
+  GNUNET_memcpy (&priv,
+                 buf,
+                 buf_size);
 
   {
     struct GNUNET_CRYPTO_EddsaPublicKey pub;
diff --git a/src/util/taler-exchange-secmod-rsa.c b/src/util/taler-exchange-secmod-rsa.c
index c651d78a8..414cb4acc 100644
--- a/src/util/taler-exchange-secmod-rsa.c
+++ b/src/util/taler-exchange-secmod-rsa.c
@@ -394,13 +394,13 @@ generate_response (struct DenominationKey *dk)
                                   &an->secm_sig);
   an->secm_pub = TES_smpub;
   p = (void *) &an[1];
-  memcpy (p,
-          buf,
-          buf_len);
+  GNUNET_memcpy (p,
+                 buf,
+                 buf_len);
   GNUNET_free (buf);
-  memcpy (p + buf_len,
-          denom->section,
-          nlen);
+  GNUNET_memcpy (p + buf_len,
+                 denom->section,
+                 nlen);
   dk->an = an;
 }
 
@@ -524,9 +524,9 @@ send_signature (struct TES_Client *client,
   sr = GNUNET_malloc (tsize);
   sr->header.size = htons (tsize);
   sr->header.type = htons (TALER_HELPER_RSA_MT_RES_SIGNATURE);
-  memcpy (&sr[1],
-          buf,
-          buf_size);
+  GNUNET_memcpy (&sr[1],
+                 buf,
+                 buf_size);
   GNUNET_free (buf);
   ret = TES_transmit (client->csock,
                       &sr->header);
@@ -1111,9 +1111,9 @@ rsa_client_init (struct TES_Client *client)
          NULL != dk;
          dk = dk->next)
     {
-      memcpy (&buf[obs],
-              dk->an,
-              ntohs (dk->an->header.size));
+      GNUNET_memcpy (&buf[obs],
+                     dk->an,
+                     ntohs (dk->an->header.size));
       GNUNET_assert (obs + ntohs (dk->an->header.size)
                      > obs);
       obs += ntohs (dk->an->header.size);
@@ -1212,18 +1212,18 @@ rsa_update_client_keys (struct TES_Client *client)
           .h_rsa = key->h_rsa
         };
 
-        memcpy (&buf[obs],
-                &pn,
-                sizeof (pn));
+        GNUNET_memcpy (&buf[obs],
+                       &pn,
+                       sizeof (pn));
         GNUNET_assert (obs + sizeof (pn)
                        > obs);
         obs += sizeof (pn);
       }
       else
       {
-        memcpy (&buf[obs],
-                key->an,
-                ntohs (key->an->header.size));
+        GNUNET_memcpy (&buf[obs],
+                       key->an,
+                       ntohs (key->an->header.size));
         GNUNET_assert (obs + ntohs (key->an->header.size)
                        > obs);
         obs += ntohs (key->an->header.size);
diff --git a/src/util/util.c b/src/util/util.c
index 82c5f7f39..da5727487 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -41,9 +41,9 @@ TALER_b2s (const void *buf,
                       &hc);
   tmp = GNUNET_STRINGS_data_to_string_alloc (&hc,
                                              sizeof (hc));
-  memcpy (ret,
-          tmp,
-          8);
+  GNUNET_memcpy (ret,
+                 tmp,
+                 8);
   GNUNET_free (tmp);
   ret[8] = '\0';
   return ret;