diff --git a/src/internal.c b/src/internal.c
index 310d76077..6f2a9b047 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -5396,35 +5396,35 @@ const char* const cipher_names[] =
 #endif
 
 #ifdef BUILD_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
-    "RSA-CAMELLIA128-CBC-SHA",
+    "CAMELLIA128-SHA",
 #endif
 
 #ifdef BUILD_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
-    "DHE-RSA-CAMELLIA128-CBC-SHA",
+    "DHE-RSA-CAMELLIA128-SHA",
 #endif
 
 #ifdef BUILD_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
-    "RSA-CAMELLIA256-CBC-SHA",
+    "CAMELLIA256-SHA",
 #endif
 
 #ifdef BUILD_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
-    "DHE-RSA-CAMELLIA256-CBC-SHA",
+    "DHE-RSA-CAMELLIA256-SHA",
 #endif
 
 #ifdef BUILD_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256
-    "RSA-CAMELLIA128-CBC-SHA256",
+    "CAMELLIA128-SHA256",
 #endif
 
 #ifdef BUILD_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
-    "DHE-RSA-CAMELLIA128-CBC-SHA256",
+    "DHE-RSA-CAMELLIA128-SHA256",
 #endif
 
 #ifdef BUILD_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256
-    "RSA-CAMELLIA256-CBC-SHA256",
+    "CAMELLIA256-SHA256",
 #endif
 
 #ifdef BUILD_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
-    "DHE-RSA-CAMELLIA256-CBC-SHA256"
+    "DHE-RSA-CAMELLIA256-SHA256"
 #endif
 
 };
diff --git a/tests/test-camellia-openssl.conf b/tests/test-camellia-openssl.conf
index 6406bf158..2b9ff8919 100644
--- a/tests/test-camellia-openssl.conf
+++ b/tests/test-camellia-openssl.conf
@@ -1,216 +1,216 @@
-# server TLSv1 DHE-RSA-CAMELLIA128-CBC-SHA
+# server TLSv1 DHE-RSA-CAMELLIA128-SHA
 -v 1
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 
-# client TLSv1 DHE-RSA-CAMELLIA128-CBC-SHA
+# client TLSv1 DHE-RSA-CAMELLIA128-SHA
 -v 1
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 
-# server TLSv1 DHE-RSA-CAMELLIA256-CBC-SHA
+# server TLSv1 DHE-RSA-CAMELLIA256-SHA
 -v 1
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 
-# client TLSv1 DHE-RSA-CAMELLIA256-CBC-SHA
+# client TLSv1 DHE-RSA-CAMELLIA256-SHA
 -v 1
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 
-# server TLSv1 DHE-RSA-CAMELLIA128-CBC-SHA256
+# server TLSv1 DHE-RSA-CAMELLIA128-SHA256
 -v 1
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 
-# client TLSv1 DHE-RSA-CAMELLIA128-CBC-SHA256
+# client TLSv1 DHE-RSA-CAMELLIA128-SHA256
 -v 1
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 
-# server TLSv1 DHE-RSA-CAMELLIA256-CBC-SHA256
+# server TLSv1 DHE-RSA-CAMELLIA256-SHA256
 -v 1
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 
-# client TLSv1 DHE-RSA-CAMELLIA256-CBC-SHA256
+# client TLSv1 DHE-RSA-CAMELLIA256-SHA256
 -v 1
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 
-# server TLSv1.1 DHE-RSA-CAMELLIA128-CBC-SHA
+# server TLSv1.1 DHE-RSA-CAMELLIA128-SHA
 -v 2
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 
-# client TLSv1.1 DHE-RSA-CAMELLIA128-CBC-SHA
+# client TLSv1.1 DHE-RSA-CAMELLIA128-SHA
 -v 2
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 
-# server TLSv1.1 DHE-RSA-CAMELLIA256-CBC-SHA
+# server TLSv1.1 DHE-RSA-CAMELLIA256-SHA
 -v 2
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 
-# client TLSv1.1 DHE-RSA-CAMELLIA256-CBC-SHA
+# client TLSv1.1 DHE-RSA-CAMELLIA256-SHA
 -v 2
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 
-# server TLSv1.1 DHE-RSA-CAMELLIA128-CBC-SHA256
+# server TLSv1.1 DHE-RSA-CAMELLIA128-SHA256
 -v 2
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 
-# client TLSv1.1 DHE-RSA-CAMELLIA128-CBC-SHA256
+# client TLSv1.1 DHE-RSA-CAMELLIA128-SHA256
 -v 2
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 
-# server TLSv1.1 DHE-RSA-CAMELLIA256-CBC-SHA256
+# server TLSv1.1 DHE-RSA-CAMELLIA256-SHA256
 -v 2
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 
-# client TLSv1.1 DHE-RSA-CAMELLIA256-CBC-SHA256
+# client TLSv1.1 DHE-RSA-CAMELLIA256-SHA256
 -v 2
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 
-# server TLSv1.2 DHE-RSA-CAMELLIA128-CBC-SHA
+# server TLSv1.2 DHE-RSA-CAMELLIA128-SHA
 -v 3
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 
-# client TLSv1.2 DHE-RSA-CAMELLIA128-CBC-SHA
+# client TLSv1.2 DHE-RSA-CAMELLIA128-SHA
 -v 3
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 
-# server TLSv1.2 DHE-RSA-CAMELLIA256-CBC-SHA
+# server TLSv1.2 DHE-RSA-CAMELLIA256-SHA
 -v 3
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 
-# client TLSv1.2 DHE-RSA-CAMELLIA256-CBC-SHA
+# client TLSv1.2 DHE-RSA-CAMELLIA256-SHA
 -v 3
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 
-# server TLSv1.2 DHE-RSA-CAMELLIA128-CBC-SHA256
+# server TLSv1.2 DHE-RSA-CAMELLIA128-SHA256
 -v 3
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 
-# client TLSv1.2 DHE-RSA-CAMELLIA128-CBC-SHA256
+# client TLSv1.2 DHE-RSA-CAMELLIA128-SHA256
 -v 3
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 
-# server TLSv1.2 DHE-RSA-CAMELLIA256-CBC-SHA256
+# server TLSv1.2 DHE-RSA-CAMELLIA256-SHA256
 -v 3
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 
-# client TLSv1.2 DHE-RSA-CAMELLIA256-CBC-SHA256
+# client TLSv1.2 DHE-RSA-CAMELLIA256-SHA256
 -v 3
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 
-# server TLSv1 DHE-RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# server TLSv1 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
 -v 1
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 -N
 
