commit b5ef0bada4cc24a580c9f1f2e391edd64b4f5f23
author Paul Bakker <p.j.bakker@polarssl.org> Sun Jan 11 20:25:36 2009 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> Sun Jan 11 20:25:36 2009 +0000
tree f72ce92b8e22870ab92b274645894a2b776b7bfb
parent 38119b18d6940a2eef43b4b46db7dc8484063413

 - Added SSL_RSA_CAMELLIA_128_SHA, SSL_RSA_CAMELLIA_256_SHA, SSL_EDH_RSA_CAMELLIA_256_SHA ciphersuites to SSL

programs/ssl/ssl_server.c

diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index 30d8502..27b0da6 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -65,9 +65,12 @@
 int my_ciphers[] =
 {
     SSL_EDH_RSA_AES_256_SHA,
+    SSL_EDH_RSA_CAMELLIA_256_SHA,
     SSL_EDH_RSA_DES_168_SHA,
     SSL_RSA_AES_256_SHA,
+    SSL_RSA_CAMELLIA_256_SHA,
     SSL_RSA_AES_128_SHA,
+    SSL_RSA_CAMELLIA_128_SHA,
     SSL_RSA_DES_168_SHA,
     SSL_RSA_RC4_128_SHA,
     SSL_RSA_RC4_128_MD5,

programs/test/ssl_test.c

diff --git a/programs/test/ssl_test.c b/programs/test/ssl_test.c
index 5781ac3..d616282 100644
--- a/programs/test/ssl_test.c
+++ b/programs/test/ssl_test.c
@@ -391,7 +391,8 @@
     "    SSL_RSA_RC4_128_MD5         SSL_RSA_RC4_128_SHA\n"      \
     "    SSL_RSA_DES_168_SHA         SSL_EDH_RSA_DES_168_SHA\n"  \
     "    SSL_RSA_AES_128_SHA         SSL_EDH_RSA_AES_256_SHA\n"  \
-    "    SSL_RSA_AES_256_SHA\n\n"
+    "    SSL_RSA_AES_256_SHA         SSL_EDH_RSA_CAMELLIA_256_SHA\n" \
+    "    SSL_RSA_CAMELLIA_128_SHA    SSL_RSA_CAMELLIA_256_SHA\n\n"
 
 int main( int argc, char *argv[] )
 {
@@ -541,6 +542,15 @@
             if( strcmp( q, "ssl_edh_rsa_aes_256_sha" ) == 0 )
                 opt.force_cipher[0] = SSL_EDH_RSA_AES_256_SHA;
 
+            if( strcmp( q, "ssl_rsa_camellia_128_sha" ) == 0 )
+                opt.force_cipher[0] = SSL_RSA_CAMELLIA_128_SHA;
+
+            if( strcmp( q, "ssl_rsa_camellia_256_sha" ) == 0 )
+                opt.force_cipher[0] = SSL_RSA_CAMELLIA_256_SHA;
+
+            if( strcmp( q, "ssl_edh_rsa_camellia_256_sha" ) == 0 )
+                opt.force_cipher[0] = SSL_EDH_RSA_CAMELLIA_256_SHA;
+
             if( opt.force_cipher[0] < 0 )
                 goto usage;