keyexch, keymgmt: Include the peer's public key in the check hash.

[tripe] / tripe.h

diff --git a/tripe.h b/tripe.h
index 47719fe99353ee1b54a1330e8d40172d395d2247..5f62f16dbf51be863d9a7d18006cb5e226e44881 100644 (file)
--- a/tripe.h
+++ b/tripe.h
@@ -66,6 +66,7 @@
 
 #include <mLib/alloc.h>
 #include <mLib/arena.h>
+#include <mLib/base64.h>
 #include <mLib/bres.h>
 #include <mLib/dstr.h>
 #include <mLib/env.h>
@@ -117,8 +118,9 @@
 #define T_KEYSET 32u
 #define T_KEYEXCH 64u
 #define T_KEYMGMT 128u
+#define T_CHAL 256u
 
-#define T_ALL 255u
+#define T_ALL 511u
 
 /* --- Units --- */
 
@@ -160,6 +162,15 @@ typedef union addr {
   struct sockaddr_in sin;
 } addr;
 
+/* --- Sequence number checking --- */
+
+typedef struct seqwin {
+  uint32 seq;                          /* First acceptable input sequence */
+  uint32 win;                          /* Window of acceptable numbers */
+} seqwin;
+
+#define SEQ_WINSZ 32                   /* Bits in sequence number window */
+
 /* --- A symmetric keyset --- *
  *
  * A keyset contains a set of symmetric keys for encrypting and decrypting
@@ -185,11 +196,9 @@ typedef struct keyset {
   size_t tagsz;                                /* Length to truncate MAC tags */
   gmac *min, *mout;                    /* Keyset MACs for integrity */
   uint32 oseq;                         /* Outbound sequence number */
-  uint32 iseq, iwin;                   /* Inbound sequence number */
+  seqwin iseq;                         /* Inbound sequence number */
 } keyset;
 
-#define KS_SEQWINSZ 32                 /* Bits in sequence number window */
-
 #define KSF_LISTEN 1u                  /* Don't encrypt packets yet */
 #define KSF_LINK 2u                    /* Key is in a linked list */
 
@@ -355,14 +364,29 @@ typedef struct admin_bgop {
   void (*cancel)(struct admin_bgop *); /* Destructor function */
 } admin_bgop;
 
-typedef struct admin_addop {
+typedef struct admin_resop {
   admin_bgop bg;                       /* Background operation header */
-  peerspec peer;                       /* Peer pending creation */
-  char *paddr;                         /* Hostname to be resolved */
+  char *addr;                          /* Hostname to be resolved */
   bres_client r;                       /* Background resolver task */
   sel_timer t;                         /* Timer for resolver */
+  addr sa;                             /* Socket address */
+  size_t sasz;                         /* Socket address size */
+  void (*func)(struct admin_resop *, int); /* Handler */
+} admin_resop;
+
+enum { ARES_OK, ARES_FAIL };
+
+typedef struct admin_addop {
+  admin_resop r;                       /* Name resolution header */
+  peerspec peer;                       /* Peer pending creation */
 } admin_addop;
 
+typedef struct admin_greetop {
+  admin_resop r;                       /* Name resolution header */
+  void *c;                             /* Challenge block */
+  size_t sz;                           /* Length of challenge */
+} admin_greetop;
+
 typedef struct admin_pingop {
   admin_bgop bg;                       /* Background operation header */
   ping ping;                           /* Ping pending response */
@@ -402,6 +426,7 @@ typedef struct admin {
 extern sel_state sel;                  /* Global I/O event state */
 extern group *gg;                      /* The group we work in */
 extern mp *kpriv;                      /* Our private key */
+extern ge *kpub;                       /* Our public key */
 extern octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ];
 extern const tunnel_ops *tunnels[];    /* Table of tunnels (0-term) */
 extern const tunnel_ops *tun_default;  /* Default tunnel to use */
@@ -691,8 +716,34 @@ extern int ksl_encrypt(keyset **/*ksroot*/, unsigned /*ty*/,
 extern int ksl_decrypt(keyset **/*ksroot*/, unsigned /*ty*/,
                       buf */*b*/, buf */*bb*/);
 
+/*----- Challenges --------------------------------------------------------*/
+
+/* --- @c_new@ --- *
+ *
+ * Arguments:  @buf *b@ = where to put the challenge
+ *
+ * Returns:    Zero if OK, nonzero on error.
+ *
+ * Use:                Issues a new challenge.
+ */
+
+extern int c_new(buf */*b*/);
+
+/* --- @c_check@ --- *
+ *
+ * Arguments:  @buf *b@ = where to find the challenge
+ *
+ * Returns:    Zero if OK, nonzero if it didn't work.
+ *
+ * Use:                Checks a challenge.  On failure, the buffer is broken.
+ */
+
+extern int c_check(buf */*b*/);
+
 /*----- Administration interface ------------------------------------------*/
 
+#define A_END ((char *)0)
+
 /* --- @a_warn@ --- *
  *
  * Arguments:  @const char *fmt@ = pointer to format string
@@ -819,6 +870,19 @@ extern int p_pingsend(peer */*p*/, ping */*pg*/, unsigned /*type*/,
 
 extern void p_pingdone(ping */*p*/, int /*rc*/);
 
+/* --- @p_greet@ --- *
+ *
+ * Arguments:  @peer *p@ = peer to send to
+ *             @const void *c@ = pointer to challenge
+ *             @size_t sz@ = size of challenge
+ *
+ * Returns:    ---
+ *
+ * Use:                Sends a greeting packet.
+ */
+
+extern void p_greet(peer */*p*/, const void */*c*/, size_t /*sz*/);
+
 /* --- @p_tun@ --- *
  *
  * Arguments:  @peer *p@ = pointer to peer block
@@ -1031,6 +1095,31 @@ extern const char *timestr(time_t /*t*/);
 
 extern int mystrieq(const char */*x*/, const char */*y*/);
 
+/* --- @seq_reset@ --- *
+ *
+ * Arguments:  @seqwin *s@ = sequence-checking window
+ *
+ * Returns:    ---
+ *
+ * Use:                Resets a sequence number window.
+ */
+
+extern void seq_reset(seqwin */*s*/);
+
+/* --- @seq_check@ --- *
+ *
+ * Arguments:  @seqwin *s@ = sequence-checking window
+ *             @uint32 q@ = sequence number to check
+ *             @const char *service@ = service to report message from
+ *
+ * Returns:    A @SEQ_@ code.
+ *
+ * Use:                Checks a sequence number against the window, updating things
+ *             as necessary.
+ */
+
+extern int seq_check(seqwin */*s*/, uint32 /*q*/, const char */*service*/);
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus