diff options
| author | Martin Willi <martin@revosec.ch> | 2010-08-17 17:27:21 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-08-19 19:02:16 +0200 |
| commit | 7fc4b0814fa3aeefd1d9685e99900e48a7cfbab2 (patch) | |
| tree | 566b79265a4c161ea1859774bc15ffc7f352e150 /src/libcharon | |
| parent | df8d0d87031da4fbb186d0886eada17bcfd0ad1a (diff) | |
| download | strongswan-7fc4b0814fa3aeefd1d9685e99900e48a7cfbab2.tar.bz2 strongswan-7fc4b0814fa3aeefd1d9685e99900e48a7cfbab2.tar.xz | |
Make function to test if an encryption algorithm is an AEAD alg public
Diffstat (limited to 'src/libcharon')
| -rw-r--r-- | src/libcharon/config/proposal.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c index e19ee974a..0dc29f5c0 100644 --- a/src/libcharon/config/proposal.c +++ b/src/libcharon/config/proposal.c @@ -254,28 +254,6 @@ static void strip_dh(private_proposal_t *this) } /** - * Returns true if the given alg is an authenticated encryption algorithm - */ -static bool is_authenticated_encryption(u_int16_t alg) -{ - switch(alg) - { - 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: - case ENCR_CAMELLIA_CCM_ICV8: - case ENCR_CAMELLIA_CCM_ICV12: - case ENCR_CAMELLIA_CCM_ICV16: - case ENCR_NULL_AUTH_AES_GMAC: - return TRUE; - } - return FALSE; -} - -/** * Find a matching alg/keysize in two linked lists */ static bool select_algo(linked_list_t *first, linked_list_t *second, bool priv, @@ -366,7 +344,7 @@ static proposal_t *select_proposal(private_proposal_t *this, return NULL; } /* select integrity algorithm */ - if (!is_authenticated_encryption(algo)) + if (!encryption_algorithm_is_aead(algo)) { if (select_algo(this->integrity_algos, other->integrity_algos, private, &add, &algo, &key_size)) @@ -565,7 +543,7 @@ static void check_proposal(private_proposal_t *this) e = this->encryption_algos->create_enumerator(this->encryption_algos); while (e->enumerate(e, &alg)) { - if (!is_authenticated_encryption(alg->algorithm)) + if (!encryption_algorithm_is_aead(alg->algorithm)) { all_aead = FALSE; break; |