prepare CAMELLIA_CCM ESP encryption
authorAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 10 Aug 2009 14:30:42 +0000 (16:30 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 10 Aug 2009 14:30:42 +0000 (16:30 +0200)
src/charon/config/proposal.c
src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c
src/charon/sa/keymat.c

index e2dfcca..cf7e196 100644 (file)
@@ -266,6 +266,9 @@ static bool is_authenticated_encryption(u_int16_t alg)
                case ENCR_AES_GCM_ICV8:
                case ENCR_AES_GCM_ICV12:
                case ENCR_AES_GCM_ICV16:
+               case ENCR_CAMELLIA_CCM_ICV8:
+               case ENCR_CAMELLIA_CCM_ICV12:
+               case ENCR_CAMELLIA_CCM_ICV16:
                        return TRUE;
        }
        return FALSE;
index 078ae34..c137650 100644 (file)
@@ -984,14 +984,17 @@ static status_t add_sa(private_kernel_netlink_ipsec_t *this,
                        break;
                case ENCR_AES_CCM_ICV16:
                case ENCR_AES_GCM_ICV16:
+               case ENCR_CAMELLIA_CCM_ICV16:
                        icv_size += 32;
                        /* FALL */
                case ENCR_AES_CCM_ICV12:
                case ENCR_AES_GCM_ICV12:
+               case ENCR_CAMELLIA_CCM_ICV12:
                        icv_size += 32;
                        /* FALL */
                case ENCR_AES_CCM_ICV8:
                case ENCR_AES_GCM_ICV8:
+               case ENCR_CAMELLIA_CCM_ICV8:
                {
                        struct xfrm_algo_aead *algo;
 
index 117d260..46fb795 100644 (file)
@@ -419,6 +419,9 @@ static bool derive_child_keys(private_keymat_t *this,
                        case ENCR_AES_CCM_ICV8:
                        case ENCR_AES_CCM_ICV12:
                        case ENCR_AES_CCM_ICV16:
+                       case ENCR_CAMELLIA_CCM_ICV8:
+                       case ENCR_CAMELLIA_CCM_ICV12:
+                       case ENCR_CAMELLIA_CCM_ICV16:
                                enc_size += 3;
                                break;
                        case ENCR_AES_GCM_ICV8: