--- gvpe/src/global.h	2003/03/22 02:35:57	1.5
+++ gvpe/src/global.h	2003/04/05 17:54:22	1.12
@@ -23,19 +23,30 @@
 
 #include <time.h>
 
+/* Protocol version. Different major versions are incompatible,
+ * different minor versions probably are compatible ;)
+ */
+
+#define PROTOCOL_MAJOR 0
+#define PROTOCOL_MINOR 1
 
 #define RSA_KEYBITS	1280		// must be >= 1280 and divisible by 8
 #define RSA_KEYLEN	((RSA_KEYBITS) >> 3)
-#define RSA_OVERHEAD	(41 + 1)	// well, no define for OAEP
+#define RSA_OVERHEAD	(41 + 1)	// well, no define for OAEP in openssl
+
+#define RSA_HASH	EVP_ripemd160 ()// speed don't matter, boy, safety does.. I need sha256 :(
+#define RSA_HASHLEN	(160 >> 3)
+#define RSA_RESLEN	RSA_HASHLEN
 
-#define CHALLENGE_TTL	30		// challenge bytes timeout after n seconds
+#define RSA_IDLEN	16		// how many bytes are used to identify the challenge
+#define RSA_TTL		20		// challenge bytes timeout after n seconds
 
 #define CIPHER		ENABLE_CIPHER ()
 #define CIPHER_KEYLEN	(EVP_CIPHER_key_length (CIPHER))
 #define DIGEST		ENABLE_DIGEST ()
 #define HMAC_KEYLEN	(256 >> 3)	// number of bits used for the HMAC key (also change CHG_HMAC_KEY)
 
-#define MAX_SEQNO	0xfffff000U
+#define MAX_SEQNO	0xfffffff0U
 
 #define CHG_SEQNO	 0	// where the seqno starts within the rsa challenge
 #define CHG_CIPHER_KEY	 4	// where the key starts within the rsa challenge
@@ -43,11 +54,13 @@
 
 //                   hdr seq len              hmac        MAC MAC
 #define VPE_OVERHEAD (4 + 4 + 4 + RAND_SIZE + HMACLENGTH - 6 - 6)
-#define UDP_OVERHEAD 40			// size of a (normal) ip + udp header
+#define IP_OVERHEAD  20			// size of a (normal) ip header
+#define UDP_OVERHEAD (IP_OVERHEAD + 20)	// size of a (normal) ip + udp header
+#define MAX_OVERHEAD UDP_OVERHEAD	// the max. overhead of any protocol
 #define ETH_OVERHEAD 14			// the size of an ethernet header
 #define MAXSIZE (MAX_MTU + VPE_OVERHEAD)// slightly too large, but who cares
 
-#define PKTCACHESIZE 4			// the size of the memory pool for packets
+#define PKTCACHESIZE 5			// the size of the memory pool for packets
 
 #define QUEUEDEPTH 16			// the number of packets that will be queued (should be low)