diff options
Diffstat (limited to 'src/gnsrecord')
-rw-r--r-- | src/gnsrecord/gnsrecord_crypto.c | 4 | ||||
-rw-r--r-- | src/gnsrecord/gnsrecord_serialization.c | 6 | ||||
-rw-r--r-- | src/gnsrecord/plugin_gnsrecord_dns.c | 18 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c index fcd373580..0fab97f06 100644 --- a/src/gnsrecord/gnsrecord_crypto.c +++ b/src/gnsrecord/gnsrecord_crypto.c | |||
@@ -116,7 +116,7 @@ GNUNET_GNSRECORD_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | |||
116 | } | 116 | } |
117 | /* serialize */ | 117 | /* serialize */ |
118 | rd_count_nbo = htonl (rd_count); | 118 | rd_count_nbo = htonl (rd_count); |
119 | memcpy (payload, &rd_count_nbo, sizeof (uint32_t)); | 119 | GNUNET_memcpy (payload, &rd_count_nbo, sizeof (uint32_t)); |
120 | GNUNET_assert (payload_len == | 120 | GNUNET_assert (payload_len == |
121 | GNUNET_GNSRECORD_records_serialize (rd_count, rdc, | 121 | GNUNET_GNSRECORD_records_serialize (rd_count, rdc, |
122 | payload_len, &payload[sizeof (uint32_t)])); | 122 | payload_len, &payload[sizeof (uint32_t)])); |
@@ -212,7 +212,7 @@ GNUNET_GNSRECORD_block_decrypt (const struct GNUNET_GNSRECORD_Block *block, | |||
212 | GNUNET_CRYPTO_symmetric_decrypt (&block[1], payload_len, | 212 | GNUNET_CRYPTO_symmetric_decrypt (&block[1], payload_len, |
213 | &skey, &iv, | 213 | &skey, &iv, |
214 | payload)); | 214 | payload)); |
215 | memcpy (&rd_count, | 215 | GNUNET_memcpy (&rd_count, |
216 | payload, | 216 | payload, |
217 | sizeof (uint32_t)); | 217 | sizeof (uint32_t)); |
218 | rd_count = ntohl (rd_count); | 218 | rd_count = ntohl (rd_count); |
diff --git a/src/gnsrecord/gnsrecord_serialization.c b/src/gnsrecord/gnsrecord_serialization.c index ccecf87aa..e2cabafd3 100644 --- a/src/gnsrecord/gnsrecord_serialization.c +++ b/src/gnsrecord/gnsrecord_serialization.c | |||
@@ -132,11 +132,11 @@ GNUNET_GNSRECORD_records_serialize (unsigned int rd_count, | |||
132 | rec.flags = htonl (rd[i].flags); | 132 | rec.flags = htonl (rd[i].flags); |
133 | if (off + sizeof (rec) > dest_size) | 133 | if (off + sizeof (rec) > dest_size) |
134 | return -1; | 134 | return -1; |
135 | memcpy (&dest[off], &rec, sizeof (rec)); | 135 | GNUNET_memcpy (&dest[off], &rec, sizeof (rec)); |
136 | off += sizeof (rec); | 136 | off += sizeof (rec); |
137 | if (off + rd[i].data_size > dest_size) | 137 | if (off + rd[i].data_size > dest_size) |
138 | return -1; | 138 | return -1; |
139 | memcpy (&dest[off], rd[i].data, rd[i].data_size); | 139 | GNUNET_memcpy (&dest[off], rd[i].data, rd[i].data_size); |
140 | off += rd[i].data_size; | 140 | off += rd[i].data_size; |
141 | } | 141 | } |
142 | return off; | 142 | return off; |
@@ -167,7 +167,7 @@ GNUNET_GNSRECORD_records_deserialize (size_t len, | |||
167 | { | 167 | { |
168 | if (off + sizeof (rec) > len) | 168 | if (off + sizeof (rec) > len) |
169 | return GNUNET_SYSERR; | 169 | return GNUNET_SYSERR; |
170 | memcpy (&rec, &src[off], sizeof (rec)); | 170 | GNUNET_memcpy (&rec, &src[off], sizeof (rec)); |
171 | dest[i].expiration_time = GNUNET_ntohll (rec.expiration_time); | 171 | dest[i].expiration_time = GNUNET_ntohll (rec.expiration_time); |
172 | dest[i].data_size = ntohl ((uint32_t) rec.data_size); | 172 | dest[i].data_size = ntohl ((uint32_t) rec.data_size); |
173 | dest[i].record_type = ntohl (rec.record_type); | 173 | dest[i].record_type = ntohl (rec.record_type); |
diff --git a/src/gnsrecord/plugin_gnsrecord_dns.c b/src/gnsrecord/plugin_gnsrecord_dns.c index aa64f0dd6..691936c16 100644 --- a/src/gnsrecord/plugin_gnsrecord_dns.c +++ b/src/gnsrecord/plugin_gnsrecord_dns.c | |||
@@ -361,7 +361,7 @@ dns_string_to_value (void *cls, | |||
361 | return GNUNET_SYSERR; | 361 | return GNUNET_SYSERR; |
362 | } | 362 | } |
363 | *data = GNUNET_new (struct in_addr); | 363 | *data = GNUNET_new (struct in_addr); |
364 | memcpy (*data, &value_a, sizeof (value_a)); | 364 | GNUNET_memcpy (*data, &value_a, sizeof (value_a)); |
365 | *data_size = sizeof (value_a); | 365 | *data_size = sizeof (value_a); |
366 | return GNUNET_OK; | 366 | return GNUNET_OK; |
367 | case GNUNET_DNSPARSER_TYPE_NS: | 367 | case GNUNET_DNSPARSER_TYPE_NS: |
@@ -383,7 +383,7 @@ dns_string_to_value (void *cls, | |||
383 | } | 383 | } |
384 | *data_size = off; | 384 | *data_size = off; |
385 | *data = GNUNET_malloc (off); | 385 | *data = GNUNET_malloc (off); |
386 | memcpy (*data, nsbuf, off); | 386 | GNUNET_memcpy (*data, nsbuf, off); |
387 | return GNUNET_OK; | 387 | return GNUNET_OK; |
388 | } | 388 | } |
389 | case GNUNET_DNSPARSER_TYPE_CNAME: | 389 | case GNUNET_DNSPARSER_TYPE_CNAME: |
@@ -405,7 +405,7 @@ dns_string_to_value (void *cls, | |||
405 | } | 405 | } |
406 | *data_size = off; | 406 | *data_size = off; |
407 | *data = GNUNET_malloc (off); | 407 | *data = GNUNET_malloc (off); |
408 | memcpy (*data, cnamebuf, off); | 408 | GNUNET_memcpy (*data, cnamebuf, off); |
409 | return GNUNET_OK; | 409 | return GNUNET_OK; |
410 | } | 410 | } |
411 | case GNUNET_DNSPARSER_TYPE_CERT: | 411 | case GNUNET_DNSPARSER_TYPE_CERT: |
@@ -491,7 +491,7 @@ dns_string_to_value (void *cls, | |||
491 | } | 491 | } |
492 | *data_size = off; | 492 | *data_size = off; |
493 | *data = GNUNET_malloc (off); | 493 | *data = GNUNET_malloc (off); |
494 | memcpy (*data, certbuf, off); | 494 | GNUNET_memcpy (*data, certbuf, off); |
495 | } | 495 | } |
496 | GNUNET_free (cert_data); | 496 | GNUNET_free (cert_data); |
497 | return GNUNET_OK; | 497 | return GNUNET_OK; |
@@ -546,7 +546,7 @@ dns_string_to_value (void *cls, | |||
546 | } | 546 | } |
547 | *data_size = off; | 547 | *data_size = off; |
548 | *data = GNUNET_malloc (off); | 548 | *data = GNUNET_malloc (off); |
549 | memcpy (*data, soabuf, off); | 549 | GNUNET_memcpy (*data, soabuf, off); |
550 | return GNUNET_OK; | 550 | return GNUNET_OK; |
551 | } | 551 | } |
552 | case GNUNET_DNSPARSER_TYPE_PTR: | 552 | case GNUNET_DNSPARSER_TYPE_PTR: |
@@ -568,7 +568,7 @@ dns_string_to_value (void *cls, | |||
568 | } | 568 | } |
569 | *data_size = off; | 569 | *data_size = off; |
570 | *data = GNUNET_malloc (off); | 570 | *data = GNUNET_malloc (off); |
571 | memcpy (*data, ptrbuf, off); | 571 | GNUNET_memcpy (*data, ptrbuf, off); |
572 | return GNUNET_OK; | 572 | return GNUNET_OK; |
573 | } | 573 | } |
574 | case GNUNET_DNSPARSER_TYPE_MX: | 574 | case GNUNET_DNSPARSER_TYPE_MX: |
@@ -606,7 +606,7 @@ dns_string_to_value (void *cls, | |||
606 | } | 606 | } |
607 | *data_size = off; | 607 | *data_size = off; |
608 | *data = GNUNET_malloc (off); | 608 | *data = GNUNET_malloc (off); |
609 | memcpy (*data, mxbuf, off); | 609 | GNUNET_memcpy (*data, mxbuf, off); |
610 | return GNUNET_OK; | 610 | return GNUNET_OK; |
611 | } | 611 | } |
612 | case GNUNET_DNSPARSER_TYPE_SRV: | 612 | case GNUNET_DNSPARSER_TYPE_SRV: |
@@ -649,7 +649,7 @@ dns_string_to_value (void *cls, | |||
649 | } | 649 | } |
650 | *data_size = off; | 650 | *data_size = off; |
651 | *data = GNUNET_malloc (off); | 651 | *data = GNUNET_malloc (off); |
652 | memcpy (*data, srvbuf, off); | 652 | GNUNET_memcpy (*data, srvbuf, off); |
653 | return GNUNET_OK; | 653 | return GNUNET_OK; |
654 | } | 654 | } |
655 | case GNUNET_DNSPARSER_TYPE_TXT: | 655 | case GNUNET_DNSPARSER_TYPE_TXT: |
@@ -666,7 +666,7 @@ dns_string_to_value (void *cls, | |||
666 | } | 666 | } |
667 | *data = GNUNET_new (struct in6_addr); | 667 | *data = GNUNET_new (struct in6_addr); |
668 | *data_size = sizeof (struct in6_addr); | 668 | *data_size = sizeof (struct in6_addr); |
669 | memcpy (*data, &value_aaaa, sizeof (value_aaaa)); | 669 | GNUNET_memcpy (*data, &value_aaaa, sizeof (value_aaaa)); |
670 | return GNUNET_OK; | 670 | return GNUNET_OK; |
671 | case GNUNET_DNSPARSER_TYPE_TLSA: | 671 | case GNUNET_DNSPARSER_TYPE_TLSA: |
672 | { | 672 | { |