diff options
| author | Martin Willi <martin@revosec.ch> | 2011-09-21 11:17:56 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-10-14 10:05:46 +0200 |
| commit | 3cd28acce0405af40d02d9e935b2c2610e0940c2 (patch) | |
| tree | 8dc7ea418ee3fad0d35c0123477238bb3102e715 | |
| parent | 02572b84f99bb5e29a05dcb1d0a314b00df71b91 (diff) | |
| download | strongswan-3cd28acce0405af40d02d9e935b2c2610e0940c2.tar.bz2 strongswan-3cd28acce0405af40d02d9e935b2c2610e0940c2.tar.xz | |
Add aead plugin features
| -rw-r--r-- | src/libstrongswan/plugins/plugin_feature.c | 12 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/plugin_feature.h | 9 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/plugin_loader.c | 5 |
3 files changed, 26 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/plugin_feature.c b/src/libstrongswan/plugins/plugin_feature.c index 682963b75..29ca10130 100644 --- a/src/libstrongswan/plugins/plugin_feature.c +++ b/src/libstrongswan/plugins/plugin_feature.c @@ -21,6 +21,7 @@ ENUM(plugin_feature_names, FEATURE_NONE, FEATURE_CUSTOM, "NONE", "CRYPTER", + "AEAD", "SIGNER", "HASHER", "PRF", @@ -56,6 +57,9 @@ bool plugin_feature_matches(plugin_feature_t *a, plugin_feature_t *b) case FEATURE_CRYPTER: return a->crypter.alg == b->crypter.alg && a->crypter.key_size == b->crypter.key_size; + case FEATURE_AEAD: + return a->aead.alg == b->aead.alg && + a->aead.key_size == b->aead.key_size; case FEATURE_SIGNER: return a->signer == b->signer; case FEATURE_HASHER: @@ -116,6 +120,14 @@ char* plugin_feature_get_string(plugin_feature_t *feature) return str; } break; + case FEATURE_AEAD: + if (asprintf(&str, "%N:%N-%d", plugin_feature_names, feature->type, + encryption_algorithm_names, feature->aead.alg, + feature->aead.key_size) > 0) + { + return str; + } + break; case FEATURE_SIGNER: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, integrity_algorithm_names, feature->signer) > 0) diff --git a/src/libstrongswan/plugins/plugin_feature.h b/src/libstrongswan/plugins/plugin_feature.h index c10c3c499..1f7762973 100644 --- a/src/libstrongswan/plugins/plugin_feature.h +++ b/src/libstrongswan/plugins/plugin_feature.h @@ -95,6 +95,8 @@ struct plugin_feature_t { FEATURE_NONE, /** crypter_t */ FEATURE_CRYPTER, + /** aead_t */ + FEATURE_AEAD, /** signer_t */ FEATURE_SIGNER, /** hasher_t */ @@ -141,6 +143,11 @@ struct plugin_feature_t { encryption_algorithm_t alg; size_t key_size; } crypter; + /** FEATURE_AEAD */ + struct { + encryption_algorithm_t alg; + size_t key_size; + } aead; /** FEATURE_SIGNER */ integrity_algorithm_t signer; /** FEATURE_PRF */ @@ -240,6 +247,7 @@ struct plugin_feature_t { #define __PLUGIN_FEATURE(kind, type, ...) (plugin_feature_t){ FEATURE_##kind, FEATURE_##type, { __VA_ARGS__ }} #define _PLUGIN_FEATURE_CRYPTER(kind, alg, size) __PLUGIN_FEATURE(kind, CRYPTER, .crypter = { alg, size }) +#define _PLUGIN_FEATURE_AEAD(kind, alg, size) __PLUGIN_FEATURE(kind, AEAD, .aead = { alg, size }) #define _PLUGIN_FEATURE_SIGNER(kind, alg) __PLUGIN_FEATURE(kind, SIGNER, .signer = alg) #define _PLUGIN_FEATURE_HASHER(kind, alg) __PLUGIN_FEATURE(kind, HASHER, .hasher = alg) #define _PLUGIN_FEATURE_PRF(kind, alg) __PLUGIN_FEATURE(kind, PRF, .prf = alg) @@ -262,6 +270,7 @@ struct plugin_feature_t { #define __PLUGIN_FEATURE_REGISTER(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .reg.f = _f } #define __PLUGIN_FEATURE_REGISTER_BUILDER(type, _f, _final) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .reg = {.f = _f, .final = _final, }} #define _PLUGIN_FEATURE_REGISTER_CRYPTER(type, f) __PLUGIN_FEATURE_REGISTER(type, f) +#define _PLUGIN_FEATURE_REGISTER_AEAD(type, f) __PLUGIN_FEATURE_REGISTER(type, f) #define _PLUGIN_FEATURE_REGISTER_SIGNER(type, f) __PLUGIN_FEATURE_REGISTER(type, f) #define _PLUGIN_FEATURE_REGISTER_HASHER(type, f) __PLUGIN_FEATURE_REGISTER(type, f) #define _PLUGIN_FEATURE_REGISTER_PRF(type, f) __PLUGIN_FEATURE_REGISTER(type, f) diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c index 831a10613..ecd1d718f 100644 --- a/src/libstrongswan/plugins/plugin_loader.c +++ b/src/libstrongswan/plugins/plugin_loader.c @@ -297,6 +297,7 @@ static bool load_feature(private_plugin_loader_t *this, plugin_entry_t *entry, switch (feature->type) { case FEATURE_CRYPTER: + case FEATURE_AEAD: case FEATURE_SIGNER: case FEATURE_HASHER: case FEATURE_PRF: @@ -340,6 +341,10 @@ static bool load_feature(private_plugin_loader_t *this, plugin_entry_t *entry, lib->crypto->add_crypter(lib->crypto, feature->crypter.alg, name, reg->reg.f); break; + case FEATURE_AEAD: + lib->crypto->add_aead(lib->crypto, feature->aead.alg, + name, reg->reg.f); + break; case FEATURE_SIGNER: lib->crypto->add_signer(lib->crypto, feature->signer, name, reg->reg.f); |