4 files changed, 12 insertions, 12 deletions

diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c
index 9185aac64..b868719c3 100644
--- a/src/identity/gnunet-service-identity.c
+++ b/src/identity/gnunet-service-identity.c
@@ -190,7 +190,7 @@ send_result_code (struct GNUNET_SERVER_Client *client,
   rcm->header.size = htons (sizeof (struct GNUNET_IDENTITY_ResultCodeMessage) + elen);
   rcm->result_code = htonl (result_code);
   if (0 < elen)
-    memcpy (&rcm[1], emsg, elen);
+    GNUNET_memcpy (&rcm[1], emsg, elen);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending result %d (%s) to client\n",
               (int) result_code,
@@ -219,7 +219,7 @@ create_update_message (struct Ego *ego)
   um->name_len = htons (name_len);
   um->end_of_list = htons (GNUNET_NO);
   um->private_key = *ego->pk;
-  memcpy (&um[1], ego->identifier, name_len);
+  GNUNET_memcpy (&um[1], ego->identifier, name_len);
   return um;
 }
 
@@ -245,7 +245,7 @@ create_set_default_message (struct Ego *ego,
   sdm->name_len = htons (name_len);
   sdm->reserved = htons (0);
   sdm->private_key = *ego->pk;
-  memcpy (&sdm[1], servicename, name_len);
+  GNUNET_memcpy (&sdm[1], servicename, name_len);
   return sdm;
 }
 
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 215433704..4c8a35dc2 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -688,7 +688,7 @@ GNUNET_IDENTITY_get (struct GNUNET_IDENTITY_Handle *h,
                              GNUNET_MESSAGE_TYPE_IDENTITY_GET_DEFAULT);
   gdm->name_len = htons (slen);
   gdm->reserved = htons (0);
-  memcpy (&gdm[1],
+  GNUNET_memcpy (&gdm[1],
           service_name,
           slen);
   GNUNET_MQ_send (h->mq,
@@ -740,7 +740,7 @@ GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *h,
   sdm->name_len = htons (slen);
   sdm->reserved = htons (0);
   sdm->private_key = *ego->pk;
-  memcpy (&sdm[1],
+  GNUNET_memcpy (&sdm[1],
           service_name,
           slen);
   GNUNET_MQ_send (h->mq,
@@ -793,7 +793,7 @@ GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *h,
   pk = GNUNET_CRYPTO_ecdsa_key_create ();
   crm->private_key = *pk;
   GNUNET_free (pk);
-  memcpy (&crm[1],
+  GNUNET_memcpy (&crm[1],
           name,
           slen);
   GNUNET_MQ_send (h->mq,
@@ -850,10 +850,10 @@ GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *h,
   grm->old_name_len = htons (slen_old);
   grm->new_name_len = htons (slen_new);
   dst = (char *) &grm[1];
-  memcpy (dst,
+  GNUNET_memcpy (dst,
           old_name,
           slen_old);
-  memcpy (&dst[slen_old],
+  GNUNET_memcpy (&dst[slen_old],
           new_name,
           slen_new);
   GNUNET_MQ_send (h->mq,
@@ -902,7 +902,7 @@ GNUNET_IDENTITY_delete (struct GNUNET_IDENTITY_Handle *h,
                              GNUNET_MESSAGE_TYPE_IDENTITY_DELETE);
   gdm->name_len = htons (slen);
   gdm->reserved = htons (0);
-  memcpy (&gdm[1],
+  GNUNET_memcpy (&gdm[1],
           name,
           slen);
   GNUNET_MQ_send (h->mq,
diff --git a/src/identity/plugin_gnsrecord_identity.c b/src/identity/plugin_gnsrecord_identity.c
index 3fd47bd02..c26c04074 100644
--- a/src/identity/plugin_gnsrecord_identity.c
+++ b/src/identity/plugin_gnsrecord_identity.c
@@ -146,7 +146,7 @@ string_to_value (void *cls,
                                      write_ptr,
                                      sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
       write_ptr += sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
-      memcpy (write_ptr, str, strlen (str) + 1); //with 0-Terminator
+      GNUNET_memcpy (write_ptr, str, strlen (str) + 1); //with 0-Terminator
       GNUNET_free (tmp_tok);
       return GNUNET_OK;
 
diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index aa8a5ca60..e64b2685a 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -517,7 +517,7 @@ ego_create_cont (struct GNUNET_REST_RequestHandle *con,
     return;
   }
   term_data[handle->data_size] = '\0';
-  memcpy (term_data, handle->data, handle->data_size);
+  GNUNET_memcpy (term_data, handle->data, handle->data_size);
   data_js = json_loads (term_data,
                         JSON_DECODE_ANY,
                         &err);
@@ -646,7 +646,7 @@ ego_edit_cont (struct GNUNET_REST_RequestHandle *con,
   }
 
   term_data[handle->data_size] = '\0';
-  memcpy (term_data, handle->data, handle->data_size);
+  GNUNET_memcpy (term_data, handle->data, handle->data_size);
   data_js = json_loads (term_data,
                         JSON_DECODE_ANY,
                         &err);