denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepare CAMELLIA_CCM ESP encryption

Browse Source
This commit is contained in:
Andreas Steffen
2009-08-10 16:30:42 +02:00
parent 20af53fe33
commit 8ddcac4c48
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/proposal.c
+3
View File
@@ -266,6 +266,9 @@ static bool is_authenticated_encryption(u_int16_t alg)
case ENCR_AES_GCM_ICV8: case ENCR_AES_GCM_ICV8:
case ENCR_AES_GCM_ICV12: case ENCR_AES_GCM_ICV12:
case ENCR_AES_GCM_ICV16: case ENCR_AES_GCM_ICV16:
case ENCR_CAMELLIA_CCM_ICV8:
case ENCR_CAMELLIA_CCM_ICV12:
case ENCR_CAMELLIA_CCM_ICV16:
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+3
View File
@@ -984,14 +984,17 @@ static status_t add_sa(private_kernel_netlink_ipsec_t *this,
break; break;
case ENCR_AES_CCM_ICV16: case ENCR_AES_CCM_ICV16:
case ENCR_AES_GCM_ICV16: case ENCR_AES_GCM_ICV16:
case ENCR_CAMELLIA_CCM_ICV16:
icv_size += 32; icv_size += 32;
/* FALL */ /* FALL */
case ENCR_AES_CCM_ICV12: case ENCR_AES_CCM_ICV12:
case ENCR_AES_GCM_ICV12: case ENCR_AES_GCM_ICV12:
case ENCR_CAMELLIA_CCM_ICV12:
icv_size += 32; icv_size += 32;
/* FALL */ /* FALL */
case ENCR_AES_CCM_ICV8: case ENCR_AES_CCM_ICV8:
case ENCR_AES_GCM_ICV8: case ENCR_AES_GCM_ICV8:
case ENCR_CAMELLIA_CCM_ICV8:
{ {
struct xfrm_algo_aead *algo; struct xfrm_algo_aead *algo;
src/charon/sa/keymat.c
+3
View File
@@ -419,6 +419,9 @@ static bool derive_child_keys(private_keymat_t *this,
case ENCR_AES_CCM_ICV8: case ENCR_AES_CCM_ICV8:
case ENCR_AES_CCM_ICV12: case ENCR_AES_CCM_ICV12:
case ENCR_AES_CCM_ICV16: case ENCR_AES_CCM_ICV16:
case ENCR_CAMELLIA_CCM_ICV8:
case ENCR_CAMELLIA_CCM_ICV12:
case ENCR_CAMELLIA_CCM_ICV16:
enc_size += 3; enc_size += 3;
break; break;
case ENCR_AES_GCM_ICV8: case ENCR_AES_GCM_ICV8: