From: Martin Willi <martin@revosec.ch>
Date: Fri, 20 Aug 2010 09:01:57 +0000 (+0200)
Subject: Added more TLS cipher suites we already support
X-Git-Tag: 4.5.0~440
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e413d9ce947da179c54e6b56dcadc58bf8bad46;p=thirdparty%2Fstrongswan.git

Added more TLS cipher suites we already support
---

diff --git a/src/libtls/tls_crypto.c b/src/libtls/tls_crypto.c
index acb732ef0f..90d15cb4d8 100644
--- a/src/libtls/tls_crypto.c
+++ b/src/libtls/tls_crypto.c
@@ -340,46 +340,52 @@ typedef struct {
  */
 static suite_algs_t suite_algs[] = {
 	{ TLS_RSA_WITH_NULL_MD5,
-		HASH_MD5,
-		PRF_HMAC_MD5,
-		AUTH_HMAC_MD5_128,
-		ENCR_NULL, 0
+		HASH_MD5, PRF_HMAC_MD5,
+		AUTH_HMAC_MD5_128, ENCR_NULL, 0
 	},
 	{ TLS_RSA_WITH_NULL_SHA,
-		HASH_SHA1,
-		PRF_HMAC_SHA1,
-		AUTH_HMAC_SHA1_160,
-		ENCR_NULL, 0
+		HASH_SHA1, PRF_HMAC_SHA1,
+		AUTH_HMAC_SHA1_160, ENCR_NULL, 0
 	},
 	{ TLS_RSA_WITH_NULL_SHA256,
-		HASH_SHA256,
-		PRF_HMAC_SHA2_256,
-		AUTH_HMAC_SHA2_256_256,
-		ENCR_NULL, 0
+		HASH_SHA256, PRF_HMAC_SHA2_256,
+		AUTH_HMAC_SHA2_256_256, ENCR_NULL, 0
+	},
+	{ TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+		HASH_SHA1, PRF_HMAC_SHA1,
+		AUTH_HMAC_SHA1_160, ENCR_3DES, 0
 	},
 	{ TLS_RSA_WITH_AES_128_CBC_SHA,
-		HASH_SHA1,
-		PRF_HMAC_SHA1,
-		AUTH_HMAC_SHA1_160,
-		ENCR_AES_CBC, 16
+		HASH_SHA1, PRF_HMAC_SHA1,
+		AUTH_HMAC_SHA1_160, ENCR_AES_CBC, 16
+	},
+	{ TLS_RSA_WITH_AES_128_CBC_SHA256,
+		HASH_SHA256, PRF_HMAC_SHA2_256,
+		AUTH_HMAC_SHA2_256_256, ENCR_AES_CBC, 16
 	},
 	{ TLS_RSA_WITH_AES_256_CBC_SHA,
-		HASH_SHA1,
-		PRF_HMAC_SHA1,
-		AUTH_HMAC_SHA1_160,
-		ENCR_AES_CBC, 32
+		HASH_SHA1, PRF_HMAC_SHA1,
+		AUTH_HMAC_SHA1_160, ENCR_AES_CBC, 32
 	},
-	{ TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-		HASH_SHA1,
-		PRF_HMAC_SHA1,
-		AUTH_HMAC_SHA1_160,
-		ENCR_3DES, 0
+	{ TLS_RSA_WITH_AES_256_CBC_SHA256,
+		HASH_SHA256, PRF_HMAC_SHA2_256,
+		AUTH_HMAC_SHA2_256_256, ENCR_AES_CBC, 32
 	},
-	{ TLS_RSA_WITH_AES_128_CBC_SHA256,
-		HASH_SHA256,
-		PRF_HMAC_SHA2_256,
-		AUTH_HMAC_SHA2_256_256,
-		ENCR_AES_CBC, 16
+	{ TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
+		HASH_SHA1, PRF_HMAC_SHA1,
+		AUTH_HMAC_SHA1_160, ENCR_CAMELLIA_CBC, 16
+	},
+	{ TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+		HASH_SHA256, PRF_HMAC_SHA2_256,
+		AUTH_HMAC_SHA2_256_256, ENCR_CAMELLIA_CBC, 16
+	},
+	{ TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
+		HASH_SHA1, PRF_HMAC_SHA1,
+		AUTH_HMAC_SHA1_160, ENCR_CAMELLIA_CBC, 32
+	},
+	{ TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+		HASH_SHA256, PRF_HMAC_SHA2_256,
+		AUTH_HMAC_SHA2_256_256, ENCR_CAMELLIA_CBC, 32
 	},
 };