/*
This file is part of GNUnet.
- Copyright (C) 2013 GNUnet e.V.
+ Copyright (C) 2013, 2017 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-
+/**
+ * @file cadet/gnunet-service-cadet_tunnel.c
+ * @brief logical links between CADET clients
+ * @author Bartlomiej Polot
+ */
#include "platform.h"
#include "gnunet_util_lib.h"
-
#include "gnunet_signatures.h"
#include "gnunet_statistics_service.h"
-
#include "cadet_protocol.h"
#include "cadet_path.h"
-
#include "gnunet-service-cadet_tunnel.h"
#include "gnunet-service-cadet_connection.h"
#include "gnunet-service-cadet_channel.h"
#define REKEY_WAIT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5)
#if !defined(GNUNET_CULL_LOGGING)
-#define DUMP_KEYS_TO_STDERR GNUNET_YES
+ #define DUMP_KEYS_TO_STDERR GNUNET_YES
#else
-#define DUMP_KEYS_TO_STDERR GNUNET_NO
+ #define DUMP_KEYS_TO_STDERR GNUNET_NO
#endif
#define MIN_TUNNEL_BUFFER 8
#define AX_HEADER_SIZE (sizeof (uint32_t) * 2\
+ sizeof (struct GNUNET_CRYPTO_EcdhePublicKey))
-
/******************************************************************************/
/******************************** STRUCTS **********************************/
/******************************************************************************/
/**
- * Connection list and metadata.
+ * Entry in list of connections used by tunnel, with metadata.
*/
struct CadetTConnection
{
uint32_t throughput;
};
-/**
- * Structure used during a Key eXchange.
- */
-struct CadetTunnelKXCtx
-{
- /**
- * Encryption ("our") old "confirmed" key, for encrypting traffic sent by us
- * end before the key exchange is finished or times out.
- */
- struct GNUNET_CRYPTO_SymmetricSessionKey e_key_old;
-
- /**
- * Decryption ("their") old "confirmed" key, for decrypting traffic sent by
- * the other end before the key exchange started.
- */
- struct GNUNET_CRYPTO_SymmetricSessionKey d_key_old;
-
- /**
- * Same as @c e_key_old, for the case of two simultaneous KX.
- * This can happen if cadet decides to start a re-key while the peer has also
- * started its re-key (due to network delay this is impossible to avoid).
- * In this case, the key material generated with the peer's old ephemeral
- * *might* (but doesn't have to) be incorrect.
- * Since no more than two re-keys can happen simultaneously, this is enough.
- */
- struct GNUNET_CRYPTO_SymmetricSessionKey e_key_old2;
-
- /**
- * Same as @c d_key_old, for the case described in @c e_key_old2.
- */
- struct GNUNET_CRYPTO_SymmetricSessionKey d_key_old2;
-
- /**
- * Challenge to send and expect in the PONG.
- */
- uint32_t challenge;
-
- /**
- * When the rekey started. One minute after this the new key will be used.
- */
- struct GNUNET_TIME_Absolute rekey_start_time;
-
- /**
- * Task for delayed destruction of the Key eXchange context, to allow delayed
- * messages with the old key to be decrypted successfully.
- */
- struct GNUNET_SCHEDULER_Task *finish_task;
-};
-
-/**
- * Encryption systems possible.
- */
-enum CadetTunnelEncryption
-{
- /**
- * Default Axolotl system.
- */
- CADET_Axolotl,
-
- /**
- * Fallback OTR-style encryption.
- */
- CADET_OTR
-};
/**
* Struct to old keys for skipped messages while advancing the Axolotl ratchet.
struct GNUNET_TIME_Absolute ratchet_expiration;
};
+
/**
* Struct containing all information regarding a tunnel to a peer.
*/
*/
struct CadetPeer *peer;
- /**
- * Type of encryption used in the tunnel.
- */
- enum CadetTunnelEncryption enc_type;
-
/**
* Axolotl info.
*/
*/
enum CadetTunnelEState estate;
- /**
- * Key eXchange context.
- */
- struct CadetTunnelKXCtx *kx_ctx;
-
/**
* Peer's ephemeral key, to recreate @c e_key and @c d_key when own ephemeral
* key changes.
/**
* Task to start the rekey process.
*/
- struct GNUNET_SCHEDULER_Task * rekey_task;
+ struct GNUNET_SCHEDULER_Task *rekey_task;
/**
* Paths that are actively used to reach the destination peer.
/**
* Channel ID for the next created channel.
*/
- CADET_ChannelNumber next_chid;
+ struct GNUNET_CADET_ChannelTunnelNumber next_ctn;
/**
* Destroy flag: if true, destroy on last message.
*/
static struct GNUNET_CONTAINER_MultiPeerMap *tunnels;
-/**
- * Default TTL for payload packets.
- */
-static unsigned long long default_ttl;
-
/**
* Own Peer ID private key.
*/
static struct GNUNET_TIME_Relative ratchet_time;
-/******************************** OTR ***********************************/
-
-/**
- * Own global OTR ephemeral private key.
- */
-static struct GNUNET_CRYPTO_EcdhePrivateKey *otr_ephemeral_key;
-
-/**
- * Cached message used to perform a OTR key exchange.
- */
-static struct GNUNET_CADET_KX_Ephemeral otr_kx_msg;
-
-/**
- * Task to generate a new OTR ephemeral key.
- */
-static struct GNUNET_SCHEDULER_Task *rekey_task;
-
-/**
- * OTR Rekey period.
- */
-static struct GNUNET_TIME_Relative rekey_period;
-
-
/******************************************************************************/
/******************************** STATIC ***********************************/
/******************************************************************************/
conn_ok = CADET_TUNNEL_READY == t->cstate;
enc_ok = CADET_TUNNEL_KEY_OK == t->estate
|| CADET_TUNNEL_KEY_REKEY == t->estate
- || (CADET_TUNNEL_KEY_PING == t->estate
- && CADET_Axolotl == t->enc_type);
+ || CADET_TUNNEL_KEY_PING == t->estate;
ready = conn_ok && enc_ok;
ready = ready || GCT_is_loopback (t);
return ready;
}
-/**
- * Check if a key is invalid (NULL pointer or all 0)
- *
- * @param key Key to check.
- *
- * @return #GNUNET_YES if key is null, #GNUNET_NO if exists and is not 0.
- */
-static int
-is_key_null (struct GNUNET_CRYPTO_SymmetricSessionKey *key)
-{
- struct GNUNET_CRYPTO_SymmetricSessionKey null_key;
-
- if (NULL == key)
- return GNUNET_YES;
-
- memset (&null_key, 0, sizeof (null_key));
- if (0 == memcmp (key, &null_key, sizeof (null_key)))
- return GNUNET_YES;
- return GNUNET_NO;
-}
-
-
-/**
- * Ephemeral key message purpose size.
- *
- * @return Size of the part of the ephemeral key message that must be signed.
- */
-static size_t
-ephemeral_purpose_size (void)
-{
- return sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
- sizeof (struct GNUNET_TIME_AbsoluteNBO) +
- sizeof (struct GNUNET_TIME_AbsoluteNBO) +
- sizeof (struct GNUNET_CRYPTO_EcdhePublicKey) +
- sizeof (struct GNUNET_PeerIdentity);
-}
-
-
-/**
- * Size of the encrypted part of a ping message.
- *
- * @return Size of the encrypted part of a ping message.
- */
-static size_t
-ping_encryption_size (void)
-{
- return sizeof (uint32_t);
-}
-
-
/**
* Get the channel's buffer. ONLY FOR NON-LOOPBACK CHANNELS!!
*
}
-/**
- * Check that a ephemeral key message s well formed and correctly signed.
- *
- * @param t Tunnel on which the message came.
- * @param msg The ephemeral key message.
- *
- * @return #GNUNET_OK if message is fine, #GNUNET_SYSERR otherwise.
- */
-int
-check_ephemeral (struct CadetTunnel *t,
- const struct GNUNET_CADET_KX_Ephemeral *msg)
-{
- /* Check message size */
- if (ntohs (msg->header.size) != sizeof (struct GNUNET_CADET_KX_Ephemeral))
- {
- /* This is probably an old "MESH" version. */
- LOG (GNUNET_ERROR_TYPE_INFO,
- "Expected ephemeral of size %u, got %u\n",
- sizeof (struct GNUNET_CADET_KX_Ephemeral),
- ntohs (msg->header.size));
- return GNUNET_SYSERR;
- }
-
- /* Check signature size */
- if (ntohl (msg->purpose.size) != ephemeral_purpose_size ())
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Expected signature purpose of size %u, got %u\n",
- ephemeral_purpose_size (),
- ntohs (msg->purpose.size));
- return GNUNET_SYSERR;
- }
-
- /* Check origin */
- if (0 != memcmp (&msg->origin_identity,
- GCP_get_id (t->peer),
- sizeof (struct GNUNET_PeerIdentity)))
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Unexpected origin, got %s\n",
- GNUNET_i2s (&msg->origin_identity));
- return GNUNET_SYSERR;
- }
-
- /* Check signature */
- if (GNUNET_OK !=
- GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_CADET_KX,
- &msg->purpose,
- &msg->signature,
- &msg->origin_identity.public_key))
- {
- LOG (GNUNET_ERROR_TYPE_WARNING, "Signature invalid\n");
- return GNUNET_SYSERR;
- }
-
- return GNUNET_OK;
-}
-
-
-/**
- * Select the best key to use for encryption (send), based on KX status.
- *
- * Normally, return the current key. If there is a KX in progress and the old
- * key is fresh enough, return the old key.
- *
- * @param t Tunnel to choose the key from.
- *
- * @return The optimal key to encrypt/hmac outgoing traffic.
- */
-static const struct GNUNET_CRYPTO_SymmetricSessionKey *
-select_key (const struct CadetTunnel *t)
-{
- const struct GNUNET_CRYPTO_SymmetricSessionKey *key;
-
- if (NULL != t->kx_ctx
- && NULL == t->kx_ctx->finish_task)
- {
- struct GNUNET_TIME_Relative age;
-
- age = GNUNET_TIME_absolute_get_duration (t->kx_ctx->rekey_start_time);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- " key exchange in progress, started %s ago\n",
- GNUNET_STRINGS_relative_time_to_string (age, GNUNET_YES));
- // FIXME make duration of old keys configurable
- if (age.rel_value_us < GNUNET_TIME_UNIT_MINUTES.rel_value_us)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " using old key\n");
- key = &t->kx_ctx->e_key_old;
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " using new key (old key too old)\n");
- key = &t->e_key;
- }
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " no KX: using current key\n");
- key = &t->e_key;
- }
- return key;
-}
-
-
/**
* Create a new Axolotl ephemeral (ratchet) key.
*
static void
t_hmac (const void *plaintext, size_t size,
uint32_t iv, const struct GNUNET_CRYPTO_SymmetricSessionKey *key,
- struct GNUNET_CADET_Hash *hmac)
+ struct GNUNET_ShortHashCode *hmac)
{
static const char ctx[] = "cadet authentication key";
struct GNUNET_CRYPTO_AuthKey auth_key;
NULL);
/* Two step: CADET_Hash is only 256 bits, HashCode is 512. */
GNUNET_CRYPTO_hmac (&auth_key, plaintext, size, &hash);
- memcpy (hmac, &hash, sizeof (*hmac));
-}
-
-
-/**
- * Encrypt daforce_newest_keyta with the tunnel key.
- *
- * @param t Tunnel whose key to use.
- * @param dst Destination for the encrypted data.
- * @param src Source of the plaintext. Can overlap with @c dst.
- * @param size Size of the plaintext.
- * @param iv Initialization Vector to use.
- * @param force_newest_key Force the use of the newest key, otherwise
- * CADET will use the old key when allowed.
- * This can happen in the case when a KX is going on
- * and the old one hasn't expired.
- */
-static int
-t_encrypt (struct CadetTunnel *t, void *dst, const void *src,
- size_t size, uint32_t iv, int force_newest_key)
-{
- struct GNUNET_CRYPTO_SymmetricInitializationVector siv;
- const struct GNUNET_CRYPTO_SymmetricSessionKey *key;
- size_t out_size;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_encrypt start\n");
-
- key = GNUNET_YES == force_newest_key ? &t->e_key : select_key (t);
- #if DUMP_KEYS_TO_STDERR
- LOG (GNUNET_ERROR_TYPE_INFO, " ENC with key %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) key));
- #endif
- GNUNET_CRYPTO_symmetric_derive_iv (&siv, key, &iv, sizeof (iv), NULL);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_encrypt IV derived\n");
- out_size = GNUNET_CRYPTO_symmetric_encrypt (src, size, key, &siv, dst);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_encrypt end\n");
-
- return out_size;
+ GNUNET_memcpy (hmac, &hash, sizeof (*hmac));
}
struct CadetTunnelAxolotl *ax;
size_t out_size;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_ax_encrypt start\n");
+ CADET_TIMING_START;
ax = t->ax;
-
ax->ratchet_counter++;
if (GNUNET_YES == ax->ratchet_allowed
&& (ratchet_messages <= ax->ratchet_counter
#endif
out_size = GNUNET_CRYPTO_symmetric_encrypt (src, size, &MK, &iv, dst);
-
t_hmac_derive_key (&ax->CKs, &ax->CKs, "1", 1);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_ax_encrypt end\n");
+ CADET_TIMING_END;
return out_size;
}
struct CadetTunnelAxolotl *ax;
size_t out_size;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_ax_decrypt start\n");
+ CADET_TIMING_START;
ax = t->ax;
t_hmac_derive_key (&ax->CKr, &ax->CKr, "1", 1);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_ax_decrypt end\n");
+ CADET_TIMING_END;
return out_size;
}
* @param msg Message whose header to encrypt.
*/
static void
-t_h_encrypt (struct CadetTunnel *t, struct GNUNET_CADET_AX *msg)
+t_h_encrypt (struct CadetTunnel *t, struct GNUNET_CADET_TunnelEncryptedMessage *msg)
{
struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
struct CadetTunnelAxolotl *ax;
size_t out_size;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_h_encrypt start\n");
-
+ CADET_TIMING_START;
ax = t->ax;
GNUNET_CRYPTO_symmetric_derive_iv (&iv, &ax->HKs, NULL, 0, NULL);
&ax->HKs, &iv, &msg->Ns);
GNUNET_assert (AX_HEADER_SIZE == out_size);
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_ax_encrypt end\n");
+ CADET_TIMING_END;
}
* @param dst Where to decrypt header to.
*/
static void
-t_h_decrypt (struct CadetTunnel *t, const struct GNUNET_CADET_AX *src,
- struct GNUNET_CADET_AX *dst)
+t_h_decrypt (struct CadetTunnel *t, const struct GNUNET_CADET_TunnelEncryptedMessage *src,
+ struct GNUNET_CADET_TunnelEncryptedMessage *dst)
{
struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
struct CadetTunnelAxolotl *ax;
size_t out_size;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_h_decrypt start\n");
+ CADET_TIMING_START;
ax = t->ax;
GNUNET_CRYPTO_symmetric_derive_iv (&iv, &ax->HKr, NULL, 0, NULL);
GNUNET_assert (AX_HEADER_SIZE == out_size);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_h_decrypt end\n");
-}
-
-
-/**
- * Decrypt and verify data with the appropriate tunnel key.
- *
- * @param key Key to use.
- * @param dst Destination for the plaintext.
- * @param src Source of the encrypted data. Can overlap with @c dst.
- * @param size Size of the encrypted data.
- * @param iv Initialization Vector to use.
- *
- * @return Size of the decrypted data, -1 if an error was encountered.
- */
-static int
-decrypt (const struct GNUNET_CRYPTO_SymmetricSessionKey *key,
- void *dst, const void *src, size_t size, uint32_t iv)
-{
- struct GNUNET_CRYPTO_SymmetricInitializationVector siv;
- size_t out_size;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, " decrypt start\n");
- LOG (GNUNET_ERROR_TYPE_DEBUG, " decrypt iv\n");
- GNUNET_CRYPTO_symmetric_derive_iv (&siv, key, &iv, sizeof (iv), NULL);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " decrypt iv done\n");
- out_size = GNUNET_CRYPTO_symmetric_decrypt (src, size, key, &siv, dst);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " decrypt end\n");
-
- return out_size;
-}
-
-
-/**
- * Decrypt and verify data with the most recent tunnel key.
- *
- * @param t Tunnel whose key to use.
- * @param dst Destination for the plaintext.
- * @param src Source of the encrypted data. Can overlap with @c dst.
- * @param size Size of the encrypted data.
- * @param iv Initialization Vector to use.
- *
- * @return Size of the decrypted data, -1 if an error was encountered.
- */
-static int
-t_decrypt (struct CadetTunnel *t, void *dst, const void *src,
- size_t size, uint32_t iv)
-{
- size_t out_size;
-
-#if DUMP_KEYS_TO_STDERR
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_decrypt with %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->d_key));
-#endif
- if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
- {
- GNUNET_STATISTICS_update (stats, "# non decryptable data", 1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "got data on %s without a valid key\n",
- GCT_2s (t));
- GCT_debug (t, GNUNET_ERROR_TYPE_WARNING);
- return -1;
- }
-
- out_size = decrypt (&t->d_key, dst, src, size, iv);
-
- return out_size;
-}
-
-
-/**
- * Decrypt and verify data with the appropriate tunnel key and verify that the
- * data has not been altered since it was sent by the remote peer.
- *
- * @param t Tunnel whose key to use.
- * @param dst Destination for the plaintext.
- * @param src Source of the encrypted data. Can overlap with @c dst.
- * @param size Size of the encrypted data.
- * @param iv Initialization Vector to use.
- * @param msg_hmac HMAC of the message, cannot be NULL.
- *
- * @return Size of the decrypted data, -1 if an error was encountered.
- */
-static int
-t_decrypt_and_validate (struct CadetTunnel *t,
- void *dst, const void *src,
- size_t size, uint32_t iv,
- const struct GNUNET_CADET_Hash *msg_hmac)
-{
- struct GNUNET_CRYPTO_SymmetricSessionKey *key;
- struct GNUNET_CADET_Hash hmac;
- int decrypted_size;
-
- /* Try primary (newest) key */
- key = &t->d_key;
- decrypted_size = decrypt (key, dst, src, size, iv);
- t_hmac (src, size, iv, key, &hmac);
- if (0 == memcmp (msg_hmac, &hmac, sizeof (hmac)))
- return decrypted_size;
-
- /* If no key exchange is going on, we just failed. */
- if (NULL == t->kx_ctx)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed checksum validation on tunnel %s with no KX\n",
- GCT_2s (t));
- GNUNET_STATISTICS_update (stats, "# wrong HMAC no KX", 1, GNUNET_NO);
- return -1;
- }
-
- /* Try secondary key, from previous KX period. */
- key = &t->kx_ctx->d_key_old;
- decrypted_size = decrypt (key, dst, src, size, iv);
- t_hmac (src, size, iv, key, &hmac);
- if (0 == memcmp (msg_hmac, &hmac, sizeof (hmac)))
- return decrypted_size;
-
- /* Hail Mary, try tertiary, key, in case of parallel re-keys. */
- key = &t->kx_ctx->d_key_old2;
- decrypted_size = decrypt (key, dst, src, size, iv);
- t_hmac (src, size, iv, key, &hmac);
- if (0 == memcmp (msg_hmac, &hmac, sizeof (hmac)))
- return decrypted_size;
-
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed checksum validation on tunnel %s with KX\n",
- GCT_2s (t));
- GNUNET_STATISTICS_update (stats, "# wrong HMAC with KX", 1, GNUNET_NO);
- return -1;
+ CADET_TIMING_END;
}
*/
static int
try_old_ax_keys (struct CadetTunnel *t, void *dst,
- const struct GNUNET_CADET_AX *src, size_t size)
+ const struct GNUNET_CADET_TunnelEncryptedMessage *src, size_t size)
{
struct CadetTunnelSkippedKey *key;
- struct GNUNET_CADET_Hash *hmac;
+ struct GNUNET_ShortHashCode *hmac;
struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
- struct GNUNET_CADET_AX plaintext_header;
+ struct GNUNET_CADET_TunnelEncryptedMessage plaintext_header;
struct GNUNET_CRYPTO_SymmetricSessionKey *valid_HK;
size_t esize;
size_t res;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Trying old keys\n");
hmac = &plaintext_header.hmac;
- esize = size - sizeof (struct GNUNET_CADET_AX);
+ esize = size - sizeof (struct GNUNET_CADET_TunnelEncryptedMessage);
/* Find a correct Header Key */
for (key = t->ax->skipped_head; NULL != key; key = key->next)
return -1;
/* Should've been checked in -cadet_connection.c handle_cadet_encrypted. */
- GNUNET_assert (size > sizeof (struct GNUNET_CADET_AX));
- len = size - sizeof (struct GNUNET_CADET_AX);
+ GNUNET_assert (size > sizeof (struct GNUNET_CADET_TunnelEncryptedMessage));
+ len = size - sizeof (struct GNUNET_CADET_TunnelEncryptedMessage);
GNUNET_assert (len >= sizeof (struct GNUNET_MessageHeader));
/* Decrypt header */
*/
static int
t_ax_decrypt_and_validate (struct CadetTunnel *t, void *dst,
- const struct GNUNET_CADET_AX *src, size_t size)
+ const struct GNUNET_CADET_TunnelEncryptedMessage *src,
+ size_t size)
{
struct CadetTunnelAxolotl *ax;
- struct GNUNET_CADET_Hash msg_hmac;
+ struct GNUNET_ShortHashCode msg_hmac;
struct GNUNET_HashCode hmac;
- struct GNUNET_CADET_AX plaintext_header;
+ struct GNUNET_CADET_TunnelEncryptedMessage plaintext_header;
uint32_t Np;
uint32_t PNp;
- size_t esize;
- size_t osize;
+ size_t esize; /* Size of encryped payload */
+ size_t osize; /* Size of output (decrypted payload) */
+ esize = size - sizeof (struct GNUNET_CADET_TunnelEncryptedMessage);
ax = t->ax;
- esize = size - sizeof (struct GNUNET_CADET_AX);
-
if (NULL == ax)
return -1;
/**
- * Create key material by doing ECDH on the local and remote ephemeral keys.
+ * Pick a connection on which send the next data message.
*
- * @param key_material Where to store the key material.
- * @param ephemeral Peer's public ephemeral key.
+ * @param t Tunnel on which to send the message.
*
- * @return GNUNET_OK if it went fine, GNUNET_SYSERR otherwise.
+ * @return The connection on which to send the next message.
*/
-static int
-derive_otr_key_material (struct GNUNET_HashCode *key_material,
- const struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral)
+static struct CadetConnection *
+tunnel_get_connection (struct CadetTunnel *t)
{
- if (GNUNET_OK !=
- GNUNET_CRYPTO_ecc_ecdh (otr_ephemeral_key, ephemeral, key_material))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- return GNUNET_OK;
-}
-
-
-/**
- * Create a symmetic key from the identities of both ends and the key material
- * from ECDH.
- *
- * @param key Destination for the generated key.
- * @param sender ID of the peer that will encrypt with @c key.
- * @param receiver ID of the peer that will decrypt with @c key.
- * @param key_material Hash created with ECDH with the ephemeral keys.
- */
-void
-derive_symmertic (struct GNUNET_CRYPTO_SymmetricSessionKey *key,
- const struct GNUNET_PeerIdentity *sender,
- const struct GNUNET_PeerIdentity *receiver,
- const struct GNUNET_HashCode *key_material)
-{
- const char salt[] = "CADET kx salt";
-
- GNUNET_CRYPTO_kdf (key, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey),
- salt, sizeof (salt),
- key_material, sizeof (struct GNUNET_HashCode),
- sender, sizeof (struct GNUNET_PeerIdentity),
- receiver, sizeof (struct GNUNET_PeerIdentity),
- NULL);
-}
-
-
-/**
- * Derive the tunnel's keys using our own and the peer's ephemeral keys.
- *
- * @param t Tunnel for which to create the keys.
- *
- * @return GNUNET_OK if successful, GNUNET_SYSERR otherwise.
- */
-static int
-create_otr_keys (struct CadetTunnel *t)
-{
- struct GNUNET_HashCode km;
-
- if (GNUNET_OK != derive_otr_key_material (&km, &t->peers_ephemeral_key))
- return GNUNET_SYSERR;
- derive_symmertic (&t->e_key, &my_full_id, GCP_get_id (t->peer), &km);
- derive_symmertic (&t->d_key, GCP_get_id (t->peer), &my_full_id, &km);
- #if DUMP_KEYS_TO_STDERR
- LOG (GNUNET_ERROR_TYPE_INFO, "ME: %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &otr_kx_msg.ephemeral_key));
- LOG (GNUNET_ERROR_TYPE_INFO, "PE: %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->peers_ephemeral_key));
- LOG (GNUNET_ERROR_TYPE_INFO, "KM: %s\n", GNUNET_h2s (&km));
- LOG (GNUNET_ERROR_TYPE_INFO, "EK: %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->e_key));
- LOG (GNUNET_ERROR_TYPE_INFO, "DK: %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->d_key));
- #endif
- return GNUNET_OK;
-}
-
-
-/**
- * Create a new Key eXchange context for the tunnel.
- *
- * If the old keys were verified, keep them for old traffic. Create a new KX
- * timestamp and a new nonce.
- *
- * @param t Tunnel for which to create the KX ctx.
- *
- * @return GNUNET_OK if successful, GNUNET_SYSERR otherwise.
- */
-static int
-create_kx_ctx (struct CadetTunnel *t)
-{
- LOG (GNUNET_ERROR_TYPE_INFO, " new kx ctx for %s\n", GCT_2s (t));
-
- if (NULL != t->kx_ctx)
- {
- if (NULL != t->kx_ctx->finish_task)
- {
- LOG (GNUNET_ERROR_TYPE_INFO, " resetting exisiting finish task\n");
- GNUNET_SCHEDULER_cancel (t->kx_ctx->finish_task);
- t->kx_ctx->finish_task = NULL;
- }
- }
- else
- {
- t->kx_ctx = GNUNET_new (struct CadetTunnelKXCtx);
- t->kx_ctx->challenge = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
- UINT32_MAX);
- }
-
- if (CADET_TUNNEL_KEY_OK == t->estate)
- {
- LOG (GNUNET_ERROR_TYPE_INFO, " backing up keys\n");
- t->kx_ctx->d_key_old = t->d_key;
- t->kx_ctx->e_key_old = t->e_key;
- }
- else
- LOG (GNUNET_ERROR_TYPE_INFO, " old keys not valid, not saving\n");
- t->kx_ctx->rekey_start_time = GNUNET_TIME_absolute_get ();
- return create_otr_keys (t);
-}
-
-
-/**
- * @brief Finish the Key eXchange and destroy the old keys.
- *
- * @param cls Closure (Tunnel for which to finish the KX).
- * @param tc Task context.
- */
-static void
-finish_kx (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct CadetTunnel *t = cls;
-
- LOG (GNUNET_ERROR_TYPE_INFO, "finish KX for %s\n", GCT_2s (t));
-
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- {
- LOG (GNUNET_ERROR_TYPE_INFO, " shutdown\n");
- return;
- }
-
- GNUNET_free (t->kx_ctx);
- t->kx_ctx = NULL;
-}
-
-
-/**
- * Destroy a Key eXchange context for the tunnel. This function only schedules
- * the destruction, the freeing of the memory (and clearing of old key material)
- * happens after a delay!
- *
- * @param t Tunnel whose KX ctx to destroy.
- */
-static void
-destroy_kx_ctx (struct CadetTunnel *t)
-{
- struct GNUNET_TIME_Relative delay;
-
- if (NULL == t->kx_ctx || NULL != t->kx_ctx->finish_task)
- return;
-
- if (is_key_null (&t->kx_ctx->e_key_old))
- {
- t->kx_ctx->finish_task = GNUNET_SCHEDULER_add_now (finish_kx, t);
- return;
- }
-
- delay = GNUNET_TIME_relative_divide (rekey_period, 4);
- delay = GNUNET_TIME_relative_min (delay, GNUNET_TIME_UNIT_MINUTES);
-
- t->kx_ctx->finish_task = GNUNET_SCHEDULER_add_delayed (delay, finish_kx, t);
-}
-
-
-
-/**
- * Pick a connection on which send the next data message.
- *
- * @param t Tunnel on which to send the message.
- *
- * @return The connection on which to send the next message.
- */
-static struct CadetConnection *
-tunnel_get_connection (struct CadetTunnel *t)
-{
- struct CadetTConnection *iter;
- struct CadetConnection *best;
- unsigned int qn;
- unsigned int lowest_q;
+ struct CadetTConnection *iter;
+ struct CadetConnection *best;
+ unsigned int qn;
+ unsigned int lowest_q;
LOG (GNUNET_ERROR_TYPE_DEBUG, "tunnel_get_connection %s\n", GCT_2s (t));
best = NULL;
tqd = GNUNET_malloc (sizeof (struct CadetTunnelDelayed) + size);
tqd->t = t;
- memcpy (&tqd[1], msg, size);
+ GNUNET_memcpy (&tqd[1], msg, size);
GNUNET_CONTAINER_DLL_insert_tail (t->tq_head, t->tq_tail, tqd);
return tqd;
}
* @param existing_q In case this a transmission of previously queued data,
* this should be TunnelQueue given to the client.
* Otherwise, NULL.
- *
* @return Handle to cancel message.
* NULL if @c cont is NULL or an error happens and message is dropped.
*/
static struct CadetTunnelQueue *
send_prebuilt_message (const struct GNUNET_MessageHeader *message,
- struct CadetTunnel *t, struct CadetConnection *c,
- int force, GCT_sent cont, void *cont_cls,
+ struct CadetTunnel *t,
+ struct CadetConnection *c,
+ int force,
+ GCT_sent cont,
+ void *cont_cls,
struct CadetTunnelQueue *existing_q)
{
struct GNUNET_MessageHeader *msg;
- struct GNUNET_CADET_Encrypted *otr_msg;
- struct GNUNET_CADET_AX *ax_msg;
+ struct GNUNET_CADET_TunnelEncryptedMessage *ax_msg;
struct CadetTunnelQueue *tq;
size_t size = ntohs (message->size);
- const uint16_t max_overhead = sizeof (struct GNUNET_CADET_Encrypted)
- + sizeof (struct GNUNET_CADET_AX);
- char cbuf[max_overhead + size];
+ char cbuf[sizeof (struct GNUNET_CADET_TunnelEncryptedMessage) + size] GNUNET_ALIGN;
size_t esize;
- uint32_t mid;
- uint32_t iv;
uint16_t type;
int fwd;
GNUNET_assert (GNUNET_NO == GCT_is_loopback (t));
- if (CADET_Axolotl == t->enc_type)
- {
- ax_msg = (struct GNUNET_CADET_AX *) cbuf;
- msg = &ax_msg->header;
- msg->size = htons (sizeof (struct GNUNET_CADET_AX) + size);
- msg->type = htons (GNUNET_MESSAGE_TYPE_CADET_AX);
- ax_msg->reserved = 0;
- esize = t_ax_encrypt (t, &ax_msg[1], message, size);
- ax_msg->Ns = htonl (t->ax->Ns++);
- ax_msg->PNs = htonl (t->ax->PNs);
- GNUNET_CRYPTO_ecdhe_key_get_public (t->ax->DHRs, &ax_msg->DHRs);
- t_h_encrypt (t, ax_msg);
- t_hmac (&ax_msg->Ns, AX_HEADER_SIZE + esize, 0, &t->ax->HKs, &ax_msg->hmac);
- }
- else
- {
- otr_msg = (struct GNUNET_CADET_Encrypted *) cbuf;
- msg = &otr_msg->header;
- iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
- otr_msg->iv = iv;
- esize = t_encrypt (t, &otr_msg[1], message, size, iv, GNUNET_NO);
- t_hmac (&otr_msg[1], size, iv, select_key (t), &otr_msg->hmac);
- msg->size = htons (sizeof (struct GNUNET_CADET_Encrypted) + size);
- msg->type = htons (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED);
- otr_msg->ttl = htonl (default_ttl);
- }
+ ax_msg = (struct GNUNET_CADET_TunnelEncryptedMessage *) cbuf;
+ msg = &ax_msg->header;
+ msg->size = htons (sizeof (struct GNUNET_CADET_TunnelEncryptedMessage) + size);
+ msg->type = htons (GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED);
+ esize = t_ax_encrypt (t, &ax_msg[1], message, size);
+ ax_msg->Ns = htonl (t->ax->Ns++);
+ ax_msg->PNs = htonl (t->ax->PNs);
+ GNUNET_CRYPTO_ecdhe_key_get_public (t->ax->DHRs, &ax_msg->DHRs);
+ t_h_encrypt (t, ax_msg);
+ t_hmac (&ax_msg->Ns, AX_HEADER_SIZE + esize, 0, &t->ax->HKs, &ax_msg->hmac);
GNUNET_assert (esize == size);
if (NULL == c)
}
return NULL; /* Drop... */
}
-
- mid = 0;
- type = ntohs (message->type);
- switch (type)
- {
- case GNUNET_MESSAGE_TYPE_CADET_DATA:
- case GNUNET_MESSAGE_TYPE_CADET_DATA_ACK:
- if (GNUNET_MESSAGE_TYPE_CADET_DATA == type)
- mid = ntohl (((struct GNUNET_CADET_Data *) message)->mid);
- else
- mid = ntohl (((struct GNUNET_CADET_DataACK *) message)->mid);
- /* Fall thru */
- case GNUNET_MESSAGE_TYPE_CADET_KEEPALIVE:
- case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_CREATE:
- case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY:
- case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_ACK:
- case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_NACK:
- break;
- default:
- GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_ERROR, "type %s not valid\n", GC_m2s (type));
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG, "type %s\n", GC_m2s (type));
-
fwd = GCC_is_origin (c, GNUNET_YES);
+ ax_msg->cid = *GCC_get_id (c);
+ ax_msg->cemi = GCC_get_pid (c, fwd);
+
+ type = htons (message->type);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message of type %s with CEMI %u and CID %s\n",
+ GC_m2s (type),
+ htonl (ax_msg->cemi.pid),
+ GNUNET_sh2s (&ax_msg->cid.connection_of_tunnel));
if (NULL == cont)
{
- GNUNET_break (NULL == GCC_send_prebuilt_message (msg, type, mid, c, fwd,
- force, NULL, NULL));
+ (void) GCC_send_prebuilt_message (msg,
+ type,
+ ax_msg->cemi,
+ c,
+ fwd,
+ force, NULL, NULL);
return NULL;
}
if (NULL == existing_q)
tq = existing_q;
tq->tqd = NULL;
}
- tq->cq = GCC_send_prebuilt_message (msg, type, mid, c, fwd, force,
- &tun_message_sent, tq);
- GNUNET_assert (NULL != tq->cq);
tq->cont = cont;
tq->cont_cls = cont_cls;
+ tq->cq = GCC_send_prebuilt_message (msg,
+ type,
+ ax_msg->cemi,
+ c,
+ fwd,
+ force,
+ &tun_message_sent, tq);
+ GNUNET_assert (NULL != tq->cq);
return tq;
}
/**
- * @brief Resend the AX KX until we complete the handshake.
+ * @brief Resend the KX until we complete the handshake.
*
* @param cls Closure (tunnel).
- * @param tc Task context.
*/
static void
-ax_kx_resend (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+kx_resend (void *cls)
{
struct CadetTunnel *t = cls;
t->rekey_task = NULL;
-
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
-
if (CADET_TUNNEL_KEY_OK == t->estate)
{
/* Should have been canceled on estate change */
return;
}
- GCT_send_ax_kx (t, CADET_TUNNEL_KEY_SENT >= t->estate);
+ GCT_send_kx (t, CADET_TUNNEL_KEY_SENT >= t->estate);
}
if (CADET_TUNNEL_KEY_OK == t->estate)
return;
- if (CADET_Axolotl == t->enc_type)
- {
- if (NULL != t->rekey_task)
- {
- GNUNET_break (0);
- GCT_debug (t, GNUNET_ERROR_TYPE_WARNING);
- GNUNET_SCHEDULER_cancel (t->rekey_task);
- }
- t->rekey_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
- &ax_kx_resend, t);
- }
-}
-
-
-/**
- * Callback called when a queued message is sent.
- *
- * @param cls Closure.
- * @param c Connection this message was on.
- * @param type Type of message sent.
- * @param fwd Was this a FWD going message?
- * @param size Size of the message.
- */
-static void
-pong_sent (void *cls,
- struct CadetConnection *c,
- struct CadetConnectionQueue *q,
- uint16_t type, int fwd, size_t size)
-{
- struct CadetTunnel *t = cls;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "pong_sent %s\n", GC_m2s (type));
-
- t->pong_h = NULL;
-}
-
-
-/**
- * Sends key exchange message on a tunnel, choosing the best connection.
- * Should not be called on loopback tunnels.
- *
- * @param t Tunnel on which this message is transmitted.
- * @param message Message to send. Function modifies it.
- *
- * @return Handle to the message in the connection queue.
- */
-static struct CadetConnectionQueue *
-send_kx (struct CadetTunnel *t,
- const struct GNUNET_MessageHeader *message)
-{
- struct CadetConnection *c;
- struct GNUNET_CADET_KX *msg;
- size_t size = ntohs (message->size);
- char cbuf[sizeof (struct GNUNET_CADET_KX) + size];
- uint16_t type;
- int fwd;
- GCC_sent cont;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT KX on Tunnel %s\n", GCT_2s (t));
-
- /* Avoid loopback. */
- if (GCT_is_loopback (t))
- {
- GNUNET_break (0);
- return NULL;
- }
- type = ntohs (message->type);
-
- /* Even if tunnel is "being destroyed", send anyway.
- * Could be a response to a rekey initiated by remote peer,
- * who is trying to create a new channel!
- */
-
- /* Must have a connection, or be looking for one. */
- if (NULL == t->connection_head)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "%s with no connection\n", GC_m2s (type));
- if (CADET_TUNNEL_SEARCHING != t->cstate)
- {
- GNUNET_break (0);
- GCT_debug (t, GNUNET_ERROR_TYPE_ERROR);
- GCP_debug (t->peer, GNUNET_ERROR_TYPE_ERROR);
- }
- return NULL;
- }
-
- msg = (struct GNUNET_CADET_KX *) cbuf;
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_CADET_KX);
- msg->header.size = htons (sizeof (struct GNUNET_CADET_KX) + size);
- c = tunnel_get_connection (t);
- if (NULL == c)
- {
- if (NULL == t->destroy_task && CADET_TUNNEL_READY == t->cstate)
- {
- GNUNET_break (0);
- GCT_debug (t, GNUNET_ERROR_TYPE_ERROR);
- }
- return NULL;
- }
- switch (type)
- {
- case GNUNET_MESSAGE_TYPE_CADET_KX_EPHEMERAL:
- case GNUNET_MESSAGE_TYPE_CADET_AX_KX:
- GNUNET_assert (NULL == t->ephm_h);
- cont = &ephm_sent;
- break;
- case GNUNET_MESSAGE_TYPE_CADET_KX_PONG:
- GNUNET_assert (NULL == t->pong_h);
- cont = &pong_sent;
- break;
-
- default:
- LOG (GNUNET_ERROR_TYPE_DEBUG, "unkown type %s\n", GC_m2s (type));
- GNUNET_assert (0);
- }
- memcpy (&msg[1], message, size);
-
- fwd = GCC_is_origin (c, GNUNET_YES);
-
- return GCC_send_prebuilt_message (&msg->header, type, 0, c,
- fwd, GNUNET_YES,
- cont, t);
-}
-
-
-/**
- * Send the ephemeral key on a tunnel.
- *
- * @param t Tunnel on which to send the key.
- */
-static void
-send_ephemeral (struct CadetTunnel *t)
-{
- LOG (GNUNET_ERROR_TYPE_INFO, "==> EPHM for %s\n", GCT_2s (t));
- if (NULL != t->ephm_h)
- {
- LOG (GNUNET_ERROR_TYPE_INFO, " already queued\n");
- return;
- }
-
- otr_kx_msg.sender_status = htonl (t->estate);
- otr_kx_msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
- otr_kx_msg.nonce = t->kx_ctx->challenge;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " send nonce c %u\n", otr_kx_msg.nonce);
- t_encrypt (t, &otr_kx_msg.nonce, &otr_kx_msg.nonce,
- ping_encryption_size(), otr_kx_msg.iv, GNUNET_YES);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " send nonce e %u\n", otr_kx_msg.nonce);
- t->ephm_h = send_kx (t, &otr_kx_msg.header);
-}
-
-
-/**
- * Send a pong message on a tunnel.
- *d_
- * @param t Tunnel on which to send the pong.
- * @param challenge Value sent in the ping that we have to send back.
- */
-static void
-send_pong (struct CadetTunnel *t, uint32_t challenge)
-{
- struct GNUNET_CADET_KX_Pong msg;
-
- LOG (GNUNET_ERROR_TYPE_INFO, "==> PONG for %s\n", GCT_2s (t));
- if (NULL != t->pong_h)
- {
- LOG (GNUNET_ERROR_TYPE_INFO, " already queued\n");
- return;
- }
- msg.header.size = htons (sizeof (msg));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_KX_PONG);
- msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
- msg.nonce = challenge;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " sending %u\n", msg.nonce);
- t_encrypt (t, &msg.nonce, &msg.nonce,
- sizeof (msg.nonce), msg.iv, GNUNET_YES);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " e sending %u\n", msg.nonce);
-
- t->pong_h = send_kx (t, &msg.header);
-}
-
-
-/**
- * Initiate a rekey with the remote peer.
- *
- * @param cls Closure (tunnel).
- * @param tc TaskContext.
- */
-static void
-rekey_tunnel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct CadetTunnel *t = cls;
-
- t->rekey_task = NULL;
-
- LOG (GNUNET_ERROR_TYPE_INFO, "Re-key Tunnel %s\n", GCT_2s (t));
- if (NULL != tc && 0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- return;
-
- GNUNET_assert (NULL != t->kx_ctx);
- struct GNUNET_TIME_Relative duration;
-
- duration = GNUNET_TIME_absolute_get_duration (t->kx_ctx->rekey_start_time);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- " kx started %s ago\n",
- GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
-
- // FIXME make duration of old keys configurable
- if (duration.rel_value_us >= GNUNET_TIME_UNIT_MINUTES.rel_value_us)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " deleting old keys\n");
- memset (&t->kx_ctx->d_key_old, 0, sizeof (t->kx_ctx->d_key_old));
- memset (&t->kx_ctx->e_key_old, 0, sizeof (t->kx_ctx->e_key_old));
- }
-
- send_ephemeral (t);
-
- switch (t->estate)
- {
- case CADET_TUNNEL_KEY_UNINITIALIZED:
- GCT_change_estate (t, CADET_TUNNEL_KEY_SENT);
- break;
-
- case CADET_TUNNEL_KEY_SENT:
- break;
-
- case CADET_TUNNEL_KEY_OK:
- /* Inconsistent!
- * - state should have changed during rekey_iterator
- * - task should have been canceled at pong_handle
- */
- GNUNET_break (0);
- GCT_change_estate (t, CADET_TUNNEL_KEY_REKEY);
- break;
-
- case CADET_TUNNEL_KEY_PING:
- case CADET_TUNNEL_KEY_REKEY:
- break;
-
- default:
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Unexpected state %u\n", t->estate);
- }
-
- // FIXME exponential backoff
- struct GNUNET_TIME_Relative delay;
-
- delay = GNUNET_TIME_relative_divide (rekey_period, 16);
- delay = GNUNET_TIME_relative_min (delay, REKEY_WAIT);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " next call in %s\n",
- GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
- t->rekey_task = GNUNET_SCHEDULER_add_delayed (delay, &rekey_tunnel, t);
-}
-
-
-/**
- * Our ephemeral key has changed, create new session key on all tunnels.
- *
- * Each tunnel will start the Key Exchange with a random delay between
- * 0 and number_of_tunnels*100 milliseconds, so there are 10 key exchanges
- * per second, on average.
- *
- * @param cls Closure (size of the hashmap).
- * @param key Current public key.
- * @param value Value in the hash map (tunnel).
- *
- * @return #GNUNET_YES, so we should continue to iterate,
- */
-static int
-rekey_iterator (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
-{
- struct CadetTunnel *t = value;
- struct GNUNET_TIME_Relative delay;
- long n = (long) cls;
- uint32_t r;
-
if (NULL != t->rekey_task)
- return GNUNET_YES;
-
- if (GNUNET_YES == GCT_is_loopback (t))
- return GNUNET_YES;
-
- if (CADET_OTR != t->enc_type)
- return GNUNET_YES;
-
- r = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, (uint32_t) n * 100);
- delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, r);
- t->rekey_task = GNUNET_SCHEDULER_add_delayed (delay, &rekey_tunnel, t);
- if (GNUNET_OK == create_kx_ctx (t))
- GCT_change_estate (t, CADET_TUNNEL_KEY_REKEY);
- else
{
GNUNET_break (0);
- // FIXME restart kx
+ GCT_debug (t, GNUNET_ERROR_TYPE_WARNING);
+ GNUNET_SCHEDULER_cancel (t->rekey_task);
}
+ t->rekey_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &kx_resend, t);
- return GNUNET_YES;
-}
-
-
-/**
- * Create a new ephemeral key and key message, schedule next rekeying.
- *
- * @param cls Closure (unused).
- * @param tc TaskContext.
- */
-static void
-global_otr_rekey (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_TIME_Absolute time;
- long n;
-
- rekey_task = NULL;
-
- if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- return;
-
- GNUNET_free_non_null (otr_ephemeral_key);
- otr_ephemeral_key = GNUNET_CRYPTO_ecdhe_key_create ();
-
- time = GNUNET_TIME_absolute_get ();
- otr_kx_msg.creation_time = GNUNET_TIME_absolute_hton (time);
- time = GNUNET_TIME_absolute_add (time, rekey_period);
- time = GNUNET_TIME_absolute_add (time, GNUNET_TIME_UNIT_MINUTES);
- otr_kx_msg.expiration_time = GNUNET_TIME_absolute_hton (time);
- GNUNET_CRYPTO_ecdhe_key_get_public (otr_ephemeral_key, &otr_kx_msg.ephemeral_key);
- LOG (GNUNET_ERROR_TYPE_INFO, "GLOBAL OTR RE-KEY, NEW EPHM: %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &otr_kx_msg.ephemeral_key));
-
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_eddsa_sign (id_key,
- &otr_kx_msg.purpose,
- &otr_kx_msg.signature));
-
- n = (long) GNUNET_CONTAINER_multipeermap_size (tunnels);
- GNUNET_CONTAINER_multipeermap_iterate (tunnels, &rekey_iterator, (void *) n);
-
- rekey_task = GNUNET_SCHEDULER_add_delayed (rekey_period,
- &global_otr_rekey, NULL);
}
{
struct CadetTunnel *t = value;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "GCT_shutdown destroying tunnel at %p\n", t);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "GCT_shutdown destroying tunnel at %p\n", t);
GCT_destroy (t);
return GNUNET_YES;
}
* @param gid ID of the channel.
*/
static void
-send_channel_destroy (struct CadetTunnel *t, unsigned int gid)
+send_channel_destroy (struct CadetTunnel *t,
+ struct GNUNET_CADET_ChannelTunnelNumber gid)
{
- struct GNUNET_CADET_ChannelManage msg;
+ struct GNUNET_CADET_ChannelManageMessage msg;
msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY);
msg.header.size = htons (sizeof (msg));
- msg.chid = htonl (gid);
+ msg.ctn = gid;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"WARNING destroying unknown channel %u on tunnel %s\n",
- gid, GCT_2s (t));
+ ntohl (gid.cn),
+ GCT_2s (t));
send_prebuilt_message (&msg.header, t, NULL, GNUNET_YES, NULL, NULL, NULL);
}
*/
static void
handle_data (struct CadetTunnel *t,
- const struct GNUNET_CADET_Data *msg,
+ const struct GNUNET_CADET_ChannelAppDataMessage *msg,
int fwd)
{
struct CadetChannel *ch;
/* Check size */
size = ntohs (msg->header.size);
if (size <
- sizeof (struct GNUNET_CADET_Data) +
+ sizeof (struct GNUNET_CADET_ChannelAppDataMessage) +
sizeof (struct GNUNET_MessageHeader))
{
GNUNET_break (0);
/* Check channel */
- ch = GCT_get_channel (t, ntohl (msg->chid));
+ ch = GCT_get_channel (t, msg->ctn);
if (NULL == ch)
{
- GNUNET_STATISTICS_update (stats, "# data on unknown channel",
- 1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "channel 0x%X unknown\n", ntohl (msg->chid));
- send_channel_destroy (t, ntohl (msg->chid));
+ GNUNET_STATISTICS_update (stats,
+ "# data on unknown channel",
+ 1,
+ GNUNET_NO);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "channel 0x%X unknown\n",
+ ntohl (msg->ctn.cn));
+ send_channel_destroy (t, msg->ctn);
return;
}
*/
static void
handle_data_ack (struct CadetTunnel *t,
- const struct GNUNET_CADET_DataACK *msg,
+ const struct GNUNET_CADET_ChannelDataAckMessage *msg,
int fwd)
{
struct CadetChannel *ch;
/* Check size */
size = ntohs (msg->header.size);
- if (size != sizeof (struct GNUNET_CADET_DataACK))
+ if (size != sizeof (struct GNUNET_CADET_ChannelDataAckMessage))
{
GNUNET_break (0);
return;
}
/* Check channel */
- ch = GCT_get_channel (t, ntohl (msg->chid));
+ ch = GCT_get_channel (t, msg->ctn);
if (NULL == ch)
{
GNUNET_STATISTICS_update (stats, "# data ack on unknown channel",
1, GNUNET_NO);
LOG (GNUNET_ERROR_TYPE_DEBUG, "WARNING channel %u unknown\n",
- ntohl (msg->chid));
+ ntohl (msg->ctn.cn));
return;
}
*/
static void
handle_ch_create (struct CadetTunnel *t,
- const struct GNUNET_CADET_ChannelCreate *msg)
+ const struct GNUNET_CADET_ChannelOpenMessage *msg)
{
struct CadetChannel *ch;
size_t size;
/* Check size */
size = ntohs (msg->header.size);
- if (size != sizeof (struct GNUNET_CADET_ChannelCreate))
+ if (size != sizeof (struct GNUNET_CADET_ChannelOpenMessage))
{
GNUNET_break_op (0);
return;
}
/* Check channel */
- ch = GCT_get_channel (t, ntohl (msg->chid));
+ ch = GCT_get_channel (t, msg->ctn);
if (NULL != ch && ! GCT_is_loopback (t))
{
/* Probably a retransmission, safe to ignore */
*/
static void
handle_ch_nack (struct CadetTunnel *t,
- const struct GNUNET_CADET_ChannelManage *msg)
+ const struct GNUNET_CADET_ChannelManageMessage *msg)
{
struct CadetChannel *ch;
size_t size;
/* Check size */
size = ntohs (msg->header.size);
- if (size != sizeof (struct GNUNET_CADET_ChannelManage))
+ if (size != sizeof (struct GNUNET_CADET_ChannelManageMessage))
{
GNUNET_break (0);
return;
}
/* Check channel */
- ch = GCT_get_channel (t, ntohl (msg->chid));
+ ch = GCT_get_channel (t, msg->ctn);
if (NULL == ch)
{
GNUNET_STATISTICS_update (stats, "# channel NACK on unknown channel",
1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "WARNING channel %u unknown\n",
- ntohl (msg->chid));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "WARNING channel %u unknown\n",
+ ntohl (msg->ctn.cn));
return;
}
*/
static void
handle_ch_ack (struct CadetTunnel *t,
- const struct GNUNET_CADET_ChannelManage *msg,
+ const struct GNUNET_CADET_ChannelManageMessage *msg,
int fwd)
{
struct CadetChannel *ch;
/* Check size */
size = ntohs (msg->header.size);
- if (size != sizeof (struct GNUNET_CADET_ChannelManage))
+ if (size != sizeof (struct GNUNET_CADET_ChannelManageMessage))
{
GNUNET_break (0);
return;
}
/* Check channel */
- ch = GCT_get_channel (t, ntohl (msg->chid));
+ ch = GCT_get_channel (t, msg->ctn);
if (NULL == ch)
{
- GNUNET_STATISTICS_update (stats, "# channel ack on unknown channel",
- 1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "WARNING channel %u unknown\n",
- ntohl (msg->chid));
+ GNUNET_STATISTICS_update (stats,
+ "# channel ack on unknown channel",
+ 1,
+ GNUNET_NO);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "WARNING channel %u unknown\n",
+ ntohl (msg->ctn.cn));
return;
}
*/
static void
handle_ch_destroy (struct CadetTunnel *t,
- const struct GNUNET_CADET_ChannelManage *msg,
+ const struct GNUNET_CADET_ChannelManageMessage *msg,
int fwd)
{
struct CadetChannel *ch;
/* Check size */
size = ntohs (msg->header.size);
- if (size != sizeof (struct GNUNET_CADET_ChannelManage))
+ if (size != sizeof (struct GNUNET_CADET_ChannelManageMessage))
{
GNUNET_break (0);
return;
}
/* Check channel */
- ch = GCT_get_channel (t, ntohl (msg->chid));
+ ch = GCT_get_channel (t, msg->ctn);
if (NULL == ch)
{
/* Probably a retransmission, safe to ignore */
/**
- * The peer's ephemeral key has changed: update the symmetrical keys.
+ * Demultiplex by message type and call appropriate handler for a message
+ * towards a channel of a local tunnel.
*
* @param t Tunnel this message came on.
- * @param msg Key eXchange message.
+ * @param msgh Message header.
+ * @param fwd Is this message fwd? This only is meaningful in loopback channels.
+ * #GNUNET_YES if message is FWD on the respective channel (loopback)
+ * #GNUNET_NO if message is BCK on the respective channel (loopback)
+ * #GNUNET_SYSERR if message on a one-ended channel (remote)
*/
static void
-handle_ephemeral (struct CadetTunnel *t,
- const struct GNUNET_CADET_KX_Ephemeral *msg)
+handle_decrypted (struct CadetTunnel *t,
+ const struct GNUNET_MessageHeader *msgh,
+ int fwd)
{
- LOG (GNUNET_ERROR_TYPE_INFO, "<== EPHM for %s\n", GCT_2s (t));
+ uint16_t type;
+ char buf[256];
- /* Some old versions are still around, don't log as error. */
- if (GNUNET_OK != check_ephemeral (t, msg))
- return;
+ type = ntohs (msgh->type);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "<-- %s on %s\n", GC_m2s (type), GCT_2s (t));
+ SPRINTF (buf, "# received encrypted of type %hu (%s)", type, GC_m2s (type));
+ GNUNET_STATISTICS_update (stats, buf, 1, GNUNET_NO);
- /* If we get a proper OTR-style ephemeral, fallback to old crypto. */
- if (NULL != t->ax)
+ switch (type)
{
- destroy_ax (t);
- t->enc_type = CADET_OTR;
- if (NULL != t->rekey_task)
- GNUNET_SCHEDULER_cancel (t->rekey_task);
- if (GNUNET_OK != create_kx_ctx (t))
- {
- // FIXME restart kx
- GNUNET_break (0);
- return;
- }
- rekey_tunnel (t, NULL);
- GNUNET_STATISTICS_update (stats, "# otr-downgrades", -1, GNUNET_NO);
- }
+ case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_KEEPALIVE:
+ /* Do nothing, connection aleady got updated. */
+ GNUNET_STATISTICS_update (stats, "# keepalives received", 1, GNUNET_NO);
+ break;
- /**
- * If the key is different from what we know, derive the new E/D keys.
- * Else destroy the rekey ctx (duplicate EPHM after successful KX).
- */
- if (0 != memcmp (&t->peers_ephemeral_key, &msg->ephemeral_key,
- sizeof (msg->ephemeral_key)))
- {
- #if DUMP_KEYS_TO_STDERR
- LOG (GNUNET_ERROR_TYPE_INFO, "OLD: %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->peers_ephemeral_key));
- LOG (GNUNET_ERROR_TYPE_INFO, "NEW: %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &msg->ephemeral_key));
- #endif
- t->peers_ephemeral_key = msg->ephemeral_key;
+ case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_APP_DATA:
+ /* Don't send hop ACK, wait for client to ACK */
+ handle_data (t, (struct GNUNET_CADET_ChannelAppDataMessage *) msgh, fwd);
+ break;
- if (GNUNET_OK != create_kx_ctx (t))
- {
- // FIXME restart kx
- GNUNET_break (0);
- return;
- }
+ case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_APP_DATA_ACK:
+ handle_data_ack (t, (struct GNUNET_CADET_ChannelDataAckMessage *) msgh, fwd);
+ break;
- if (CADET_TUNNEL_KEY_OK == t->estate)
- {
- GCT_change_estate (t, CADET_TUNNEL_KEY_REKEY);
- }
- if (NULL != t->rekey_task)
- GNUNET_SCHEDULER_cancel (t->rekey_task);
- t->rekey_task = GNUNET_SCHEDULER_add_now (rekey_tunnel, t);
- }
- if (CADET_TUNNEL_KEY_SENT == t->estate)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " our key was sent, sending challenge\n");
- send_ephemeral (t);
- GCT_change_estate (t, CADET_TUNNEL_KEY_PING);
- }
+ case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_OPEN:
+ handle_ch_create (t, (struct GNUNET_CADET_ChannelOpenMessage *) msgh);
+ break;
- if (CADET_TUNNEL_KEY_UNINITIALIZED != ntohl(msg->sender_status))
- {
- uint32_t nonce;
+ case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_OPEN_NACK_DEPRECATED:
+ handle_ch_nack (t, (struct GNUNET_CADET_ChannelManageMessage *) msgh);
+ break;
+
+ case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_OPEN_ACK:
+ handle_ch_ack (t, (struct GNUNET_CADET_ChannelManageMessage *) msgh, fwd);
+ break;
+
+ case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY:
+ handle_ch_destroy (t, (struct GNUNET_CADET_ChannelManageMessage *) msgh, fwd);
+ break;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " recv nonce e %u\n", msg->nonce);
- t_decrypt (t, &nonce, &msg->nonce, ping_encryption_size (), msg->iv);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " recv nonce c %u\n", nonce);
- send_pong (t, nonce);
+ default:
+ GNUNET_break_op (0);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "end-to-end message not known (%u)\n",
+ ntohs (msgh->type));
+ GCT_debug (t, GNUNET_ERROR_TYPE_WARNING);
}
}
+/******************************************************************************/
+/******************************** API ***********************************/
+/******************************************************************************/
+
/**
- * Peer has answer to our challenge.
- * If answer is successful, consider the key exchange finished and clean
- * up all related state.
+ * Decrypt and process an encrypted message.
+ *
+ * Calls the appropriate handler for a message in a channel of a local tunnel.
*
* @param t Tunnel this message came on.
- * @param msg Key eXchange Pong message.
+ * @param msg Message header.
*/
-static void
-handle_pong (struct CadetTunnel *t,
- const struct GNUNET_CADET_KX_Pong *msg)
+void
+GCT_handle_encrypted (struct CadetTunnel *t,
+ const struct GNUNET_CADET_TunnelEncryptedMessage *msg)
{
- uint32_t challenge;
+ uint16_t size = ntohs (msg->header.size);
+ char cbuf [size];
+ int decrypted_size;
+ const struct GNUNET_MessageHeader *msgh;
+ unsigned int off;
- LOG (GNUNET_ERROR_TYPE_INFO, "<== PONG for %s\n", GCT_2s (t));
- if (NULL == t->rekey_task)
- {
- GNUNET_STATISTICS_update (stats, "# duplicate PONG messages", 1, GNUNET_NO);
- return;
- }
- if (NULL == t->kx_ctx)
+ GNUNET_STATISTICS_update (stats, "# received encrypted", 1, GNUNET_NO);
+
+ decrypted_size = t_ax_decrypt_and_validate (t, cbuf, msg, size);
+
+ if (-1 == decrypted_size)
{
- GNUNET_STATISTICS_update (stats, "# stray PONG messages", 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (stats, "# unable to decrypt", 1, GNUNET_NO);
+ if (CADET_TUNNEL_KEY_PING <= t->estate)
+ {
+ GNUNET_break_op (0);
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Wrong crypto, tunnel %s\n", GCT_2s (t));
+ GCT_debug (t, GNUNET_ERROR_TYPE_WARNING);
+ }
return;
}
+ GCT_change_estate (t, CADET_TUNNEL_KEY_OK);
- t_decrypt (t, &challenge, &msg->nonce, sizeof (uint32_t), msg->iv);
- if (challenge != t->kx_ctx->challenge)
+ /* FIXME: this is bad, as the structs returned from
+ this loop may be unaligned, see util's MST for
+ how to do this right. */
+ off = 0;
+ while (off + sizeof (struct GNUNET_MessageHeader) <= decrypted_size)
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Wrong PONG challenge on %s\n", GCT_2s (t));
- LOG (GNUNET_ERROR_TYPE_DEBUG, "PONG: %u (e: %u). Expected: %u.\n",
- challenge, msg->nonce, t->kx_ctx->challenge);
- send_ephemeral (t);
- return;
- }
- GNUNET_SCHEDULER_cancel (t->rekey_task);
- t->rekey_task = NULL;
+ uint16_t msize;
- /* Don't free the old keys right away, but after a delay.
- * Rationale: the KX could have happened over a very fast connection,
- * with payload traffic still signed with the old key stuck in a slower
- * connection.
- * Don't keep the keys longer than 1/4 the rekey period, and no longer than
- * one minute.
- */
- destroy_kx_ctx (t);
- GCT_change_estate (t, CADET_TUNNEL_KEY_OK);
+ msgh = (const struct GNUNET_MessageHeader *) &cbuf[off];
+ msize = ntohs (msgh->size);
+ if (msize < sizeof (struct GNUNET_MessageHeader))
+ {
+ GNUNET_break_op (0);
+ return;
+ }
+ if (off + msize < decrypted_size)
+ {
+ GNUNET_break_op (0);
+ return;
+ }
+ handle_decrypted (t, msgh, GNUNET_SYSERR);
+ off += msize;
+ }
}
/**
- * Handle Axolotl handshake.
+ * Handle a Key eXchange message.
*
- * @param t Tunnel this message came on.
- * @param msg Key eXchange Pong message.
+ * @param t Tunnel on which the message came.
+ * @param msg KX message itself.
*/
-static void
-handle_kx_ax (struct CadetTunnel *t, const struct GNUNET_CADET_AX_KX *msg)
+void
+GCT_handle_kx (struct CadetTunnel *t,
+ const struct GNUNET_CADET_TunnelKeyExchangeMessage *msg)
{
struct CadetTunnelAxolotl *ax;
struct GNUNET_HashCode key_material[3];
const struct GNUNET_PeerIdentity *pid;
int am_I_alice;
- LOG (GNUNET_ERROR_TYPE_INFO, "<== { AX_KX} on %s\n", GCT_2s (t));
+ CADET_TIMING_START;
+
+ LOG (GNUNET_ERROR_TYPE_INFO, "<== { KX} on %s\n", GCT_2s (t));
if (NULL == t->ax)
{
/* Something is wrong if ax is NULL. Whose fault it is? */
- GNUNET_break_op (CADET_OTR == t->enc_type);
- GNUNET_break (CADET_Axolotl == t->enc_type);
return;
}
ax = t->ax;
return;
}
- if (0 != (GNUNET_CADET_AX_KX_FLAG_FORCE_REPLY & ntohl (msg->flags)))
+ if (0 != (GNUNET_CADET_KX_FLAG_FORCE_REPLY & ntohl (msg->flags)))
{
if (NULL != t->rekey_task)
{
GNUNET_SCHEDULER_cancel (t->rekey_task);
t->rekey_task = NULL;
}
- GCT_send_ax_kx (t, GNUNET_NO);
+ GCT_send_kx (t, GNUNET_NO);
}
if (0 == memcmp (&ax->DHRr, &msg->ratchet_key, sizeof(msg->ratchet_key)))
ax->PNs = 0;
ax->Nr = 0;
ax->Ns = 0;
+
GCT_change_estate (t, CADET_TUNNEL_KEY_PING);
send_queued_data (t);
-}
-
-
-/**
- * Demultiplex by message type and call appropriate handler for a message
- * towards a channel of a local tunnel.
- *
- * @param t Tunnel this message came on.
- * @param msgh Message header.
- * @param fwd Is this message fwd? This only is meaningful in loopback channels.
- * #GNUNET_YES if message is FWD on the respective channel (loopback)
- * #GNUNET_NO if message is BCK on the respective channel (loopback)
- * #GNUNET_SYSERR if message on a one-ended channel (remote)
- */
-static void
-handle_decrypted (struct CadetTunnel *t,
- const struct GNUNET_MessageHeader *msgh,
- int fwd)
-{
- uint16_t type;
- char buf[256];
-
- type = ntohs (msgh->type);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "<-- %s on %s\n", GC_m2s (type), GCT_2s (t));
- SPRINTF (buf, "# received encrypted of type %hu (%s)", type, GC_m2s (type));
- GNUNET_STATISTICS_update (stats, buf, 1, GNUNET_NO);
-
- switch (type)
- {
- case GNUNET_MESSAGE_TYPE_CADET_KEEPALIVE:
- /* Do nothing, connection aleady got updated. */
- GNUNET_STATISTICS_update (stats, "# keepalives received", 1, GNUNET_NO);
- break;
-
- case GNUNET_MESSAGE_TYPE_CADET_DATA:
- /* Don't send hop ACK, wait for client to ACK */
- handle_data (t, (struct GNUNET_CADET_Data *) msgh, fwd);
- break;
-
- case GNUNET_MESSAGE_TYPE_CADET_DATA_ACK:
- handle_data_ack (t, (struct GNUNET_CADET_DataACK *) msgh, fwd);
- break;
-
- case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_CREATE:
- handle_ch_create (t, (struct GNUNET_CADET_ChannelCreate *) msgh);
- break;
-
- case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_NACK:
- handle_ch_nack (t, (struct GNUNET_CADET_ChannelManage *) msgh);
- break;
-
- case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_ACK:
- handle_ch_ack (t, (struct GNUNET_CADET_ChannelManage *) msgh, fwd);
- break;
-
- case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY:
- handle_ch_destroy (t, (struct GNUNET_CADET_ChannelManage *) msgh, fwd);
- break;
-
- default:
- GNUNET_break_op (0);
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "end-to-end message not known (%u)\n",
- ntohs (msgh->type));
- GCT_debug (t, GNUNET_ERROR_TYPE_WARNING);
- }
-}
-
-
-/******************************************************************************/
-/******************************** API ***********************************/
-/******************************************************************************/
-/**
- * Decrypt old format and demultiplex by message type. Call appropriate handler
- * for a message towards a channel of a local tunnel.
- *
- * @param t Tunnel this message came on.
- * @param msg Message header.
- */
-void
-GCT_handle_encrypted (struct CadetTunnel *t,
- const struct GNUNET_MessageHeader *msg)
-{
- uint16_t size = ntohs (msg->size);
- char cbuf [size];
- int decrypted_size;
- uint16_t type;
- const struct GNUNET_MessageHeader *msgh;
- unsigned int off;
-
- type = ntohs (msg->type);
- switch (type)
- {
- case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED:
- {
- const struct GNUNET_CADET_Encrypted *emsg;
- size_t payload_size;
-
- GNUNET_STATISTICS_update (stats, "# received OTR", 1, GNUNET_NO);
- emsg = (const struct GNUNET_CADET_Encrypted *) msg;
- payload_size = size - sizeof (struct GNUNET_CADET_Encrypted);
- decrypted_size = t_decrypt_and_validate (t, cbuf, &emsg[1], payload_size,
- emsg->iv, &emsg->hmac);
- }
- break;
- case GNUNET_MESSAGE_TYPE_CADET_AX:
- {
- const struct GNUNET_CADET_AX *emsg;
-
- GNUNET_STATISTICS_update (stats, "# received Axolotl", 1, GNUNET_NO);
- emsg = (const struct GNUNET_CADET_AX *) msg;
- decrypted_size = t_ax_decrypt_and_validate (t, cbuf, emsg, size);
- }
- break;
- default:
- GNUNET_break_op (0);
- return;
- }
-
- if (-1 == decrypted_size)
- {
- GNUNET_break_op (0);
- GNUNET_STATISTICS_update (stats, "# unable to decrypt", 1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_WARNING, "Wrong crypto on tunnel %s\n", GCT_2s (t));
- GCT_debug (t, GNUNET_ERROR_TYPE_WARNING);
- return;
- }
- GCT_change_estate (t, CADET_TUNNEL_KEY_OK);
-
- /* FIXME: this is bad, as the structs returned from
- this loop may be unaligned, see util's MST for
- how to do this right. */
- off = 0;
- while (off + sizeof (struct GNUNET_MessageHeader) <= decrypted_size)
- {
- uint16_t msize;
-
- msgh = (const struct GNUNET_MessageHeader *) &cbuf[off];
- msize = ntohs (msgh->size);
- if (msize < sizeof (struct GNUNET_MessageHeader))
- {
- GNUNET_break_op (0);
- return;
- }
- if (off + msize < decrypted_size)
- {
- GNUNET_break_op (0);
- return;
- }
- handle_decrypted (t, msgh, GNUNET_SYSERR);
- off += msize;
- }
-}
-
-
-/**
- * Demultiplex an encapsulated KX message by message type.
- *
- * @param t Tunnel on which the message came.
- * @param message Payload of KX message.
- */
-void
-GCT_handle_kx (struct CadetTunnel *t,
- const struct GNUNET_MessageHeader *message)
-{
- uint16_t type;
- char buf[256];
- type = ntohs (message->type);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "kx message received: %s\n", GC_m2s (type));
- sprintf (buf, "# received KX of type %hu (%s)", type, GC_m2s (type));
- GNUNET_STATISTICS_update (stats, buf, 1, GNUNET_NO);
- switch (type)
- {
- case GNUNET_MESSAGE_TYPE_CADET_KX_EPHEMERAL:
- handle_ephemeral (t, (const struct GNUNET_CADET_KX_Ephemeral *) message);
- break;
-
- case GNUNET_MESSAGE_TYPE_CADET_KX_PONG:
- handle_pong (t, (const struct GNUNET_CADET_KX_Pong *) message);
- break;
-
- case GNUNET_MESSAGE_TYPE_CADET_AX_KX:
- handle_kx_ax (t, (const struct GNUNET_CADET_AX_KX *) message);
- break;
-
- default:
- GNUNET_break_op (0);
- LOG (GNUNET_ERROR_TYPE_WARNING, "kx message %s unknown\n", GC_m2s (type));
- }
+ CADET_TIMING_END;
}
/**
GCT_init (const struct GNUNET_CONFIGURATION_Handle *c,
const struct GNUNET_CRYPTO_EddsaPrivateKey *key)
{
- int expected_overhead;
+ unsigned int expected_overhead;
LOG (GNUNET_ERROR_TYPE_DEBUG, "init\n");
expected_overhead = 0;
- expected_overhead += sizeof (struct GNUNET_CADET_Encrypted);
- expected_overhead += sizeof (struct GNUNET_CADET_Data);
- expected_overhead += sizeof (struct GNUNET_CADET_ACK);
+ expected_overhead += sizeof (struct GNUNET_CADET_TunnelEncryptedMessage);
+ expected_overhead += sizeof (struct GNUNET_CADET_ChannelAppDataMessage);
+ expected_overhead += sizeof (struct GNUNET_CADET_ConnectionEncryptedAckMessage);
GNUNET_assert (GNUNET_CONSTANTS_CADET_P2P_OVERHEAD == expected_overhead);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (c, "CADET", "DEFAULT_TTL",
- &default_ttl))
- {
- GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_DEBUG,
- "CADET", "DEFAULT_TTL", "USING DEFAULT");
- default_ttl = 64;
- }
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_time (c, "CADET", "REKEY_PERIOD",
- &rekey_period))
- {
- rekey_period = GNUNET_TIME_UNIT_DAYS;
- }
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (c, "CADET", "RATCHET_MESSAGES",
+ GNUNET_CONFIGURATION_get_value_number (c,
+ "CADET",
+ "RATCHET_MESSAGES",
&ratchet_messages))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
- "CADET", "RATCHET_MESSAGES", "USING DEFAULT");
+ "CADET",
+ "RATCHET_MESSAGES",
+ "USING DEFAULT");
ratchet_messages = 64;
}
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_time (c, "CADET", "RATCHET_TIME",
+ GNUNET_CONFIGURATION_get_value_time (c,
+ "CADET",
+ "RATCHET_TIME",
&ratchet_time))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
id_key = key;
-
- otr_kx_msg.header.size = htons (sizeof (otr_kx_msg));
- otr_kx_msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_KX_EPHEMERAL);
- otr_kx_msg.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CADET_KX);
- otr_kx_msg.purpose.size = htonl (ephemeral_purpose_size ());
- otr_kx_msg.origin_identity = my_full_id;
- rekey_task = GNUNET_SCHEDULER_add_now (&global_otr_rekey, NULL);
tunnels = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_YES);
}
GCT_shutdown (void)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down tunnels\n");
- if (NULL != rekey_task)
- {
- GNUNET_SCHEDULER_cancel (rekey_task);
- rekey_task = NULL;
- }
GNUNET_CONTAINER_multipeermap_iterate (tunnels, &destroy_iterator, NULL);
GNUNET_CONTAINER_multipeermap_destroy (tunnels);
}
struct CadetTunnel *t;
t = GNUNET_new (struct CadetTunnel);
- t->next_chid = 0;
+ t->next_ctn.cn = 0;
t->peer = destination;
if (GNUNET_OK !=
}
else if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate triggered kx\n");
- GCT_send_ax_kx (t, GNUNET_NO);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate triggered KX\n");
+ GCT_send_kx (t, GNUNET_NO);
}
else
{
* of being created/processed.
*
* @param cls Closure (Tunnel to check).
- * @param tc Task context.
*/
static void
-trim_connections (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+trim_connections (void *cls)
{
struct CadetTunnel *t = cls;
t->trim_connections_task = NULL;
-
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
-
if (GCT_count_connections (t) > 2 * CONNECTIONS_PER_TUNNEL)
{
struct CadetTConnection *iter;
* @param ch Channel.
*/
void
-GCT_add_channel (struct CadetTunnel *t, struct CadetChannel *ch)
+GCT_add_channel (struct CadetTunnel *t,
+ struct CadetChannel *ch)
{
struct CadetTChannel *aux;
aux = GNUNET_new (struct CadetTChannel);
aux->ch = ch;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " adding %p to %p\n", aux, t->channel_head);
- GNUNET_CONTAINER_DLL_insert_tail (t->channel_head, t->channel_tail, aux);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ " adding %p to %p\n", aux, t->channel_head);
+ GNUNET_CONTAINER_DLL_insert_tail (t->channel_head,
+ t->channel_tail,
+ aux);
if (NULL != t->destroy_task)
{
if (aux->ch == ch)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " found! %s\n", GCCH_2s (ch));
- GNUNET_CONTAINER_DLL_remove (t->channel_head, t->channel_tail, aux);
+ GNUNET_CONTAINER_DLL_remove (t->channel_head,
+ t->channel_tail,
+ aux);
GNUNET_free (aux);
return;
}
* Search for a channel by global ID.
*
* @param t Tunnel containing the channel.
- * @param chid Public channel number.
+ * @param ctn Public channel number.
*
* @return channel handler, NULL if doesn't exist
*/
struct CadetChannel *
-GCT_get_channel (struct CadetTunnel *t, CADET_ChannelNumber chid)
+GCT_get_channel (struct CadetTunnel *t,
+ struct GNUNET_CADET_ChannelTunnelNumber ctn)
{
struct CadetTChannel *iter;
for (iter = t->channel_head; NULL != iter; iter = iter->next)
{
- if (GCCH_get_id (iter->ch) == chid)
+ if (GCCH_get_id (iter->ch).cn == ctn.cn)
break;
}
* the tunnel. This way we avoid a new public key handshake.
*
* @param cls Closure (tunnel to destroy).
- * @param tc Task context.
*/
static void
-delayed_destroy (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+delayed_destroy (void *cls)
{
struct CadetTunnel *t = cls;
struct CadetTConnection *iter;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "delayed destroying tunnel %p\n", t);
- if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Not destroying tunnel, due to shutdown. "
- "Tunnel at %p should have been freed by GCT_shutdown\n", t);
- return;
- }
t->destroy_task = NULL;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "delayed destroying tunnel %p\n",
+ t);
t->cstate = CADET_TUNNEL_SHUTDOWN;
-
for (iter = t->connection_head; NULL != iter; iter = iter->next)
{
GCC_send_destroy (iter->c);
if (NULL == t)
return;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "destroying tunnel %s\n", GCP_2s (t->peer));
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "destroying tunnel %s\n",
+ GCP_2s (t->peer));
GNUNET_break (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_remove (tunnels,
GCP_get_id (t->peer), t));
mh = (struct GNUNET_MessageHeader *) &t->tq_head[1];
type = ntohs (mh->type);
- if (0 == keepalives_queued && GNUNET_MESSAGE_TYPE_CADET_KEEPALIVE == type)
+ if (0 == keepalives_queued && GNUNET_MESSAGE_TYPE_CADET_CHANNEL_KEEPALIVE == type)
{
keepalives_queued = 1;
LOG (GNUNET_ERROR_TYPE_DEBUG,
if (NULL != t->destroy_task)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "cancelling dest: %p\n", t->destroy_task);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "cancelling dest: %p\n",
+ t->destroy_task);
GNUNET_SCHEDULER_cancel (t->destroy_task);
t->destroy_task = NULL;
}
GNUNET_SCHEDULER_cancel (t->rekey_task);
t->rekey_task = NULL;
}
- if (NULL != t->kx_ctx)
- {
- if (NULL != t->kx_ctx->finish_task)
- GNUNET_SCHEDULER_cancel (t->kx_ctx->finish_task);
- GNUNET_free (t->kx_ctx);
- }
-
if (NULL != t->ax)
destroy_ax (t);
GCT_use_path (struct CadetTunnel *t, struct CadetPeerPath *path)
{
struct CadetConnection *c;
- struct GNUNET_CADET_Hash cid;
+ struct GNUNET_CADET_ConnectionTunnelIdentifier cid;
unsigned int own_pos;
if (NULL == t || NULL == path)
*
* @return GID of a channel free to use.
*/
-CADET_ChannelNumber
-GCT_get_next_chid (struct CadetTunnel *t)
+struct GNUNET_CADET_ChannelTunnelNumber
+GCT_get_next_ctn (struct CadetTunnel *t)
{
- CADET_ChannelNumber chid;
- CADET_ChannelNumber mask;
+ struct GNUNET_CADET_ChannelTunnelNumber ctn;
+ struct GNUNET_CADET_ChannelTunnelNumber mask;
int result;
/* Set bit 30 depending on the ID relationship. Bit 31 is always 0 for GID.
*/
result = GNUNET_CRYPTO_cmp_peer_identity (&my_full_id, GCP_get_id (t->peer));
if (0 > result)
- mask = 0x40000000;
+ mask.cn = htonl (0x40000000);
else
- mask = 0x0;
- t->next_chid |= mask;
+ mask.cn = 0x0;
+ t->next_ctn.cn |= mask.cn;
- while (NULL != GCT_get_channel (t, t->next_chid))
+ while (NULL != GCT_get_channel (t, t->next_ctn))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Channel %u exists...\n", t->next_chid);
- t->next_chid = (t->next_chid + 1) & ~GNUNET_CADET_LOCAL_CHANNEL_ID_CLI;
- t->next_chid |= mask;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Channel %u exists...\n",
+ t->next_ctn.cn);
+ t->next_ctn.cn = htonl ((ntohl (t->next_ctn.cn) + 1) & ~GNUNET_CADET_LOCAL_CHANNEL_ID_CLI);
+ t->next_ctn.cn |= mask.cn;
}
- chid = t->next_chid;
- t->next_chid = (t->next_chid + 1) & ~GNUNET_CADET_LOCAL_CHANNEL_ID_CLI;
- t->next_chid |= mask;
+ ctn = t->next_ctn;
+ t->next_ctn.cn = (t->next_ctn.cn + 1) & ~GNUNET_CADET_LOCAL_CHANNEL_ID_CLI;
+ t->next_ctn.cn |= mask.cn;
- return chid;
+ return ctn;
}
{
continue;
}
+ GNUNET_assert(cs != 0);
allow_per_connection = to_allow/cs;
to_allow -= allow_per_connection;
cs--;
*/
struct CadetTunnelQueue *
GCT_send_prebuilt_message (const struct GNUNET_MessageHeader *message,
- struct CadetTunnel *t, struct CadetConnection *c,
+ struct CadetTunnel *t,
+ struct CadetConnection *c,
int force, GCT_sent cont, void *cont_cls)
{
return send_prebuilt_message (message, t, c, force, cont, cont_cls, NULL);
/**
- * Send an Axolotl KX message.
+ * Send a KX message.
*
* @param t Tunnel on which to send it.
* @param force_reply Force the other peer to reply with a KX message.
*/
void
-GCT_send_ax_kx (struct CadetTunnel *t, int force_reply)
+GCT_send_kx (struct CadetTunnel *t, int force_reply)
{
- struct GNUNET_CADET_AX_KX msg;
- enum GNUNET_CADET_AX_KX_Flags flags;
+ static struct CadetEncryptedMessageIdentifier zero;
+ struct CadetConnection *c;
+ struct GNUNET_CADET_TunnelKeyExchangeMessage msg;
+ enum GNUNET_CADET_KX_Flags flags;
- LOG (GNUNET_ERROR_TYPE_INFO, "==> { AX_KX} on %s\n", GCT_2s (t));
+ LOG (GNUNET_ERROR_TYPE_INFO, "==> { KX} on %s\n", GCT_2s (t));
if (NULL != t->ephm_h)
{
- LOG (GNUNET_ERROR_TYPE_INFO, " already queued\n");
+ LOG (GNUNET_ERROR_TYPE_INFO, " already queued, nop\n");
+ return;
+ }
+ GNUNET_assert (GNUNET_NO == GCT_is_loopback (t));
+
+ c = tunnel_get_connection (t);
+ if (NULL == c)
+ {
+ if (NULL == t->destroy_task && CADET_TUNNEL_READY == t->cstate)
+ {
+ GNUNET_break (0);
+ GCT_debug (t, GNUNET_ERROR_TYPE_ERROR);
+ }
return;
}
msg.header.size = htons (sizeof (msg));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_AX_KX);
- flags = GNUNET_CADET_AX_KX_FLAG_NONE;
- if (force_reply)
- flags |= GNUNET_CADET_AX_KX_FLAG_FORCE_REPLY;
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_TUNNEL_KX);
+ flags = GNUNET_CADET_KX_FLAG_NONE;
+ if (GNUNET_YES == force_reply)
+ flags |= GNUNET_CADET_KX_FLAG_FORCE_REPLY;
msg.flags = htonl (flags);
+ msg.cid = *GCC_get_id (c);
GNUNET_CRYPTO_ecdhe_key_get_public (t->ax->kx_0, &msg.ephemeral_key);
GNUNET_CRYPTO_ecdhe_key_get_public (t->ax->DHRs, &msg.ratchet_key);
- t->ephm_h = send_kx (t, &msg.header);
+ t->ephm_h = GCC_send_prebuilt_message (&msg.header,
+ UINT16_MAX,
+ zero,
+ c,
+ GCC_is_origin (c, GNUNET_YES),
+ GNUNET_YES, &ephm_sent, t);
if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
GCT_change_estate (t, CADET_TUNNEL_KEY_SENT);
}
-/**
- * Sends an already built and encrypted message on a tunnel, choosing the best
- * connection. Useful for re-queueing messages queued on a destroyed connection.
- *
- * @param message Message to send. Function modifies it.
- * @param t Tunnel on which this message is transmitted.
- */
-void
-GCT_resend_message (const struct GNUNET_MessageHeader *message,
- struct CadetTunnel *t)
-{
- struct CadetConnection *c;
- int fwd;
-
- c = tunnel_get_connection (t);
- if (NULL == c)
- {
- /* TODO queue in tunnel, marked as encrypted */
- LOG (GNUNET_ERROR_TYPE_DEBUG, "No connection available, dropping.\n");
- return;
- }
- fwd = GCC_is_origin (c, GNUNET_YES);
- GNUNET_break (NULL == GCC_send_prebuilt_message (message, UINT16_MAX, 0,
- c, fwd,
- GNUNET_YES, NULL, NULL));
-}
-
-
/**
* Is the tunnel directed towards the local peer?
*
void
GCT_debug (const struct CadetTunnel *t, enum GNUNET_ErrorType level)
{
- struct CadetTChannel *iterch;
- struct CadetTConnection *iterc;
+ struct CadetTChannel *iter_ch;
+ struct CadetTConnection *iter_c;
int do_log;
do_log = GNUNET_get_log_call_status (level & (~GNUNET_ERROR_TYPE_BULK),
LOG2 (level, "TTT DEBUG TUNNEL TOWARDS %s\n", GCT_2s (t));
LOG2 (level, "TTT cstate %s, estate %s\n",
cstate2s (t->cstate), estate2s (t->estate));
- LOG2 (level, "TTT kx_ctx %p, rekey_task %u, finish task %u\n",
- t->kx_ctx, t->rekey_task, t->kx_ctx ? t->kx_ctx->finish_task : 0);
#if DUMP_KEYS_TO_STDERR
- if (CADET_Axolotl == t->enc_type)
- {
- ax_debug (t->ax, level);
- }
- else
- {
- LOG2 (level, "TTT my EPHM\t %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &otr_kx_msg.ephemeral_key));
- LOG2 (level, "TTT peers EPHM:\t %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->peers_ephemeral_key));
- LOG2 (level, "TTT ENC key:\t %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->e_key));
- LOG2 (level, "TTT DEC key:\t %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->d_key));
- if (t->kx_ctx)
- {
- LOG2 (level, "TTT OLD ENC key:\t %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->kx_ctx->e_key_old));
- LOG2 (level, "TTT OLD DEC key:\t %s\n",
- GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->kx_ctx->d_key_old));
- }
- }
+ ax_debug (t->ax, level);
#endif
LOG2 (level, "TTT tq_head %p, tq_tail %p\n", t->tq_head, t->tq_tail);
LOG2 (level, "TTT destroy %p\n", t->destroy_task);
-
LOG2 (level, "TTT channels:\n");
- for (iterch = t->channel_head; NULL != iterch; iterch = iterch->next)
+ for (iter_ch = t->channel_head; NULL != iter_ch; iter_ch = iter_ch->next)
{
- GCCH_debug (iterch->ch, level);
+ GCCH_debug (iter_ch->ch, level);
}
LOG2 (level, "TTT connections:\n");
- for (iterc = t->connection_head; NULL != iterc; iterc = iterc->next)
+ for (iter_c = t->connection_head; NULL != iter_c; iter_c = iter_c->next)
{
- GCC_debug (iterc->c, level);
+ GCC_debug (iter_c->c, level);
}
LOG2 (level, "TTT DEBUG TUNNEL END\n");
projects / oweals / gnunet.git / blobdiff