diff options
| author | Martin Willi <martin@revosec.ch> | 2010-08-13 14:25:14 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-08-13 17:11:53 +0200 |
| commit | 3b77c27a5b30f726bbc86f175439e1fcb3f36a31 (patch) | |
| tree | 0c2617f8708c091c9cd09616200a6925dfdde0ea /src | |
| parent | 1ee98dbb4a45952fc0c66396103f3441c419e12f (diff) | |
| download | strongswan-3b77c27a5b30f726bbc86f175439e1fcb3f36a31.tar.bz2 strongswan-3b77c27a5b30f726bbc86f175439e1fcb3f36a31.tar.xz | |
Added Camellia, AES-CTR to default IKE proposal, if supported
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/config/proposal.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c index e86393028..2308ce774 100644 --- a/src/libcharon/config/proposal.c +++ b/src/libcharon/config/proposal.c @@ -777,20 +777,24 @@ static void proposal_add_supported_ike(private_proposal_t *this) switch (encryption) { case ENCR_AES_CBC: + 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: - case ENCR_AES_CTR: + 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: - add_algorithm(this, ENCRYPTION_ALGORITHM, encryption, 0); + /* not yet in IKE */ break; case ENCR_DES: /* no, thanks */ |