/*
This file is part of GNUnet.
- Copyright (C) 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2013 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
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
#include "platform.h"
#define DUMP_KEYS_TO_STDERR GNUNET_NO
#endif
+#define MIN_TUNNEL_BUFFER 8
+#define MAX_TUNNEL_BUFFER 64
+#define MAX_SKIPPED_KEYS 64
+#define MAX_KEY_GAP 256
+#define AX_HEADER_SIZE (sizeof (uint32_t) * 2\
+ + sizeof (struct GNUNET_CRYPTO_EcdhePublicKey))
+
+
/******************************************************************************/
/******************************** STRUCTS **********************************/
/******************************************************************************/
CADET_OTR
};
+/**
+ * Struct to old keys for skipped messages while advancing the Axolotl ratchet.
+ */
struct CadetTunnelSkippedKey
{
+ /**
+ * DLL next.
+ */
struct CadetTunnelSkippedKey *next;
+
+ /**
+ * DLL prev.
+ */
struct CadetTunnelSkippedKey *prev;
+ /**
+ * When was this key stored (for timeout).
+ */
struct GNUNET_TIME_Absolute timestamp;
+ /**
+ * Header key.
+ */
struct GNUNET_CRYPTO_SymmetricSessionKey HK;
+
+ /**
+ * Message key.
+ */
struct GNUNET_CRYPTO_SymmetricSessionKey MK;
+
+ /**
+ * Key number for a given HK.
+ */
+ unsigned int Kn;
};
+
/**
- * Axolotl data, according to https://github.com/trevp/axolotl/wiki
+ * Axolotl data, according to https://github.com/trevp/axolotl/wiki .
*/
struct CadetTunnelAxolotl
{
/**
* A (double linked) list of stored message keys and associated header keys
- * for "skipped" messages, i.e. messages that have not bee*n
- * received despite the reception of more recent messages, (head)/
+ * for "skipped" messages, i.e. messages that have not been
+ * received despite the reception of more recent messages, (head).
*/
struct CadetTunnelSkippedKey *skipped_head;
/**
* Elements in @a skipped_head <-> @a skipped_tail.
*/
- uint skipped;
+ unsigned int skipped;
/**
- * 32-byte root key which gets updated by DH ratchet
+ * 32-byte root key which gets updated by DH ratchet.
*/
struct GNUNET_CRYPTO_SymmetricSessionKey RK;
/**
- * 32-byte header key (send)
+ * 32-byte header key (send).
*/
struct GNUNET_CRYPTO_SymmetricSessionKey HKs;
struct GNUNET_CRYPTO_SymmetricSessionKey HKr;
/**
- * 32-byte next header key (send)
+ * 32-byte next header key (send).
*/
struct GNUNET_CRYPTO_SymmetricSessionKey NHKs;
/**
- * 32-byte next header key (recv)
+ * 32-byte next header key (recv).
*/
struct GNUNET_CRYPTO_SymmetricSessionKey NHKr;
/**
- * 32-byte chain keys (used for forward-secrecy updating, send)
+ * 32-byte chain keys (used for forward-secrecy updating, send).
*/
struct GNUNET_CRYPTO_SymmetricSessionKey CKs;
/**
- * 32-byte chain keys (used for forward-secrecy updating, recv)
+ * 32-byte chain keys (used for forward-secrecy updating, recv).
*/
struct GNUNET_CRYPTO_SymmetricSessionKey CKr;
/**
- * ECDH for key exchange (A0 / B0)
+ * ECDH for key exchange (A0 / B0).
*/
struct GNUNET_CRYPTO_EcdhePrivateKey *kx_0;
/**
- * ECDH Ratchet key (send)
+ * ECDH Ratchet key (send).
*/
struct GNUNET_CRYPTO_EcdhePrivateKey *DHRs;
/**
- * ECDH Ratchet key (recv)
+ * ECDH Ratchet key (recv).
*/
struct GNUNET_CRYPTO_EcdhePublicKey DHRr;
/**
- * Message number (reset to 0 with each new ratchet, send)
+ * Message number (reset to 0 with each new ratchet, next message to send).
*/
uint32_t Ns;
/**
- * Message numbers (reset to 0 with each new ratchet, recv)
+ * Message number (reset to 0 with each new ratchet, next message to recv).
*/
uint32_t Nr;
uint32_t PNs;
/**
- * True (#GNUNET_YES) if the party will send a new ratchet key in next msg.
+ * True (#GNUNET_YES) if we have to send a new ratchet key in next msg.
*/
int ratchet_flag;
+
+ /**
+ * Number of messages recieved since our last ratchet advance.
+ * - If this counter = 0, we cannot send a new ratchet key in next msg.
+ * - If this counter > 0, we can (but don't yet have to) send a new key.
+ */
+ unsigned int ratchet_allowed;
+
+ /**
+ * Number of messages recieved since our last ratchet advance.
+ * - If this counter = 0, we cannot send a new ratchet key in next msg.
+ * - If this counter > 0, we can (but don't yet have to) send a new key.
+ */
+ unsigned int ratchet_counter;
+
+ /**
+ * When does this ratchet expire and a new one is triggered.
+ */
+ struct GNUNET_TIME_Absolute ratchet_expiration;
};
/**
};
-/**
- * Cached Axolotl key with signature.
- */
-struct CadetAxolotlSignedKey
-{
- /**
- * Information about what is being signed (@a permanent_key).
- */
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
- /**
- * Permanent public ECDH key.
- */
- struct GNUNET_CRYPTO_EcdhePublicKey permanent_key;
-
- /**
- * An EdDSA signature of the permanent ECDH key with the Peer's ID key.
- */
- struct GNUNET_CRYPTO_EddsaSignature signature;
-} GNUNET_PACKED;
-
-
/******************************************************************************/
/******************************* GLOBALS ***********************************/
/******************************************************************************/
*/
static unsigned long long default_ttl;
-
/**
* Own Peer ID private key.
*/
const static struct GNUNET_CRYPTO_EddsaPrivateKey *id_key;
+
/******************************** AXOLOTL ************************************/
-static struct GNUNET_CRYPTO_EcdhePrivateKey *ax_key;
+/**
+ * How many messages are needed to trigger a ratchet advance.
+ */
+static unsigned long long ratchet_messages;
/**
- * Own Axolotl permanent public key (cache).
+ * How long until we trigger a ratched advance.
*/
-static struct CadetAxolotlSignedKey ax_identity;
+static struct GNUNET_TIME_Relative ratchet_time;
-/******************************** OTR ***********************************/
+/******************************** OTR ***********************************/
/**
* Own global OTR ephemeral private key.
is_ready (struct CadetTunnel *t)
{
int ready;
-
- GCT_debug (t, GNUNET_ERROR_TYPE_DEBUG);
- ready = CADET_TUNNEL_READY == t->cstate
- && (CADET_TUNNEL_KEY_OK == t->estate
- || CADET_TUNNEL_KEY_REKEY == t->estate);
+ int conn_ok;
+ int enc_ok;
+
+ 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);
+ ready = conn_ok && enc_ok;
ready = ready || GCT_is_loopback (t);
return ready;
}
}
-/**
- * Ephemeral key message purpose size.
- *
- * @return Size of the part of the ephemeral key message that must be signed.
- */
-static size_t
-ax_purpose_size (void)
-{
- return sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
- sizeof (struct GNUNET_CRYPTO_EcdhePublicKey);
-}
-
-
/**
* Size of the encrypted part of a ping message.
*
* @param t Tunnel on which the message came.
* @param msg The ephemeral key message.
*
- * @return GNUNET_OK if message is fine, GNUNET_SYSERR otherwise.
+ * @return #GNUNET_OK if message is fine, #GNUNET_SYSERR otherwise.
*/
int
check_ephemeral (struct CadetTunnel *t,
{
/* 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 !=
&msg->purpose,
&msg->signature,
&msg->origin_identity.public_key))
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Signature invalid\n");
return GNUNET_SYSERR;
+ }
return GNUNET_OK;
}
}
+/**
+ * Create a new Axolotl ephemeral (ratchet) key.
+ *
+ * @param t Tunnel.
+ */
+static void
+new_ephemeral (struct CadetTunnel *t)
+{
+ GNUNET_free_non_null (t->ax->DHRs);
+ t->ax->DHRs = GNUNET_CRYPTO_ecdhe_key_create();
+ #if DUMP_KEYS_TO_STDERR
+ {
+ struct GNUNET_CRYPTO_EcdhePublicKey pub;
+ GNUNET_CRYPTO_ecdhe_key_get_public (t->ax->DHRs, &pub);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " new DHRs generated: pub %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &pub));
+ }
+ #endif
+}
+
+
/**
* Calculate HMAC.
*
struct GNUNET_HashCode hash;
#if DUMP_KEYS_TO_STDERR
- LOG (GNUNET_ERROR_TYPE_INFO, " HMAC with key %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) key));
+ LOG (GNUNET_ERROR_TYPE_INFO, " HMAC %u bytes with key %s\n", size,
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) key));
#endif
GNUNET_CRYPTO_hmac_derive_key (&auth_key, key,
&iv, sizeof (iv),
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_h2s ((struct GNUNET_HashCode *) key));
+ 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");
/**
- * Generate a new key with a HMAC mechanism from the existing chain key.
+ * Perform a HMAC.
*
- * @param ax Axolotl context.
- * @param key[out] Derived key.
+ * @param key Key to use.
+ * @param hash[out] Resulting HMAC.
* @param source Source key material (data to HMAC).
* @param len Length of @a source.
*/
-void
-t_ax_hmac_hash (struct CadetTunnelAxolotl *ax,
- struct GNUNET_CRYPTO_SymmetricSessionKey *key,
+static void
+t_ax_hmac_hash (struct GNUNET_CRYPTO_SymmetricSessionKey *key,
+ struct GNUNET_HashCode *hash,
void *source, unsigned int len)
{
- static const char ctx[] = "axolotl key derivation";
+ static const char ctx[] = "axolotl HMAC-HASH";
struct GNUNET_CRYPTO_AuthKey auth_key;
- struct GNUNET_HashCode hash;
- GNUNET_CRYPTO_hmac_derive_key (&auth_key, &ax->CKs,
+ GNUNET_CRYPTO_hmac_derive_key (&auth_key, key,
ctx, sizeof (ctx),
NULL);
- GNUNET_CRYPTO_hmac (&auth_key, source, len, &hash);
- GNUNET_CRYPTO_kdf (key, sizeof (*key),
- ctx, sizeof (ctx),
- &hash, sizeof (hash));
+ GNUNET_CRYPTO_hmac (&auth_key, source, len, hash);
+}
+
+
+/**
+ * Derive a key from a HMAC-HASH.
+ *
+ * @param key Key to use for the HMAC.
+ * @param out Key to generate.
+ * @param source Source key material (data to HMAC).
+ * @param len Length of @a source.
+ */
+static void
+t_hmac_derive_key (struct GNUNET_CRYPTO_SymmetricSessionKey *key,
+ struct GNUNET_CRYPTO_SymmetricSessionKey *out,
+ void *source, unsigned int len)
+{
+ static const char ctx[] = "axolotl derive key";
+ struct GNUNET_HashCode h;
+
+ t_ax_hmac_hash (key, &h, source, len);
+ GNUNET_CRYPTO_kdf (out, sizeof (*out), ctx, sizeof (ctx),
+ &h, sizeof (h), NULL);
}
/**
- * Encrypt data with the tunnel key.
+ * Encrypt data with the axolotl tunnel key.
*
* @param t Tunnel whose key to use.
* @param dst Destination for the encrypted data.
ax = t->ax;
+ ax->ratchet_counter++;
+ if (GNUNET_YES == ax->ratchet_allowed
+ && (ratchet_messages <= ax->ratchet_counter
+ || 0 == GNUNET_TIME_absolute_get_remaining (ax->ratchet_expiration).rel_value_us))
+ {
+ ax->ratchet_flag = GNUNET_YES;
+ }
+
if (GNUNET_YES == ax->ratchet_flag)
{
/* Advance ratchet */
+ struct GNUNET_CRYPTO_SymmetricSessionKey keys[3];
+ struct GNUNET_HashCode dh;
+ struct GNUNET_HashCode hmac;
+ static const char ctx[] = "axolotl ratchet";
+
+ new_ephemeral (t);
+ ax->HKs = ax->NHKs;
+
+ /* RK, NHKs, CKs = KDF( HMAC-HASH(RK, DH(DHRs, DHRr)) ) */
+ GNUNET_CRYPTO_ecc_ecdh (ax->DHRs, &ax->DHRr, &dh);
+ t_ax_hmac_hash (&ax->RK, &hmac, &dh, sizeof (dh));
+ GNUNET_CRYPTO_kdf (keys, sizeof (keys), ctx, sizeof (ctx),
+ &hmac, sizeof (hmac), NULL);
+ ax->RK = keys[0];
+ ax->NHKs = keys[1];
+ ax->CKs = keys[2];
+
+ ax->PNs = ax->Ns;
+ ax->Ns = 0;
+ ax->ratchet_flag = GNUNET_NO;
+ ax->ratchet_allowed = GNUNET_NO;
+ ax->ratchet_counter = 0;
+ ax->ratchet_expiration =
+ GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get(), ratchet_time);
}
- t_ax_hmac_hash (ax, &MK, "0", 1);
+ t_hmac_derive_key (&ax->CKs, &MK, "0", 1);
GNUNET_CRYPTO_symmetric_derive_iv (&iv, &MK, NULL, 0, NULL);
#if DUMP_KEYS_TO_STDERR
- LOG (GNUNET_ERROR_TYPE_INFO, " ENC with key %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &MK));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " CKs: %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->CKs));
+ LOG (GNUNET_ERROR_TYPE_INFO, " AX_ENC with key %u: %s\n", ax->Ns,
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &MK));
#endif
out_size = GNUNET_CRYPTO_symmetric_encrypt (src, size, &MK, &iv, dst);
- t_ax_hmac_hash (ax, &ax->CKs, "1", 1);
+ t_hmac_derive_key (&ax->CKs, &ax->CKs, "1", 1);
LOG (GNUNET_ERROR_TYPE_DEBUG, " t_ax_encrypt end\n");
}
+/**
+ * Decrypt data with the axolotl tunnel key.
+ *
+ * @param t Tunnel whose key to use.
+ * @param dst Destination for the decrypted data.
+ * @param src Source of the ciphertext. Can overlap with @c dst.
+ * @param size Size of the ciphertext.
+ *
+ * @return Size of the decrypted data.
+ */
+static int
+t_ax_decrypt (struct CadetTunnel *t, void *dst, const void *src, size_t size)
+{
+ struct GNUNET_CRYPTO_SymmetricSessionKey MK;
+ struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
+ struct CadetTunnelAxolotl *ax;
+ size_t out_size;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " t_ax_decrypt start\n");
+
+ ax = t->ax;
+
+ t_hmac_derive_key (&ax->CKr, &MK, "0", 1);
+ GNUNET_CRYPTO_symmetric_derive_iv (&iv, &MK, NULL, 0, NULL);
+
+ #if DUMP_KEYS_TO_STDERR
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " CKr: %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->CKr));
+ LOG (GNUNET_ERROR_TYPE_INFO, " AX_DEC with key %u: %s\n", ax->Nr,
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &MK));
+ #endif
+
+ GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
+ out_size = GNUNET_CRYPTO_symmetric_decrypt (src, size, &MK, &iv, dst);
+ GNUNET_assert (out_size == size);
+
+ t_hmac_derive_key (&ax->CKr, &ax->CKr, "1", 1);
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " t_ax_decrypt end\n");
+
+ return out_size;
+}
+
+
+/**
+ * Encrypt header with the axolotl header key.
+ *
+ * @param t Tunnel whose key to use.
+ * @param msg Message whose header to encrypt.
+ */
+static void
+t_h_encrypt (struct CadetTunnel *t, struct GNUNET_CADET_AX *msg)
+{
+ struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
+ struct CadetTunnelAxolotl *ax;
+ size_t out_size;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " t_h_encrypt start\n");
+
+ ax = t->ax;
+ GNUNET_CRYPTO_symmetric_derive_iv (&iv, &ax->HKs, NULL, 0, NULL);
+
+ #if DUMP_KEYS_TO_STDERR
+ LOG (GNUNET_ERROR_TYPE_INFO, " AX_ENC_H with key %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->HKs));
+ #endif
+
+ out_size = GNUNET_CRYPTO_symmetric_encrypt (&msg->Ns, AX_HEADER_SIZE,
+ &ax->HKs, &iv, &msg->Ns);
+
+ GNUNET_assert (AX_HEADER_SIZE == out_size);
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " t_ax_encrypt end\n");
+}
+
+
+/**
+ * Decrypt header with the current axolotl header key.
+ *
+ * @param t Tunnel whose current ax HK to use.
+ * @param src Message whose header to decrypt.
+ * @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)
+{
+ struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
+ struct CadetTunnelAxolotl *ax;
+ size_t out_size;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " t_h_decrypt start\n");
+
+ ax = t->ax;
+ GNUNET_CRYPTO_symmetric_derive_iv (&iv, &ax->HKr, NULL, 0, NULL);
+
+ #if DUMP_KEYS_TO_STDERR
+ LOG (GNUNET_ERROR_TYPE_INFO, " AX_DEC_H with key %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->HKr));
+ #endif
+
+ out_size = GNUNET_CRYPTO_symmetric_decrypt (&src->Ns, AX_HEADER_SIZE,
+ &ax->HKr, &iv, &dst->Ns);
+
+ 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.
*
#if DUMP_KEYS_TO_STDERR
LOG (GNUNET_ERROR_TYPE_DEBUG, " t_decrypt with %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &t->d_key));
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->d_key));
#endif
if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
{
return -1;
}
+
/**
* 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 msg_hmac HMAC of the message, cannot be NULL.
+ * @param src Source of the message. Can overlap with @c dst.
+ * @param size Size of the message.
*
* @return Size of the decrypted data, -1 if an error was encountered.
*/
static int
-t_ax_decrypt_and_validate (struct CadetTunnel *t,
- void *dst, const void *src, size_t size,
- const struct GNUNET_CADET_Hash *msg_hmac)
+try_old_ax_keys (struct CadetTunnel *t, void *dst,
+ const struct GNUNET_CADET_AX *src, size_t size)
+{
+ struct CadetTunnelSkippedKey *key;
+ struct GNUNET_CADET_Hash *hmac;
+ struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
+ struct GNUNET_CADET_AX plaintext_header;
+ struct GNUNET_CRYPTO_SymmetricSessionKey *valid_HK;
+ size_t esize;
+ size_t res;
+ size_t len;
+ unsigned int N;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Trying old keys\n");
+ hmac = &plaintext_header.hmac;
+ esize = size - sizeof (struct GNUNET_CADET_AX);
+
+ /* Find a correct Header Key */
+ for (key = t->ax->skipped_head; NULL != key; key = key->next)
+ {
+ #if DUMP_KEYS_TO_STDERR
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " Trying hmac with key %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &key->HK));
+ #endif
+ t_hmac (&src->Ns, AX_HEADER_SIZE + esize, 0, &key->HK, hmac);
+ if (0 == memcmp (hmac, &src->hmac, sizeof (*hmac)))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " hmac correct\n");
+ valid_HK = &key->HK;
+ break;
+ }
+ }
+ if (NULL == key)
+ 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 (len >= sizeof (struct GNUNET_MessageHeader));
+
+ /* Decrypt header */
+ GNUNET_CRYPTO_symmetric_derive_iv (&iv, &key->HK, NULL, 0, NULL);
+ res = GNUNET_CRYPTO_symmetric_decrypt (&src->Ns, AX_HEADER_SIZE,
+ &key->HK, &iv, &plaintext_header.Ns);
+ GNUNET_assert (AX_HEADER_SIZE == res);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " Message %u, previous: %u\n",
+ ntohl (plaintext_header.Ns), ntohl (plaintext_header.PNs));
+
+ /* Find the correct Message Key */
+ N = ntohl (plaintext_header.Ns);
+ while (NULL != key && N != key->Kn)
+ key = key->next;
+ if (NULL == key || 0 != memcmp (&key->HK, valid_HK, sizeof (*valid_HK)))
+ return -1;
+
+ #if DUMP_KEYS_TO_STDERR
+ LOG (GNUNET_ERROR_TYPE_INFO, " AX_DEC_H with skipped key %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &key->HK));
+ LOG (GNUNET_ERROR_TYPE_INFO, " AX_DEC with skipped key %u: %s\n",
+ key->Kn, GNUNET_i2s ((struct GNUNET_PeerIdentity *) &key->MK));
+ #endif
+
+ /* Decrypt payload */
+ GNUNET_CRYPTO_symmetric_derive_iv (&iv, &key->MK, NULL, 0, NULL);
+ res = GNUNET_CRYPTO_symmetric_decrypt (&src[1], len, &key->MK, &iv, dst);
+
+ /* Remove key */
+ GNUNET_CONTAINER_DLL_remove (t->ax->skipped_head, t->ax->skipped_tail, key);
+ t->ax->skipped--;
+ GNUNET_free (key); /* GNUNET_free overwrites memory with 0xbaadf00d */
+
+ return res;
+}
+
+
+/**
+ * Delete a key from the list of skipped keys.
+ *
+ * @param t Tunnel to delete from.
+ * @param HKr Header Key to use.
+ */
+static void
+store_skipped_key (struct CadetTunnel *t,
+ const struct GNUNET_CRYPTO_SymmetricSessionKey *HKr)
+{
+ struct CadetTunnelSkippedKey *key;
+
+ key = GNUNET_new (struct CadetTunnelSkippedKey);
+ key->timestamp = GNUNET_TIME_absolute_get ();
+ key->Kn = t->ax->Nr;
+ key->HK = t->ax->HKr;
+ t_hmac_derive_key (&t->ax->CKr, &key->MK, "0", 1);
+ #if DUMP_KEYS_TO_STDERR
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " storing MK for Nr %u: %s\n",
+ key->Kn, GNUNET_i2s ((struct GNUNET_PeerIdentity *) &key->MK));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " for CKr: %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->ax->CKr));
+ #endif
+ t_hmac_derive_key (&t->ax->CKr, &t->ax->CKr, "1", 1);
+ GNUNET_CONTAINER_DLL_insert (t->ax->skipped_head, t->ax->skipped_tail, key);
+ t->ax->Nr++;
+ t->ax->skipped++;
+}
+
+
+/**
+ * Delete a key from the list of skipped keys.
+ *
+ * @param t Tunnel to delete from.
+ * @param key Key to delete.
+ */
+static void
+delete_skipped_key (struct CadetTunnel *t, struct CadetTunnelSkippedKey *key)
+{
+ GNUNET_CONTAINER_DLL_remove (t->ax->skipped_head, t->ax->skipped_tail, key);
+ GNUNET_free (key);
+ t->ax->skipped--;
+}
+
+
+/**
+ * Stage skipped AX keys and calculate the message key.
+ *
+ * Stores each HK and MK for skipped messages.
+ *
+ * @param t Tunnel where to stage the keys.
+ * @param HKr Header key.
+ * @param Np Received meesage number.
+ *
+ * @return GNUNET_OK if keys were stored.
+ * GNUNET_SYSERR if an error ocurred (Np not expected).
+ */
+static int
+store_ax_keys (struct CadetTunnel *t,
+ const struct GNUNET_CRYPTO_SymmetricSessionKey *HKr,
+ uint32_t Np)
+{
+ int gap;
+
+
+ gap = Np - t->ax->Nr;
+ LOG (GNUNET_ERROR_TYPE_INFO, "Storing keys [%u, %u)\n", t->ax->Nr, Np);
+ if (MAX_KEY_GAP < gap)
+ {
+ /* Avoid DoS (forcing peer to do 2*33 chain HMAC operations) */
+ /* TODO: start new key exchange on return */
+ GNUNET_break_op (0);
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Got message %u, expected %u+\n",
+ Np, t->ax->Nr);
+ return GNUNET_SYSERR;
+ }
+ if (0 > gap)
+ {
+ /* Delayed message: don't store keys, flag to try old keys. */
+ return GNUNET_SYSERR;
+ }
+
+ while (t->ax->Nr < Np)
+ store_skipped_key (t, HKr);
+
+ while (t->ax->skipped > MAX_SKIPPED_KEYS)
+ delete_skipped_key (t, t->ax->skipped_tail);
+
+ return GNUNET_OK;
+}
+
+
+/**
+ * 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 message. Can overlap with @c dst.
+ * @param size Size of the message.
+ *
+ * @return Size of the decrypted data, -1 if an error was encountered.
+ */
+static int
+t_ax_decrypt_and_validate (struct CadetTunnel *t, void *dst,
+ const struct GNUNET_CADET_AX *src, size_t size)
{
struct CadetTunnelAxolotl *ax;
+ struct GNUNET_CADET_Hash msg_hmac;
+ struct GNUNET_HashCode hmac;
+ struct GNUNET_CADET_AX plaintext_header;
+ uint32_t Np;
+ uint32_t PNp;
+ size_t esize;
+ size_t osize;
+
+ ax = t->ax;
+ esize = size - sizeof (struct GNUNET_CADET_AX);
+
+ if (NULL == ax)
+ return -1;
+
+ /* Try current HK */
+ t_hmac (&src->Ns, AX_HEADER_SIZE + esize, 0, &ax->HKr, &msg_hmac);
+ if (0 != memcmp (&msg_hmac, &src->hmac, sizeof (msg_hmac)))
+ {
+ static const char ctx[] = "axolotl ratchet";
+ struct GNUNET_CRYPTO_SymmetricSessionKey keys[3]; /* RKp, NHKp, CKp */
+ struct GNUNET_CRYPTO_SymmetricSessionKey HK;
+ struct GNUNET_HashCode dh;
+ struct GNUNET_CRYPTO_EcdhePublicKey *DHRp;
+
+ /* Try Next HK */
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " trying next HK\n");
+ t_hmac (&src->Ns, AX_HEADER_SIZE + esize, 0, &ax->NHKr, &msg_hmac);
+ if (0 != memcmp (&msg_hmac, &src->hmac, sizeof (msg_hmac)))
+ {
+ /* Try the skipped keys, if that fails, we're out of luck. */
+ return try_old_ax_keys (t, dst, src, size);
+ }
+ LOG (GNUNET_ERROR_TYPE_INFO, "next HK worked\n");
+
+ HK = ax->HKr;
+ ax->HKr = ax->NHKr;
+ t_h_decrypt (t, src, &plaintext_header);
+ Np = ntohl (plaintext_header.Ns);
+ PNp = ntohl (plaintext_header.PNs);
+ DHRp = &plaintext_header.DHRs;
+ store_ax_keys (t, &HK, PNp);
+
+ /* RKp, NHKp, CKp = KDF (HMAC-HASH (RK, DH (DHRp, DHRs))) */
+ GNUNET_CRYPTO_ecc_ecdh (ax->DHRs, DHRp, &dh);
+ t_ax_hmac_hash (&ax->RK, &hmac, &dh, sizeof (dh));
+ GNUNET_CRYPTO_kdf (keys, sizeof (keys), ctx, sizeof (ctx),
+ &hmac, sizeof (hmac), NULL);
+
+ /* Commit "purported" keys */
+ ax->RK = keys[0];
+ ax->NHKr = keys[1];
+ ax->CKr = keys[2];
+ ax->DHRr = *DHRp;
+ ax->Nr = 0;
+ ax->ratchet_allowed = GNUNET_YES;
+ }
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "current HK\n");
+ t_h_decrypt (t, src, &plaintext_header);
+ Np = ntohl (plaintext_header.Ns);
+ PNp = ntohl (plaintext_header.PNs);
+ }
+ LOG (GNUNET_ERROR_TYPE_INFO, " got AX Nr %u\n", Np);
+ if (Np != ax->Nr)
+ if (GNUNET_OK != store_ax_keys (t, &ax->HKr, Np))
+ /* Try the skipped keys, if that fails, we're out of luck. */
+ return try_old_ax_keys (t, dst, src, size);
- ax = t->ax;
+ osize = t_ax_decrypt (t, dst, &src[1], esize);
+ ax->Nr = Np + 1;
- if (NULL == ax)
+ if (osize != esize)
+ {
+ GNUNET_break_op (0);
return -1;
+ }
- /* */
- /* */
-
- return 0;
+ return osize;
}
* Create key material by doing ECDH on the local and remote ephemeral keys.
*
* @param key_material Where to store the key material.
- * @param ephemeral_key Peer's public ephemeral key.
+ * @param ephemeral Peer's public ephemeral key.
+ *
+ * @return GNUNET_OK if it went fine, GNUNET_SYSERR otherwise.
*/
-void
-derive_key_material (struct GNUNET_HashCode *key_material,
- const struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral_key)
+static int
+derive_otr_key_material (struct GNUNET_HashCode *key_material,
+ const struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral)
{
if (GNUNET_OK !=
- GNUNET_CRYPTO_ecc_ecdh (otr_ephemeral_key,
- ephemeral_key,
- key_material))
+ GNUNET_CRYPTO_ecc_ecdh (otr_ephemeral_key, ephemeral, key_material))
{
GNUNET_break (0);
+ return GNUNET_SYSERR;
}
+ return GNUNET_OK;
}
* 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 void
-create_keys (struct CadetTunnel *t)
+static int
+create_otr_keys (struct CadetTunnel *t)
{
struct GNUNET_HashCode km;
- derive_key_material (&km, &t->peers_ephemeral_key);
+ 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_h2s ((struct GNUNET_HashCode *) &otr_kx_msg.ephemeral_key));
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &otr_kx_msg.ephemeral_key));
LOG (GNUNET_ERROR_TYPE_INFO, "PE: %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &t->peers_ephemeral_key));
+ 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_h2s ((struct GNUNET_HashCode *) &t->e_key));
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->e_key));
LOG (GNUNET_ERROR_TYPE_INFO, "DK: %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &t->d_key));
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->d_key));
#endif
+ return GNUNET_OK;
}
* timestamp and a new nonce.
*
* @param t Tunnel for which to create the KX ctx.
+ *
+ * @return GNUNET_OK if successful, GNUNET_SYSERR otherwise.
*/
-static void
+static int
create_kx_ctx (struct CadetTunnel *t)
{
LOG (GNUNET_ERROR_TYPE_INFO, " new kx ctx for %s\n", GCT_2s (t));
else
LOG (GNUNET_ERROR_TYPE_INFO, " old keys not valid, not saving\n");
t->kx_ctx->rekey_start_time = GNUNET_TIME_absolute_get ();
- create_keys (t);
+ 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)
+finish_kx (void *cls)
{
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;
}
if (is_key_null (&t->kx_ctx->e_key_old))
{
- t->kx_ctx->finish_task = GNUNET_SCHEDULER_add_now (finish_kx, t);
+ 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);
+ t->kx_ctx->finish_task = GNUNET_SCHEDULER_add_delayed (delay,
+ &finish_kx, t);
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "queue data on Tunnel %s\n", GCT_2s (t));
- if (GNUNET_YES == is_ready (t))
- {
- GNUNET_break (0);
- return NULL;
- }
+ GNUNET_assert (GNUNET_NO == is_ready (t));
tqd = GNUNET_malloc (sizeof (struct CadetTunnelDelayed) + size);
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 CadetTunnelQueue *tq;
- struct GNUNET_CADET_Encrypted *msg;
size_t size = ntohs (message->size);
- char cbuf[sizeof (struct GNUNET_CADET_Encrypted) + size];
+ const uint16_t max_overhead = sizeof (struct GNUNET_CADET_Encrypted)
+ + sizeof (struct GNUNET_CADET_AX);
+ char cbuf[max_overhead + size];
size_t esize;
uint32_t mid;
uint32_t iv;
GNUNET_assert (GNUNET_NO == GCT_is_loopback (t));
- iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
- msg = (struct GNUNET_CADET_Encrypted *) cbuf;
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED);
- msg->iv = iv;
-
if (CADET_Axolotl == t->enc_type)
- esize = t_ax_encrypt (t, &msg[1], message, size);
+ {
+ 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
- esize = t_encrypt (t, &msg[1], message, size, iv, GNUNET_NO);
+ {
+ 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);
+ }
GNUNET_assert (esize == size);
- t_hmac (&msg[1], size, iv, select_key (t), &msg->hmac);
- msg->header.size = htons (sizeof (struct GNUNET_CADET_Encrypted) + size);
if (NULL == c)
c = tunnel_get_connection (t);
case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY:
case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_ACK:
case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_NACK:
- msg->cid = *GCC_get_id (c);
- msg->ttl = htonl (default_ttl);
break;
default:
GNUNET_break (0);
if (NULL == cont)
{
- GNUNET_break (NULL == GCC_send_prebuilt_message (&msg->header, type, mid, c,
- fwd, force, NULL, NULL));
+ GNUNET_break (NULL == GCC_send_prebuilt_message (msg, type, mid, c, fwd,
+ force, NULL, NULL));
return NULL;
}
if (NULL == existing_q)
tq = existing_q;
tq->tqd = NULL;
}
- tq->cq = GCC_send_prebuilt_message (&msg->header, type, mid, c, fwd, force,
+ tq->cq = GCC_send_prebuilt_message (msg, type, mid, c, fwd, force,
&tun_message_sent, tq);
GNUNET_assert (NULL != tq->cq);
tq->cont = cont;
if (GNUNET_NO == is_ready (t))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " not ready yet: %s/%s\n",
+ LOG (GNUNET_ERROR_TYPE_WARNING, " not ready yet: %s/%s\n",
estate2s (t->estate), cstate2s (t->cstate));
return;
}
}
+/**
+ * @brief Resend the AX KX until we complete the handshake.
+ *
+ * @param cls Closure (tunnel).
+ */
+static void
+ax_kx_resend (void *cls)
+{
+ struct CadetTunnel *t = cls;
+
+ t->rekey_task = NULL;
+ if (CADET_TUNNEL_KEY_OK == t->estate)
+ {
+ /* Should have been canceled on estate change */
+ GNUNET_break (0);
+ return;
+ }
+
+ GCT_send_ax_kx (t, CADET_TUNNEL_KEY_SENT >= t->estate);
+}
+
+
/**
* Callback called when a queued message is sent.
*
*/
static void
ephm_sent (void *cls,
- struct CadetConnection *c,
- struct CadetConnectionQueue *q,
- uint16_t type, int fwd, size_t size)
+ struct CadetConnection *c,
+ struct CadetConnectionQueue *q,
+ uint16_t type, int fwd, size_t size)
{
struct CadetTunnel *t = cls;
LOG (GNUNET_ERROR_TYPE_DEBUG, "ephemeral sent %s\n", GC_m2s (type));
+
t->ephm_h = NULL;
+
+ 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.
*
t->pong_h = NULL;
}
+
/**
* Sends key exchange message on a tunnel, choosing the best connection.
* Should not be called on loopback tunnels.
static void
send_ephemeral (struct CadetTunnel *t)
{
- LOG (GNUNET_ERROR_TYPE_INFO, "===> EPHM for %s\n", GCT_2s (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");
{
struct GNUNET_CADET_KX_Pong msg;
- LOG (GNUNET_ERROR_TYPE_INFO, "===> PONG for %s\n", GCT_2s (t));
+ 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");
* 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)
+rekey_tunnel (void *cls)
{
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));
+ 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)
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);
- create_kx_ctx (t);
- GCT_change_estate (t, CADET_TUNNEL_KEY_REKEY);
+ if (GNUNET_OK == create_kx_ctx (t))
+ GCT_change_estate (t, CADET_TUNNEL_KEY_REKEY);
+ else
+ {
+ GNUNET_break (0);
+ // FIXME restart kx
+ }
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)
+global_otr_rekey (void *cls)
{
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 ();
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_h2s ((struct GNUNET_HashCode *) &otr_kx_msg.ephemeral_key));
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &otr_kx_msg.ephemeral_key));
GNUNET_assert (GNUNET_OK ==
GNUNET_CRYPTO_eddsa_sign (id_key,
{
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;
}
int fwd)
{
struct CadetChannel *ch;
+ char buf[128];
size_t size;
+ uint16_t type;
/* Check size */
size = ntohs (msg->header.size);
GNUNET_break (0);
return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, " payload of type %s\n",
- GC_m2s (ntohs (msg[1].header.type)));
+ type = ntohs (msg[1].header.type);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " payload of type %s\n", GC_m2s (type));
+ SPRINTF (buf, "# received payload of type %hu", type);
+ GNUNET_STATISTICS_update (stats, buf, 1, GNUNET_NO);
+
/* Check channel */
ch = GCT_get_channel (t, ntohl (msg->chid));
{
GNUNET_STATISTICS_update (stats, "# data on unknown channel",
1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "WARNING channel 0x%X unknown\n",
- ntohl (msg->chid));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "channel 0x%X unknown\n", ntohl (msg->chid));
send_channel_destroy (t, ntohl (msg->chid));
return;
}
/**
* Handle channel create.
*
- * @param t Tunnel on which the data came.
- * @param msg Data message.
+ * @param t Tunnel on which the message came.
+ * @param msg ChannelCreate message.
*/
static void
handle_ch_create (struct CadetTunnel *t,
size = ntohs (msg->header.size);
if (size != sizeof (struct GNUNET_CADET_ChannelCreate))
{
- GNUNET_break (0);
+ GNUNET_break_op (0);
return;
}
}
-/**
- * Create a new Axolotl ephemeral (ratchet) key.
- *
- * @param t Tunnel.
- */
-static void
-new_ephemeral (struct CadetTunnel *t)
-{
- GNUNET_free_non_null (t->ax->DHRs);
- t->ax->DHRs = GNUNET_CRYPTO_ecdhe_key_create();
-}
-
-
/**
* Free Axolotl data.
*
GNUNET_free_non_null (t->ax->DHRs);
GNUNET_free_non_null (t->ax->kx_0);
+ while (NULL != t->ax->skipped_head)
+ delete_skipped_key (t, t->ax->skipped_head);
+ GNUNET_assert (0 == t->ax->skipped);
GNUNET_free (t->ax);
t->ax = NULL;
-}
+ if (NULL != t->rekey_task)
+ {
+ GNUNET_SCHEDULER_cancel (t->rekey_task);
+ t->rekey_task = NULL;
+ }
+ if (NULL != t->ephm_h)
+ {
+ GCC_cancel (t->ephm_h);
+ t->ephm_h = NULL;
+ }
+}
/**
handle_ephemeral (struct CadetTunnel *t,
const struct GNUNET_CADET_KX_Ephemeral *msg)
{
- LOG (GNUNET_ERROR_TYPE_INFO, "<=== EPHM for %s\n", GCT_2s (t));
+ LOG (GNUNET_ERROR_TYPE_INFO, "<== EPHM for %s\n", GCT_2s (t));
+ /* Some old versions are still around, don't log as error. */
if (GNUNET_OK != check_ephemeral (t, msg))
- {
- GNUNET_break_op (0);
return;
- }
/* If we get a proper OTR-style ephemeral, fallback to old crypto. */
if (NULL != t->ax)
t->enc_type = CADET_OTR;
if (NULL != t->rekey_task)
GNUNET_SCHEDULER_cancel (t->rekey_task);
- create_kx_ctx (t);
- rekey_tunnel (t, NULL);
+ if (GNUNET_OK != create_kx_ctx (t))
+ {
+ // FIXME restart kx
+ GNUNET_break (0);
+ return;
+ }
+ rekey_tunnel (t);
+ GNUNET_STATISTICS_update (stats, "# otr-downgrades", -1, GNUNET_NO);
}
/**
{
#if DUMP_KEYS_TO_STDERR
LOG (GNUNET_ERROR_TYPE_INFO, "OLD: %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &t->peers_ephemeral_key));
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &t->peers_ephemeral_key));
LOG (GNUNET_ERROR_TYPE_INFO, "NEW: %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &msg->ephemeral_key));
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &msg->ephemeral_key));
#endif
t->peers_ephemeral_key = msg->ephemeral_key;
- create_kx_ctx (t);
+ if (GNUNET_OK != create_kx_ctx (t))
+ {
+ // FIXME restart kx
+ GNUNET_break (0);
+ return;
+ }
if (CADET_TUNNEL_KEY_OK == t->estate)
{
}
if (NULL != t->rekey_task)
GNUNET_SCHEDULER_cancel (t->rekey_task);
- t->rekey_task = GNUNET_SCHEDULER_add_now (rekey_tunnel, t);
+ t->rekey_task = GNUNET_SCHEDULER_add_now (&rekey_tunnel, t);
}
if (CADET_TUNNEL_KEY_SENT == t->estate)
{
* @param msg Key eXchange Pong message.
*/
static void
-handle_pong (struct CadetTunnel *t, const struct GNUNET_CADET_KX_Pong *msg)
+handle_pong (struct CadetTunnel *t,
+ const struct GNUNET_CADET_KX_Pong *msg)
{
uint32_t challenge;
- LOG (GNUNET_ERROR_TYPE_INFO, "<=== PONG for %s\n", GCT_2s (t));
+ 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);
struct CadetTunnelAxolotl *ax;
struct GNUNET_HashCode key_material[3];
struct GNUNET_CRYPTO_SymmetricSessionKey keys[5];
- const struct GNUNET_CRYPTO_EcdhePublicKey *pub;
- const struct GNUNET_CRYPTO_EcdhePrivateKey *priv;
const char salt[] = "CADET Axolotl salt";
const struct GNUNET_PeerIdentity *pid;
int am_I_alice;
- LOG (GNUNET_ERROR_TYPE_INFO, "<=== AX_KX on %s\n", GCT_2s (t));
+ LOG (GNUNET_ERROR_TYPE_INFO, "<== { AX_KX} on %s\n", GCT_2s (t));
if (NULL == t->ax)
{
GNUNET_break (CADET_Axolotl == t->enc_type);
return;
}
-
- if (GNUNET_OK != GCP_check_key (t->peer, &msg->permanent_key,
- &msg->purpose, &msg->signature))
- {
- GNUNET_break_op (0);
- return;
- }
+ ax = t->ax;
pid = GCT_get_destination (t);
if (0 > GNUNET_CRYPTO_cmp_peer_identity (&my_full_id, pid))
return;
}
+ if (0 != (GNUNET_CADET_AX_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);
+ }
+
+ if (0 == memcmp (&ax->DHRr, &msg->ratchet_key, sizeof(msg->ratchet_key)))
+ {
+ LOG (GNUNET_ERROR_TYPE_INFO, " known ratchet key, exit\n");
+ return;
+ }
+
LOG (GNUNET_ERROR_TYPE_INFO, " is Alice? %s\n", am_I_alice ? "YES" : "NO");
- ax = t->ax;
ax->DHRr = msg->ratchet_key;
/* ECDH A B0 */
if (GNUNET_YES == am_I_alice)
{
- priv = ax_key; /* A */
- pub = &msg->ephemeral_key; /* B0 */
+ GNUNET_CRYPTO_eddsa_ecdh (id_key, /* A */
+ &msg->ephemeral_key, /* B0 */
+ &key_material[0]);
}
else
{
- priv = ax->kx_0; /* B0 */
- pub = &msg->permanent_key; /* A */
+ GNUNET_CRYPTO_ecdh_eddsa (ax->kx_0, /* B0 */
+ &pid->public_key, /* A */
+ &key_material[0]);
}
- GNUNET_CRYPTO_ecc_ecdh (priv, pub, &key_material[0]);
/* ECDH A0 B */
if (GNUNET_YES == am_I_alice)
{
- priv = ax->kx_0; /* A0 */
- pub = &msg->permanent_key; /* B */
+ GNUNET_CRYPTO_ecdh_eddsa (ax->kx_0, /* A0 */
+ &pid->public_key, /* B */
+ &key_material[1]);
}
else
{
- priv = ax_key; /* B */
- pub = &msg->ephemeral_key; /* A0 */
+ GNUNET_CRYPTO_eddsa_ecdh (id_key, /* A */
+ &msg->ephemeral_key, /* B0 */
+ &key_material[1]);
+
+
}
- GNUNET_CRYPTO_ecc_ecdh (priv, pub, &key_material[1]);
- /* ECDH A0 B0*/
- priv = ax->kx_0; /* A0 or B0 */
- pub = &msg->ephemeral_key; /* B0 or A0 */
- GNUNET_CRYPTO_ecc_ecdh (priv, pub, &key_material[2]);
+ /* ECDH A0 B0 */
+ /* (This is the triple-DH, we could probably safely skip this,
+ as A0/B0 are already in the key material.) */
+ GNUNET_CRYPTO_ecc_ecdh (ax->kx_0, /* A0 or B0 */
+ &msg->ephemeral_key, /* B0 or A0 */
+ &key_material[2]);
#if DUMP_KEYS_TO_STDERR
{
salt, sizeof (salt),
&key_material, sizeof (key_material), NULL);
+ if (0 == memcmp (&ax->RK, &keys[0], sizeof(ax->RK)))
+ {
+ LOG (GNUNET_ERROR_TYPE_INFO, " known handshake key, exit\n");
+ return;
+ }
ax->RK = keys[0];
if (GNUNET_YES == am_I_alice)
{
ax->NHKs = keys[3];
ax->CKs = keys[4];
ax->ratchet_flag = GNUNET_NO;
+ ax->ratchet_allowed = GNUNET_NO;
+ ax->ratchet_counter = 0;
+ ax->ratchet_expiration =
+ GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get(), ratchet_time);
}
+ ax->PNs = 0;
+ ax->Nr = 0;
+ ax->Ns = 0;
+ GCT_change_estate (t, CADET_TUNNEL_KEY_PING);
+ send_queued_data (t);
}
int fwd)
{
uint16_t type;
+ char buf[256];
type = ntohs (msgh->type);
- LOG (GNUNET_ERROR_TYPE_INFO, "<=== %s on %s\n", GC_m2s (type), GCT_2s (t));
+ 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)
{
}
}
+
/******************************************************************************/
/******************************** API ***********************************/
/******************************************************************************/
GCT_handle_encrypted (struct CadetTunnel *t,
const struct GNUNET_MessageHeader *msg)
{
- size_t size = ntohs (msg->size);
- size_t payload_size;
- int decrypted_size;
+ uint16_t size = ntohs (msg->size);
char cbuf [size];
- uint16_t type = ntohs (msg->type);
- struct GNUNET_MessageHeader *msgh;
+ int decrypted_size;
+ uint16_t type;
+ const struct GNUNET_MessageHeader *msgh;
unsigned int off;
- if (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED == type)
- {
- const struct GNUNET_CADET_Encrypted *emsg;
-
- emsg = (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);
- }
- else if (GNUNET_MESSAGE_TYPE_CADET_AX == type)
+ type = ntohs (msg->type);
+ switch (type)
{
- const struct GNUNET_CADET_AX *emsg;
+ 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;
- emsg = (struct GNUNET_CADET_AX *) msg;
- payload_size = size - sizeof (struct GNUNET_CADET_AX);
- decrypted_size = t_ax_decrypt_and_validate (t, cbuf, &emsg[1],
- payload_size, &emsg->hmac);
+ 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 < decrypted_size)
+ while (off + sizeof (struct GNUNET_MessageHeader) <= decrypted_size)
{
uint16_t msize;
- msgh = (struct GNUNET_MessageHeader *) &cbuf[off];
+ 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;
}
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:
GNUNET_CONFIGURATION_get_value_number (c, "CADET", "DEFAULT_TTL",
&default_ttl))
{
- GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_DEBUG,
"CADET", "DEFAULT_TTL", "USING DEFAULT");
default_ttl = 64;
}
{
rekey_period = GNUNET_TIME_UNIT_DAYS;
}
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (c, "CADET", "RATCHET_MESSAGES",
+ &ratchet_messages))
+ {
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
+ "CADET", "RATCHET_MESSAGES", "USING DEFAULT");
+ ratchet_messages = 64;
+ }
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (c, "CADET", "RATCHET_TIME",
+ &ratchet_time))
+ {
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
+ "CADET", "RATCHET_TIME", "USING DEFAULT");
+ ratchet_time = GNUNET_TIME_UNIT_HOURS;
+ }
+
id_key = key;
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);
-
- ax_key = GNUNET_CRYPTO_ecdhe_key_create ();
- GNUNET_CRYPTO_ecdhe_key_get_public (ax_key, &ax_identity.permanent_key);
- ax_identity.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CADET_AXKX);
- ax_identity.purpose.size = htonl (ax_purpose_size ());
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_eddsa_sign (id_key,
- &ax_identity.purpose,
- &ax_identity.signature));
-
tunnels = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_YES);
}
void
GCT_shutdown (void)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down tunnels\n");
if (NULL != rekey_task)
{
GNUNET_SCHEDULER_cancel (rekey_task);
}
GNUNET_CONTAINER_multipeermap_iterate (tunnels, &destroy_iterator, NULL);
GNUNET_CONTAINER_multipeermap_destroy (tunnels);
- GNUNET_free (ax_key);
}
else if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate triggered kx\n");
- GCT_send_ax_kx (t);
+ GCT_send_ax_kx (t, GNUNET_NO);
}
else
{
/**
* Change the tunnel encryption state.
*
+ * If the encryption state changes to OK, stop the rekey task.
+ *
* @param t Tunnel whose encryption state to change, or NULL.
* @param state New encryption state.
*/
LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s estate is now %s\n",
GCP_2s (t->peer), estate2s (t->estate));
- /* Send queued data if enc state changes to OK */
- if (myid != GCP_get_short_id (t->peer) &&
- CADET_TUNNEL_KEY_OK != old && CADET_TUNNEL_KEY_OK == t->estate)
+ if (CADET_TUNNEL_KEY_OK != old && CADET_TUNNEL_KEY_OK == t->estate)
{
- send_queued_data (t);
+ if (NULL != t->rekey_task)
+ {
+ GNUNET_SCHEDULER_cancel (t->rekey_task);
+ t->rekey_task = NULL;
+ }
+ /* Send queued data if tunnel is not loopback */
+ if (myid != GCP_get_short_id (t->peer))
+ send_queued_data (t);
}
}
* 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;
/* Start new connections if needed */
if (CONNECTIONS_PER_TUNNEL > conns
- && NULL == t->destroy_task
&& CADET_TUNNEL_SHUTDOWN != t->cstate
&& GNUNET_NO == shutting_down)
{
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;
}
* 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);
// FIXME make delay a config option
t->destroy_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
&delayed_destroy, t);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled destroy of %p as %llu\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled destroy of %p as %p\n",
t, t->destroy_task);
}
struct CadetTConnection *next_c;
struct CadetTChannel *iter_ch;
struct CadetTChannel *next_ch;
+ unsigned int keepalives_queued;
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));
GCCH_destroy (iter_ch->ch);
/* Should only happen on shutdown, but it's ok. */
}
+ keepalives_queued = 0;
+ while (NULL != t->tq_head)
+ {
+ /* Should have been cleaned by destuction of channel. */
+ struct GNUNET_MessageHeader *mh;
+ uint16_t type;
+
+ mh = (struct GNUNET_MessageHeader *) &t->tq_head[1];
+ type = ntohs (mh->type);
+ if (0 == keepalives_queued && GNUNET_MESSAGE_TYPE_CADET_KEEPALIVE == type)
+ {
+ keepalives_queued = 1;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "one keepalive left behind on tunnel shutdown\n");
+ }
+ else if (GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY == type)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "tunnel destroyed before a CHANNEL_DESTROY was sent to peer\n");
+ }
+ else
+ {
+ GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "message left behind on tunnel shutdown: %s\n",
+ GC_m2s (type));
+ }
+ unqueue_data (t->tq_head);
+ }
+
if (NULL != t->destroy_task)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "cancelling dest: %llX\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;
}
if (NULL != t->trim_connections_task)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "cancelling trim: %llX\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "cancelling trim: %p\n",
t->trim_connections_task);
GNUNET_SCHEDULER_cancel (t->trim_connections_task);
t->trim_connections_task = NULL;
* @return Connection created.
*/
struct CadetConnection *
-GCT_use_path (struct CadetTunnel *t, struct CadetPeerPath *p)
+GCT_use_path (struct CadetTunnel *t, struct CadetPeerPath *path)
{
struct CadetConnection *c;
struct GNUNET_CADET_Hash cid;
unsigned int own_pos;
- if (NULL == t || NULL == p)
+ if (NULL == t || NULL == path)
{
GNUNET_break (0);
return NULL;
return NULL;
}
- for (own_pos = 0; own_pos < p->length; own_pos++)
+ for (own_pos = 0; own_pos < path->length; own_pos++)
{
- if (p->peers[own_pos] == myid)
+ if (path->peers[own_pos] == myid)
break;
}
- if (own_pos >= p->length)
+ if (own_pos >= path->length)
{
GNUNET_break_op (0);
return NULL;
}
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE, &cid, sizeof (cid));
- c = GCC_new (&cid, t, p, own_pos);
+ c = GCC_new (&cid, t, path, own_pos);
if (NULL == c)
{
/* Path was flawed */
{
/* Probably getting buffer for a channel create/handshake. */
LOG (GNUNET_ERROR_TYPE_DEBUG, " no channels, allow max\n");
- return 64;
+ return MIN_TUNNEL_BUFFER;
}
buffer = 0;
if (ch_buf > buffer)
buffer = ch_buf;
}
+ if (MIN_TUNNEL_BUFFER > buffer)
+ return MIN_TUNNEL_BUFFER;
+
+ if (MAX_TUNNEL_BUFFER < buffer)
+ {
+ GNUNET_break (0);
+ return MAX_TUNNEL_BUFFER;
+ }
return buffer;
}
if (GNUNET_NO == is_ready (t))
{
- if (count_queued_data (t) > 3)
+ if (count_queued_data (t) >= 3)
return 0;
else
return 1;
if (NULL != t->channel_head)
LOG (GNUNET_ERROR_TYPE_DEBUG, " head ch: %p\n", t->channel_head->ch);
+ if (NULL != t->tq_head)
+ send_queued_data (t);
+
/* Get buffer space */
buffer = GCT_get_connections_buffer (t);
if (0 == buffer)
{
if (NULL != q->cq)
{
+ GNUNET_assert (NULL == q->tqd);
GCC_cancel (q->cq);
/* tun_message_sent() will be called and free q */
}
}
+/**
+ * Check if the tunnel has queued traffic.
+ *
+ * @param t Tunnel to check.
+ *
+ * @return #GNUNET_YES if there is queued traffic
+ * #GNUNET_NO otherwise
+ */
+int
+GCT_has_queued_traffic (struct CadetTunnel *t)
+{
+ return (NULL != t->tq_head) ? GNUNET_YES : GNUNET_NO;
+}
+
+
/**
* Sends an already built message on a tunnel, encrypting it and
* choosing the best connection if not provided.
* Send an Axolotl 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)
+GCT_send_ax_kx (struct CadetTunnel *t, int force_reply)
{
struct GNUNET_CADET_AX_KX msg;
+ enum GNUNET_CADET_AX_KX_Flags flags;
- LOG (GNUNET_ERROR_TYPE_INFO, "===> AX_KX for %s\n", GCT_2s (t));
+ LOG (GNUNET_ERROR_TYPE_INFO, "==> { AX_KX} on %s\n", GCT_2s (t));
+ if (NULL != t->ephm_h)
+ {
+ LOG (GNUNET_ERROR_TYPE_INFO, " already queued\n");
+ return;
+ }
msg.header.size = htons (sizeof (msg));
msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_AX_KX);
- msg.permanent_key = ax_identity.permanent_key;
- msg.purpose = ax_identity.purpose;
- msg.signature = ax_identity.signature;
+ flags = GNUNET_CADET_AX_KX_FLAG_NONE;
+ if (force_reply)
+ flags |= GNUNET_CADET_AX_KX_FLAG_FORCE_REPLY;
+ msg.flags = htonl (flags);
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);
+ if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
+ GCT_change_estate (t, CADET_TUNNEL_KEY_SENT);
}
return;
}
fwd = GCC_is_origin (c, GNUNET_YES);
- GNUNET_break (NULL == GCC_send_prebuilt_message (message, 0, 0, c, fwd,
+ GNUNET_break (NULL == GCC_send_prebuilt_message (message, UINT16_MAX, 0,
+ c, fwd,
GNUNET_YES, NULL, NULL));
}
/***************************** INFO/DEBUG *******************************/
/******************************************************************************/
+static void
+ax_debug (const struct CadetTunnelAxolotl *ax, enum GNUNET_ErrorType level)
+{
+ struct GNUNET_CRYPTO_EcdhePublicKey pub;
+ struct CadetTunnelSkippedKey *iter;
+
+ LOG2 (level, "TTT RK \t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->RK));
+
+ LOG2 (level, "TTT HKs \t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->HKs));
+ LOG2 (level, "TTT HKr \t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->HKr));
+ LOG2 (level, "TTT NHKs\t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->NHKs));
+ LOG2 (level, "TTT NHKr\t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->NHKr));
+
+ LOG2 (level, "TTT CKs \t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->CKs));
+ LOG2 (level, "TTT CKr \t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->CKr));
+
+ GNUNET_CRYPTO_ecdhe_key_get_public (ax->DHRs, &pub);
+ LOG2 (level, "TTT DHRs\t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &pub));
+ LOG2 (level, "TTT DHRr\t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &ax->DHRr));
+
+ LOG2 (level, "TTT Nr\t %u\tNs\t%u\n", ax->Nr, ax->Ns);
+ LOG2 (level, "TTT PNs\t %u\tSkipped\t%u\n", ax->PNs, ax->skipped);
+ LOG2 (level, "TTT Ratchet\t%u\n", ax->ratchet_flag);
+
+ for (iter = ax->skipped_head; NULL != iter; iter = iter->next)
+ {
+ LOG2 (level, "TTT HK\t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &iter->HK));
+ LOG2 (level, "TTT MK\t %s\n",
+ GNUNET_i2s ((struct GNUNET_PeerIdentity *) &iter->MK));
+ }
+}
+
/**
* Log all possible info about the tunnel state.
*
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
- LOG2 (level, "TTT my EPHM\t %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &otr_kx_msg.ephemeral_key));
- LOG2 (level, "TTT peers EPHM:\t %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &t->peers_ephemeral_key));
- LOG2 (level, "TTT ENC key:\t %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &t->e_key));
- LOG2 (level, "TTT DEC key:\t %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &t->d_key));
- if (t->kx_ctx)
- {
- LOG2 (level, "TTT OLD ENC key:\t %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &t->kx_ctx->e_key_old));
- LOG2 (level, "TTT OLD DEC key:\t %s\n",
- GNUNET_h2s ((struct GNUNET_HashCode *) &t->kx_ctx->d_key_old));
+ 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));
+ }
}
#endif
LOG2 (level, "TTT tq_head %p, tq_tail %p\n", t->tq_head, t->tq_tail);
- LOG2 (level, "TTT destroy %u\n", t->destroy_task);
+ LOG2 (level, "TTT destroy %p\n", t->destroy_task);
LOG2 (level, "TTT channels:\n");
for (iterch = t->channel_head; NULL != iterch; iterch = iterch->next)
{
- LOG2 (level, "TTT - %s\n", GCCH_2s (iterch->ch));
+ GCCH_debug (iterch->ch, level);
}
LOG2 (level, "TTT connections:\n");
projects / oweals / gnunet.git / blobdiff