X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsptps.h;h=ab163442a18afc19605dee842e2b12bbbb17fd5a;hb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;hp=ee41f46f6257bfd573e6838448286c3967ac7b88;hpb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;p=meshlink

diff --git a/src/sptps.h b/src/sptps.h
index ee41f46f..ab163442 100644
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -1,6 +1,6 @@
 /*
     sptps.h -- Simple Peer-to-Peer Security
-    Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -22,8 +22,7 @@
 
 #include "system.h"
 
-#include "cipher.h"
-#include "digest.h"
+#include "chacha-poly1305/chacha-poly1305.h"
 #include "ecdh.h"
 #include "ecdsa.h"
 
@@ -35,13 +34,13 @@
 #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
+#define SPTPS_KEX 1           // Waiting for the first Key EXchange record
+#define SPTPS_SECONDARY_KEX 2 // Ready to receive a secondary Key EXchange record
+#define SPTPS_SIG 3           // Waiting for a SIGnature record
+#define SPTPS_ACK 4           // Waiting for an ACKnowledgement record
 
-typedef bool (*send_data_t)(void *handle, uint8_t type, const char *data, size_t len);
-typedef bool (*receive_record_t)(void *handle, uint8_t type, const char *data, uint16_t len);
+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);
 
 typedef struct sptps {
 	bool initiator;
@@ -53,17 +52,14 @@ typedef struct sptps {
 	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;
 	char *late;
 
 	bool outstate;
-	cipher_t *outcipher;
-	digest_t *outdigest;
+	chacha_poly1305_ctx_t *outcipher;
 	uint32_t outseqno;
 
 	ecdsa_t *mykey;
@@ -87,9 +83,9 @@ extern void sptps_log_stderr(sptps_t *s, int s_errno, const char *format, va_lis
 extern void (*sptps_log)(sptps_t *s, int s_errno, const char *format, va_list ap);
 extern bool sptps_start(sptps_t *s, void *handle, bool initiator, bool datagram, ecdsa_t *mykey, ecdsa_t *hiskey, const char *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 char *data, uint16_t len);
-extern bool sptps_receive_data(sptps_t *s, const char *data, size_t len);
+extern bool sptps_send_record(sptps_t *s, uint8_t type, const void *data, uint16_t len);
+extern bool 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 char *data, size_t len);
+extern bool sptps_verify_datagram(sptps_t *s, const void *data, size_t len);
 
 #endif