Incopatible protocol fix! Include message type code under MAC tag to prevent

[tripe] / keyexch.c

/* -*-c-*-
 *
 * $Id: keyexch.c,v 1.8 2003/07/13 11:19:49 mdw Exp $
 *
 * Key exchange protocol
 *
 * (c) 2001 Straylight/Edgeware
 */

/*----- Licensing notice --------------------------------------------------* 
 *
 * This file is part of Trivial IP Encryption (TrIPE).
 *
 * TrIPE is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * 
 * TrIPE is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License
 * along with TrIPE; if not, write to the Free Software Foundation,
 * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

/*----- Revision history --------------------------------------------------* 
 *
 * $Log: keyexch.c,v $
 * Revision 1.8  2003/07/13 11:19:49  mdw
 * Incopatible protocol fix!  Include message type code under MAC tag to prevent
 * cut-and-paste from key-exchange messages to general packet transport.
 *
 * Revision 1.7  2003/05/17 11:01:28  mdw
 * Handle flags on challenge timers correctly to prevent confusing the event
 * list.
 *
 * Revision 1.6  2003/04/06 10:26:35  mdw
 * Report peer name on decrypt errors.
 *
 * Revision 1.5  2002/01/13 14:54:40  mdw
 * Patch up zero-knowledge property by passing an encrypted log with a
 * challenge, so that the prover can verify that the challenge is good.
 *
 * Revision 1.4  2001/06/22 19:40:36  mdw
 * Support expiry of other peers' public keys.
 *
 * Revision 1.3  2001/06/19 22:07:09  mdw
 * Cosmetic fixes.
 *
 * Revision 1.2  2001/02/16 21:24:27  mdw
 * Rewrite for new key exchange protocol.
 *
 * Revision 1.1  2001/02/03 20:26:37  mdw
 * Initial checkin.
 *
 */

/*----- Header files ------------------------------------------------------*/

#include "tripe.h"

/*----- Tunable parameters ------------------------------------------------*/

#define T_VALID MIN(2)			/* Challenge validity period */
#define T_RETRY SEC(10)			/* Challenge retransmit interval */

#define ISVALID(kx, now) ((now) < (kx)->t_valid)

/*----- Various utilities -------------------------------------------------*/

/* --- @hashmp@ --- *
 *
 * Arguments:	@HASH_CTX *r@ = pointer to hash context
 *		@mp *m@ = pointer to multiprecision integer
 *
 * Returns:	---
 *
 * Use:		Adds the hash of a multiprecision integer to the context.
 *		Corrupts @buf_t@.
 */

static void hashmp(HASH_CTX *r, mp *m)
{
  buf b;
  buf_init(&b, buf_t, sizeof(buf_t));
  buf_putmp(&b, m);
  assert(BOK(&b));
  HASH(r, BBASE(&b), BLEN(&b));
}

/* --- @mpcrypt@ --- *
 *
 * Arguments:	@mp *d@ = the destination integer
 *		@mp *x@ = the plaintext/ciphertext integer
 *		@size_t sz@ = the expected size of the plaintext
 *		@const octet *k@ = pointer to key material
 *		@size_t ksz@ = size of the key
 *
 * Returns:	The encrypted/decrypted integer.
 *
 * Use:		Encrypts (or decrypts) a multiprecision integer using another
 *		multiprecision integer as the key.  This is a slightly grotty
 *		way to do this, but it's easier than the alternatives.
 */

static mp *mpcrypt(mp *d, mp *x, size_t sz, const octet *k, size_t ksz)
{
  MGF_CTX m;

  MGF_INIT(&m, k, ksz, 0);
  mp_storeb(x, buf_t, sz);
  MGF_CRYPT(&m, buf_t, buf_t, sz);
  return (mp_loadb(d, buf_t, sz));
}

/* --- @timer@ --- *
 *
 * Arguments:	@struct timeval *tv@ = the current time
 *		@void *v@ = pointer to key exchange context
 *
 * Returns:	---
 *
 * Use:		Acts when the key exchange timer goes off.
 */

static void timer(struct timeval *tv, void *v)
{
  keyexch *kx = v;
  kx->f &= ~KXF_TIMER;
  T( trace(T_KEYEXCH, "keyexch: timer has popped"); )
  kx_start(kx);
}

/* --- @settimer@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *		@time_t t@ = when to set the timer for
 *
 * Returns:	---
 *
 * Use:		Sets the timer for the next key exchange attempt.
 */

