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

libipsec: Add support for AES and Camellia in CCM mode

Browse Source 
Fixes #2172.
This commit is contained in:
Tobias Brunner
2017-01-25 17:26:45 +01:00
parent 1da567734f
commit 896d729a60
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libipsec/esp_context.c
+16 -3
View File
@@ -210,19 +210,32 @@ METHOD(esp_context_t, destroy, void,
static bool create_aead(private_esp_context_t *this, int alg, static bool create_aead(private_esp_context_t *this, int alg,
chunk_t key) chunk_t key)
{ {
size_t salt = 0;
switch (alg) switch (alg)
{ {
case ENCR_AES_GCM_ICV8: case ENCR_AES_GCM_ICV8:
case ENCR_AES_GCM_ICV12: case ENCR_AES_GCM_ICV12:
case ENCR_AES_GCM_ICV16: case ENCR_AES_GCM_ICV16:
case ENCR_CHACHA20_POLY1305: case ENCR_CHACHA20_POLY1305:
/* the key includes a 4 byte salt */ salt = 4;
this->aead = lib->crypto->create_aead(lib->crypto, alg, break;
key.len - 4, 4); case ENCR_AES_CCM_ICV8:
case ENCR_AES_CCM_ICV12:
case ENCR_AES_CCM_ICV16:
case ENCR_CAMELLIA_CCM_ICV8:
case ENCR_CAMELLIA_CCM_ICV12:
case ENCR_CAMELLIA_CCM_ICV16:
salt = 3;
break; break;
default: default:
break; break;
} }
if (salt)
{
this->aead = lib->crypto->create_aead(lib->crypto, alg,
key.len - salt, salt);
}
if (!this->aead) if (!this->aead)
{ {
DBG1(DBG_ESP, "failed to create ESP context: unsupported AEAD " DBG1(DBG_ESP, "failed to create ESP context: unsupported AEAD "