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

ccm and gcm icv_sizes are accepted both in bits and octets

Browse Source
This commit is contained in:
Andreas Steffen
2008-05-17 21:51:47 +00:00
parent 0b0fba9e0d
commit 15c508c708
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/proposal.c
+12 -6
View File
@@ -596,19 +596,23 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
else if (strstr(alg.ptr, "ccm")) else if (strstr(alg.ptr, "ccm"))
{ {
u_int16_t key_size, icv_size; u_int16_t key_size, icv_size;
if (sscanf(alg.ptr, "aes%huccm%hu", &key_size, &icv_size) == 2) if (sscanf(alg.ptr, "aes%huccm%hu", &key_size, &icv_size) == 2)
{ {
if (key_size == 128 || key_size == 192 || key_size == 256) if (key_size == 128 || key_size == 192 || key_size == 256)
{ {
switch(icv_size) switch(icv_size)
{ {
case 8: case 8: /* octets */
case 64: /* bits */
add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_CCM_ICV8, key_size); add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_CCM_ICV8, key_size);
break; break;
case 12: case 12: /* octets */
case 96: /* bits */
add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_CCM_ICV12, key_size); add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_CCM_ICV12, key_size);
break; break;
case 16: case 16: /* octets */
case 128: /* bits */
add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_CCM_ICV16, key_size); add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_CCM_ICV16, key_size);
break; break;
default: default:
@@ -621,19 +625,21 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
else if (strstr(alg.ptr, "gcm")) else if (strstr(alg.ptr, "gcm"))
{ {
u_int16_t key_size, icv_size; u_int16_t key_size, icv_size;
if (sscanf(alg.ptr, "aes%hugcm%hu", &key_size, &icv_size) == 2) if (sscanf(alg.ptr, "aes%hugcm%hu", &key_size, &icv_size) == 2)
{ {
if (key_size == 128 || key_size == 192 || key_size == 256) if (key_size == 128 || key_size == 192 || key_size == 256)
{ {
switch (icv_size) switch (icv_size)
{ {
case 8: case 8: /* octets */
case 64: /* bits */
add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_GCM_ICV8, key_size); add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_GCM_ICV8, key_size);
break; break;
case 12:
add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_GCM_ICV12, key_size); add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_GCM_ICV12, key_size);
break; break;
case 16: case 16: /* octets */
case 128: /* bits */
add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_GCM_ICV16, key_size); add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_GCM_ICV16, key_size);
break; break;
default: default: