GitHub CI: update list of container images

[tinc] / src / sptps.h

diff --git a/src/sptps.h b/src/sptps.h
index 51de575..633eb81 100644 (file)
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -1,6 +1,9 @@
+#ifndef TINC_SPTPS_H
+#define TINC_SPTPS_H
+
 /*
     sptps.h -- Simple Peer-to-Peer Security
-    Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,8 +22,7 @@
 
 #include "system.h"
 
-#include "cipher.h"
-#include "digest.h"
+#include "chacha-poly1305/chacha-poly1305.h"
 #include "ecdh.h"
 #include "ecdsa.h"
 
@@ -31,40 +33,69 @@
 #define SPTPS_ALERT 129       // Warning or error messages
 #define SPTPS_CLOSE 130       // Application closed the connection
 
+// Overhead for datagrams
+#define SPTPS_DATAGRAM_OVERHEAD 21
+
+typedef bool (*send_data_t)(void *handle, uint8_t type, const void *data, size_t len);
+typedef bool (*receive_record_t)(void *handle, uint8_t type, const void *data, uint16_t len);
+
 // Key exchange states
-#define SPTPS_KEX 0           // Waiting for the first Key EXchange record
-#define SPTPS_SECONDARY_KEX 1 // Ready to receive a secondary Key EXchange record
-#define SPTPS_SIG 2           // Waiting for a SIGnature record
-#define SPTPS_ACK 3           // Waiting for an ACKnowledgement record
+typedef enum sptps_state_t {
+       SPTPS_KEX = 1,           // Waiting for the first Key EXchange record
+       SPTPS_SECONDARY_KEX = 2, // Ready to receive a secondary Key EXchange record
+       SPTPS_SIG = 3,           // Waiting for a SIGnature record
+       SPTPS_ACK = 4,           // Waiting for an ACKnowledgement record
+} sptps_state_t;
+
+PACKED(struct sptps_kex_t {
+       uint8_t version;
+       uint8_t nonce[ECDH_SIZE];
+       uint8_t pubkey[ECDH_SIZE];
+});
+
+typedef struct sptps_kex_t sptps_kex_t;
+
+STATIC_ASSERT(sizeof(sptps_kex_t) == 65, "sptps_kex_t has invalid size");
+
+typedef union sptps_key_t {
+       struct {
+               uint8_t key0[CHACHA_POLY1305_KEYLEN];
+               uint8_t key1[CHACHA_POLY1305_KEYLEN];
+       };
+       uint8_t both[CHACHA_POLY1305_KEYLEN * 2];
+} sptps_key_t;
 
-typedef bool (*send_data_t)(void *handle, const char *data, size_t len);
-typedef bool (*receive_record_t)(void *handle, uint8_t type, const char *data, uint16_t len);
+STATIC_ASSERT(sizeof(sptps_key_t) == 128, "sptps_key_t has invalid size");
 
 typedef struct sptps {
        bool initiator;
-       int state;
+       bool datagram;
+       sptps_state_t state;
 
-       char *inbuf;
+       uint8_t *inbuf;
        size_t buflen;
+       uint16_t reclen;
 
        bool instate;
-       cipher_t incipher;
-       digest_t indigest;
+       chacha_poly1305_ctx_t *incipher;
        uint32_t inseqno;
+       uint32_t received;
+       unsigned int replaywin;
+       unsigned int farfuture;
+       uint8_t *late;
 
        bool outstate;
-       cipher_t outcipher;
-       digest_t outdigest;
+       chacha_poly1305_ctx_t *outcipher;
        uint32_t outseqno;
 
-       ecdsa_t mykey;
-       ecdsa_t hiskey;
-       ecdh_t ecdh;
+       ecdsa_t *mykey;
+       ecdsa_t *hiskey;
+       ecdh_t *ecdh;
 
-       char *mykex;
-       char *hiskex;
-       char *key;
-       char *label;
+       sptps_kex_t *mykex;
+       sptps_kex_t *hiskex;
+       sptps_key_t *key;
+       uint8_t *label;
        size_t labellen;
 
        void *handle;
@@ -72,8 +103,15 @@ typedef struct sptps {
        receive_record_t receive_record;
 } sptps_t;
 
-extern bool start_sptps(sptps_t *s, void *handle, bool initiator, ecdsa_t mykey, ecdsa_t hiskey, const char *label, size_t labellen, send_data_t send_data, receive_record_t receive_record);
-extern bool stop_sptps(sptps_t *s);
-extern bool send_record(sptps_t *s, uint8_t type, const char *data, uint16_t len);
-extern bool receive_data(sptps_t *s, const char *data, size_t len);
-extern bool force_kex(sptps_t *s);
+extern unsigned int sptps_replaywin;
+extern void sptps_log_quiet(sptps_t *s, int s_errno, const char *format, va_list ap) ATTR_FORMAT(printf, 3, 0);
+extern void sptps_log_stderr(sptps_t *s, int s_errno, const char *format, va_list ap) ATTR_FORMAT(printf, 3, 0);
+extern void (*sptps_log)(sptps_t *s, int s_errno, const char *format, va_list ap) ATTR_FORMAT(printf, 3, 0);
+extern bool sptps_start(sptps_t *s, void *handle, bool initiator, bool datagram, ecdsa_t *mykey, ecdsa_t *hiskey, const void *label, size_t labellen, send_data_t send_data, receive_record_t receive_record);
+extern bool sptps_stop(sptps_t *s);
+extern bool sptps_send_record(sptps_t *s, uint8_t type, const void *data, uint16_t len);
+extern size_t sptps_receive_data(sptps_t *s, const void *data, size_t len);
+extern bool sptps_force_kex(sptps_t *s);
+extern bool sptps_verify_datagram(sptps_t *s, const void *data, size_t len);
+
+#endif