aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2008-05-19 08:48:44 +0000
committerTobias Brunner <tobias@strongswan.org>2008-05-19 08:48:44 +0000
commit68ac3b44d14357148ad9d45b577ab8074e79a5cc (patch)
tree023ed2c108543a4186794b0e2366f765d917aa3a
parent6898ca1397aefc7f31aad518d23a5ae767343c1e (diff)
downloadstrongswan-68ac3b44d14357148ad9d45b577ab8074e79a5cc.tar.bz2
strongswan-68ac3b44d14357148ad9d45b577ab8074e79a5cc.tar.xz
fixed a bug introduced in [3973]
-rw-r--r--src/charon/config/proposal.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/charon/config/proposal.c b/src/charon/config/proposal.c
index c87e44c0e..748700860 100644
--- a/src/charon/config/proposal.c
+++ b/src/charon/config/proposal.c
@@ -564,7 +564,7 @@ static void check_proposal(private_proposal_t *this)
{
/* if all encryption algorithms in the proposal are authenticated encryption
* 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);
}
@@ -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)
{
- switch(icv_size)
+ switch (icv_size)
{
case 8: /* octets */
case 64: /* bits */
@@ -636,6 +636,8 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
case 64: /* bits */
add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_GCM_ICV8, key_size);
break;
+ case 12: /* octets */
+ case 96: /* bits */
add_algorithm(this, ENCRYPTION_ALGORITHM, ENCR_AES_GCM_ICV12, key_size);
break;
case 16: /* octets */