diff options
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnel.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c index 50d1ab2e1..4ecb9f599 100644 --- a/src/cadet/gnunet-service-cadet_tunnel.c +++ b/src/cadet/gnunet-service-cadet_tunnel.c | |||
@@ -2905,12 +2905,13 @@ handle_kx_ax (struct CadetTunnel *t, const struct GNUNET_CADET_AX_KX *msg) | |||
2905 | return; | 2905 | return; |
2906 | } | 2906 | } |
2907 | 2907 | ||
2908 | if (GNUNET_CADET_AX_KX_FLAG_FORCE_REPLY == | 2908 | if (0 != (GNUNET_CADET_AX_KX_FLAG_FORCE_REPLY & ntohl (msg->flags))) |
2909 | (GNUNET_CADET_AX_KX_FLAG_FORCE_REPLY & ntohl (msg->flags))) | ||
2910 | GCT_send_ax_kx (t, GNUNET_NO); | 2909 | GCT_send_ax_kx (t, GNUNET_NO); |
2911 | 2910 | ||
2912 | if (0 == memcmp(&ax->DHRr, &msg->ratchet_key, sizeof(msg->ratchet_key))) | 2911 | if (0 == memcmp (&ax->DHRr, &msg->ratchet_key, sizeof(msg->ratchet_key))) |
2912 | { | ||
2913 | return; | 2913 | return; |
2914 | } | ||
2914 | 2915 | ||
2915 | LOG (GNUNET_ERROR_TYPE_INFO, " is Alice? %s\n", am_I_alice ? "YES" : "NO"); | 2916 | LOG (GNUNET_ERROR_TYPE_INFO, " is Alice? %s\n", am_I_alice ? "YES" : "NO"); |
2916 | 2917 | ||
@@ -4301,7 +4302,7 @@ GCT_send_ax_kx (struct CadetTunnel *t, int force_reply) | |||
4301 | GNUNET_CRYPTO_ecdhe_key_get_public (t->ax->DHRs, &msg.ratchet_key); | 4302 | GNUNET_CRYPTO_ecdhe_key_get_public (t->ax->DHRs, &msg.ratchet_key); |
4302 | 4303 | ||
4303 | t->ephm_h = send_kx (t, &msg.header); | 4304 | t->ephm_h = send_kx (t, &msg.header); |
4304 | if (CADET_TUNNEL_KEY_OK != t->estate) | 4305 | if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate) |
4305 | GCT_change_estate (t, CADET_TUNNEL_KEY_SENT); | 4306 | GCT_change_estate (t, CADET_TUNNEL_KEY_SENT); |
4306 | } | 4307 | } |
4307 | 4308 | ||