From b15cb1b547ddff270e0c6d1c3b058a2f21350e85 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Mon, 14 Jul 2014 16:08:17 +0200
Subject: [PATCH] Small update on Camellia

---
 CHANGES | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 19008abb2c..1d40d510e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -889,12 +889,41 @@ o Crypto.Camellia
   Crypto. In addition the following cipher suites have been added to
   SSL:
 
-    TLS_rsa_with_camellia_128_cbc_sha
-    TLS_dhe_dss_with_camellia_128_cbc_sha
-    TLS_dhe_rsa_with_camellia_128_cbc_sha
-    TLS_rsa_with_camellia_256_cbc_sha
-    TLS_dhe_dss_with_camellia_256_cbc_sha
-    TLS_dhe_rsa_with_camellia_256_cbc_sha
+    TLS_rsa_with_camellia_{128,256}_cbc_{sha,sha256}
+    TLS_dh_dss_with_camellia_{128,256}_cbc_{sha,sha256}
+    TLS_dh_rsa_with_camellia_{128,256}_cbc_{sha,sha256}
+    TLS_dhe_dss_with_camellia_{128,256}_cbc_{sha,sha256}
+    TLS_dhe_rsa_with_camellia_{128,256}_cbc_{sha,sha256}
+    TLS_dh_anon_with_camellia_{128,256}_cbc_{sha,sha256}
+
+    TLS_ecdhe_ecdsa_with_camellia_128_cbc_sha256
+    TLS_ecdhe_ecdsa_with_camellia_256_cbc_sha384
+    TLS_ecdh_ecdsa_with_camellia_128_cbc_sha256
+    TLS_ecdh_ecdsa_with_camellia_256_cbc_sha384
+    TLS_ecdhe_rsa_with_camellia_128_cbc_sha256
+    TLS_ecdhe_rsa_with_camellia_256_cbc_sha384
+    TLS_ecdh_rsa_with_camellia_128_cbc_sha256
+    TLS_ecdh_rsa_with_camellia_256_cbc_sha384
+    TLS_rsa_with_camellia_128_gcm_sha256
+    TLS_rsa_with_camellia_256_gcm_sha384
+    TLS_dhe_rsa_with_camellia_128_gcm_sha256
+    TLS_dhe_rsa_with_camellia_256_gcm_sha384
+    TLS_dh_rsa_with_camellia_128_gcm_sha256
+    TLS_dh_rsa_with_camellia_256_gcm_sha384
+    TLS_dhe_dss_with_camellia_128_gcm_sha256
+    TLS_dhe_dss_with_camellia_256_gcm_sha384
+    TLS_dh_dss_with_camellia_128_gcm_sha256
+    TLS_dh_dss_with_camellia_256_gcm_sha384
+    TLS_dh_anon_with_camellia_128_gcm_sha256
+    TLS_dh_anon_with_camellia_256_gcm_sha384
+    TLS_ecdhe_ecdsa_with_camellia_128_gcm_sha256
+    TLS_ecdhe_ecdsa_with_camellia_256_gcm_sha384
+    TLS_ecdh_ecdsa_with_camellia_128_gcm_sha256
+    TLS_ecdh_ecdsa_with_camellia_256_gcm_sha384
+    TLS_ecdhe_rsa_with_camellia_128_gcm_sha256
+    TLS_ecdhe_rsa_with_camellia_256_gcm_sha384
+    TLS_ecdh_rsa_with_camellia_128_gcm_sha256
+    TLS_ecdh_rsa_with_camellia_256_gcm_sha384
 
 o Crypto.SALSA20 and Crypto.SALSA20R12
 
-- 
GitLab