Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / sptps.h

diff --git a/src/sptps.h b/src/sptps.h
index b1026d5..51de575 100644 (file)
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -24,10 +24,18 @@
 #include "ecdh.h"
 #include "ecdsa.h"
 
-#define STATE_FIRST_KEX 0 // Waiting for peer's ECDHE pubkey
-#define STATE_NORMAL 1
-#define STATE_WAIT_KEX 2 // Waiting for peer's ECDHE pubkey
-#define STATE_WAIT_ACK 3 // Waiting for peer's acknowledgement of pubkey reception
+#define SPTPS_VERSION 0
+
+// Record types
+#define SPTPS_HANDSHAKE 128   // Key exchange and authentication
+#define SPTPS_ALERT 129       // Warning or error messages
+#define SPTPS_CLOSE 130       // Application closed the connection
+
+// 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 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);
@@ -39,10 +47,12 @@ typedef struct sptps {
        char *inbuf;
        size_t buflen;
 
+       bool instate;
        cipher_t incipher;
        digest_t indigest;
        uint32_t inseqno;
 
+       bool outstate;
        cipher_t outcipher;
        digest_t outdigest;
        uint32_t outseqno;
@@ -51,7 +61,8 @@ typedef struct sptps {
        ecdsa_t hiskey;
        ecdh_t ecdh;
 
-       char *myrandom;
+       char *mykex;
+       char *hiskex;
        char *key;
        char *label;
        size_t labellen;
@@ -65,3 +76,4 @@ extern bool start_sptps(sptps_t *s, void *handle, bool initiator, ecdsa_t mykey,
 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);