static void settimer(keyexch *kx, time_t t)
{
  struct timeval tv;
  if (kx->f & KXF_TIMER)
    sel_rmtimer(&kx->t);
  tv.tv_sec = t;
  tv.tv_usec = 0;
  sel_addtimer(&sel, &kx->t, &tv, timer, kx);
  kx->f |= KXF_TIMER;
}

/*----- Challenge management ----------------------------------------------*/

/* --- Notes on challenge management --- *
 *
 * We may get multiple different replies to our key exchange; some will be
 * correct, some inserted by attackers.  Up until @KX_THRESH@, all challenges
 * received will be added to the table and given a full response.  After
 * @KX_THRESH@ distinct challenges are received, we return only a `cookie':
 * our existing challenge, followed by a hash of the sender's challenge.  We
 * do %%\emph{not}%% give a bare challenge a reply slot at this stage.  All
 * properly-formed cookies are assigned a table slot: if none is spare, a
 * used slot is randomly selected and destroyed.  A cookie always receives a
 * full reply.
 */

/* --- @kxc_destroy@ --- *
 *
 * Arguments:	@kxchal *kxc@ = pointer to the challenge block
 *
 * Returns:	---
 *
 * Use:		Disposes of a challenge block.
 */

static void kxc_destroy(kxchal *kxc)
{
  if (kxc->f & KXF_TIMER)
    sel_rmtimer(&kxc->t);
  mp_drop(kxc->c);
  mp_drop(kxc->r);
  mp_drop(kxc->ck);
  ks_drop(kxc->ks);
  DESTROY(kxc);
}

/* --- @kxc_stoptimer@ --- *
 *
 * Arguments:	@kxchal *kxc@ = pointer to the challenge block
 *
 * Returns:	---
 *
 * Use:		Stops the challenge's retry timer from sending messages.
 *		Useful when the state machine is in the endgame of the
 *		exchange.
 */

static void kxc_stoptimer(kxchal *kxc)
{
  if (kxc->f & KXF_TIMER)
    sel_rmtimer(&kxc->t);
  kxc->f &= ~KXF_TIMER;
}

/* --- @kxc_new@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange block
 *
 * Returns:	A pointer to the challenge block.
 *
 * Use:		Returns a pointer to a new challenge block to fill in.
 */

static kxchal *kxc_new(keyexch *kx)
{
  kxchal *kxc;
  unsigned i;

  /* --- If we're over reply threshold, discard one at random --- */

  if (kx->nr < KX_NCHAL)
    i = kx->nr++;
  else {
    i = rand_global.ops->range(&rand_global, KX_NCHAL);
    kxc_destroy(kx->r[i]);
  }

  /* --- Fill in the new structure --- */

  kxc = CREATE(kxchal);
  kxc->c = 0;
  kxc->r = 0;
  kxc->ck = 0;
  kxc->ks = 0;
  kxc->kx = kx;
  kxc->f = 0;
  kx->r[i] = kxc;
  return (kxc);
}

/* --- @kxc_bychal@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange block
 *		@mp *c@ = challenge from remote host
 *
 * Returns:	Pointer to the challenge block, or null.
 *
 * Use:		Finds a challenge block, given its challenge.
 */

static kxchal *kxc_bychal(keyexch *kx, mp *c)
{
  unsigned i;

  for (i = 0; i < kx->nr; i++) {
    if (MP_EQ(c, kx->r[i]->c))
      return (kx->r[i]);
  }
  return (0);
}

/* --- @kxc_byhc@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange block
 *		@const octet *hc@ = challenge hash from remote host
 *
 * Returns:	Pointer to the challenge block, or null.
 *
 * Use:		Finds a challenge block, given a hash of its challenge.
 */

static kxchal *kxc_byhc(keyexch *kx, const octet *hc)
{
  unsigned i;

  for (i = 0; i < kx->nr; i++) {
    if (memcmp(hc, kx->r[i]->hc, HASHSZ) == 0)
      return (kx->r[i]);
  }
  return (0);
}

/* --- @kxc_answer@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange block
 *		@kxchal *kxc@ = pointer to challenge block
 *
 * Returns:	---
 *
 * Use:		Sends a reply to the remote host, according to the data in
 *		this challenge block.
 */

static void kxc_answer(keyexch *kx, kxchal *kxc);

static void kxc_timer(struct timeval *tv, void *v)
{
  kxchal *kxc = v;
  kxc->f &= ~KXF_TIMER;
  kxc_answer(kxc->kx, kxc);
}

