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/cadet/gnunet-service-cadet_channel.c | 15 ++++------ src/cadet/gnunet-service-cadet_connection.c | 5 ++-- src/cadet/gnunet-service-cadet_core.c | 10 +++---- src/cadet/gnunet-service-cadet_hello.c | 5 ++-- src/cadet/gnunet-service-cadet_paths.c | 5 ++-- src/cadet/gnunet-service-cadet_tunnels.c | 45 ++++++++++++----------------- 6 files changed, 34 insertions(+), 51 deletions(-) (limited to 'src/cadet') diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index 1e898c1eb..bd95428be 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c @@ -679,9 +679,8 @@ GCCH_channel_local_new (struct CadetClient *owner, GCCH_hash_port (&ch->h_port, port, GCP_get_id (destination)); - if (0 == memcmp (&my_full_id, - GCP_get_id (destination), - sizeof (struct GNUNET_PeerIdentity))) + if (0 == GNUNET_memcmp (&my_full_id, + GCP_get_id (destination))) { struct OpenPort *op; @@ -1185,9 +1184,8 @@ GCCH_handle_channel_open_ack (struct CadetChannel *ch, GNUNET_break_op (0); return; } - if (0 != memcmp (&ch->port, - port, - sizeof (struct GNUNET_HashCode))) + if (0 != GNUNET_memcmp (&ch->port, + port)) { /* Other peer failed to provide the right port, refuse connection. */ @@ -1612,9 +1610,8 @@ handle_matching_ack (struct CadetChannel *ch, (NULL != cti) ) { GCC_ack_observed (cti); - if (0 == memcmp (cti, - &crm->connection_taken, - sizeof (struct GNUNET_CADET_ConnectionTunnelIdentifier))) + if (0 == GNUNET_memcmp (cti, + &crm->connection_taken)) { GCC_latency_observed (cti, GNUNET_TIME_absolute_get_duration (crm->first_transmission_time)); diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 4f1e5be8e..1f7e86d60 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c @@ -919,9 +919,8 @@ GCC_create_inbound (struct CadetPeer *destination, { int cmp; - cmp = memcmp (cid, - &cc->cid, - sizeof (*cid)); + cmp = GNUNET_memcmp (cid, + &cc->cid); if (0 == cmp) { /* Two peers picked the SAME random connection identifier at the diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c index 275785b57..879230d29 100644 --- a/src/cadet/gnunet-service-cadet_core.c +++ b/src/cadet/gnunet-service-cadet_core.c @@ -843,9 +843,8 @@ handle_connection_create (void *cls, } /* Initiator is at offset 0, find us */ for (off=1;offheader); diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c index a061c5685..bdc92668e 100644 --- a/src/cadet/gnunet-service-cadet_paths.c +++ b/src/cadet/gnunet-service-cadet_paths.c @@ -496,9 +496,8 @@ GCPP_try_path_from_dht (const struct GNUNET_PeerIdentity *get_path, ? &get_path[get_path_length - off - 1] : &put_path[get_path_length + put_path_length - off - 1]; /* Check that I am not in the path */ - if (0 == memcmp (&my_full_id, - pid, - sizeof (struct GNUNET_PeerIdentity))) + if (0 == GNUNET_memcmp (&my_full_id, + pid)) { skip = off + 1; continue; diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 57a6d1adf..a2a493ebd 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c @@ -1013,9 +1013,8 @@ try_old_ax_keys (struct CadetTunnelAxolotl *ax, 0, &key->HK, hmac); - if (0 == memcmp (hmac, - &src->hmac, - sizeof (*hmac))) + if (0 == GNUNET_memcmp (hmac, + &src->hmac)) { valid_HK = &key->HK; break; @@ -1047,9 +1046,8 @@ try_old_ax_keys (struct CadetTunnelAxolotl *ax, (N != key->Kn) ) key = key->next; if ( (NULL == key) || - (0 != memcmp (&key->HK, - valid_HK, - sizeof (*valid_HK))) ) + (0 != GNUNET_memcmp (&key->HK, + valid_HK)) ) return -1; /* Decrypt payload */ @@ -1181,9 +1179,8 @@ t_ax_decrypt_and_validate (struct CadetTunnelAxolotl *ax, sizeof (struct GNUNET_CADET_AxHeader) + esize, 0, &ax->HKr, &msg_hmac); - if (0 != memcmp (&msg_hmac, - &src->hmac, - sizeof (msg_hmac))) + if (0 != GNUNET_memcmp (&msg_hmac, + &src->hmac)) { static const char ctx[] = "axolotl ratchet"; struct GNUNET_CRYPTO_SymmetricSessionKey keys[3]; /* RKp, NHKp, CKp */ @@ -1197,9 +1194,8 @@ t_ax_decrypt_and_validate (struct CadetTunnelAxolotl *ax, 0, &ax->NHKr, &msg_hmac); - if (0 != memcmp (&msg_hmac, - &src->hmac, - sizeof (msg_hmac))) + if (0 != GNUNET_memcmp (&msg_hmac, + &src->hmac)) { /* Try the skipped keys, if that fails, we're out of luck. */ return try_old_ax_keys (ax, @@ -1528,9 +1524,8 @@ update_ax_by_kx (struct CadetTunnelAxolotl *ax, GNUNET_break_op (0); return GNUNET_SYSERR; } - if (0 == memcmp (&ax->DHRr, - ratchet_key, - sizeof (*ratchet_key))) + if (0 == GNUNET_memcmp (&ax->DHRr, + ratchet_key)) { GNUNET_STATISTICS_update (stats, "# Ratchet key already known", @@ -1872,9 +1867,8 @@ check_ee (const struct GNUNET_CRYPTO_EcdhePrivateKey *e1, GNUNET_CRYPTO_ecc_ecdh (e2, &p1, &hc2)); - GNUNET_break (0 == memcmp (&hc1, - &hc2, - sizeof (hc1))); + GNUNET_break (0 == GNUNET_memcmp (&hc1, + &hc2)); } @@ -1899,9 +1893,8 @@ check_ed (const struct GNUNET_CRYPTO_EcdhePrivateKey *e1, GNUNET_CRYPTO_eddsa_ecdh (e2, &p1, &hc2)); - GNUNET_break (0 == memcmp (&hc1, - &hc2, - sizeof (hc1))); + GNUNET_break (0 == GNUNET_memcmp (&hc1, + &hc2)); } @@ -1974,9 +1967,8 @@ GCT_handle_kx_auth (struct CadetTConnection *ct, GNUNET_CRYPTO_hash (&ax_tmp.RK, sizeof (ax_tmp.RK), &kx_auth); - if (0 != memcmp (&kx_auth, - &msg->auth, - sizeof (kx_auth))) + if (0 != GNUNET_memcmp (&kx_auth, + &msg->auth)) { /* This KX_AUTH is not using the latest KX/KX_AUTH data we transmitted to the sender, refuse it, try KX again. */ @@ -1992,9 +1984,8 @@ GCT_handle_kx_auth (struct CadetTConnection *ct, GNUNET_CRYPTO_ecdhe_key_get_public (&ax_tmp.kx_0, &ephemeral_key); - if (0 != memcmp (&ephemeral_key, - &msg->r_ephemeral_key_XXX, - sizeof (ephemeral_key))) + if (0 != GNUNET_memcmp (&ephemeral_key, + &msg->r_ephemeral_key_XXX)) { LOG (GNUNET_ERROR_TYPE_WARNING, "My ephemeral is %s!\n", -- cgit v1.2.3