--- gvpe/src/global.h	2013/07/19 18:18:27	1.31
+++ gvpe/src/global.h	2013/07/19 18:21:03	1.32
@@ -76,7 +76,7 @@
 #define HKDF_XTR_HASH	EVP_sha512
 #define HKDF_PRF_HASH	EVP_sha256
 
-#define HKDF_SALT	32 // how many bytes for the hkdf salt
+#define HKDF_SALT	24 // how many bytes for the hkdf salt
 
 #define RSA_KEYLEN	(RSABITS >> 3)
 
@@ -86,11 +86,11 @@
 
 #define CIPHER		ENABLE_CIPHER
 #define CIPHER_KEYSIZE	(KEY_SIZE (CIPHER))
-#define CIPHER_IKMSIZE	CIPHER_KEYSIZE * 2 // randomness in rsa challenge
+#define CIPHER_IKMSIZE	(CIPHER_KEYSIZE * 3 / 2) // randomness in rsa challenge
 
 #define MAC_DIGEST	ENABLE_HMAC
 #define MAC_KEYSIZE	HASH_SIZE (ENABLE_HMAC)	// number of bits used for the HMAC key
-#define MAC_IKMSIZE	MAC_KEYSIZE * 2 // randomness in rsa challenge
+#define MAC_IKMSIZE	(MAC_KEYSIZE    * 3 / 2) // randomness in rsa challenge
 
 #define WINDOWSIZE	512		// sliding window size
 #define MAX_SEQNO	(0xfffffff0U - WINDOWSIZE * 8)