putting CADET on a diet: proper alignment for AX KX, kill obsolete OTR legacy code

2 files changed, 2 insertions, 17 deletions

diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index 000def902..a40354fb5 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -127,13 +127,13 @@ extern "C"
 
 /**
  * Size of the CADET message overhead:
- * + sizeof (struct GNUNET_CADET_Encrypted)
+ * + sizeof (struct GNUNET_CADET_AX)
  * + sizeof (struct GNUNET_CADET_Data)
  * + sizeof (struct GNUNET_CADET_ACK))
  *
  * Checked for correcteness in gnunet-service-cadet_tunnel.c: GCT_init().
  */
-#define GNUNET_CONSTANTS_CADET_P2P_OVERHEAD 132
+#define GNUNET_CONSTANTS_CADET_P2P_OVERHEAD 164
 
 /**
  * Maximum message size that can be sent on CADET.
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 086406a44..8da8fcd00 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -847,16 +847,6 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_CADET_KX                     262
 
 /**
- * New ephemeral key.
- */
-#define GNUNET_MESSAGE_TYPE_CADET_KX_EPHEMERAL           263
-
-/**
- * Answer to session key challenge.
- */
-#define GNUNET_MESSAGE_TYPE_CADET_KX_PONG                265
-
-/**
  * Request the destuction of a connection
  */
 #define GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY     266
@@ -898,11 +888,6 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_NACK           276
 
 /**
- * Encrypted data. (Payload, channel management, keepalive)
- */
-#define GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED              280
-
-/**
  * Axolotl key exchange.
  */
 #define GNUNET_MESSAGE_TYPE_CADET_AX_KX                  281