static void kxc_answer(keyexch *kx, kxchal *kxc)
{
  stats *st = p_stats(kx->p);
  buf *b = p_txstart(kx->p, MSG_KEYEXCH | (kxc->r ? KX_REPLY : KX_CHAL));
  struct timeval tv;
  buf bb;

  /* --- Build the reply packet --- */

  if (!kxc->r)
    buf_putmp(b, kx->c);
  else
    buf_put(b, kx->hc, HASHSZ);
  buf_put(b, kxc->hc, HASHSZ);
  buf_putmp(b, kxc->ck);

  /* --- Maybe send an actual reply, if we have one --- */

  if (!kxc->r) {
    T( trace(T_KEYEXCH, "keyexch: resending challenge to `%s'",
	     p_name(kx->p)); )
  } else {
    T( trace(T_KEYEXCH, "keyexch: sending reply to `%s'", p_name(kx->p)); )
    buf_init(&bb, buf_i, sizeof(buf_i));
    buf_putmp(&bb, kxc->r);
    buf_flip(&bb);
    ks_encrypt(kxc->ks, MSG_KEYEXCH | KX_REPLY, &bb, b);
  }

  /* --- Update the statistics --- */

  if (BOK(b)) {
    st->n_kxout++;
    st->sz_kxout += BLEN(b);
    p_txend(kx->p);
  }

  /* --- Schedule another resend --- */

  if (kxc->f & KXF_TIMER)
    sel_rmtimer(&kxc->t);
  gettimeofday(&tv, 0);
  tv.tv_sec += T_RETRY;
  sel_addtimer(&sel, &kxc->t, &tv, kxc_timer, kxc);
  kxc->f |= KXF_TIMER;
}

/*----- Individual message handlers ---------------------------------------*/

/* --- @getreply@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *		@mp *c@ = a challenge
 *		@mp *ck@ = the supplied expected-reply check value
 *
 * Returns:	A pointer to the reply, or null if the reply-hash was wrong.
 *
 * Use:		Computes replies to challenges.
 */

static mp *getreply(keyexch *kx, mp *c, mp *ck)
{
  mp *r = mpmont_exp(&mg, MP_NEW, c, kpriv.x);
  mp *a;
  HASH_CTX h;
  octet buf[HASHSZ];  
  int ok;

  HASH_INIT(&h);
  HASH_STRING(&h, "tripe-expected-reply");
  hashmp(&h, c);
  hashmp(&h, kx->c);
  hashmp(&h, r);
  HASH_DONE(&h, buf);

  a = mpcrypt(MP_NEW, ck, mp_octets(kpriv.dp.q), buf, sizeof(buf));
  IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
    trace(T_CRYPTO, "crypto: computed reply = %s", mpstr(r));
    trace_block(T_CRYPTO, "crypto: computed reply hash", buf, HASHSZ);
    trace(T_CRYPTO, "crypto: recovered log = %s", mpstr(a));
  }))
  a = mpmont_exp(&mg, a, kpriv.dp.g, a);
  ok = mp_eq(a, c);
  if (!ok) {
    a_warn("invalid expected-reply check from `%s'", p_name(kx->p));
    IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
      trace(T_CRYPTO, "crypto: computed challenge = %s", mpstr(a));
    }))
    mp_drop(r);
  }
  mp_drop(a);
  return (ok ? r : 0);
}

/* --- @dochallenge@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange block
 *		@unsigned msg@ = message code for the packet
 *		@buf *b@ = buffer containing the packet
 *
 * Returns:	Zero if OK, nonzero if the packet was rejected.
 *
 * Use:		Processes a packet containing a challenge.
 */

