Really stop using cipher.h and digest.h.

diff --git a/src/chacha-poly1305/chacha-poly1305.c b/src/chacha-poly1305/chacha-poly1305.c
index bd5cb2c40cf325d853d0d9f334148ad15af11f2a..c7464203d36088c80f225ddc294223413b748278 100644 (file)
--- a/src/chacha-poly1305/chacha-poly1305.c
+++ b/src/chacha-poly1305/chacha-poly1305.c
@@ -1,6 +1,5 @@
 #include "../system.h"
 
-#include "../cipher.h"
 #include "../xalloc.h"
 
 #include "chacha.h"

diff --git a/src/connection.c b/src/connection.c
index 1732b150fcfd499e57f810502266be83f5f10b90..3db7a2711ba62b8b8f293e93cbc1074d5228eb5b 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -20,7 +20,6 @@
 #include "system.h"
 
 #include "list.h"
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
 #include "list.h"

diff --git a/src/connection.h b/src/connection.h
index 181de823a6a81a2fafd033c9c8a37f59d916b2be..d4169bcc123408b85d3f4c9c7e89caf8699800a1 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -21,8 +21,6 @@
 #define __TINC_CONNECTION_H__
 
 #include "buffer.h"
-#include "cipher.h"
-#include "digest.h"
 #include "list.h"
 #include "sptps.h"
 

diff --git a/src/meta.c b/src/meta.c
index 160333b2c4cb140ced2bb17395ab550f0d6cb89d..14342608518aac02ee8c06cfe16d572e2935750a 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -19,7 +19,6 @@
 
 #include "system.h"
 
-#include "cipher.h"
 #include "connection.h"
 #include "logger.h"
 #include "meshlink_internal.h"

diff --git a/src/net.h b/src/net.h
index 06797446012dca0574696670c0b863966fbda2e8..33d273593cf3a2e917e9cd804e086f37748d1c8b 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -20,8 +20,6 @@
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 
-#include "cipher.h"
-#include "digest.h"
 #include "event.h"
 #include "sockaddr.h"
 
@@ -31,8 +29,8 @@
 #define MTU 1518        /* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
 #endif
 
-/* MAXSIZE is the maximum size of an encapsulated packet: MTU + seqno + padding + HMAC + compressor overhead */
-#define MAXSIZE (MTU + 4 + CIPHER_MAX_BLOCK_SIZE + DIGEST_MAX_SIZE + MTU/64 + 20)
+/* MAXSIZE is the maximum size of an encapsulated packet: MTU + seqno + HMAC + compressor overhead */
+#define MAXSIZE (MTU + 4 + 32 + MTU/64 + 20)
 
 /* MAXBUFSIZE is the maximum size of a request: enough for a MAXSIZEd packet or a 8192 bits RSA key */
 #define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128)

diff --git a/src/net_packet.c b/src/net_packet.c
index a8c8b03619924bfe0e18e493c8e8f221a6891942..d231c231936cebae714f3413132fdcdf859495b1 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -23,11 +23,9 @@
 #include <zlib.h>
 #endif
 
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
 #include "crypto.h"
-#include "digest.h"
 #include "graph.h"
 #include "logger.h"
 #include "meshlink_internal.h"

diff --git a/src/net_setup.c b/src/net_setup.c
index b6d88da3c3c42f9629959cf5cbcd77bede667b3f..decaaaa451c08ceabceb452f3a81b8b68bfc99ec 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -19,10 +19,8 @@
 
 #include "system.h"
 
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
-#include "digest.h"
 #include "ecdsa.h"
 #include "graph.h"
 #include "logger.h"

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index bd1c1c47fe18691d6eb4c46e53975f01c5986035..3bd444ea7aa0f5c14d490ee926ac66dac17c0f83 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -21,9 +21,6 @@
 
 #include "conf.h"
 #include "connection.h"
-#include "cipher.h"
-#include "crypto.h"
-#include "digest.h"
 #include "ecdsa.h"
 #include "edge.h"
 #include "graph.h"

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 59ca7db499e540bc331dcd34e7848f078597567f..8ab1325c23d701982a29a7163e871869e9d7757c 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -19,9 +19,7 @@
 
 #include "system.h"
 
-#include "cipher.h"
 #include "connection.h"
-#include "crypto.h"
 #include "logger.h"
 #include "meshlink_internal.h"
 #include "net.h"