From f5f5a9f680df2cebe6435ec87650cb3cb6e3ef6e Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Fri, 26 Apr 2019 05:56:54 +0200 Subject: memcmp() -> GNUNET_memcmp(), first take --- src/secretsharing/gnunet-secretsharing-profiler.c | 4 ++-- src/secretsharing/gnunet-service-secretsharing.c | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/secretsharing') diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c b/src/secretsharing/gnunet-secretsharing-profiler.c index f4cc0f248..85abe154b 100644 --- a/src/secretsharing/gnunet-secretsharing-profiler.c +++ b/src/secretsharing/gnunet-secretsharing-profiler.c @@ -228,7 +228,7 @@ static void decrypt_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "decrypt failed for peer %u\n", n); return; } - else if (0 == memcmp (&reference_plaintext, plaintext, sizeof (struct GNUNET_SECRETSHARING_Plaintext))) + else if (0 == GNUNET_memcmp (&reference_plaintext, plaintext)) GNUNET_log (GNUNET_ERROR_TYPE_INFO, "decrypt got correct result for peer %u\n", n); else GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "decrypt got wrong result for peer %u\n", n); @@ -331,7 +331,7 @@ secret_ready_cb (void *cls, { common_pubkey = *public_key; } - else if (0 != memcmp (public_key, &common_pubkey, sizeof (struct GNUNET_SECRETSHARING_PublicKey))) + else if (0 != GNUNET_memcmp (public_key, &common_pubkey)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "generated public keys do not match\n"); GNUNET_SCHEDULER_shutdown (); diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c index 1ffde0436..d136c5a68 100644 --- a/src/secretsharing/gnunet-service-secretsharing.c +++ b/src/secretsharing/gnunet-service-secretsharing.c @@ -330,7 +330,7 @@ get_keygen_peer_info (const struct KeygenSession *ks, { unsigned int i; for (i = 0; i < ks->num_peers; i++) - if (0 == memcmp (peer, &ks->info[i].peer, sizeof (struct GNUNET_PeerIdentity))) + if (0 == GNUNET_memcmp (peer, &ks->info[i].peer)) return &ks->info[i]; return NULL; } @@ -349,7 +349,7 @@ get_decrypt_peer_info (const struct DecryptSession *ds, { unsigned int i; for (i = 0; i < ds->share->num_peers; i++) - if (0 == memcmp (peer, &ds->info[i].peer, sizeof (struct GNUNET_PeerIdentity))) + if (0 == GNUNET_memcmp (peer, &ds->info[i].peer)) return &ds->info[i]; return NULL; } @@ -411,9 +411,8 @@ peer_find (const struct GNUNET_PeerIdentity *haystack, unsigned int n, unsigned int i; for (i = 0; i < n; i++) - if (0 == memcmp (&haystack[i], - needle, - sizeof (struct GNUNET_PeerIdentity))) + if (0 == GNUNET_memcmp (&haystack[i], + needle)) return i; return -1; } @@ -827,7 +826,7 @@ keygen_round2_conclude (void *cls) GNUNET_SECRETSHARING_ELGAMAL_BITS / 8, ks->info[i].sigma); share->original_indices[i] = j; - if (0 == memcmp (&share->peers[i], &my_peer, sizeof (struct GNUNET_PeerIdentity))) + if (0 == GNUNET_memcmp (&share->peers[i], &my_peer)) share->my_peer = j; j += 1; } @@ -1897,7 +1896,7 @@ decrypt_new_element (void *cls, return; } - if (0 != memcmp (&d->ciphertext, &session->ciphertext, sizeof (struct GNUNET_SECRETSHARING_Ciphertext))) + if (0 != GNUNET_memcmp (&d->ciphertext, &session->ciphertext)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "P%u: got decrypt element with non-matching ciphertext from P%u\n", (unsigned int) session->share->my_peer, (unsigned int) (info - session->info)); -- cgit v1.2.3