static int dochallenge(keyexch *kx, unsigned msg, buf *b)
{
  mp *c = 0, *ck = 0;
  const octet *hc = 0;
  kxchal *kxc;
  HASH_CTX h;
  octet buf[HASHSZ];

  /* --- Ensure that we're in a sensible state --- */

  if (kx->s != KXS_CHAL) {
    a_warn("unexpected challenge from `%s'", p_name(kx->p));
    goto bad;
  }

  /* --- Unpack the packet --- */

  if ((c = buf_getmp(b)) == 0 ||
      (msg >= KX_COOKIE && (hc = buf_get(b, HASHSZ)) == 0) ||
      (msg >= KX_CHAL && (ck = buf_getmp(b)) == 0) ||
      BLEFT(b)) {
    a_warn("malformed packet from `%s'", p_name(kx->p));
    goto bad;
  }

  IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
    trace(T_CRYPTO, "crypto: challenge = %s", mpstr(c));
    if (hc) trace_block(T_CRYPTO, "crypto: cookie", hc, HASHSZ);
    if (ck) trace(T_CRYPTO, "crypto: check value = %s", mpstr(ck));
  }))

  /* --- First, handle a bare challenge --- *
   *
   * If the table is heavily loaded, just emit a cookie and return.
   */

  if (!hc && kx->nr >= KX_THRESH) {
    T( trace(T_KEYEXCH, "keyexch: too many challenges -- sending cookie"); )
    b = p_txstart(kx->p, MSG_KEYEXCH | KX_COOKIE);
    buf_putmp(b, kx->c);
    HASH_INIT(&h);
    HASH_STRING(&h, "tripe-cookie");
    hashmp(&h, c);
    HASH_DONE(&h, buf_get(b, HASHSZ));
    p_txend(kx->p);
    goto tidy;
  }

  /* --- Discard a packet with an invalid cookie --- */

  if (hc && memcmp(hc, kx->hc, HASHSZ) != 0) {
    a_warn("incorrect cookie from `%s'", p_name(kx->p));
    goto bad;
  }

  /* --- Find a challenge block for this packet --- *
   *
   * If there isn't one already, create a new one.
   */

  if ((kxc = kxc_bychal(kx, c)) == 0) {
    size_t x, y, z;
    mp *r;

    /* --- Be careful here --- *
     *
     * If this is a full challenge, and it's the first time I've seen it, I
     * want to be able to throw it away before committing a table entry to
     * it.
     */

    if (!ck)
      kxc = kxc_new(kx);	
    else {
      if ((r = getreply(kx, c, ck)) == 0)
	goto bad;
      kxc = kxc_new(kx);
      kxc->r = r;
    }
    kxc->c = mp_copy(c);

    /* --- Work out the cookie for this challenge --- */

    HASH_INIT(&h);
    HASH_STRING(&h, "tripe-cookie");
    hashmp(&h, kxc->c);
    HASH_DONE(&h, kxc->hc);    

    /* --- Compute the expected-reply hash --- */

    HASH_INIT(&h);
    HASH_STRING(&h, "tripe-expected-reply");
    hashmp(&h, kx->c);
    hashmp(&h, kxc->c);
    hashmp(&h, kx->rx);
    HASH_DONE(&h, buf);
    kxc->ck = mpcrypt(MP_NEW, kx->alpha, mp_octets(kpriv.dp.q),
		      buf, sizeof(buf));

    /* --- Work out the shared key --- */

    trace(T_CRYPTO, "debug: c = %s", mpstr(c));
    trace(T_CRYPTO, "debug: alpha = %s", mpstr(kx->alpha));
    r = mpmont_exp(&mg, MP_NEW, c, kx->alpha);
    trace(T_CRYPTO, "debug: r = %s", mpstr(r));

    /* --- Compute the switch messages --- */

    HASH_INIT(&h); HASH_STRING(&h, "tripe-switch-request");
    hashmp(&h, kx->c); hashmp(&h, kxc->c);
    HASH_DONE(&h, kxc->hswrq_out);
    HASH_INIT(&h); HASH_STRING(&h, "tripe-switch-confirm");
    hashmp(&h, kx->c); hashmp(&h, kxc->c);
    HASH_DONE(&h, kxc->hswok_out);

    HASH_INIT(&h); HASH_STRING(&h, "tripe-switch-request");
    hashmp(&h, kxc->c); hashmp(&h, kx->c);
    HASH_DONE(&h, kxc->hswrq_in);
    HASH_INIT(&h); HASH_STRING(&h, "tripe-switch-confirm");
    hashmp(&h, kxc->c); hashmp(&h, kx->c);
    HASH_DONE(&h, kxc->hswok_in);

    IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
      trace_block(T_CRYPTO, "crypto: computed cookie", kxc->hc, HASHSZ);
      trace_block(T_CRYPTO, "crypto: expected-reply hash",
		  buf, HASHSZ);
      trace(T_CRYPTO, "crypto: my reply check = %s", mpstr(kxc->ck));
      trace(T_CRYPTO, "crypto: shared secret = %s", mpstr(r));
      trace_block(T_CRYPTO, "crypto: outbound switch request",
		  kxc->hswrq_out, HASHSZ);
      trace_block(T_CRYPTO, "crypto: outbound switch confirm",
		  kxc->hswok_out, HASHSZ);
      trace_block(T_CRYPTO, "crypto: inbound switch request",
		  kxc->hswrq_in, HASHSZ);
      trace_block(T_CRYPTO, "crypto: inbound switch confirm",
		  kxc->hswok_in, HASHSZ);
    }))

    /* --- Create a new symmetric keyset --- */

    buf_init(b, buf_o, sizeof(buf_o));
    buf_putmp(b, kx->c); x = BLEN(b);
    buf_putmp(b, kxc->c); y = BLEN(b);
    buf_putmp(b, r); z = BLEN(b);
    assert(BOK(b));

    kxc->ks = ks_gen(BBASE(b), x, y, z, kx->p);
    mp_drop(r);
  }

  /* --- Answer the challenge if we need to --- */

  if (ck && !kxc->r) {
    mp *r;
    if ((r = getreply(kx, c, ck)) == 0)
      goto bad;
    kxc->r = r;
  }

  kxc_answer(kx, kxc);

  /* --- Tidy up and go home --- */