-# client TLSv1 DHE-RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# client TLSv1 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
 -v 1
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 -N
 
-# server TLSv1 DHE-RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# server TLSv1 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
 -v 1
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 -N
 
-# client TLSv1 DHE-RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# client TLSv1 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
 -v 1
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 -N
 
-# server TLSv1 DHE-RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# server TLSv1 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
 -v 1
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 -N
 
-# client TLSv1 DHE-RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# client TLSv1 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
 -v 1
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 -N
 
-# server TLSv1 DHE-RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# server TLSv1 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
 -v 1
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 -N
 
-# client TLSv1 DHE-RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# client TLSv1 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
 -v 1
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 -N
 
-# server TLSv1.1 DHE-RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# server TLSv1.1 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
 -v 2
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 -N
 
-# client TLSv1.1 DHE-RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# client TLSv1.1 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
 -v 2
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 -N
 
-# server TLSv1.1 DHE-RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# server TLSv1.1 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
 -v 2
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 -N
 
-# client TLSv1.1 DHE-RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# client TLSv1.1 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
 -v 2
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 -N
 
-# server TLSv1.1 DHE-RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# server TLSv1.1 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
 -v 2
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 -N
 
-# client TLSv1.1 DHE-RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# client TLSv1.1 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
 -v 2
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 -N
 
-# server TLSv1.1 DHE-RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# server TLSv1.1 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
 -v 2
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 -N
 
-# client TLSv1.1 DHE-RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# client TLSv1.1 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
 -v 2
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 -N
 
-# server TLSv1.2 DHE-RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# server TLSv1.2 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
 -v 3
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 -N
 
-# client TLSv1.2 DHE-RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# client TLSv1.2 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
 -v 3
--l DHE-RSA-CAMELLIA128-CBC-SHA
+-l DHE-RSA-CAMELLIA128-SHA
 -N
 
-# server TLSv1.2 DHE-RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# server TLSv1.2 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
 -v 3
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 -N
 
-# client TLSv1.2 DHE-RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# client TLSv1.2 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
 -v 3
--l DHE-RSA-CAMELLIA256-CBC-SHA
+-l DHE-RSA-CAMELLIA256-SHA
 -N
 
-# server TLSv1.2 DHE-RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# server TLSv1.2 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
 -v 3
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 -N
 
