always use GNUNET_memcpy

This commit is contained in:
Christian Grothoff 2023-05-10 01:01:37 +02:00
parent 3ebd0a70b2
commit c014acf3c4
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
28 changed files with 231 additions and 231 deletions

View File

@ -172,7 +172,7 @@ coin_history_index (const struct TALER_CoinSpendPublicKeyP *coin_pub)
{
uint32_t i;
memcpy (&i,
GNUNET_memcpy (&i,
coin_pub,
sizeof (i));
return i % MAX_COIN_HISTORIES;

View File

@ -674,10 +674,10 @@ hash_rc (const char *receiver_account,
size_t slen = strlen (receiver_account);
char buf[sizeof (struct TALER_WireTransferIdentifierRawP) + slen];
memcpy (buf,
GNUNET_memcpy (buf,
wtid,
sizeof (*wtid));
memcpy (&buf[sizeof (*wtid)],
GNUNET_memcpy (&buf[sizeof (*wtid)],
receiver_account,
slen);
GNUNET_CRYPTO_hash (buf,
@ -1504,7 +1504,7 @@ history_debit_cb (void *cls,
roi->details.execution_date = dd->execution_date;
roi->details.wtid = dd->wtid;
roi->details.credit_account_uri = (const char *) &roi[1];
memcpy (&roi[1],
GNUNET_memcpy (&roi[1],
dd->credit_account_uri,
slen);
if (GNUNET_OK !=
@ -1678,7 +1678,7 @@ reserve_in_cb (void *cls,
rii->details.execution_date = execution_date;
rii->details.reserve_pub = *reserve_pub;
rii->details.debit_account_uri = (const char *) &rii[1];
memcpy (&rii[1],
GNUNET_memcpy (&rii[1],
sender_account_details,
slen);
GNUNET_CRYPTO_hash (&wire_reference,

View File

@ -99,10 +99,10 @@ TALER_BANK_prepare_transfer (
wp->account_len = htonl ((uint32_t) d_len);
wp->exchange_url_len = htonl ((uint32_t) u_len);
end = (char *) &wp[1];
memcpy (end,
GNUNET_memcpy (end,
destination_account_payto_uri,
d_len);
memcpy (end + d_len,
GNUNET_memcpy (end + d_len,
exchange_base_url,
u_len);
*buf = (char *) wp;

View File

@ -1389,7 +1389,7 @@ make_transfer (
if (NULL != timestamp)
*timestamp = t->date;
t->type = T_DEBIT;
memcpy (t->subject.debit.exchange_base_url,
GNUNET_memcpy (t->subject.debit.exchange_base_url,
exchange_base_url,
url_len);
t->subject.debit.wtid = *subject;

View File

@ -312,7 +312,7 @@ expired_reserve_cb (void *cls,
memset (&wtid,
0,
sizeof (wtid));
memcpy (&wtid,
GNUNET_memcpy (&wtid,
reserve_pub,
GNUNET_MIN (sizeof (wtid),
sizeof (*reserve_pub)));

View File

@ -932,7 +932,7 @@ proceed_with_handler (struct TEH_RequestContext *rc,
/* Parse command-line arguments */
/* make a copy of 'url' because 'strtok_r()' will modify */
memcpy (d,
GNUNET_memcpy (d,
url,
ulen);
i = 0;

View File

@ -563,7 +563,7 @@ wire_prepare_cb (void *cls,
}
wpd = GNUNET_malloc (sizeof (struct WirePrepareData)
+ buf_size);
memcpy (&wpd[1],
GNUNET_memcpy (&wpd[1],
buf,
buf_size);
wpd->buf_size = buf_size;

View File

@ -169,7 +169,7 @@ bem_insert (struct GNUNET_PQ_Context *conn,
GNUNET_CRYPTO_hash (&b,
sizeof (b),
&hc);
memcpy (&ihc,
GNUNET_memcpy (&ihc,
&hc,
sizeof (ihc));
{
@ -265,7 +265,7 @@ bem_select (struct GNUNET_PQ_Context *conn,
GNUNET_CRYPTO_hash (&b,
sizeof (b),
&hc);
memcpy (&ihc,
GNUNET_memcpy (&ihc,
&hc,
sizeof (ihc));
{

View File

@ -1118,7 +1118,7 @@ lrbt_cb_table_refresh_transfer_keys (void *cls,
ctx->error = true;
return;
}
memcpy (&td.details.refresh_transfer_keys.tprivs[0],
GNUNET_memcpy (&td.details.refresh_transfer_keys.tprivs[0],
tpriv,
tpriv_size);
ctx->cb (ctx->cb_cls,

View File

@ -990,7 +990,7 @@ proceed_with_handler (struct TEKT_RequestContext *rc,
/* Parse command-line arguments */
/* make a copy of 'url' because 'strtok_r()' will modify */
memcpy (d,
GNUNET_memcpy (d,
url,
ulen);
i = 0;

View File

@ -202,19 +202,19 @@ qconv_denom_pub (void *cls,
}
len = tlen + sizeof (be);
buf = GNUNET_malloc (len);
memcpy (buf,
GNUNET_memcpy (buf,
be,
sizeof (be));
switch (denom_pub->cipher)
{
case TALER_DENOMINATION_RSA:
memcpy (&buf[sizeof (be)],
GNUNET_memcpy (&buf[sizeof (be)],
tbuf,
tlen);
GNUNET_free (tbuf);
break;
case TALER_DENOMINATION_CS:
memcpy (&buf[sizeof (be)],
GNUNET_memcpy (&buf[sizeof (be)],
&denom_pub->details.cs_public_key,
tlen);
break;
@ -298,19 +298,19 @@ qconv_denom_sig (void *cls,
}
len = tlen + sizeof (be);
buf = GNUNET_malloc (len);
memcpy (buf,
GNUNET_memcpy (buf,
&be,
sizeof (be));
switch (denom_sig->cipher)
{
case TALER_DENOMINATION_RSA:
memcpy (&buf[sizeof (be)],
GNUNET_memcpy (&buf[sizeof (be)],
tbuf,
tlen);
GNUNET_free (tbuf);
break;
case TALER_DENOMINATION_CS:
memcpy (&buf[sizeof (be)],
GNUNET_memcpy (&buf[sizeof (be)],
&denom_sig->details.cs_signature,
tlen);
break;
@ -394,19 +394,19 @@ qconv_blinded_denom_sig (void *cls,
}
len = tlen + sizeof (be);
buf = GNUNET_malloc (len);
memcpy (buf,
GNUNET_memcpy (buf,
&be,
sizeof (be));
switch (denom_sig->cipher)
{
case TALER_DENOMINATION_RSA:
memcpy (&buf[sizeof (be)],
GNUNET_memcpy (&buf[sizeof (be)],
tbuf,
tlen);
GNUNET_free (tbuf);
break;
case TALER_DENOMINATION_CS:
memcpy (&buf[sizeof (be)],
GNUNET_memcpy (&buf[sizeof (be)],
&denom_sig->details.blinded_cs_answer,
tlen);
break;
@ -487,18 +487,18 @@ qconv_blinded_planchet (void *cls,
}
len = tlen + sizeof (be);
buf = GNUNET_malloc (len);
memcpy (buf,
GNUNET_memcpy (buf,
&be,
sizeof (be));
switch (bp->cipher)
{
case TALER_DENOMINATION_RSA:
memcpy (&buf[sizeof (be)],
GNUNET_memcpy (&buf[sizeof (be)],
bp->details.rsa_blinded_planchet.blinded_msg,
tlen);
break;
case TALER_DENOMINATION_CS:
memcpy (&buf[sizeof (be)],
GNUNET_memcpy (&buf[sizeof (be)],
&bp->details.cs_blinded_planchet,
tlen);
break;
@ -578,7 +578,7 @@ qconv_exchange_withdraw_values (void *cls,
}
len = tlen + sizeof (be);
buf = GNUNET_malloc (len);
memcpy (buf,
GNUNET_memcpy (buf,
&be,
sizeof (be));
switch (alg_values->cipher)
@ -586,7 +586,7 @@ qconv_exchange_withdraw_values (void *cls,
case TALER_DENOMINATION_RSA:
break;
case TALER_DENOMINATION_CS:
memcpy (&buf[sizeof (be)],
GNUNET_memcpy (&buf[sizeof (be)],
&alg_values->details.cs_values,
tlen);
break;

View File

@ -113,7 +113,7 @@ extract_amount_nbo_helper (PGresult *result,
}
len = GNUNET_MIN (TALER_CURRENCY_LEN - 1,
strlen (currency));
memcpy (r_amount_nbo->currency,
GNUNET_memcpy (r_amount_nbo->currency,
currency,
len);
return GNUNET_OK;
@ -420,7 +420,7 @@ extract_denom_pub (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (be,
GNUNET_memcpy (be,
res,
sizeof (be));
res += sizeof (be);
@ -445,7 +445,7 @@ extract_denom_pub (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (&pk->details.cs_public_key,
GNUNET_memcpy (&pk->details.cs_public_key,
res,
len);
return GNUNET_OK;
@ -543,7 +543,7 @@ extract_denom_sig (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (&be,
GNUNET_memcpy (&be,
res,
sizeof (be));
if (0x00 != ntohl (be[1]))
@ -572,7 +572,7 @@ extract_denom_sig (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (&sig->details.cs_signature,
GNUNET_memcpy (&sig->details.cs_signature,
res,
len);
return GNUNET_OK;
@ -670,7 +670,7 @@ extract_blinded_denom_sig (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (&be,
GNUNET_memcpy (&be,
res,
sizeof (be));
if (0x01 != ntohl (be[1])) /* magic marker: blinded */
@ -699,7 +699,7 @@ extract_blinded_denom_sig (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (&sig->details.blinded_cs_answer,
GNUNET_memcpy (&sig->details.blinded_cs_answer,
res,
len);
return GNUNET_OK;
@ -798,7 +798,7 @@ extract_blinded_planchet (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (&be,
GNUNET_memcpy (&be,
res,
sizeof (be));
if (0x0100 != ntohl (be[1])) /* magic marker: blinded */
@ -824,7 +824,7 @@ extract_blinded_planchet (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (&bp->details.cs_blinded_planchet,
GNUNET_memcpy (&bp->details.cs_blinded_planchet,
res,
len);
return GNUNET_OK;
@ -923,7 +923,7 @@ extract_exchange_withdraw_values (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (&be,
GNUNET_memcpy (&be,
res,
sizeof (be));
if (0x010000 != ntohl (be[1])) /* magic marker: EWV */
@ -949,7 +949,7 @@ extract_exchange_withdraw_values (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
memcpy (&alg_values->details.cs_values,
GNUNET_memcpy (&alg_values->details.cs_values,
res,
len);
return GNUNET_OK;

View File

@ -297,7 +297,7 @@ static int process(const char *template, struct iwrap *iwrap, FILE *file, const
#endif
if (len > MUSTACH_MAX_LENGTH)
return MUSTACH_ERROR_TAG_TOO_LONG;
memcpy(name, beg, len);
GNUNET_memcpy(name, beg, len);
name[len] = 0;
break;
}
@ -317,7 +317,7 @@ static int process(const char *template, struct iwrap *iwrap, FILE *file, const
return MUSTACH_ERROR_BAD_SEPARATORS;
oplen = l;
tmp = alloca(oplen + 1);
memcpy(tmp, beg, oplen);
GNUNET_memcpy(tmp, beg, oplen);
tmp[oplen] = 0;
opstr = tmp;
while (l < len && isspace(beg[l])) l++;
@ -325,7 +325,7 @@ static int process(const char *template, struct iwrap *iwrap, FILE *file, const
return MUSTACH_ERROR_BAD_SEPARATORS;
cllen = len - l;
tmp = alloca(cllen + 1);
memcpy(tmp, beg + l, cllen);
GNUNET_memcpy(tmp, beg + l, cllen);
tmp[cllen] = 0;
clstr = tmp;
break;

View File

@ -85,7 +85,7 @@ run (void *cls,
memset (&wtid,
0x5a,
sizeof (wtid));
memcpy (&exchange_auth_twisted,
GNUNET_memcpy (&exchange_auth_twisted,
&bc.exchange_auth,
sizeof (struct TALER_BANK_AuthenticationData));
if (with_fakebank)

View File

@ -150,7 +150,7 @@ TALER_TESTING_cmd_batch (const char *label,
bs->batch = GNUNET_new_array (i + 1,
struct TALER_TESTING_Command);
memcpy (bs->batch,
GNUNET_memcpy (bs->batch,
batch,
sizeof (struct TALER_TESTING_Command) * i);
{

View File

@ -452,7 +452,7 @@ TALER_TESTING_run2 (struct TALER_TESTING_Interpreter *is,
is->commands = GNUNET_malloc_large ( (i + 1)
* sizeof (struct TALER_TESTING_Command));
GNUNET_assert (NULL != is->commands);
memcpy (is->commands,
GNUNET_memcpy (is->commands,
commands,
sizeof (struct TALER_TESTING_Command) * i);
is->timeout_task = GNUNET_SCHEDULER_add_delayed (

View File

@ -72,7 +72,7 @@ TALER_string_to_amount (const char *str,
}
GNUNET_assert (TALER_CURRENCY_LEN > (colon - str));
memcpy (amount->currency,
GNUNET_memcpy (amount->currency,
str,
colon - str);
/* 0-terminate *and* normalize buffer by setting everything to '\0' */
@ -193,7 +193,7 @@ 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,
GNUNET_memcpy (res->currency,
d->currency,
TALER_CURRENCY_LEN);
}
@ -205,7 +205,7 @@ TALER_amount_ntoh (struct TALER_Amount *res,
{
res->value = GNUNET_ntohll (dn->value);
res->fraction = ntohl (dn->fraction);
memcpy (res->currency,
GNUNET_memcpy (res->currency,
dn->currency,
TALER_CURRENCY_LEN);
GNUNET_assert (GNUNET_YES ==
@ -225,7 +225,7 @@ TALER_amount_set_zero (const char *cur,
memset (amount,
0,
sizeof (struct TALER_Amount));
memcpy (amount->currency,
GNUNET_memcpy (amount->currency,
cur,
slen);
return GNUNET_OK;
@ -680,7 +680,7 @@ TALER_amount_multiply (struct TALER_Amount *result,
if (GNUNET_SYSERR ==
TALER_amount_normalize (&in))
return TALER_AAR_INVALID_NORMALIZATION_FAILED;
memcpy (result->currency,
GNUNET_memcpy (result->currency,
amount->currency,
TALER_CURRENCY_LEN);
if ( (0 == factor) ||

View File

@ -90,7 +90,7 @@ compute_totp (struct GNUNET_TIME_Timestamp ts,
mc = gcry_md_read (md,
GCRY_MD_SHA1);
GNUNET_assert (NULL != mc);
memcpy (hmac,
GNUNET_memcpy (hmac,
mc,
sizeof (hmac));
gcry_md_close (md);

View File

@ -131,7 +131,7 @@ blob_encrypt (const struct NonceP *nonce,
+ data_size;
*res_size = ciphertext_size;
*res = GNUNET_malloc (ciphertext_size);
memcpy (*res,
GNUNET_memcpy (*res,
nonce,
crypto_secretbox_NONCEBYTES);
GNUNET_assert (0 ==
@ -274,7 +274,7 @@ 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],
GNUNET_memcpy (&hdr[1],
xbuf,
cbuf_size);
GNUNET_free (xbuf);
@ -423,7 +423,7 @@ 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],
GNUNET_memcpy (&hdr[1],
xbuf,
cbuf_size);
GNUNET_free (xbuf);
@ -441,10 +441,10 @@ TALER_CRYPTO_contract_encrypt_for_deposit (
GNUNET_free (hdr);
/* prepend purse_pub */
*econtract = GNUNET_malloc (xecontract_size + sizeof (*purse_pub));
memcpy (*econtract,
GNUNET_memcpy (*econtract,
purse_pub,
sizeof (*purse_pub));
memcpy (sizeof (*purse_pub) + *econtract,
GNUNET_memcpy (sizeof (*purse_pub) + *econtract,
xecontract,
xecontract_size);
*econtract_size = xecontract_size + sizeof (*purse_pub);
@ -573,7 +573,7 @@ TALER_CRYPTO_kyc_attributes_encrypt (
cbuf_size = compressBound (clen);
xbuf = GNUNET_malloc (cbuf_size + sizeof (uint32_t));
belen = htonl ((uint32_t) clen);
memcpy (xbuf,
GNUNET_memcpy (xbuf,
&belen,
sizeof (belen));
ret = compress (xbuf + 4,
@ -623,7 +623,7 @@ TALER_CRYPTO_kyc_attributes_decrypt (
GNUNET_break_op (0);
return NULL;
}
memcpy (&belen,
GNUNET_memcpy (&belen,
xhdr,
sizeof (belen));
clen = ntohl (belen);

View File

@ -357,7 +357,7 @@ 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,
GNUNET_memcpy (&sr->purpose,
purpose,
purpose_size);
if (GNUNET_OK !=

View File

@ -417,7 +417,7 @@ 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],
GNUNET_memcpy (&sr[1],
rsr->msg,
rsr->msg_size);
if (GNUNET_OK !=
@ -655,7 +655,7 @@ 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],
GNUNET_memcpy (&sr[1],
rsr->msg,
rsr->msg_size);
wbuf += sizeof (*sr) + rsr->msg_size;

View File

@ -1177,7 +1177,7 @@ TALER_exchange_online_denomination_expired_sign (
};
/* strncpy would create a compiler warning */
memcpy (dua.operation,
GNUNET_memcpy (dua.operation,
op,
GNUNET_MIN (sizeof (dua.operation),
strlen (op)));
@ -1204,7 +1204,7 @@ TALER_exchange_online_denomination_expired_verify (
};
/* strncpy would create a compiler warning */
memcpy (dua.operation,
GNUNET_memcpy (dua.operation,
op,
GNUNET_MIN (sizeof (dua.operation),
strlen (op)));

View File

@ -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;

View File

@ -267,7 +267,7 @@ TALER_payto_hash (const char *payto,
&sha512);
GNUNET_static_assert (sizeof (sha512) > sizeof (*h_payto));
/* truncate */
memcpy (h_payto,
GNUNET_memcpy (h_payto,
&sha512,
sizeof (*h_payto));
}

View File

@ -423,7 +423,7 @@ generate_response (struct DenominationKey *dk)
&an->secm_sig);
an->secm_pub = TES_smpub;
p = (void *) &an[1];
memcpy (p,
GNUNET_memcpy (p,
denom->section,
nlen);
dk->an = an;
@ -1373,7 +1373,7 @@ cs_client_init (struct TES_Client *client)
NULL != dk;
dk = dk->next)
{
memcpy (&buf[obs],
GNUNET_memcpy (&buf[obs],
dk->an,
ntohs (dk->an->header.size));
obs += ntohs (dk->an->header.size);
@ -1472,7 +1472,7 @@ cs_update_client_keys (struct TES_Client *client)
.h_cs = key->h_cs
};
memcpy (&buf[obs],
GNUNET_memcpy (&buf[obs],
&pn,
sizeof (pn));
GNUNET_assert (obs + sizeof (pn)
@ -1481,7 +1481,7 @@ cs_update_client_keys (struct TES_Client *client)
}
else
{
memcpy (&buf[obs],
GNUNET_memcpy (&buf[obs],
key->an,
ntohs (key->an->header.size));
GNUNET_assert (obs + ntohs (key->an->header.size)

View File

@ -826,7 +826,7 @@ parse_key (const char *filename,
filename);
return GNUNET_SYSERR;
}
memcpy (&priv,
GNUNET_memcpy (&priv,
buf,
buf_size);

View File

@ -394,11 +394,11 @@ generate_response (struct DenominationKey *dk)
&an->secm_sig);
an->secm_pub = TES_smpub;
p = (void *) &an[1];
memcpy (p,
GNUNET_memcpy (p,
buf,
buf_len);
GNUNET_free (buf);
memcpy (p + buf_len,
GNUNET_memcpy (p + buf_len,
denom->section,
nlen);
dk->an = an;
@ -524,7 +524,7 @@ 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],
GNUNET_memcpy (&sr[1],
buf,
buf_size);
GNUNET_free (buf);
@ -1111,7 +1111,7 @@ rsa_client_init (struct TES_Client *client)
NULL != dk;
dk = dk->next)
{
memcpy (&buf[obs],
GNUNET_memcpy (&buf[obs],
dk->an,
ntohs (dk->an->header.size));
GNUNET_assert (obs + ntohs (dk->an->header.size)
@ -1212,7 +1212,7 @@ rsa_update_client_keys (struct TES_Client *client)
.h_rsa = key->h_rsa
};
memcpy (&buf[obs],
GNUNET_memcpy (&buf[obs],
&pn,
sizeof (pn));
GNUNET_assert (obs + sizeof (pn)
@ -1221,7 +1221,7 @@ rsa_update_client_keys (struct TES_Client *client)
}
else
{
memcpy (&buf[obs],
GNUNET_memcpy (&buf[obs],
key->an,
ntohs (key->an->header.size));
GNUNET_assert (obs + ntohs (key->an->header.size)

View File

@ -41,7 +41,7 @@ TALER_b2s (const void *buf,
&hc);
tmp = GNUNET_STRINGS_data_to_string_alloc (&hc,
sizeof (hc));
memcpy (ret,
GNUNET_memcpy (ret,
tmp,
8);
GNUNET_free (tmp);