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

libipsec: Don't limit traditional algorithms to AES and SHA1/2

Browse Source 
Closes #377.
This commit is contained in:
Tobias Brunner
2013-08-12 12:21:57 +02:00
parent 11f468533f
commit 3f29ff82c3
1 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libipsec/esp_context.c
+7 -25
View File
@@ -224,7 +224,7 @@ static bool create_aead(private_esp_context_t *this, int alg,
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 "
"algorithm"); "algorithm %N", encryption_algorithm_names, alg);
return FALSE; return FALSE;
} }
if (!this->aead->set_key(this->aead, key)) if (!this->aead->set_key(this->aead, key))
@@ -241,22 +241,14 @@ static bool create_aead(private_esp_context_t *this, int alg,
static bool create_traditional(private_esp_context_t *this, int enc_alg, static bool create_traditional(private_esp_context_t *this, int enc_alg,
chunk_t enc_key, int int_alg, chunk_t int_key) chunk_t enc_key, int int_alg, chunk_t int_key)
{ {
crypter_t *crypter = NULL; crypter_t *crypter;
signer_t *signer = NULL; signer_t *signer;
switch (enc_alg) crypter = lib->crypto->create_crypter(lib->crypto, enc_alg, enc_key.len);
{
case ENCR_AES_CBC:
crypter = lib->crypto->create_crypter(lib->crypto, enc_alg,
enc_key.len);
break;
default:
break;
}
if (!crypter) if (!crypter)
{ {
DBG1(DBG_ESP, "failed to create ESP context: unsupported encryption " DBG1(DBG_ESP, "failed to create ESP context: unsupported encryption "
"algorithm"); "algorithm %N", encryption_algorithm_names, enc_alg);
goto failed; goto failed;
} }
if (!crypter->set_key(crypter, enc_key)) if (!crypter->set_key(crypter, enc_key))
@@ -266,21 +258,11 @@ static bool create_traditional(private_esp_context_t *this, int enc_alg,
goto failed; goto failed;
} }
switch (int_alg) signer = lib->crypto->create_signer(lib->crypto, int_alg);
{
case AUTH_HMAC_SHA1_96:
case AUTH_HMAC_SHA2_256_128:
case AUTH_HMAC_SHA2_384_192:
case AUTH_HMAC_SHA2_512_256:
signer = lib->crypto->create_signer(lib->crypto, int_alg);
break;
default:
break;
}
if (!signer) if (!signer)
{ {
DBG1(DBG_ESP, "failed to create ESP context: unsupported integrity " DBG1(DBG_ESP, "failed to create ESP context: unsupported integrity "
"algorithm"); "algorithm %N", integrity_algorithm_names, int_alg);
goto failed; goto failed;
} }
if (!signer->set_key(signer, int_key)) if (!signer->set_key(signer, int_key))