X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsptps.h;h=9754811c447508c306248ee42dc106ee4c79b21d;hb=8fc838f88fad6d6a632f9d4e6906e31931c765e3;hp=3a8e65f7a7630853dc890426b1efff8693430482;hpb=fa20cfceecee1756ecb7882b6fe9167f4db92777;p=meshlink diff --git a/src/sptps.h b/src/sptps.h index 3a8e65f7..9754811c 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 , + Copyright (C) 2014 Guus Sliepen 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" @@ -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;