From: Tobias Brunner Date: Thu, 22 Sep 2011 16:37:11 +0000 (+0200) Subject: Don't use union members directly in plugin_feature_t. X-Git-Tag: 4.6.0~169 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c293c87761b6c65fa90cf131868c51801fd540e6;p=thirdparty%2Fstrongswan.git Don't use union members directly in plugin_feature_t. --- diff --git a/src/libcharon/sa/authenticators/eap/eap_method.c b/src/libcharon/sa/authenticators/eap/eap_method.c index 536dab7080..a05e8c59a0 100644 --- a/src/libcharon/sa/authenticators/eap/eap_method.c +++ b/src/libcharon/sa/authenticators/eap/eap_method.c @@ -30,7 +30,7 @@ bool eap_method_register(plugin_t *plugin, plugin_feature_t *feature, { if (reg) { - charon->eap->add_method(charon->eap, feature->eap, 0, + charon->eap->add_method(charon->eap, feature->arg.eap, 0, feature->type == FEATURE_EAP_SERVER ? EAP_SERVER : EAP_PEER, (eap_constructor_t)data); } diff --git a/src/libstrongswan/plugins/plugin_feature.c b/src/libstrongswan/plugins/plugin_feature.c index 29ca101302..f84af4fdfc 100644 --- a/src/libstrongswan/plugins/plugin_feature.c +++ b/src/libstrongswan/plugins/plugin_feature.c @@ -55,43 +55,45 @@ bool plugin_feature_matches(plugin_feature_t *a, plugin_feature_t *b) case FEATURE_NONE: return FALSE; case FEATURE_CRYPTER: - return a->crypter.alg == b->crypter.alg && - a->crypter.key_size == b->crypter.key_size; + return a->arg.crypter.alg == b->arg.crypter.alg && + a->arg.crypter.key_size == b->arg.crypter.key_size; case FEATURE_AEAD: - return a->aead.alg == b->aead.alg && - a->aead.key_size == b->aead.key_size; + return a->arg.aead.alg == b->arg.aead.alg && + a->arg.aead.key_size == b->arg.aead.key_size; case FEATURE_SIGNER: - return a->signer == b->signer; + return a->arg.signer == b->arg.signer; case FEATURE_HASHER: - return a->hasher == b->hasher; + return a->arg.hasher == b->arg.hasher; case FEATURE_PRF: - return a->prf == b->prf; + return a->arg.prf == b->arg.prf; case FEATURE_DH: - return a->dh_group == b->dh_group; + return a->arg.dh_group == b->arg.dh_group; case FEATURE_RNG: - return a->rng_quality <= b->rng_quality; + return a->arg.rng_quality <= b->arg.rng_quality; case FEATURE_PRIVKEY: case FEATURE_PRIVKEY_GEN: case FEATURE_PUBKEY: - return a->privkey == b->privkey; + return a->arg.privkey == b->arg.privkey; case FEATURE_PRIVKEY_SIGN: case FEATURE_PUBKEY_VERIFY: - return a->privkey_sign == b->privkey_sign; + return a->arg.privkey_sign == b->arg.privkey_sign; case FEATURE_PRIVKEY_DECRYPT: case FEATURE_PUBKEY_ENCRYPT: - return a->privkey_decrypt == b->privkey_decrypt; + return a->arg.privkey_decrypt == b->arg.privkey_decrypt; case FEATURE_CERT_DECODE: case FEATURE_CERT_ENCODE: - return a->cert == b->cert; + return a->arg.cert == b->arg.cert; case FEATURE_EAP_SERVER: case FEATURE_EAP_PEER: - return a->eap == b->eap; + return a->arg.eap == b->arg.eap; case FEATURE_DATABASE: - return a->database == DB_ANY || a->database == b->database; + return a->arg.database == DB_ANY || + a->arg.database == b->arg.database; case FEATURE_FETCHER: - return a->fetcher == NULL || streq(a->fetcher, b->fetcher); + return a->arg.fetcher == NULL || + streq(a->arg.fetcher, b->arg.fetcher); case FEATURE_CUSTOM: - return streq(a->custom, b->custom); + return streq(a->arg.custom, b->arg.custom); } } return FALSE; @@ -114,51 +116,51 @@ char* plugin_feature_get_string(plugin_feature_t *feature) return strdup("NONE"); case FEATURE_CRYPTER: if (asprintf(&str, "%N:%N-%d", plugin_feature_names, feature->type, - encryption_algorithm_names, feature->crypter.alg, - feature->crypter.key_size) > 0) + encryption_algorithm_names, feature->arg.crypter.alg, + feature->arg.crypter.key_size) > 0) { 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) + encryption_algorithm_names, feature->arg.aead.alg, + feature->arg.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) + integrity_algorithm_names, feature->arg.signer) > 0) { return str; } break; case FEATURE_HASHER: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - hash_algorithm_names, feature->hasher) > 0) + hash_algorithm_names, feature->arg.hasher) > 0) { return str; } break; case FEATURE_PRF: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - pseudo_random_function_names, feature->prf) > 0) + pseudo_random_function_names, feature->arg.prf) > 0) { return str; } break; case FEATURE_DH: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - diffie_hellman_group_names, feature->dh_group) > 0) + diffie_hellman_group_names, feature->arg.dh_group) > 0) { return str; } break; case FEATURE_RNG: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - rng_quality_names, feature->rng_quality) > 0) + rng_quality_names, feature->arg.rng_quality) > 0) { return str; } @@ -167,7 +169,7 @@ char* plugin_feature_get_string(plugin_feature_t *feature) case FEATURE_PRIVKEY_GEN: case FEATURE_PUBKEY: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - key_type_names, feature->privkey) > 0) + key_type_names, feature->arg.privkey) > 0) { return str; } @@ -175,7 +177,7 @@ char* plugin_feature_get_string(plugin_feature_t *feature) case FEATURE_PRIVKEY_SIGN: case FEATURE_PUBKEY_VERIFY: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - signature_scheme_names, feature->privkey_sign) > 0) + signature_scheme_names, feature->arg.privkey_sign) > 0) { return str; } @@ -183,7 +185,7 @@ char* plugin_feature_get_string(plugin_feature_t *feature) case FEATURE_PRIVKEY_DECRYPT: case FEATURE_PUBKEY_ENCRYPT: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - encryption_scheme_names, feature->privkey_decrypt) > 0) + encryption_scheme_names, feature->arg.privkey_decrypt) > 0) { return str; } @@ -191,7 +193,7 @@ char* plugin_feature_get_string(plugin_feature_t *feature) case FEATURE_CERT_DECODE: case FEATURE_CERT_ENCODE: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - certificate_type_names, feature->cert) > 0) + certificate_type_names, feature->arg.cert) > 0) { return str; } @@ -199,28 +201,28 @@ char* plugin_feature_get_string(plugin_feature_t *feature) case FEATURE_EAP_SERVER: case FEATURE_EAP_PEER: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - eap_type_short_names, feature->eap) > 0) + eap_type_short_names, feature->arg.eap) > 0) { return str; } break; case FEATURE_DATABASE: if (asprintf(&str, "%N:%N", plugin_feature_names, feature->type, - db_driver_names, feature->database) > 0) + db_driver_names, feature->arg.database) > 0) { return str; } break; case FEATURE_FETCHER: if (asprintf(&str, "%N:%s", plugin_feature_names, feature->type, - feature->fetcher) > 0) + feature->arg.fetcher) > 0) { return str; } break; case FEATURE_CUSTOM: if (asprintf(&str, "%N:%s", plugin_feature_names, feature->type, - feature->custom) > 0) + feature->arg.custom) > 0) { return str; } diff --git a/src/libstrongswan/plugins/plugin_feature.h b/src/libstrongswan/plugins/plugin_feature.h index 1f7762973c..ce8bcc3463 100644 --- a/src/libstrongswan/plugins/plugin_feature.h +++ b/src/libstrongswan/plugins/plugin_feature.h @@ -198,7 +198,7 @@ struct plugin_feature_t { /** data to pass to callback */ void *data; } cb; - }; + } arg; }; #define FEATURE(kind, type, ...) _PLUGIN_FEATURE_##type(kind, __VA_ARGS__) @@ -267,10 +267,10 @@ struct plugin_feature_t { #define _PLUGIN_FEATURE_DATABASE(kind, type) __PLUGIN_FEATURE(kind, DATABASE, .database = type) #define _PLUGIN_FEATURE_FETCHER(kind, type) __PLUGIN_FEATURE(kind, FETCHER, .fetcher = type) -#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(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f } +#define __PLUGIN_FEATURE_REGISTER_BUILDER(type, _f, _final) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.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) @@ -284,7 +284,7 @@ struct plugin_feature_t { #define _PLUGIN_FEATURE_REGISTER_DATABASE(type, f) __PLUGIN_FEATURE_REGISTER(type, f) #define _PLUGIN_FEATURE_REGISTER_FETCHER(type, f) __PLUGIN_FEATURE_REGISTER(type, f) -#define _PLUGIN_FEATURE_CALLBACK(_cb, _data) (plugin_feature_t){ FEATURE_CALLBACK, FEATURE_NONE, .cb = { .f = _cb, .data = _data } } +#define _PLUGIN_FEATURE_CALLBACK(_cb, _data) (plugin_feature_t){ FEATURE_CALLBACK, FEATURE_NONE, .arg.cb = { .f = _cb, .data = _data } } /** * Names for plugin_feature_t types. diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c index 8e34ca527b..0925c5d9a9 100644 --- a/src/libstrongswan/plugins/plugin_loader.c +++ b/src/libstrongswan/plugins/plugin_loader.c @@ -324,7 +324,7 @@ static bool load_feature(private_plugin_loader_t *this, plugin_entry_t *entry, } if (reg && reg->kind == FEATURE_CALLBACK) { - if (!reg->cb.f(entry->plugin, feature, TRUE, reg->cb.data)) + if (!reg->arg.cb.f(entry->plugin, feature, TRUE, reg->arg.cb.data)) { DBG1(DBG_LIB, "loading '%s' plugin feature %s with callback failed", name, str); @@ -337,53 +337,56 @@ static bool load_feature(private_plugin_loader_t *this, plugin_entry_t *entry, switch (feature->type) { case FEATURE_CRYPTER: - lib->crypto->add_crypter(lib->crypto, feature->crypter.alg, - name, reg->reg.f); + lib->crypto->add_crypter(lib->crypto, feature->arg.crypter.alg, + name, reg->arg.reg.f); break; case FEATURE_AEAD: - lib->crypto->add_aead(lib->crypto, feature->aead.alg, - name, reg->reg.f); + lib->crypto->add_aead(lib->crypto, feature->arg.aead.alg, + name, reg->arg.reg.f); break; case FEATURE_SIGNER: - lib->crypto->add_signer(lib->crypto, feature->signer, - name, reg->reg.f); + lib->crypto->add_signer(lib->crypto, feature->arg.signer, + name, reg->arg.reg.f); break; case FEATURE_HASHER: - lib->crypto->add_hasher(lib->crypto, feature->hasher, - name, reg->reg.f); + lib->crypto->add_hasher(lib->crypto, feature->arg.hasher, + name, reg->arg.reg.f); break; case FEATURE_PRF: - lib->crypto->add_prf(lib->crypto, feature->prf, - name, reg->reg.f); + lib->crypto->add_prf(lib->crypto, feature->arg.prf, + name, reg->arg.reg.f); break; case FEATURE_DH: - lib->crypto->add_dh(lib->crypto, feature->dh_group, - name, reg->reg.f); + lib->crypto->add_dh(lib->crypto, feature->arg.dh_group, + name, reg->arg.reg.f); break; case FEATURE_RNG: - lib->crypto->add_rng(lib->crypto, feature->rng_quality, - name, reg->reg.f); + lib->crypto->add_rng(lib->crypto, feature->arg.rng_quality, + name, reg->arg.reg.f); break; case FEATURE_PRIVKEY: case FEATURE_PRIVKEY_GEN: lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, - feature->privkey, reg->reg.final, reg->reg.f); + feature->arg.privkey, reg->arg.reg.final, + reg->arg.reg.f); break; case FEATURE_PUBKEY: lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, - feature->pubkey, reg->reg.final, reg->reg.f); + feature->arg.pubkey, reg->arg.reg.final, + reg->arg.reg.f); break; case FEATURE_CERT_DECODE: case FEATURE_CERT_ENCODE: lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, - feature->cert, reg->reg.final, reg->reg.f); + feature->arg.cert, reg->arg.reg.final, + reg->arg.reg.f); break; case FEATURE_DATABASE: - lib->db->add_database(lib->db, reg->reg.f); + lib->db->add_database(lib->db, reg->arg.reg.f); break; case FEATURE_FETCHER: - lib->fetcher->add_fetcher(lib->fetcher, reg->reg.f, - feature->fetcher); + lib->fetcher->add_fetcher(lib->fetcher, reg->arg.reg.f, + feature->arg.fetcher); break; default: break;