X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/52c03a2aa0b5c3461055ca0dcf38e29f2ca88f35..42da2a58637902f3bba731a83538804e57e340bf:/tripe.h diff --git a/tripe.h b/tripe.h index 2929200c..9cf7abf3 100644 --- a/tripe.h +++ b/tripe.h @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: tripe.h,v 1.18 2004/04/03 12:35:13 mdw Exp $ + * $Id$ * * Main header file for TrIPE * @@ -26,70 +26,6 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/*----- 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. - * - * Revision 1.16 2003/07/13 11:19:49 mdw - * Incompatible protocol fix! Include message type code under MAC tag to - * prevent cut-and-paste from key-exchange messages to general packet - * transport. - * - * Revision 1.15 2003/05/16 12:09:03 mdw - * Allow binding to a chosen address. - * - * Revision 1.14 2003/04/06 10:36:33 mdw - * Rearrange so as not to include Linux headers unless we need to. - * - * Revision 1.13 2003/04/06 10:26:35 mdw - * Report peer name on decrypt errors. - * - * Revision 1.12 2003/04/06 10:25:17 mdw - * Support Linux TUN/TAP device. Fix some bugs. - * - * Revision 1.11 2002/01/13 14:57:42 mdw - * Fix crap typo. - * - * Revision 1.10 2002/01/13 14:54:58 mdw - * Provide MGF macros. - * - * Revision 1.9 2001/06/22 19:40:36 mdw - * Support expiry of other peers' public keys. - * - * Revision 1.8 2001/06/19 22:10:57 mdw - * Some more constants for the algorithms. Document the packet format - * change for non-malleability. Moved @buf@ definitions to separate header - * file. - * - * Revision 1.7 2001/03/03 12:07:08 mdw - * Rename word get and put functions now that there's 16-bit support. - * - * Revision 1.6 2001/02/19 19:11:09 mdw - * Output buffering on admin connections. - * - * Revision 1.5 2001/02/16 21:41:43 mdw - * Major changes. See source files for details. - * - * Revision 1.4 2001/02/05 19:56:37 mdw - * Sequence number protection, and BSD tunnels. - * - * Revision 1.3 2001/02/04 01:17:55 mdw - * Create a configuration header file to tidy up command lines. - * - * Revision 1.2 2001/02/03 22:40:29 mdw - * Put timer information into the entropy pool when packets are received - * and on similar events. Reseed the generator on the interval timer. - * - * Revision 1.1 2001/02/03 20:26:37 mdw - * Initial checkin. - * - */ - #ifndef TRIPE_H #define TRIPE_H @@ -104,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -169,13 +106,6 @@ /*----- Magic numbers -----------------------------------------------------*/ -/* --- Tunnel types --- */ - -#define TUN_NOTDEF 0 -#define TUN_UNET 1 -#define TUN_BSD 2 -#define TUN_LINUX 3 - /* --- Trace flags --- */ #define T_TUNNEL 1u @@ -201,29 +131,21 @@ /*----- Cipher selections -------------------------------------------------*/ -#include -#include -#include -#include -#include +typedef struct algswitch { + const gccipher *c; /* Symmetric encryption scheme */ + const gccipher *mgf; /* Mask-generation function */ + const gchash *h; /* Hash function */ + const gcmac *m; /* Message authentication code */ + size_t hashsz; /* Hash output size */ + size_t tagsz; /* Length to truncate MAC tags */ + size_t cksz, mksz; /* Key lengths for @c@ and @m@ */ +} algswitch; -#define CIPHER (&blowfish_cbc) -#define MAC (&rmd160_hmac) +extern algswitch algs; -#define HASH_CTX rmd160_ctx -#define HASH_INIT rmd160_init -#define HASH rmd160_hash -#define HASH_STRING(c, s) HASH((c), s, sizeof(s)) -#define HASH_DONE rmd160_done -#define HASHSZ RMD160_HASHSZ +#define MAXHASHSZ 64 /* Largest possible hash size */ -#define MGF_CTX blowfish_counterctx -#define MGF_INIT blowfish_counterinit -#define MGF_CRYPT blowfish_counterencrypt - -#define SEQSZ 4 -#define IVSZ BLOWFISH_BLKSZ -#define MACSZ 10 +#define HASH_STRING(h, s) GH_HASH((h), (s), sizeof(s)) /*----- Data structures ---------------------------------------------------*/ @@ -259,6 +181,7 @@ typedef struct keyset { T( unsigned seq; ) /* Sequence number for tracing */ unsigned f; /* Various useful flags */ gcipher *cin, *cout; /* Keyset ciphers for encryption */ + 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 */ @@ -288,12 +211,12 @@ typedef struct kxchal { keyset *ks; /* Pointer to temporary keyset */ unsigned f; /* Various useful flags */ sel_timer t; /* Response timer for challenge */ - octet hc[HASHSZ]; /* Hash of his challenge */ + octet hc[MAXHASHSZ]; /* Hash of his challenge */ mp *ck; /* The check value */ - octet hswrq_in[HASHSZ]; /* Inbound switch request message */ - octet hswok_in[HASHSZ]; /* Inbound switch confirmation */ - octet hswrq_out[HASHSZ]; /* Outbound switch request message */ - octet hswok_out[HASHSZ]; /* Outbound switch confirmation */ + octet hswrq_in[MAXHASHSZ]; /* Inbound switch request message */ + octet hswok_in[MAXHASHSZ]; /* Inbound switch confirmation */ + octet hswrq_out[MAXHASHSZ]; /* Outbound switch request message */ + octet hswok_out[MAXHASHSZ]; /* Outbound switch confirmation */ } kxchal; typedef struct keyexch { @@ -309,7 +232,7 @@ typedef struct keyexch { 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 */ + octet hc[MAXHASHSZ]; /* Hash of my challenge */ kxchal *r[KX_NCHAL]; /* Array of challenges */ } keyexch; @@ -329,27 +252,21 @@ enum { * Used to maintain system-specific information about the tunnel interface. */ -#if TUN_TYPE == TUN_LINUX -# include -# include -#endif +typedef struct tunnel tunnel; +struct peer; -typedef struct tunnel { -#if TUN_TYPE == TUN_UNET - sel_file f; /* Selector for Usernet device */ - struct peer *p; /* Pointer to my peer */ -#elif TUN_TYPE == TUN_LINUX - sel_file f; /* Selector for TUN/TAP device */ - struct peer *p; /* Pointer to my peer */ - char ifn[IFNAMSIZ]; /* Interface name buffer */ -#elif TUN_TYPE == TUN_BSD - sel_file f; /* Selector for tunnel device */ - struct peer *p; /* Pointer to my peer */ - unsigned n; /* Number of my tunnel device */ -#else -# error "No support for this tunnel type" +typedef struct tunnel_ops { + const char *name; /* Name of this tunnel driver */ + void (*init)(void); /* Initializes the system */ + tunnel *(*create)(struct peer */*p*/); /* Initializes a new tunnel */ + const char *(*ifname)(tunnel */*t*/); /* Returns tunnel's interface name */ + void (*inject)(tunnel */*t*/, buf */*b*/); /* Sends packet through if */ + void (*destroy)(tunnel */*t*/); /* Destroys a tunnel */ +} tunnel_ops; + +#ifndef TUN_INTERNALS +struct tunnel { const tunnel_ops *ops; }; #endif -} tunnel; /* --- Peer statistics --- * * @@ -363,7 +280,7 @@ typedef struct stats { unsigned long sz_in, sz_out; /* Size of all data in and out */ unsigned long sz_kxin, sz_kxout; /* Size of key exchange messages */ unsigned long sz_ipin, sz_ipout; /* Size of encapsulated IP packets */ - time_t t_start, t_last; /* Time peer created, last recv */ + time_t t_start, t_last, t_kx; /* Time peer created, last pk, kx */ unsigned long n_reject; /* Number of rejected packets */ unsigned long n_in, n_out; /* Number of packets in and out */ unsigned long n_kxin, n_kxout; /* Number of key exchange packets */ @@ -378,7 +295,7 @@ typedef struct stats { typedef struct peer { struct peer *next, *prev; /* Links to next and previous */ char *name; /* Name of this peer */ - tunnel t; /* Tunnel for local packets */ + tunnel *t; /* Tunnel for local packets */ keyset *ks; /* List head for keysets */ buf b; /* Buffer for sending packets */ addr peer; /* Peer socket address */ @@ -410,12 +327,24 @@ typedef struct admin { sel_file w; /* Selector for write buffering */ bres_client r; /* Background resolver task */ sel_timer t; /* Timer for resolver */ + const tunnel_ops *tops; /* Tunnel to use */ addr peer; /* Address to set */ size_t sasz; /* Size of the address */ } admin; #define AF_DEAD 1u /* Destroy this admin block */ #define AF_LOCK 2u /* Don't destroy it yet */ +#define AF_NOTE 4u /* Catch notifications */ +#ifndef NTRACE + #define AF_TRACE 8u /* Catch tracing */ +#endif +#define AF_WARN 16u /* Catch warning messages */ + +#ifndef NTRACE +# define AF_ALLMSGS (AF_NOTE | AF_TRACE | AF_WARN) +#else +# define AF_ALLMSGS (AF_NOTE | AF_WARN) +#endif /*----- Global variables --------------------------------------------------*/ @@ -423,6 +352,8 @@ extern sel_state sel; /* Global I/O event state */ 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]; +extern const tunnel_ops *tunnels[]; /* Table of tunnels (0-term) */ +extern const tunnel_ops *tun_default; /* Default tunnel to use */ #ifndef NTRACE extern const trace_opt tr_opts[]; /* Trace options array */ @@ -722,16 +653,29 @@ extern int ksl_decrypt(keyset **/*ksroot*/, unsigned /*ty*/, extern void a_warn(const char */*fmt*/, ...); +/* --- @a_notify@ --- * + * + * Arguments: @const char *fmt@ = pointer to format string + * @...@ = other arguments + * + * Returns: --- + * + * Use: Sends a notification to interested admin connections. + */ + +extern void a_notify(const char */*fmt*/, ...); + /* --- @a_create@ --- * * * Arguments: @int fd_in, fd_out@ = file descriptors to use + * @unsigned f@ = initial flags to set * * Returns: --- * * Use: Creates a new admin connection. */ -extern void a_create(int /*fd_in*/, int /*fd_out*/); +extern void a_create(int /*fd_in*/, int /*fd_out*/, unsigned /*f*/); /* --- @a_quit@ --- * * @@ -866,6 +810,7 @@ unsigned p_port(void); /* --- @p_create@ --- * * * Arguments: @const char *name@ = name for this peer + * @const tunnel_ops *tops@ = tunnel to use * @struct sockaddr *sa@ = socket address of peer * @size_t sz@ = size of socket address * @@ -875,7 +820,7 @@ unsigned p_port(void); * by this point. */ -extern peer *p_create(const char */*name*/, +extern peer *p_create(const char */*name*/, const tunnel_ops */*tops*/, struct sockaddr */*sa*/, size_t /*sz*/); /* --- @p_name@ --- * @@ -921,63 +866,21 @@ extern void p_destroy(peer */*p*/); extern peer *p_first(void); extern peer *p_next(peer */*p*/); -/*----- Tunnel interface --------------------------------------------------*/ - -/* --- @tun_init@ --- * - * - * Arguments: --- - * - * Returns: --- - * - * Use: Initializes the tunneling system. Maybe this will require - * opening file descriptors or something. - */ - -extern void tun_init(void); - -/* --- @tun_create@ --- * - * - * Arguments: @tunnel *t@ = pointer to tunnel block - * @peer *p@ = pointer to peer block - * - * Returns: Zero if it worked, nonzero on failure. - * - * Use: Initializes a new tunnel. - */ - -extern int tun_create(tunnel */*t*/, peer */*p*/); - -/* --- @tun_ifname@ --- * - * - * Arguments: @tunnel *t@ = pointer to tunnel block - * - * Returns: A pointer to the tunnel's interface name. - */ +/*----- Tunnel drivers ----------------------------------------------------*/ -extern const char *tun_ifname(tunnel */*t*/); - -/* --- @tun_inject@ --- * - * - * Arguments: @tunnel *t@ = pointer to tunnel block - * @buf *b@ = buffer to send - * - * Returns: --- - * - * Use: Injects a packet into the local network stack. - */ +#ifdef TUN_LINUX + extern const tunnel_ops tun_linux; +#endif -extern void tun_inject(tunnel */*t*/, buf */*b*/); +#ifdef TUN_UNET + extern const tunnel_ops tun_unet; +#endif -/* --- @tun_destroy@ --- * - * - * Arguments: @tunnel *t@ = pointer to tunnel block - * - * Returns: --- - * - * Use: Destroys a tunnel. - */ +#ifdef TUN_BSD + extern const tunnel_ops tun_bsd; +#endif -extern void tun_destroy(tunnel */*t*/); +extern const tunnel_ops tun_slip; /*----- Other handy utilities ---------------------------------------------*/ @@ -1018,6 +921,15 @@ extern const char *gestr(group */*g*/, ge */*x*/); extern const char *timestr(time_t /*t*/); +/* --- @mystrieq@ --- * + * + * Arguments: @const char *x, *y@ = two strings + * + * Returns: True if @x@ and @y are equal, up to case. + */ + +extern int mystrieq(const char */*x*/, const char */*y*/); + /*----- That's all, folks -------------------------------------------------*/ #ifdef __cplusplus