tidy:
  mp_drop(c);
  mp_drop(ck);
  return (0);

bad:
  mp_drop(c);
  mp_drop(ck);
  return (-1);
}

/* --- @resend@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *
 * Returns:	---
 *
 * Use:		Sends the next message for a key exchange.
 */

static void resend(keyexch *kx)
{
  kxchal *kxc;
  buf bb;
  stats *st = p_stats(kx->p);
  buf *b;

  switch (kx->s) {
    case KXS_CHAL:
      T( trace(T_KEYEXCH, "keyexch: sending prechallenge to `%s'",
	       p_name(kx->p)); )
      b = p_txstart(kx->p, MSG_KEYEXCH | KX_PRECHAL);
      buf_putmp(b, kx->c);
      break;
    case KXS_COMMIT:
      T( trace(T_KEYEXCH, "keyexch: sending switch request to `%s'",
	       p_name(kx->p)); )
      kxc = kx->r[0];
      b = p_txstart(kx->p, MSG_KEYEXCH | KX_SWITCH);
      buf_put(b, kx->hc, HASHSZ);
      buf_put(b, kxc->hc, HASHSZ);
      buf_init(&bb, buf_i, sizeof(buf_i));
      buf_putmp(&bb, kxc->r);
      buf_put(&bb, kxc->hswrq_out, HASHSZ);
      buf_flip(&bb);
      ks_encrypt(kxc->ks, MSG_KEYEXCH | KX_SWITCH, &bb, b);
      break;
    case KXS_SWITCH:
      T( trace(T_KEYEXCH, "keyexch: sending switch confirmation to `%s'",
	       p_name(kx->p)); )
      kxc = kx->r[0];
      b = p_txstart(kx->p, MSG_KEYEXCH | KX_SWITCHOK);
      buf_init(&bb, buf_i, sizeof(buf_i));
      buf_put(&bb, kxc->hswok_out, HASHSZ);
      buf_flip(&bb);
      ks_encrypt(kxc->ks, MSG_KEYEXCH | KX_SWITCHOK, &bb, b);
      break;
    default:
      abort();
  }

  if (BOK(b)) {
    st->n_kxout++;
    st->sz_kxout += BLEN(b);
    p_txend(kx->p);
  }

  if (kx->s < KXS_SWITCH)
    settimer(kx, time(0) + T_RETRY);
}

/* --- @matchreply@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *		@unsigned ty@ = type of incoming message
 *		@const octet *hc_in@ = a hash of his challenge
 *		@const octet *hc_out@ = a hash of my challenge (cookie)
 *		@mp *ck@ = his expected-reply hash (optional)
 *		@buf *b@ = encrypted remainder of the packet
 *
 * Returns:	A pointer to the challenge block if OK, or null on failure.
 *
 * Use:		Checks a reply or switch packet, ensuring that its contents
 *		are sensible and correct.  If they are, @*b@ is set to point
 *		to the remainder of the encrypted data, and the correct
 *		challenge is returned.
 */

static kxchal *matchreply(keyexch *kx, unsigned ty, const octet *hc_in,
			  const octet *hc_out, mp *ck, buf *b)
{
  kxchal *kxc;
  buf bb;
  mp *r = 0;

  /* --- Check the plaintext portions of the data --- */

  IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
    trace_block(T_CRYPTO, "crypto: challenge", hc_in, HASHSZ);
    trace_block(T_CRYPTO, "crypto: cookie", hc_out, HASHSZ);
    if (ck) trace(T_CRYPTO, "crypto: check value = %s", mpstr(ck));
  }))
  if (memcmp(hc_out, kx->hc, HASHSZ) != 0) {
    a_warn("incorrect cookie from `%s'", p_name(kx->p));
    goto bad;
  }
  if ((kxc = kxc_byhc(kx, hc_in)) == 0) {
    a_warn("received reply for unknown challenge from `%s'", p_name(kx->p));
    goto bad;
  }

  /* --- Maybe compute a reply for the challenge --- */

  if (!kxc->r) {
    if (!ck) {
      a_warn("unexpected switch request from `%s'", p_name(kx->p));
      goto bad;
    }
    if ((r = getreply(kx, kxc->c, ck)) == 0)
      goto bad;
    kxc->r = r;
    r = 0;
  }

  /* --- Decrypt the rest of the packet --- */

  buf_init(&bb, buf_o, sizeof(buf_o));
  if (ks_decrypt(kxc->ks, ty, b, &bb)) {
    a_warn("failed to decrypt reply from `%s'", p_name(kx->p));
    goto bad;
  }
  buf_init(b, BBASE(&bb), BLEN(&bb));
  if ((r = buf_getmp(b)) == 0) {
    a_warn("invalid reply packet from `%s'", p_name(kx->p));
    goto bad;
  }
  IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
    trace(T_CRYPTO, "crypto: reply = %s", mpstr(r));
  }))
  if (!mp_eq(r, kx->rx)) {
    a_warn("incorrect reply from `%s'", p_name(kx->p));
    goto bad;
  }

  /* --- Done --- */

  mp_drop(r);
  return (kxc);

