diff options
| author | Martin Willi <martin@revosec.ch> | 2010-08-18 20:32:57 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-08-19 19:05:05 +0200 |
| commit | 08a5a708fc998d6cb85fedd41b4416621286edb0 (patch) | |
| tree | e28f76fc3c688abc267afa5a32a011725ed2fe14 /src | |
| parent | 3f6a2d33438c12886ea596768a920396bb9f59d5 (diff) | |
| download | strongswan-08a5a708fc998d6cb85fedd41b4416621286edb0.tar.bz2 strongswan-08a5a708fc998d6cb85fedd41b4416621286edb0.tar.xz | |
Include CCM/GCM algorithms in IKEv2 proposals, if supported
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/config/proposal.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c index 0dc29f5c0..fc603b5dd 100644 --- a/src/libcharon/config/proposal.c +++ b/src/libcharon/config/proposal.c @@ -761,21 +761,22 @@ static void proposal_add_supported_ike(private_proposal_t *this) case ENCR_AES_CTR: case ENCR_CAMELLIA_CBC: case ENCR_CAMELLIA_CTR: - /* we assume that we support all AES sizes */ - add_algorithm(this, ENCRYPTION_ALGORITHM, encryption, 128); - add_algorithm(this, ENCRYPTION_ALGORITHM, encryption, 192); - add_algorithm(this, ENCRYPTION_ALGORITHM, encryption, 256); - break; - case ENCR_3DES: - add_algorithm(this, ENCRYPTION_ALGORITHM, encryption, 0); - break; case ENCR_AES_CCM_ICV8: case ENCR_AES_CCM_ICV12: case ENCR_AES_CCM_ICV16: case ENCR_AES_GCM_ICV8: case ENCR_AES_GCM_ICV12: case ENCR_AES_GCM_ICV16: - /* not yet in IKE */ + case ENCR_CAMELLIA_CCM_ICV8: + case ENCR_CAMELLIA_CCM_ICV12: + case ENCR_CAMELLIA_CCM_ICV16: + /* we assume that we support all AES/Camellia sizes */ + add_algorithm(this, ENCRYPTION_ALGORITHM, encryption, 128); + add_algorithm(this, ENCRYPTION_ALGORITHM, encryption, 192); + add_algorithm(this, ENCRYPTION_ALGORITHM, encryption, 256); + break; + case ENCR_3DES: + add_algorithm(this, ENCRYPTION_ALGORITHM, encryption, 0); break; case ENCR_DES: /* no, thanks */ |