X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps.h;h=ee41f46f6257bfd573e6838448286c3967ac7b88;hb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;hp=3854ec24a6eedaf878e9e56eaac27aaaa063bb24;hpb=1d9dacb1f26971e19463b5501c2410c57f780ecb;p=tinc

diff --git a/src/sptps.h b/src/sptps.h
index 3854ec24..ee41f46f 100644
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -1,6 +1,6 @@
 /*
     sptps.h -- Simple Peer-to-Peer Security
-    Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2013 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
@@ -40,7 +40,7 @@
 #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 (*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 struct sptps {
@@ -53,18 +53,22 @@ typedef struct sptps {
 	uint16_t reclen;
 
 	bool instate;
-	cipher_t incipher;
-	digest_t indigest;
+	cipher_t *incipher;
+	digest_t *indigest;
 	uint32_t inseqno;
+	uint32_t received;
+	unsigned int replaywin;
+	unsigned int farfuture;
+	char *late;
 
 	bool outstate;
-	cipher_t outcipher;
-	digest_t outdigest;
+	cipher_t *outcipher;
+	digest_t *outdigest;
 	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;
@@ -77,10 +81,15 @@ typedef struct sptps {
 	receive_record_t receive_record;
 } sptps_t;
 
-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 unsigned int sptps_replaywin;
+extern void sptps_log_quiet(sptps_t *s, int s_errno, const char *format, va_list ap);
+extern void sptps_log_stderr(sptps_t *s, int s_errno, const char *format, va_list ap);
+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_force_kex(sptps_t *s);
+extern bool sptps_verify_datagram(sptps_t *s, const char *data, size_t len);
 
 #endif