bad:
  mp_drop(r);
  return (0);
}

/* --- @commit@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *		@kxchal *kxc@ = pointer to challenge to commit to
 *
 * Returns:	---
 *
 * Use:		Commits to a particular challenge as being the `right' one,
 *		since a reply has arrived for it.
 */

static void commit(keyexch *kx, kxchal *kxc)
{
  unsigned i;

  for (i = 0; i < kx->nr; i++) {
    if (kx->r[i] != kxc)
      kxc_destroy(kx->r[i]);
  }
  kx->r[0] = kxc;
  kx->nr = 1;
  kxc_stoptimer(kxc);
  ksl_link(kx->ks, kxc->ks);  
}

/* --- @doreply@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *		@buf *b@ = buffer containing packet
 *
 * Returns:	Zero if OK, nonzero if the packet was rejected.
 *
 * Use:		Handles a reply packet.  This doesn't handle the various
 *		switch packets: they're rather too different.
 */

static int doreply(keyexch *kx, buf *b)
{
  const octet *hc_in, *hc_out;
  mp *ck = 0;
  kxchal *kxc;

  if (kx->s != KXS_CHAL && kx->s != KXS_COMMIT) {
    a_warn("unexpected reply from `%s'", p_name(kx->p));
    goto bad;
  }
  if ((hc_in = buf_get(b, HASHSZ)) == 0 ||
      (hc_out = buf_get(b, HASHSZ)) == 0 ||
      (ck = buf_getmp(b)) == 0) {
    a_warn("invalid reply packet from `%s'", p_name(kx->p));
    goto bad;
  }
  if ((kxc = matchreply(kx, MSG_KEYEXCH | KX_REPLY,
			hc_in, hc_out, ck, b)) == 0)
    goto bad;
  if (BLEFT(b)) {
    a_warn("invalid reply packet from `%s'", p_name(kx->p));
    goto bad;
  }
  if (kx->s == KXS_CHAL) {
    commit(kx, kxc);
    kx->s = KXS_COMMIT;
  }
  resend(kx);
  return (0);

bad:
  mp_drop(ck);
  return (-1);
}

/* --- @doswitch@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange block
 *		@buf *b@ = pointer to buffer containing packet
 *
 * Returns:	Zero if OK, nonzero if the packet was rejected.
 *
 * Use:		Handles a reply with a switch request bolted onto it.
 */

static int doswitch(keyexch *kx, buf *b)
{
  const octet *hc_in, *hc_out, *hswrq;
  kxchal *kxc;

  if ((hc_in = buf_get(b, HASHSZ)) == 0 ||
      (hc_out = buf_get(b, HASHSZ)) == 0) {
    a_warn("invalid switch request from `%s'", p_name(kx->p));
    goto bad;
  }
  if ((kxc = matchreply(kx, MSG_KEYEXCH | KX_SWITCH,
			hc_in, hc_out, 0, b)) == 0)
    goto bad;
  if ((hswrq = buf_get(b, HASHSZ)) == 0 || BLEFT(b)) {
    a_warn("invalid switch request from `%s'", p_name(kx->p));
    goto bad;
  }
  IF_TRACING(T_KEYEXCH, {
    trace_block(T_CRYPTO, "crypto: switch request hash", hswrq, HASHSZ);
  })
  if (memcmp(hswrq, kxc->hswrq_in, HASHSZ) != 0) {
    a_warn("incorrect switch request hash from `%s'", p_name(kx->p));
    goto bad;
  }
  switch (kx->s) {
    case KXS_CHAL:
      commit(kx, kxc);
    case KXS_COMMIT:
      ks_activate(kxc->ks);
      settimer(kx, ks_tregen(kxc->ks));
      kx->s = KXS_SWITCH;
      break;
  }
  resend(kx);
  return (0);

bad:
  return (-1);
}

