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

[tripe] / tripe.h

diff --git a/tripe.h b/tripe.h
index eec4093..5f62f16 100644 (file)
--- a/tripe.h
+++ b/tripe.h
@@ -171,12 +171,6 @@ typedef struct seqwin {
 
 #define SEQ_WINSZ 32                   /* Bits in sequence number window */
 
-#define SEQ_RESET(iseq) { 
-
-#define SEQ_OK 0                       /* Sequence number valid */
-#define SEQ_OLD -1                     /* Sequence number too old */
-#define SEQ_REPLAY -2                  /* Definitely replayed */
-
 /* --- A symmetric keyset --- *
  *
  * A keyset contains a set of symmetric keys for encrypting and decrypting
@@ -432,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 */
@@ -747,6 +742,8 @@ extern int c_check(buf */*b*/);
 
 /*----- Administration interface ------------------------------------------*/
 
+#define A_END ((char *)0)
+
 /* --- @a_warn@ --- *
  *
  * Arguments:  @const char *fmt@ = pointer to format string
@@ -1098,16 +1095,6 @@ extern const char *timestr(time_t /*t*/);
 
 extern int mystrieq(const char */*x*/, const char */*y*/);
 
-/* --- @b64_encode@ --- *
- *
- * Arguments:  @const void *p@ = pointer to some gorp
- *             @size_t sz@ = size of the gorp
- *
- * Returns:    Pointer to base64-encoded version in @buf_t@.
- */
-
-extern const char *b64_encode(const void */*p*/, size_t /*sz*/);
-
 /* --- @seq_reset@ --- *
  *
  * Arguments:  @seqwin *s@ = sequence-checking window
@@ -1123,6 +1110,7 @@ extern void seq_reset(seqwin */*s*/);
  *
  * Arguments:  @seqwin *s@ = sequence-checking window
  *             @uint32 q@ = sequence number to check
+ *             @const char *service@ = service to report message from
  *
  * Returns:    A @SEQ_@ code.
  *
@@ -1130,7 +1118,7 @@ extern void seq_reset(seqwin */*s*/);
  *             as necessary.
  */
 
-extern int seq_check(seqwin */*s*/, uint32 /*q*/);
+extern int seq_check(seqwin */*s*/, uint32 /*q*/, const char */*service*/);
 
 /*----- That's all, folks -------------------------------------------------*/