commit 8d01eea7af2a28259140a9a4476f1020015a1fab
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Oct 24 19:49:07 2013 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Oct 25 16:46:05 2013 +0200
tree 01d8fc86ce05726fb2c742f67fbb94e7913c2182
parent 0b58c150d6bcc352a11d70125cde4a111364ae59

Add Camellia-GCM ciphersuites

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 70c0836..6442a9d 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -636,12 +636,14 @@
     switch( cipher_info->type )
     {
         case POLARSSL_CIPHER_ARC4_128:
+        case POLARSSL_CIPHER_DES_CBC:
         case POLARSSL_CIPHER_DES_EDE3_CBC:
         case POLARSSL_CIPHER_CAMELLIA_128_CBC:
         case POLARSSL_CIPHER_CAMELLIA_256_CBC:
+        case POLARSSL_CIPHER_CAMELLIA_128_GCM:
+        case POLARSSL_CIPHER_CAMELLIA_256_GCM:
         case POLARSSL_CIPHER_AES_128_CBC:
         case POLARSSL_CIPHER_AES_256_CBC:
-        case POLARSSL_CIPHER_DES_CBC:
         case POLARSSL_CIPHER_AES_128_GCM:
         case POLARSSL_CIPHER_AES_256_GCM:
             if( ( ret = cipher_init_ctx( &transform->cipher_ctx_enc,
@@ -1096,7 +1098,9 @@
 #endif /* POLARSSL_ARC4_C */
 #if defined(POLARSSL_GCM_C)
     if( ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_128_GCM ||
-        ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_256_GCM )
+        ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_256_GCM ||
+        ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_CAMELLIA_128_GCM ||
+        ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_CAMELLIA_256_GCM )
     {
         size_t enc_msglen, olen, totlen;
         unsigned char *enc_msg;
@@ -1399,7 +1403,9 @@
 #endif /* POLARSSL_ARC4_C */
 #if defined(POLARSSL_GCM_C)
     if( ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_128_GCM ||
-        ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_256_GCM )
+        ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_256_GCM ||
+        ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_CAMELLIA_128_GCM ||
+        ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_CAMELLIA_256_GCM )
     {
         unsigned char *dec_msg;
         unsigned char *dec_msg_result;