Support elliptic curve key exchange.

[tripe] / tripe.h

diff --git a/tripe.h b/tripe.h
index 385c45a24ca07a5c4790a607777e0dc4899e7482..2929200c74bde7348fcc1886a8e04c3581695983 100644 (file)
--- a/tripe.h
+++ b/tripe.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: tripe.h,v 1.17 2003/10/15 09:30:18 mdw Exp $
+ * $Id: tripe.h,v 1.18 2004/04/03 12:35:13 mdw Exp $
  *
  * Main header file for TrIPE
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tripe.h,v $
+ * Revision 1.18  2004/04/03 12:35:13  mdw
+ * Support elliptic curve key exchange.
+ *
  * Revision 1.17  2003/10/15 09:30:18  mdw
  * Add support for Ethereal protocol analysis.
  *
@@ -153,9 +156,11 @@
 #include <catacomb/rand.h>
 
 #include <catacomb/mp.h>
-#include <catacomb/mpmont.h>
 #include <catacomb/mprand.h>
 #include <catacomb/dh.h>
+#include <catacomb/ec.h>
+#include <catacomb/ec-keys.h>
+#include <catacomb/group.h>
 
 #include "tripe-protocol.h"
 #include "util.h"
@@ -278,8 +283,8 @@ typedef struct keyset {
 
 typedef struct kxchal {
   struct keyexch *kx;                  /* Pointer back to key exchange */
-  mp *c;                               /* Responder's challenge */
-  mp *r;                               /* My reply to the challenge */
+  ge *c;                               /* Responder's challenge */
+  ge *r;                               /* My reply to the challenge */
   keyset *ks;                          /* Pointer to temporary keyset */
   unsigned f;                          /* Various useful flags */
   sel_timer t;                         /* Response timer for challenge */
@@ -297,11 +302,11 @@ typedef struct keyexch {
   unsigned f;                          /* Various useful flags */
   unsigned s;                          /* Current state in exchange */
   sel_timer t;                         /* Timer for next exchange */
-  dh_pub kpub;                         /* Peer's public key */
+  ge *kpub;                            /* Peer's public key */
   time_t texp_kpub;                    /* Expiry time for public key */
   mp *alpha;                           /* My temporary secret */
-  mp *c;                               /* My challenge */
-  mp *rx;                              /* The expected response */
+  ge *c;                               /* My challenge */
+  ge *rx;                              /* The expected response */
   unsigned nr;                         /* Number of extant responses */
   time_t t_valid;                      /* When this exchange goes bad */
   octet hc[HASHSZ];                    /* Hash of my challenge */
@@ -415,8 +420,8 @@ typedef struct admin {
 /*----- Global variables --------------------------------------------------*/
 
 extern sel_state sel;                  /* Global I/O event state */
-extern dh_priv kpriv;                  /* Our private key */
-extern mpmont mg;                      /* Montgomery context for DH group */
+extern group *gg;                      /* The group we work in */
+extern mp *kpriv;                      /* Our private key */
 extern octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ];
 
 #ifndef NTRACE
@@ -458,7 +463,7 @@ extern void km_init(const char */*kr_priv*/, const char */*kr_pub*/,
 /* --- @km_getpubkey@ --- *
  *
  * Arguments:  @const char *tag@ = public key tag to load
- *             @dh_pub *kpub@ = where to put the public key
+ *             @ge *kpub@ = where to put the public key
  *             @time_t *t_exp@ = where to put the expiry time
  *
  * Returns:    Zero if OK, nonzero if it failed.
@@ -466,7 +471,7 @@ extern void km_init(const char */*kr_priv*/, const char */*kr_pub*/,
  * Use:                Fetches a public key from the keyring.
  */
 
-extern int km_getpubkey(const char */*tag*/, dh_pub */*kpub*/,
+extern int km_getpubkey(const char */*tag*/, ge */*kpub*/,
                        time_t */*t_exp*/);
 
 /*----- Key exchange ------------------------------------------------------*/
@@ -988,6 +993,19 @@ extern void tun_destroy(tunnel */*t*/);
 
 extern const char *mpstr(mp */*m*/);
 
+/* --- @gestr@ --- *
+ *
+ * Arguments:  @group *g@ = a group
+ *             @ge *x@ = a group element
+ *
+ * Returns:    A pointer to the element's textual representation.
+ *
+ * Use:                Converts a group element to a string.  Corrupts
+ *             @buf_t@.
+ */
+
+extern const char *gestr(group */*g*/, ge */*x*/);
+
 /* --- @timestr@ --- *
  *
  * Arguments:  @time_t t@ = a time to convert