+#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
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __SPTPS_H__
-#define __SPTPS_H__
-
#include "system.h"
-#include "cipher.h"
-#include "digest.h"
+#include "chacha-poly1305/chacha-poly1305.h"
#include "ecdh.h"
#include "ecdsa.h"
#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
+
+// Overhead for datagrams
+#define SPTPS_DATAGRAM_OVERHEAD 21
-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);
+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;
+ bool datagram;
int state;
char *inbuf;
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;
- ecdsa_t hiskey;
- ecdh_t ecdh;
+ ecdsa_t *mykey;
+ ecdsa_t *hiskey;
+ ecdh_t *ecdh;
char *mykex;
char *hiskex;
receive_record_t receive_record;
} sptps_t;
-extern bool sptps_start(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 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 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 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 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