-# client TLSv1.2 DHE-RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# client TLSv1.2 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
 -v 3
--l DHE-RSA-CAMELLIA128-CBC-SHA256
+-l DHE-RSA-CAMELLIA128-SHA256
 -N
 
-# server TLSv1.2 DHE-RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# server TLSv1.2 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
 -v 3
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 -N
 
-# client TLSv1.2 DHE-RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# client TLSv1.2 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
 -v 3
--l DHE-RSA-CAMELLIA256-CBC-SHA256
+-l DHE-RSA-CAMELLIA256-SHA256
 -N
 
diff --git a/tests/test-camellia.conf b/tests/test-camellia.conf
index f046e4891..f0ed3cc4f 100644
--- a/tests/test-camellia.conf
+++ b/tests/test-camellia.conf
@@ -1,216 +1,216 @@
-# server TLSv1 RSA-CAMELLIA128-CBC-SHA
+# server TLSv1 CAMELLIA128-SHA
 -v 1
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 
-# client TLSv1 RSA-CAMELLIA128-CBC-SHA
+# client TLSv1 CAMELLIA128-SHA
 -v 1
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 
-# server TLSv1 RSA-CAMELLIA256-CBC-SHA
+# server TLSv1 CAMELLIA256-SHA
 -v 1
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 
-# client TLSv1 RSA-CAMELLIA256-CBC-SHA
+# client TLSv1 CAMELLIA256-SHA
 -v 1
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 
-# server TLSv1 RSA-CAMELLIA128-CBC-SHA256
+# server TLSv1 CAMELLIA128-SHA256
 -v 1
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 
-# client TLSv1 RSA-CAMELLIA128-CBC-SHA256
+# client TLSv1 CAMELLIA128-SHA256
 -v 1
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 
-# server TLSv1 RSA-CAMELLIA256-CBC-SHA256
+# server TLSv1 CAMELLIA256-SHA256
 -v 1
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 
-# client TLSv1 RSA-CAMELLIA256-CBC-SHA256
+# client TLSv1 CAMELLIA256-SHA256
 -v 1
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 
-# server TLSv1.1 RSA-CAMELLIA128-CBC-SHA
+# server TLSv1.1 CAMELLIA128-SHA
 -v 2
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 
-# client TLSv1.1 RSA-CAMELLIA128-CBC-SHA
+# client TLSv1.1 CAMELLIA128-SHA
 -v 2
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 
-# server TLSv1.1 RSA-CAMELLIA256-CBC-SHA
+# server TLSv1.1 CAMELLIA256-SHA
 -v 2
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 
-# client TLSv1.1 RSA-CAMELLIA256-CBC-SHA
+# client TLSv1.1 CAMELLIA256-SHA
 -v 2
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 
-# server TLSv1.1 RSA-CAMELLIA128-CBC-SHA256
+# server TLSv1.1 CAMELLIA128-SHA256
 -v 2
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 
-# client TLSv1.1 RSA-CAMELLIA128-CBC-SHA256
+# client TLSv1.1 CAMELLIA128-SHA256
 -v 2
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 
-# server TLSv1.1 RSA-CAMELLIA256-CBC-SHA256
+# server TLSv1.1 CAMELLIA256-SHA256
 -v 2
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 
-# client TLSv1.1 RSA-CAMELLIA256-CBC-SHA256
+# client TLSv1.1 CAMELLIA256-SHA256
 -v 2
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 
-# server TLSv1.2 RSA-CAMELLIA128-CBC-SHA
+# server TLSv1.2 CAMELLIA128-SHA
 -v 3
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 
-# client TLSv1.2 RSA-CAMELLIA128-CBC-SHA
+# client TLSv1.2 CAMELLIA128-SHA
 -v 3
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 
-# server TLSv1.2 RSA-CAMELLIA256-CBC-SHA
+# server TLSv1.2 CAMELLIA256-SHA
 -v 3
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 
-# client TLSv1.2 RSA-CAMELLIA256-CBC-SHA
+# client TLSv1.2 CAMELLIA256-SHA
 -v 3
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 
-# server TLSv1.2 RSA-CAMELLIA128-CBC-SHA256
+# server TLSv1.2 CAMELLIA128-SHA256
 -v 3
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 
-# client TLSv1.2 RSA-CAMELLIA128-CBC-SHA256
+# client TLSv1.2 CAMELLIA128-SHA256
 -v 3
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 
-# server TLSv1.2 RSA-CAMELLIA256-CBC-SHA256
+# server TLSv1.2 CAMELLIA256-SHA256
 -v 3
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 
-# client TLSv1.2 RSA-CAMELLIA256-CBC-SHA256
+# client TLSv1.2 CAMELLIA256-SHA256
 -v 3
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 
-# server TLSv1 RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# server TLSv1 CAMELLIA128-SHA NON-BLOCKING
 -v 1
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 -N
 