/* --- @doswitchok@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange block
 *		@buf *b@ = pointer to buffer containing packet
 *
 * Returns:	Zero if OK, nonzero if the packet was rejected.
 *
 * Use:		Handles a reply with a switch request bolted onto it.
 */

static int doswitchok(keyexch *kx, buf *b)
{
  const octet *hswok;
  kxchal *kxc;
  buf bb;

  if (kx->s < KXS_COMMIT) {
    a_warn("unexpected switch confirmation from `%s'", p_name(kx->p));
    goto bad;
  }
  kxc = kx->r[0];
  buf_init(&bb, buf_o, sizeof(buf_o));
  if (ks_decrypt(kxc->ks, MSG_KEYEXCH | KX_SWITCHOK, b, &bb)) {
    a_warn("failed to decrypt switch confirmation from `%s'", p_name(kx->p));
    goto bad;
  }
  buf_init(b, BBASE(&bb), BLEN(&bb));
  if ((hswok = buf_get(b, HASHSZ)) == 0 || BLEFT(b)) {
    a_warn("invalid switch confirmation from `%s'", p_name(kx->p));
    goto bad;
  }
  IF_TRACING(T_KEYEXCH, {
    trace_block(T_CRYPTO, "crypto: switch confirmation hash", hswok, HASHSZ);
  })
  if (memcmp(hswok, kxc->hswok_in, HASHSZ) != 0) {
    a_warn("incorrect switch confirmation hash from `%s'", p_name(kx->p));
    goto bad;
  }
  if (kx->s < KXS_SWITCH) {
    ks_activate(kxc->ks);
    settimer(kx, ks_tregen(kxc->ks));
    kx->s = KXS_SWITCH;
  }
  return (0);

bad:
  return (-1);  
}

/*----- Main code ---------------------------------------------------------*/

/* --- @stop@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *
 * Returns:	---
 *
 * Use:		Stops a key exchange dead in its tracks.  Throws away all of
 *		the context information.  The context is left in an
 *		inconsistent state.  The only functions which understand this
 *		state are @kx_free@ and @kx_init@ (which cause it internally
 *		it), and @start@ (which expects it to be the prevailing
 *		state).
 */

static void stop(keyexch *kx)
{
  unsigned i;

  if (kx->f & KXF_DEAD)
    return;

  if (kx->f & KXF_TIMER)
    sel_rmtimer(&kx->t);
  for (i = 0; i < kx->nr; i++)
    kxc_destroy(kx->r[i]);
  mp_drop(kx->alpha);
  mp_drop(kx->c);
  mp_drop(kx->rx);
  kx->t_valid = 0;
  kx->f |= KXF_DEAD;
  kx->f &= ~KXF_TIMER;
}

/* --- @start@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *		@time_t now@ = the current time
 *
 * Returns:	---
 *
 * Use:		Starts a new key exchange with the peer.  The context must be
 *		in the bizarre state left by @stop@ or @kx_init@.
 */

static void start(keyexch *kx, time_t now)
{
  HASH_CTX h;

  assert(kx->f & KXF_DEAD);

  kx->f &= ~KXF_DEAD;
  kx->nr = 0;
  kx->alpha = mprand_range(MP_NEW, kpriv.dp.q, &rand_global, 0);
  kx->c = mpmont_exp(&mg, MP_NEW, kpriv.dp.g, kx->alpha);
  kx->rx = mpmont_exp(&mg, MP_NEW, kx->kpub.y, kx->alpha);
  kx->s = KXS_CHAL;
  kx->t_valid = now + T_VALID;

  HASH_INIT(&h);
  HASH_STRING(&h, "tripe-cookie");
  hashmp(&h, kx->c);
  HASH_DONE(&h, kx->hc);

  IF_TRACING(T_KEYEXCH, {
    trace(T_KEYEXCH, "keyexch: creating new challenge");
    IF_TRACING(T_CRYPTO, {
      trace(T_CRYPTO, "crypto: secret = %s", mpstr(kx->alpha));
      trace(T_CRYPTO, "crypto: challenge = %s", mpstr(kx->c));
      trace(T_CRYPTO, "crypto: expected response = %s", mpstr(kx->rx));
      trace_block(T_CRYPTO, "crypto: challenge cookie", kx->hc, HASHSZ);
    })
  })
}

/* --- @checkpub@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *
 * Returns:	Zero if OK, nonzero if the peer's public key has expired.
 *
 * Use:		Deactivates the key-exchange until the peer acquires a new
 *		public key.
 */

