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

pkcs11: Use plugin_features_add() in get_features()

Browse Source
This commit is contained in:
Tobias Brunner
2013-06-11 11:18:18 +02:00
parent 886a40d75e
commit 7756c0383e
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c
+8 -21
View File
@@ -185,19 +185,6 @@ METHOD(plugin_t, reload, bool,
return FALSE; return FALSE;
} }
/**
* Add a set of features
*/
static inline void add_features(plugin_feature_t *f, plugin_feature_t *n,
int count, int *pos)
{
int i;
for (i = 0; i < count; i++)
{
f[(*pos)++] = n[i];
}
}
METHOD(plugin_t, get_features, int, METHOD(plugin_t, get_features, int,
private_pkcs11_plugin_t *this, plugin_feature_t *features[]) private_pkcs11_plugin_t *this, plugin_feature_t *features[])
{ {
@@ -261,32 +248,32 @@ METHOD(plugin_t, get_features, int,
{ /* initialize only once */ { /* initialize only once */
bool use_ecc = lib->settings->get_bool(lib->settings, bool use_ecc = lib->settings->get_bool(lib->settings,
"libstrongswan.plugins.pkcs11.use_ecc", FALSE); "libstrongswan.plugins.pkcs11.use_ecc", FALSE);
add_features(f, f_manager, countof(f_manager), &count); plugin_features_add(f, f_manager, countof(f_manager), &count);
/* private key handling for EC keys is not disabled by use_ecc */ /* private key handling for EC keys is not disabled by use_ecc */
add_features(f, f_privkey, countof(f_privkey), &count); plugin_features_add(f, f_privkey, countof(f_privkey), &count);
if (lib->settings->get_bool(lib->settings, if (lib->settings->get_bool(lib->settings,
"libstrongswan.plugins.pkcs11.use_pubkey", FALSE)) "libstrongswan.plugins.pkcs11.use_pubkey", FALSE))
{ {
add_features(f, f_pubkey, countof(f_pubkey) - (use_ecc ? 0 : 1), plugin_features_add(f, f_pubkey, countof(f_pubkey) - (use_ecc ? 0 : 1),
&count); &count);
} }
if (lib->settings->get_bool(lib->settings, if (lib->settings->get_bool(lib->settings,
"libstrongswan.plugins.pkcs11.use_hasher", FALSE)) "libstrongswan.plugins.pkcs11.use_hasher", FALSE))
{ {
add_features(f, f_hash, countof(f_hash), &count); plugin_features_add(f, f_hash, countof(f_hash), &count);
} }
if (lib->settings->get_bool(lib->settings, if (lib->settings->get_bool(lib->settings,
"libstrongswan.plugins.pkcs11.use_rng", FALSE)) "libstrongswan.plugins.pkcs11.use_rng", FALSE))
{ {
add_features(f, f_rng, countof(f_rng), &count); plugin_features_add(f, f_rng, countof(f_rng), &count);
} }
if (lib->settings->get_bool(lib->settings, if (lib->settings->get_bool(lib->settings,
"libstrongswan.plugins.pkcs11.use_dh", FALSE)) "libstrongswan.plugins.pkcs11.use_dh", FALSE))
{ {
add_features(f, f_dh, countof(f_dh), &count); plugin_features_add(f, f_dh, countof(f_dh), &count);
if (use_ecc) if (use_ecc)
{ {
add_features(f, f_ecdh, countof(f_ecdh), &count); plugin_features_add(f, f_ecdh, countof(f_ecdh), &count);
} }
} }
} }