aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2022-02-26 16:05:28 +0100
committerMartin Schanzenbach <schanzen@gnunet.org>2022-02-26 16:05:28 +0100
commit52f952df6cd1e8347835573733ceff91c6c4f93e (patch)
tree0e701518b072393725f12b9e04a5ea0d1c9dc832 /src
parentb00d7788784a7e58a318e0f484886c2d6dbd1ca9 (diff)
downloadgnunet-52f952df6cd1e8347835573733ceff91c6c4f93e.tar.gz
gnunet-52f952df6cd1e8347835573733ceff91c6c4f93e.zip
-silence warnings
Diffstat (limited to 'src')
-rw-r--r--src/gns/gnunet-service-gns_resolver.c3
-rw-r--r--src/gnsrecord/gnsrecord_crypto.c7
-rw-r--r--src/gnsrecord/gnsrecord_misc.c1
-rw-r--r--src/revocation/revocation_api.c2
-rw-r--r--src/zonemaster/gnunet-service-zonemaster-monitor.c3
-rw-r--r--src/zonemaster/gnunet-service-zonemaster.c3
6 files changed, 2 insertions, 17 deletions
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 67ed48815..59b7d691c 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -1335,9 +1335,7 @@ static void
1335handle_gns_cname_result (struct GNS_ResolverHandle *rh, 1335handle_gns_cname_result (struct GNS_ResolverHandle *rh,
1336 const char *cname) 1336 const char *cname)
1337{ 1337{
1338 struct AuthorityChain *ac;
1339 int af; 1338 int af;
1340 struct GNUNET_IDENTITY_PublicKey zone;
1341 1339
1342 GNUNET_free (rh->name); 1340 GNUNET_free (rh->name);
1343 rh->name = GNUNET_strdup (cname); 1341 rh->name = GNUNET_strdup (cname);
@@ -1898,7 +1896,6 @@ handle_gns_resolution_result (void *cls,
1898{ 1896{
1899 struct GNS_ResolverHandle *rh = cls; 1897 struct GNS_ResolverHandle *rh = cls;
1900 char *cname; 1898 char *cname;
1901 int af;
1902 char scratch[UINT16_MAX]; 1899 char scratch[UINT16_MAX];
1903 size_t scratch_off; 1900 size_t scratch_off;
1904 size_t scratch_start; 1901 size_t scratch_start;
diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c
index 890ddb011..a1870feba 100644
--- a/src/gnsrecord/gnsrecord_crypto.c
+++ b/src/gnsrecord/gnsrecord_crypto.c
@@ -223,7 +223,6 @@ block_create_ecdsa (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
223 unsigned char ctr[GNUNET_CRYPTO_AES_KEY_LENGTH / 2]; 223 unsigned char ctr[GNUNET_CRYPTO_AES_KEY_LENGTH / 2];
224 unsigned char skey[GNUNET_CRYPTO_AES_KEY_LENGTH]; 224 unsigned char skey[GNUNET_CRYPTO_AES_KEY_LENGTH];
225 struct GNUNET_GNSRECORD_Data rdc[GNUNET_NZL (rd_count)]; 225 struct GNUNET_GNSRECORD_Data rdc[GNUNET_NZL (rd_count)];
226 uint32_t rd_count_nbo;
227 struct GNUNET_TIME_Absolute now; 226 struct GNUNET_TIME_Absolute now;
228 227
229 if (payload_len < 0) 228 if (payload_len < 0)
@@ -348,7 +347,6 @@ block_create_eddsa (const struct GNUNET_CRYPTO_EddsaPrivateKey *key,
348 unsigned char nonce[crypto_secretbox_NONCEBYTES]; 347 unsigned char nonce[crypto_secretbox_NONCEBYTES];
349 unsigned char skey[crypto_secretbox_KEYBYTES]; 348 unsigned char skey[crypto_secretbox_KEYBYTES];
350 struct GNUNET_GNSRECORD_Data rdc[GNUNET_NZL (rd_count)]; 349 struct GNUNET_GNSRECORD_Data rdc[GNUNET_NZL (rd_count)];
351 uint32_t rd_count_nbo;
352 struct GNUNET_TIME_Absolute now; 350 struct GNUNET_TIME_Absolute now;
353 351
354 if (payload_len < 0) 352 if (payload_len < 0)
@@ -438,7 +436,7 @@ GNUNET_GNSRECORD_block_calculate_size (const struct
438 unsigned int rd_count) 436 unsigned int rd_count)
439{ 437{
440 struct GNUNET_IDENTITY_PublicKey pkey; 438 struct GNUNET_IDENTITY_PublicKey pkey;
441 ssize_t res; 439 ssize_t res = -1;
442 440
443 GNUNET_IDENTITY_key_get_public (key, 441 GNUNET_IDENTITY_key_get_public (key,
444 &pkey); 442 &pkey);
@@ -453,7 +451,7 @@ GNUNET_GNSRECORD_block_calculate_size (const struct
453 default: 451 default:
454 GNUNET_assert (0); 452 GNUNET_assert (0);
455 } 453 }
456 return -1; 454 return res;
457 455
458} 456}
459 457
@@ -754,7 +752,6 @@ block_decrypt_eddsa (const struct GNUNET_GNSRECORD_Block *block,
754 GNUNET_GNSRECORD_RecordCallback proc, 752 GNUNET_GNSRECORD_RecordCallback proc,
755 void *proc_cls) 753 void *proc_cls)
756{ 754{
757 const struct GNUNET_GNSRECORD_EddsaBlock *edblock = &block->eddsa_block;
758 size_t payload_len = ntohl (block->size) - sizeof (struct 755 size_t payload_len = ntohl (block->size) - sizeof (struct
759 GNUNET_GNSRECORD_Block); 756 GNUNET_GNSRECORD_Block);
760 unsigned char nonce[crypto_secretbox_NONCEBYTES]; 757 unsigned char nonce[crypto_secretbox_NONCEBYTES];
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index 662c64713..9da5bd920 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -403,7 +403,6 @@ GNUNET_GNSRECORD_normalize_record_set (const char *label,
403 int include_private, 403 int include_private,
404 char **emsg) 404 char **emsg)
405{ 405{
406 struct GNUNET_TIME_Absolute expiry_tombstone;
407 struct GNUNET_TIME_Absolute now; 406 struct GNUNET_TIME_Absolute now;
408 struct GNUNET_TIME_Absolute minimum_expiration; 407 struct GNUNET_TIME_Absolute minimum_expiration;
409 int have_zone_delegation = GNUNET_NO; 408 int have_zone_delegation = GNUNET_NO;
diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c
index bc5dae021..9080ab862 100644
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -758,13 +758,11 @@ GNUNET_REVOCATION_proof_get_size (const struct GNUNET_REVOCATION_PowP *pow)
758 size_t size; 758 size_t size;
759 size_t ksize; 759 size_t ksize;
760 const struct GNUNET_IDENTITY_PublicKey *pk; 760 const struct GNUNET_IDENTITY_PublicKey *pk;
761 const struct GNUNET_IDENTITY_Signature *sig;
762 761
763 size = sizeof (struct GNUNET_REVOCATION_PowP); 762 size = sizeof (struct GNUNET_REVOCATION_PowP);
764 pk = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1]; 763 pk = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1];
765 ksize = GNUNET_IDENTITY_key_get_length (pk); 764 ksize = GNUNET_IDENTITY_key_get_length (pk);
766 size += ksize; 765 size += ksize;
767 sig = (struct GNUNET_IDENTITY_Signature *) ((char*) &pow[1] + ksize);
768 size += GNUNET_IDENTITY_signature_get_raw_length_by_type (pk->type); 766 size += GNUNET_IDENTITY_signature_get_raw_length_by_type (pk->type);
769 return size; 767 return size;
770} 768}
diff --git a/src/zonemaster/gnunet-service-zonemaster-monitor.c b/src/zonemaster/gnunet-service-zonemaster-monitor.c
index 6474228f4..4b72fe538 100644
--- a/src/zonemaster/gnunet-service-zonemaster-monitor.c
+++ b/src/zonemaster/gnunet-service-zonemaster-monitor.c
@@ -136,7 +136,6 @@ static void
136shutdown_task (void *cls) 136shutdown_task (void *cls)
137{ 137{
138 struct DhtPutActivity *ma; 138 struct DhtPutActivity *ma;
139 struct TombstoneActivity *ta;
140 139
141 (void) cls; 140 (void) cls;
142 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 141 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -283,9 +282,7 @@ handle_monitor_event (void *cls,
283 const struct GNUNET_GNSRECORD_Data *rd) 282 const struct GNUNET_GNSRECORD_Data *rd)
284{ 283{
285 struct GNUNET_GNSRECORD_Data rd_public[rd_count]; 284 struct GNUNET_GNSRECORD_Data rd_public[rd_count];
286 struct GNUNET_GNSRECORD_Data rd_fresh[rd_count + 1];
287 unsigned int rd_public_count; 285 unsigned int rd_public_count;
288 unsigned int rd_fresh_count;
289 struct DhtPutActivity *ma; 286 struct DhtPutActivity *ma;
290 struct GNUNET_TIME_Absolute expire; 287 struct GNUNET_TIME_Absolute expire;
291 char *emsg; 288 char *emsg;
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c
index c5dd3348d..c6b86bf71 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -246,7 +246,6 @@ static void
246shutdown_task (void *cls) 246shutdown_task (void *cls)
247{ 247{
248 struct DhtPutActivity *ma; 248 struct DhtPutActivity *ma;
249 struct TombstoneActivity *ta;
250 249
251 (void) cls; 250 (void) cls;
252 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 251 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -687,9 +686,7 @@ put_gns_record (void *cls,
687 const struct GNUNET_GNSRECORD_Data *rd) 686 const struct GNUNET_GNSRECORD_Data *rd)
688{ 687{
689 struct GNUNET_GNSRECORD_Data rd_public[rd_count]; 688 struct GNUNET_GNSRECORD_Data rd_public[rd_count];
690 struct GNUNET_GNSRECORD_Data rd_fresh[rd_count + 1];
691 unsigned int rd_public_count; 689 unsigned int rd_public_count;
692 unsigned int rd_fresh_count = 0;
693 struct DhtPutActivity *ma; 690 struct DhtPutActivity *ma;
694 struct GNUNET_TIME_Absolute expire; 691 struct GNUNET_TIME_Absolute expire;
695 char *emsg; 692 char *emsg;