#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
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);
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;
char *late;
bool outstate;
- cipher_t *outcipher;
- digest_t *outdigest;
+ chacha_poly1305_ctx_t *outcipher;
uint32_t outseqno;
ecdsa_t *mykey;