static int checkpub(keyexch *kx)
{
  time_t now;
  if (kx->f & KXF_DEAD)
    return (-1);
  now = time(0);
  if (KEY_EXPIRED(now, kx->texp_kpub)) {
    stop(kx);
    a_warn("public key for `%s' has expired", p_name(kx->p));
    dh_pubfree(&kx->kpub);
    kx->f &= ~KXF_PUBKEY;
    return (-1);
  }
  return (0);
}

/* --- @kx_start@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *
 * Returns:	---
 *
 * Use:		Stimulates a key exchange.  If a key exchage is in progress,
 *		a new challenge is sent (unless the quiet timer forbids
 *		this); if no exchange is in progress, one is commenced.
 */

void kx_start(keyexch *kx)
{
  time_t now = time(0);

  if (checkpub(kx))
    return;
  if (!ISVALID(kx, now)) {
    stop(kx);
    start(kx, now);
  }
  resend(kx);
}

/* --- @kx_message@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *		@unsigned msg@ = the message code
 *		@buf *b@ = pointer to buffer containing the packet
 *
 * Returns:	---
 *
 * Use:		Reads a packet containing key exchange messages and handles
 *		it.
 */

void kx_message(keyexch *kx, unsigned msg, buf *b)
{
  time_t now = time(0);
  stats *st = p_stats(kx->p);
  size_t sz = BSZ(b);
  int rc;

#ifndef NTRACE
  static const char *const pkname[] = {
    "prechallenge", "cookie", "challenge",
    "reply", "switch request", "switch confirmation"
  };
#endif

  if (checkpub(kx))
    return;

  if (!ISVALID(kx, now)) {
    stop(kx);
    start(kx, now);
  }

  T( trace(T_KEYEXCH, "keyexch: processing %s packet from `%s'",
	   msg < KX_NMSG ? pkname[msg] : "unknown", p_name(kx->p)); )

  switch (msg) {
    case KX_PRECHAL:
    case KX_COOKIE:
    case KX_CHAL:
      rc = dochallenge(kx, msg, b);
      break;
    case KX_REPLY:
      rc = doreply(kx, b);
      break;
    case KX_SWITCH:
      rc = doswitch(kx, b);
      break;
    case KX_SWITCHOK:
      rc = doswitchok(kx, b);
      break;
    default:
      a_warn("unexpected key exchange message type %u from `%p'",
	     p_name(kx->p));
      rc = -1;
      break;
  }

  if (rc)
    st->n_reject++;
  else {
    st->n_kxin++;
    st->sz_kxin += sz;
  }
}

/* --- @kx_free@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *
 * Returns:	---
 *
 * Use:		Frees everything in a key exchange context.
 */

void kx_free(keyexch *kx)
{
  stop(kx);
  if (kx->f & KXF_PUBKEY)
    dh_pubfree(&kx->kpub);
}

/* --- @kx_newkeys@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *
 * Returns:	---
 *
 * Use:		Informs the key exchange module that its keys may have
 *		changed.  If fetching the new keys fails, the peer will be
 *		destroyed, we log messages and struggle along with the old
 *		keys.
 */

void kx_newkeys(keyexch *kx)
{
  dh_pub dp;

  if (km_getpubkey(p_name(kx->p), &dp, &kx->texp_kpub))
    return;
  if (kx->f & KXF_PUBKEY)
    dh_pubfree(&kx->kpub);
  kx->kpub = dp;
  kx->f |= KXF_PUBKEY;
  if ((kx->f & KXF_DEAD) || kx->s != KXS_SWITCH) {
    T( trace(T_KEYEXCH, "keyexch: restarting key negotiation with `%s'",
	     p_name(kx->p)); )
    stop(kx);
    start(kx, time(0));
    resend(kx);
  }
}

/* --- @kx_init@ --- *
 *
 * Arguments:	@keyexch *kx@ = pointer to key exchange context
 *		@peer *p@ = pointer to peer context
 *		@keyset **ks@ = pointer to keyset list
 *
 * Returns:	Zero if OK, nonzero if it failed.
 *
 * Use:		Initializes a key exchange module.  The module currently
 *		contains no keys, and will attempt to initiate a key
 *		exchange.
 */

int kx_init(keyexch *kx, peer *p, keyset **ks)
{
  kx->ks = ks;
  kx->p = p;
  if (km_getpubkey(p_name(p), &kx->kpub, &kx->texp_kpub))
    return (-1);
  kx->f = KXF_DEAD | KXF_PUBKEY;
  start(kx, time(0));
  resend(kx);
  return (0);
}

/*----- That's all, folks -------------------------------------------------*/