-# client TLSv1 RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# client TLSv1 CAMELLIA128-SHA NON-BLOCKING
 -v 1
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 -N
 
-# server TLSv1 RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# server TLSv1 CAMELLIA256-SHA NON-BLOCKING
 -v 1
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 -N
 
-# client TLSv1 RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# client TLSv1 CAMELLIA256-SHA NON-BLOCKING
 -v 1
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 -N
 
-# server TLSv1 RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# server TLSv1 CAMELLIA128-SHA256 NON-BLOCKING
 -v 1
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 -N
 
-# client TLSv1 RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# client TLSv1 CAMELLIA128-SHA256 NON-BLOCKING
 -v 1
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 -N
 
-# server TLSv1 RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# server TLSv1 CAMELLIA256-SHA256 NON-BLOCKING
 -v 1
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 -N
 
-# client TLSv1 RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# client TLSv1 CAMELLIA256-SHA256 NON-BLOCKING
 -v 1
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 -N
 
-# server TLSv1.1 RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# server TLSv1.1 CAMELLIA128-SHA NON-BLOCKING
 -v 2
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 -N
 
-# client TLSv1.1 RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# client TLSv1.1 CAMELLIA128-SHA NON-BLOCKING
 -v 2
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 -N
 
-# server TLSv1.1 RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# server TLSv1.1 CAMELLIA256-SHA NON-BLOCKING
 -v 2
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 -N
 
-# client TLSv1.1 RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# client TLSv1.1 CAMELLIA256-SHA NON-BLOCKING
 -v 2
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 -N
 
-# server TLSv1.1 RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# server TLSv1.1 CAMELLIA128-SHA256 NON-BLOCKING
 -v 2
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 -N
 
-# client TLSv1.1 RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# client TLSv1.1 CAMELLIA128-SHA256 NON-BLOCKING
 -v 2
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 -N
 
-# server TLSv1.1 RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# server TLSv1.1 CAMELLIA256-SHA256 NON-BLOCKING
 -v 2
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 -N
 
-# client TLSv1.1 RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# client TLSv1.1 CAMELLIA256-SHA256 NON-BLOCKING
 -v 2
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 -N
 
-# server TLSv1.2 RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# server TLSv1.2 CAMELLIA128-SHA NON-BLOCKING
 -v 3
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 -N
 
-# client TLSv1.2 RSA-CAMELLIA128-CBC-SHA NON-BLOCKING
+# client TLSv1.2 CAMELLIA128-SHA NON-BLOCKING
 -v 3
--l RSA-CAMELLIA128-CBC-SHA
+-l CAMELLIA128-SHA
 -N
 
-# server TLSv1.2 RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# server TLSv1.2 CAMELLIA256-SHA NON-BLOCKING
 -v 3
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 -N
 
-# client TLSv1.2 RSA-CAMELLIA256-CBC-SHA NON-BLOCKING
+# client TLSv1.2 CAMELLIA256-SHA NON-BLOCKING
 -v 3
--l RSA-CAMELLIA256-CBC-SHA
+-l CAMELLIA256-SHA
 -N
 
-# server TLSv1.2 RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# server TLSv1.2 CAMELLIA128-SHA256 NON-BLOCKING
 -v 3
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 -N
 
-# client TLSv1.2 RSA-CAMELLIA128-CBC-SHA256 NON-BLOCKING
+# client TLSv1.2 CAMELLIA128-SHA256 NON-BLOCKING
 -v 3
--l RSA-CAMELLIA128-CBC-SHA256
+-l CAMELLIA128-SHA256
 -N
 
-# server TLSv1.2 RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# server TLSv1.2 CAMELLIA256-SHA256 NON-BLOCKING
 -v 3
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 -N
 
-# client TLSv1.2 RSA-CAMELLIA256-CBC-SHA256 NON-BLOCKING
+# client TLSv1.2 CAMELLIA256-SHA256 NON-BLOCKING
 -v 3
--l RSA-CAMELLIA256-CBC-SHA256
+-l CAMELLIA256-SHA256
 -N