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

fixed a bug introduced in [3973]

Browse Source
This commit is contained in:
Tobias Brunner
2008-05-19 08:48:44 +00:00
parent 6898ca1397
commit 68ac3b44d1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/proposal.c
+4 -2
View File
@@ -564,7 +564,7 @@ static void check_proposal(private_proposal_t *this)
{ {
/* if all encryption algorithms in the proposal are authenticated encryption /* if all encryption algorithms in the proposal are authenticated encryption
* algorithms we MUST NOT propose any integrity algorithms */ * algorithms we MUST NOT propose any integrity algorithms */
while(this->integrity_algos->remove_last(this->integrity_algos, (void**)&alg) == SUCCESS) while (this->integrity_algos->remove_last(this->integrity_algos, (void**)&alg) == SUCCESS)
{ {
free(alg); free(alg);
} }
@@ -601,7 +601,7 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
{ {
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: /* octets */ case 8: /* octets */
case 64: /* bits */ case 64: /* bits */
@@ -636,6 +636,8 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
case 64: /* bits */ 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: /* octets */
case 96: /* bits */
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: /* octets */ case 16: /* octets */