keyexch: Simplify key-exchange protocol.

[tripe] / tripe.h

diff --git a/tripe.h b/tripe.h
index 5f62f16..2182b3b 100644 (file)
--- a/tripe.h
+++ b/tripe.h
@@ -212,7 +212,6 @@ typedef struct keyset {
  */
 
 #define KX_NCHAL 16u
-#define KX_THRESH 4u
 
 typedef struct kxchal {
   struct keyexch *kx;                  /* Pointer back to key exchange */
@@ -222,7 +221,7 @@ typedef struct kxchal {
   unsigned f;                          /* Various useful flags */
   sel_timer t;                         /* Response timer for challenge */
   octet hc[MAXHASHSZ];                 /* Hash of his challenge */
-  mp *ck;                              /* The check value */
+  octet ck[MAXHASHSZ];                 /* His magical check value */
   octet hswrq_in[MAXHASHSZ];           /* Inbound switch request message */
   octet hswok_in[MAXHASHSZ];           /* Inbound switch confirmation */
   octet hswrq_out[MAXHASHSZ];          /* Outbound switch request message */
@@ -425,6 +424,7 @@ typedef struct admin {
 
 extern sel_state sel;                  /* Global I/O event state */
 extern group *gg;                      /* The group we work in */
+extern size_t indexsz;                 /* Size of exponent for the group */
 extern mp *kpriv;                      /* Our private key */
 extern ge *kpub;                       /* Our public key */
 extern octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ];