Added a get_name() function to plugin_t, create_plugin_enumerator enumerates over...
authorMartin Willi <martin@revosec.ch>
Mon, 11 Apr 2011 16:54:18 +0000 (18:54 +0200)
committerMartin Willi <martin@revosec.ch>
Fri, 15 Apr 2011 08:07:12 +0000 (10:07 +0200)
107 files changed:
src/libcharon/daemon.c
src/libcharon/plugins/addrblock/addrblock_plugin.c
src/libcharon/plugins/addrblock/addrblock_validator.c
src/libcharon/plugins/android/android_plugin.c
src/libcharon/plugins/coupling/coupling_plugin.c
src/libcharon/plugins/dhcp/dhcp_plugin.c
src/libcharon/plugins/duplicheck/duplicheck_plugin.c
src/libcharon/plugins/eap_aka/eap_aka_plugin.c
src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c
src/libcharon/plugins/eap_gtc/eap_gtc_plugin.c
src/libcharon/plugins/eap_identity/eap_identity_plugin.c
src/libcharon/plugins/eap_md5/eap_md5_plugin.c
src/libcharon/plugins/eap_mschapv2/eap_mschapv2_plugin.c
src/libcharon/plugins/eap_peap/eap_peap_plugin.c
src/libcharon/plugins/eap_radius/eap_radius_plugin.c
src/libcharon/plugins/eap_sim/eap_sim_plugin.c
src/libcharon/plugins/eap_sim_file/eap_sim_file_plugin.c
src/libcharon/plugins/eap_sim_pcsc/eap_sim_pcsc_plugin.c
src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c
src/libcharon/plugins/eap_simaka_sql/eap_simaka_sql_plugin.c
src/libcharon/plugins/eap_tls/eap_tls_plugin.c
src/libcharon/plugins/eap_tnc/eap_tnc_plugin.c
src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c
src/libcharon/plugins/farp/farp_plugin.c
src/libcharon/plugins/ha/ha_plugin.c
src/libcharon/plugins/led/led_plugin.c
src/libcharon/plugins/load_tester/load_tester_plugin.c
src/libcharon/plugins/maemo/maemo_plugin.c
src/libcharon/plugins/medcli/medcli_plugin.c
src/libcharon/plugins/medsrv/medsrv_plugin.c
src/libcharon/plugins/nm/nm_plugin.c
src/libcharon/plugins/smp/smp.c
src/libcharon/plugins/socket_default/socket_default_plugin.c
src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.c
src/libcharon/plugins/socket_raw/socket_raw_plugin.c
src/libcharon/plugins/sql/sql_plugin.c
src/libcharon/plugins/stroke/stroke_list.c
src/libcharon/plugins/stroke/stroke_plugin.c
src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c
src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c
src/libcharon/plugins/tnccs_11/tnccs_11_plugin.c
src/libcharon/plugins/tnccs_20/tnccs_20_plugin.c
src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic_plugin.c
src/libcharon/plugins/uci/uci_plugin.c
src/libcharon/plugins/unit_tester/unit_tester.c
src/libcharon/plugins/updown/updown_plugin.c
src/libcharon/plugins/whitelist/whitelist_plugin.c
src/libhydra/plugins/attr/attr_plugin.c
src/libhydra/plugins/attr_sql/attr_sql_plugin.c
src/libhydra/plugins/kernel_klips/kernel_klips_plugin.c
src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.c
src/libhydra/plugins/kernel_pfkey/kernel_pfkey_plugin.c
src/libhydra/plugins/kernel_pfroute/kernel_pfroute_plugin.c
src/libhydra/plugins/resolve/resolve_plugin.c
src/libstrongswan/plugins/aes/aes_plugin.c
src/libstrongswan/plugins/af_alg/af_alg_crypter.c
src/libstrongswan/plugins/af_alg/af_alg_crypter.h
src/libstrongswan/plugins/af_alg/af_alg_hasher.c
src/libstrongswan/plugins/af_alg/af_alg_hasher.h
src/libstrongswan/plugins/af_alg/af_alg_ops.c
src/libstrongswan/plugins/af_alg/af_alg_ops.h
src/libstrongswan/plugins/af_alg/af_alg_plugin.c
src/libstrongswan/plugins/af_alg/af_alg_prf.c
src/libstrongswan/plugins/af_alg/af_alg_prf.h
src/libstrongswan/plugins/af_alg/af_alg_signer.c
src/libstrongswan/plugins/af_alg/af_alg_signer.h
src/libstrongswan/plugins/agent/agent_plugin.c
src/libstrongswan/plugins/blowfish/blowfish_plugin.c
src/libstrongswan/plugins/ccm/ccm_plugin.c
src/libstrongswan/plugins/constraints/constraints_plugin.c
src/libstrongswan/plugins/ctr/ctr_plugin.c
src/libstrongswan/plugins/curl/curl_plugin.c
src/libstrongswan/plugins/des/des_plugin.c
src/libstrongswan/plugins/dnskey/dnskey_plugin.c
src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c
src/libstrongswan/plugins/gcm/gcm_plugin.c
src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
src/libstrongswan/plugins/gmp/gmp_plugin.c
src/libstrongswan/plugins/hmac/hmac_plugin.c
src/libstrongswan/plugins/ldap/ldap_plugin.c
src/libstrongswan/plugins/md4/md4_plugin.c
src/libstrongswan/plugins/md5/md5_plugin.c
src/libstrongswan/plugins/mysql/mysql_plugin.c
src/libstrongswan/plugins/openssl/openssl_plugin.c
src/libstrongswan/plugins/padlock/padlock_plugin.c
src/libstrongswan/plugins/pem/pem_plugin.c
src/libstrongswan/plugins/pgp/pgp_plugin.c
src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c
src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c
src/libstrongswan/plugins/plugin.h
src/libstrongswan/plugins/plugin_loader.c
src/libstrongswan/plugins/plugin_loader.h
src/libstrongswan/plugins/pubkey/pubkey_plugin.c
src/libstrongswan/plugins/random/random_plugin.c
src/libstrongswan/plugins/revocation/revocation_plugin.c
src/libstrongswan/plugins/sha1/sha1_plugin.c
src/libstrongswan/plugins/sha2/sha2_plugin.c
src/libstrongswan/plugins/soup/soup_plugin.c
src/libstrongswan/plugins/sqlite/sqlite_plugin.c
src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c
src/libstrongswan/plugins/x509/x509_plugin.c
src/libstrongswan/plugins/xcbc/xcbc_plugin.c
src/pluto/log.c
src/pluto/plugins/xauth/xauth_plugin.c
src/pluto/plutomain.c
src/scepclient/scepclient.c

index 71a1cf2..796e455 100644 (file)
@@ -200,15 +200,17 @@ METHOD(daemon_t, start, void,
  */
 static void print_plugins()
 {
-       char buf[512], *plugin;
+       char buf[512];
        int len = 0;
        enumerator_t *enumerator;
+       plugin_t *plugin;
 
        buf[0] = '\0';
        enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
        while (len < sizeof(buf) && enumerator->enumerate(enumerator, &plugin))
        {
-               len += snprintf(&buf[len], sizeof(buf)-len, "%s ", plugin);
+               len += snprintf(&buf[len], sizeof(buf)-len, "%s ",
+                                               plugin->get_name(plugin));
        }
        enumerator->destroy(enumerator);
        DBG1(DBG_DMN, "loaded plugins: %s", buf);
index 5fdb36c..a649568 100644 (file)
@@ -43,6 +43,12 @@ struct private_addrblock_plugin_t {
        addrblock_narrow_t *narrower;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_addrblock_plugin_t *this)
+{
+       return "addrblock";
+}
+
 METHOD(plugin_t, destroy, void,
        private_addrblock_plugin_t *this)
 {
@@ -63,6 +69,7 @@ plugin_t *addrblock_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 12cf0c9..1b07378 100644 (file)
@@ -88,7 +88,7 @@ static bool check_addrblock(x509_t *subject, x509_t *issuer)
 
 METHOD(cert_validator_t, validate, bool,
        private_addrblock_validator_t *this, certificate_t *subject,
-       certificate_t *issuer, bool online, int pathlen, bool anchor,
+       certificate_t *issuer, bool online, u_int pathlen, bool anchor,
        auth_cfg_t *auth)
 {
        if (subject->get_type(subject) == CERT_X509 &&
@@ -114,7 +114,9 @@ addrblock_validator_t *addrblock_validator_create()
 
        INIT(this,
                .public = {
-                       .validator.validate = _validate,
+                       .validator = {
+                               .validate = _validate,
+                       },
                        .destroy = _destroy,
                },
        );
index 3d82d8f..c55a829 100644 (file)
@@ -54,11 +54,16 @@ struct private_android_plugin_t {
         * Service that interacts with the Android Settings frontend
         */
        android_service_t *service;
-
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_android_plugin_t *this)
+{
+       return "android";
+}
+
 METHOD(plugin_t, destroy, void,
-          private_android_plugin_t *this)
+       private_android_plugin_t *this)
 {
        hydra->attributes->remove_handler(hydra->attributes,
                                                                          &this->handler->handler);
@@ -81,6 +86,7 @@ plugin_t *android_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 8e0705c..f2125d9 100644 (file)
@@ -37,6 +37,12 @@ struct private_coupling_plugin_t {
        coupling_validator_t *validator;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_coupling_plugin_t *this)
+{
+       return "coupling";
+}
+
 METHOD(plugin_t, destroy, void,
        private_coupling_plugin_t *this)
 {
@@ -55,6 +61,7 @@ plugin_t *coupling_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index fccc99b..25906e3 100644 (file)
@@ -44,6 +44,12 @@ struct private_dhcp_plugin_t {
        dhcp_provider_t *provider;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_dhcp_plugin_t *this)
+{
+       return "dhcp";
+}
+
 METHOD(plugin_t, destroy, void,
        private_dhcp_plugin_t *this)
 {
@@ -64,6 +70,7 @@ plugin_t *dhcp_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 69a8dbf..f8868e4 100644 (file)
@@ -43,6 +43,12 @@ struct private_duplicheck_plugin_t {
        duplicheck_notify_t *notify;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_duplicheck_plugin_t *this)
+{
+       return "duplicheck";
+}
+
 METHOD(plugin_t, destroy, void,
        private_duplicheck_plugin_t *this)
 {
@@ -68,6 +74,7 @@ plugin_t *duplicheck_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 92f5e66..7f120f9 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       eap_aka_plugin_t *this)
+{
+       return "eap-aka";
+}
+
 METHOD(plugin_t, destroy, void,
        eap_aka_plugin_t *this)
 {
@@ -39,6 +45,7 @@ plugin_t *eap_aka_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index fc971b3..743744d 100644 (file)
@@ -48,6 +48,12 @@ struct private_eap_aka_3gpp2_t {
        eap_aka_3gpp2_functions_t *functions;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_eap_aka_3gpp2_t *this)
+{
+       return "eap-aka-3gpp2";
+}
+
 METHOD(plugin_t, destroy, void,
        private_eap_aka_3gpp2_t *this)
 {
@@ -69,10 +75,11 @@ plugin_t *eap_aka_3gpp2_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
-               this->functions = eap_aka_3gpp2_functions_create();
+               .functions = eap_aka_3gpp2_functions_create(),
        );
 
        if (!this->functions)
index 4eb587d..da1ee1c 100644 (file)
 /* missing in cababilities.h */
 #define CAP_AUDIT_WRITE 29
 
+METHOD(plugin_t, get_name, char*,
+       eap_gtc_plugin_t *this)
+{
+       return "eap-gtc";
+}
+
 METHOD(plugin_t, destroy, void,
        eap_gtc_plugin_t *this)
 {
@@ -41,6 +47,7 @@ plugin_t *eap_gtc_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index 079c279..57762b3 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       eap_identity_plugin_t *this)
+{
+       return "eap-identity";
+}
+
 METHOD(plugin_t, destroy, void,
        eap_identity_plugin_t *this)
 {
@@ -37,6 +43,7 @@ plugin_t *eap_identity_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index 39a6f57..13d34e9 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       eap_md5_plugin_t *this)
+{
+       return "eap-md5";
+}
+
 METHOD(plugin_t, destroy, void,
        eap_md5_plugin_t *this)
 {
@@ -37,6 +43,7 @@ plugin_t *eap_md5_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index f8130e6..ae4f613 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       eap_mschapv2_plugin_t *this)
+{
+       return "eap-mschapv2";
+}
+
 METHOD(plugin_t, destroy, void,
        eap_mschapv2_plugin_t *this)
 {
@@ -38,6 +44,7 @@ plugin_t *eap_mschapv2_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index 1a0253a..b39b49c 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       eap_peap_plugin_t *this)
+{
+       return "eap-peap";
+}
 
 METHOD(plugin_t, destroy, void,
        eap_peap_plugin_t *this)
@@ -39,6 +44,7 @@ plugin_t *eap_peap_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index 1c24d77..80b72e7 100644 (file)
@@ -49,6 +49,12 @@ struct private_eap_radius_plugin_t {
  */
 static private_eap_radius_plugin_t *instance = NULL;
 
+METHOD(plugin_t, get_name, char*,
+       private_eap_radius_plugin_t *this)
+{
+       return "eap-radius";
+}
+
 METHOD(plugin_t, destroy, void,
        private_eap_radius_plugin_t *this)
 {
@@ -153,6 +159,7 @@ plugin_t *eap_radius_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 8eae6d7..1327f7f 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       eap_sim_plugin_t *this)
+{
+       return "eap-sim";
+}
+
 METHOD(plugin_t, destroy, void,
        eap_sim_plugin_t *this)
 {
@@ -39,6 +45,7 @@ plugin_t *eap_sim_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index 5bb9a9a..97b726d 100644 (file)
@@ -50,6 +50,12 @@ struct private_eap_sim_file_t {
        eap_sim_file_triplets_t *triplets;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_eap_sim_file_t *this)
+{
+       return "eap-sim-file";
+}
+
 METHOD(plugin_t, destroy, void,
        private_eap_sim_file_t *this)
 {
@@ -71,6 +77,7 @@ plugin_t *eap_sim_file_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 52b6ae9..ee8fe95 100644 (file)
@@ -35,6 +35,12 @@ struct private_eap_sim_pcsc_plugin_t {
        eap_sim_pcsc_card_t *card;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_eap_sim_pcsc_plugin_t *this)
+{
+       return "eap-sim-pcsc";
+}
+
 METHOD(plugin_t, destroy, void,
        private_eap_sim_pcsc_plugin_t *this)
 {
@@ -53,6 +59,7 @@ plugin_t *eap_sim_pcsc_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index c4a1ec2..507869e 100644 (file)
@@ -42,6 +42,12 @@ struct private_eap_simaka_pseudonym_t {
        eap_simaka_pseudonym_provider_t *provider;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_eap_simaka_pseudonym_t *this)
+{
+       return "eap-simaka-pseudonym";
+}
+
 METHOD(plugin_t, destroy, void,
        private_eap_simaka_pseudonym_t *this)
 {
@@ -62,6 +68,7 @@ plugin_t *eap_simaka_pseudonym_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index fc7a0b2..cf39b43 100644 (file)
@@ -42,6 +42,12 @@ struct private_eap_simaka_reauth_t {
        eap_simaka_reauth_provider_t *provider;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_eap_simaka_reauth_t *this)
+{
+       return "eap-simaka-reauth";
+}
+
 METHOD(plugin_t, destroy, void,
        private_eap_simaka_reauth_t *this)
 {
@@ -62,6 +68,7 @@ plugin_t *eap_simaka_reauth_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 1cc5352..192bfbc 100644 (file)
@@ -47,6 +47,12 @@ struct private_eap_simaka_sql_t {
        database_t *db;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_eap_simaka_sql_t *this)
+{
+       return "eap-simaka-sql";
+}
+
 METHOD(plugin_t, destroy, void,
        private_eap_simaka_sql_t *this)
 {
@@ -87,6 +93,7 @@ plugin_t *eap_simaka_sql_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index a7c040b..c8578b7 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       eap_tls_plugin_t *this)
+{
+       return "eap-tls";
+}
 
 METHOD(plugin_t, destroy, void,
        eap_tls_plugin_t *this)
@@ -39,6 +44,7 @@ plugin_t *eap_tls_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index 7430e4c..2b982a2 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       eap_tnc_plugin_t *this)
+{
+       return "eap-tnc";
+}
+
 METHOD(plugin_t, destroy, void,
        eap_tnc_plugin_t *this)
 {
@@ -37,6 +43,7 @@ plugin_t *eap_tnc_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index 48e759d..2587680 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       eap_ttls_plugin_t *this)
+{
+       return "eap-ttls";
+}
 
 METHOD(plugin_t, destroy, void,
        eap_ttls_plugin_t *this)
@@ -39,6 +44,7 @@ plugin_t *eap_ttls_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index d83bc1f..a0401e3 100644 (file)
@@ -43,6 +43,12 @@ struct private_farp_plugin_t {
        farp_spoofer_t *spoofer;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_farp_plugin_t *this)
+{
+       return "farp";
+}
+
 METHOD(plugin_t, destroy, void,
        private_farp_plugin_t *this)
 {
@@ -62,6 +68,7 @@ plugin_t *farp_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 581294e..c02e026 100644 (file)
@@ -91,6 +91,12 @@ struct private_ha_plugin_t {
        ha_attribute_t *attr;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_ha_plugin_t *this)
+{
+       return "ha";
+}
+
 METHOD(plugin_t, destroy, void,
        private_ha_plugin_t *this)
 {
@@ -144,6 +150,7 @@ plugin_t *ha_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 322d198..04443df 100644 (file)
@@ -37,6 +37,12 @@ struct private_led_plugin_t {
        led_listener_t *listener;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_led_plugin_t *this)
+{
+       return "led";
+}
+
 METHOD(plugin_t, destroy, void,
        private_led_plugin_t *this)
 {
@@ -55,6 +61,7 @@ plugin_t *led_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index e9092e1..c4a470f 100644 (file)
@@ -146,6 +146,12 @@ static job_requeue_t do_load_test(private_load_tester_plugin_t *this)
        return JOB_REQUEUE_NONE;
 }
 
+METHOD(plugin_t, get_name, char*,
+       private_load_tester_plugin_t *this)
+{
+       return "load-tester";
+}
+
 METHOD(plugin_t, destroy, void,
        private_load_tester_plugin_t *this)
 {
@@ -189,6 +195,7 @@ plugin_t *load_tester_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index d4549f4..2a946a1 100644 (file)
@@ -34,11 +34,16 @@ struct private_maemo_plugin_t {
         * service
         */
        maemo_service_t *service;
-
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_maemo_plugin_t *this)
+{
+       return "maemo";
+}
+
 METHOD(plugin_t, destroy, void,
-          private_maemo_plugin_t *this)
+       private_maemo_plugin_t *this)
 {
        this->service->destroy(this->service);
        free(this);
@@ -54,6 +59,7 @@ plugin_t *maemo_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 30608a0..c6ee094 100644 (file)
@@ -54,6 +54,12 @@ struct private_medcli_plugin_t {
        medcli_listener_t *listener;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_medcli_plugin_t *this)
+{
+       return "medcli";
+}
+
 METHOD(plugin_t, destroy, void,
        private_medcli_plugin_t *this)
 {
@@ -78,6 +84,7 @@ plugin_t *medcli_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 214a433..1b4e4bb 100644 (file)
@@ -48,6 +48,12 @@ struct private_medsrv_plugin_t {
        medsrv_config_t *config;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_medsrv_plugin_t *this)
+{
+       return "medsrv";
+}
+
 METHOD(plugin_t, destroy, void,
        private_medsrv_plugin_t *this)
 {
@@ -70,6 +76,7 @@ plugin_t *medsrv_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 860b83d..c061240 100644 (file)
@@ -67,6 +67,12 @@ static job_requeue_t run(private_nm_plugin_t *this)
        return JOB_REQUEUE_NONE;
 }
 
+METHOD(plugin_t, get_name, char*,
+       private_nm_plugin_t *this)
+{
+       return "nm";
+}
+
 METHOD(plugin_t, destroy, void,
        private_nm_plugin_t *this)
 {
@@ -105,6 +111,7 @@ plugin_t *nm_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 0e6cf2a..c65830b 100644 (file)
@@ -707,6 +707,12 @@ static job_requeue_t dispatch(private_smp_t *this)
        return JOB_REQUEUE_DIRECT;
 }
 
+METHOD(plugin_t, get_name, char*,
+       private_smp_t *this)
+{
+       return "smp";
+}
+
 METHOD(plugin_t, destroy, void,
        private_smp_t *this)
 {
@@ -727,6 +733,7 @@ plugin_t *smp_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index b5dea68..2227f4a 100644 (file)
@@ -32,9 +32,14 @@ struct private_socket_default_plugin_t {
         * Implements plugin interface
         */
        socket_default_plugin_t public;
-
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_socket_default_plugin_t *this)
+{
+       return "socket-default";
+}
+
 METHOD(plugin_t, destroy, void,
        private_socket_default_plugin_t *this)
 {
@@ -53,6 +58,7 @@ plugin_t *socket_default_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index a6ff14e..d481ce0 100644 (file)
@@ -32,9 +32,14 @@ struct private_socket_dynamic_plugin_t {
         * Implements plugin interface
         */
        socket_dynamic_plugin_t public;
-
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_socket_dynamic_plugin_t *this)
+{
+       return "socket-dynamic";
+}
+
 METHOD(plugin_t, destroy, void,
        private_socket_dynamic_plugin_t *this)
 {
@@ -53,6 +58,7 @@ plugin_t *socket_dynamic_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 17a3a8d..a441aa3 100644 (file)
@@ -32,9 +32,14 @@ struct private_socket_raw_plugin_t {
         * Implements plugin interface
         */
        socket_raw_plugin_t public;
-
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_socket_raw_plugin_t *this)
+{
+       return "socket-raw";
+}
+
 METHOD(plugin_t, destroy, void,
        private_socket_raw_plugin_t *this)
 {
@@ -53,6 +58,7 @@ plugin_t *socket_raw_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index ad1eb91..f71ffa1 100644 (file)
@@ -53,6 +53,12 @@ struct private_sql_plugin_t {
        sql_logger_t *logger;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_sql_plugin_t *this)
+{
+       return "sql";
+}
+
 METHOD(plugin_t, destroy, void,
        private_sql_plugin_t *this)
 {
@@ -84,6 +90,7 @@ plugin_t *sql_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 36311f0..6c42f8f 100644 (file)
@@ -402,7 +402,8 @@ METHOD(stroke_list_t, status, void,
        if (all)
        {
                peer_cfg_t *peer_cfg;
-               char *plugin, *pool;
+               plugin_t *plugin;
+               char *pool;
                host_t *host;
                u_int32_t dpd;
                time_t since, now;
@@ -431,7 +432,7 @@ METHOD(stroke_list_t, status, void,
                enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
                while (enumerator->enumerate(enumerator, &plugin))
                {
-                       fprintf(out, "%s ", plugin);
+                       fprintf(out, "%s ", plugin->get_name(plugin));
                }
                enumerator->destroy(enumerator);
                fprintf(out, "\n");
@@ -1069,12 +1070,12 @@ static void print_alg(FILE *out, int *len, enum_name_t *alg_names, int alg_type,
 {
        char alg_name[BUF_LEN];
        int alg_name_len;
-       
+
        alg_name_len = sprintf(alg_name, " %N[%s]", alg_names, alg_type, plugin_name);
        if (*len + alg_name_len > CRYPTO_MAX_ALG_LINE)
        {
                fprintf(out, "\n             ");
-               *len = 13;      
+               *len = 13;
        }
        fprintf(out, "%s", alg_name);
        *len += alg_name_len;
index 2e83d0d..a239242 100644 (file)
@@ -36,6 +36,12 @@ struct private_stroke_plugin_t {
        stroke_socket_t *socket;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_stroke_plugin_t *this)
+{
+       return "stroke";
+}
+
 METHOD(plugin_t, destroy, void,
        private_stroke_plugin_t *this)
 {
@@ -53,6 +59,7 @@ plugin_t *stroke_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 8988804..44ca082 100644 (file)
@@ -141,6 +141,12 @@ static bool load_imcs(char *filename)
        return TRUE;
 }
 
+METHOD(plugin_t, get_name, char*,
+       tnc_imc_plugin_t *this)
+{
+       return "tnc-imc";
+}
+
 METHOD(plugin_t, destroy, void,
        tnc_imc_plugin_t *this)
 {
@@ -158,6 +164,7 @@ plugin_t *tnc_imc_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index f238f01..8f92ead 100644 (file)
@@ -141,6 +141,12 @@ static bool load_imvs(char *filename)
        return TRUE;
 }
 
+METHOD(plugin_t, get_name, char*,
+       tnc_imv_plugin_t *this)
+{
+       return "tnc-imv";
+}
+
 METHOD(plugin_t, destroy, void,
        tnc_imv_plugin_t *this)
 {
@@ -158,6 +164,7 @@ plugin_t *tnc_imv_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index 03905ca..984bded 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       tnccs_11_plugin_t *this)
+{
+       return "tnccs-11";
+}
+
 METHOD(plugin_t, destroy, void,
        tnccs_11_plugin_t *this)
 {
@@ -35,11 +41,12 @@ plugin_t *tnccs_11_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
 
-       charon->tnccs->add_method(charon->tnccs, TNCCS_1_1, 
+       charon->tnccs->add_method(charon->tnccs, TNCCS_1_1,
                                                         (tnccs_constructor_t)tnccs_11_create);
 
        return &this->plugin;
index 82c78f7..7f4aeff 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       tnccs_20_plugin_t *this)
+{
+       return "tnccs-20";
+}
+
 METHOD(plugin_t, destroy, void,
        tnccs_20_plugin_t *this)
 {
@@ -35,11 +41,12 @@ plugin_t *tnccs_20_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
 
-       charon->tnccs->add_method(charon->tnccs, TNCCS_2_0, 
+       charon->tnccs->add_method(charon->tnccs, TNCCS_2_0,
                                                         (tnccs_constructor_t)tnccs_20_create);
 
        return &this->plugin;
index dbbf222..ec6e637 100644 (file)
 
 #include <daemon.h>
 
+METHOD(plugin_t, get_name, char*,
+       tnccs_dynamic_plugin_t *this)
+{
+       return "tnccs-dynamic";
+}
+
 METHOD(plugin_t, destroy, void,
        tnccs_dynamic_plugin_t *this)
 {
@@ -35,11 +41,12 @@ plugin_t *tnccs_dynamic_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
 
-       charon->tnccs->add_method(charon->tnccs, TNCCS_DYNAMIC, 
+       charon->tnccs->add_method(charon->tnccs, TNCCS_DYNAMIC,
                                                         (tnccs_constructor_t)tnccs_dynamic_create);
 
        return &this->plugin;
index 6d6d5d2..0d4cd0a 100644 (file)
@@ -58,6 +58,12 @@ struct private_uci_plugin_t {
        uci_control_t *control;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_uci_plugin_t *this)
+{
+       return "uci";
+}
+
 METHOD(plugin_t, destroy, void,
        private_uci_plugin_t *this)
 {
@@ -80,6 +86,7 @@ plugin_t *uci_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 4a0347a..fe4e8e2 100644 (file)
@@ -92,6 +92,12 @@ static void run_tests(private_unit_tester_t *this)
                 success, run, failed, skipped);
 }
 
+METHOD(plugin_t, get_name, char*,
+       private_unit_tester_plugin_t *this)
+{
+       return "unit-tester";
+}
+
 METHOD(plugin_t, destroy, void,
        private_unit_tester_t *this)
 {
@@ -108,6 +114,7 @@ plugin_t *unit_tester_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 8b790cb..5f2885a 100644 (file)
@@ -36,6 +36,12 @@ struct private_updown_plugin_t {
        updown_listener_t *listener;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_updown_plugin_t *this)
+{
+       return "updown";
+}
+
 METHOD(plugin_t, destroy, void,
        private_updown_plugin_t *this)
 {
@@ -54,6 +60,7 @@ plugin_t *updown_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 75392a8..cbd36ff 100644 (file)
@@ -43,6 +43,12 @@ struct private_whitelist_plugin_t {
        whitelist_control_t *control;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_whitelist_plugin_t *this)
+{
+       return "whitelist";
+}
+
 METHOD(plugin_t, destroy, void,
        private_whitelist_plugin_t *this)
 {
@@ -62,6 +68,7 @@ plugin_t *whitelist_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 0f66b68..762dc88 100644 (file)
@@ -36,6 +36,12 @@ struct private_attr_plugin_t {
        attr_provider_t *provider;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_attr_plugin_t *this)
+{
+       return "attr";
+}
+
 METHOD(plugin_t, destroy, void,
        private_attr_plugin_t *this)
 {
@@ -54,6 +60,7 @@ plugin_t *attr_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index ca9de02..f9be3d2 100644 (file)
@@ -40,9 +40,14 @@ struct private_attr_sql_plugin_t {
         * configuration attributes
         */
        sql_attribute_t *attribute;
-
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_attr_sql_plugin_t *this)
+{
+       return "attr-sql";
+}
+
 METHOD(plugin_t, destroy, void,
        private_attr_sql_plugin_t *this)
 {
@@ -71,6 +76,7 @@ plugin_t *attr_sql_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 3c312ca..c5b9fa6 100644 (file)
@@ -32,6 +32,12 @@ struct private_kernel_klips_plugin_t {
        kernel_klips_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_kernel_klips_plugin_t *this)
+{
+       return "kernel-klips";
+}
+
 METHOD(plugin_t, destroy, void,
        private_kernel_klips_plugin_t *this)
 {
@@ -50,6 +56,7 @@ plugin_t *kernel_klips_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 9fc1a03..78823c9 100644 (file)
@@ -33,6 +33,12 @@ struct private_kernel_netlink_plugin_t {
        kernel_netlink_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_kernel_netlink_plugin_t *this)
+{
+       return "kernel-netlink";
+}
+
 METHOD(plugin_t, destroy, void,
        private_kernel_netlink_plugin_t *this)
 {
@@ -53,6 +59,7 @@ plugin_t *kernel_netlink_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 9e7a790..fa3d386 100644 (file)
@@ -32,6 +32,12 @@ struct private_kernel_pfkey_plugin_t {
        kernel_pfkey_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_kernel_pfkey_plugin_t *this)
+{
+       return "kernel-pfkey";
+}
+
 METHOD(plugin_t, destroy, void,
        private_kernel_pfkey_plugin_t *this)
 {
@@ -50,6 +56,7 @@ plugin_t *kernel_pfkey_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index a4cb53e..1749a89 100644 (file)
@@ -32,6 +32,12 @@ struct private_kernel_pfroute_plugin_t {
        kernel_pfroute_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_kernel_pfroute_plugin_t *this)
+{
+       return "kernel-pfroute";
+}
+
 METHOD(plugin_t, destroy, void,
        private_kernel_pfroute_plugin_t *this)
 {
@@ -50,6 +56,7 @@ plugin_t *kernel_pfroute_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index ad18c70..070596b 100644 (file)
@@ -36,6 +36,12 @@ struct private_resolve_plugin_t {
        resolve_handler_t *handler;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_resolve_plugin_t *this)
+{
+       return "resolve";
+}
+
 METHOD(plugin_t, destroy, void,
        private_resolve_plugin_t *this)
 {
@@ -54,6 +60,7 @@ plugin_t *resolve_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 1c060b6..6034e67 100644 (file)
@@ -18,8 +18,6 @@
 #include <library.h>
 #include "aes_crypter.h"
 
-static const char *plugin_name = "aes";
-
 typedef struct private_aes_plugin_t private_aes_plugin_t;
 
 /**
@@ -33,6 +31,12 @@ struct private_aes_plugin_t {
        aes_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_aes_plugin_t *this)
+{
+       return "aes";
+}
+
 METHOD(plugin_t, destroy, void,
        private_aes_plugin_t *this)
 {
@@ -51,12 +55,13 @@ plugin_t *aes_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, get_name(this),
                                                         (crypter_constructor_t)aes_crypter_create);
 
        return &this->public.plugin;
index 441b354..7b3c062 100644 (file)
@@ -92,7 +92,7 @@ static struct {
 /**
  * See header.
  */
-void af_alg_crypter_probe()
+void af_alg_crypter_probe(char *plugin)
 {
        encryption_algorithm_t prev = -1;
        af_alg_ops_t *ops;
@@ -106,7 +106,7 @@ void af_alg_crypter_probe()
                        if (ops)
                        {
                                ops->destroy(ops);
-                               lib->crypto->add_crypter(lib->crypto, algs[i].id, af_alg_plugin_name,
+                               lib->crypto->add_crypter(lib->crypto, algs[i].id, plugin,
                                                                (crypter_constructor_t)af_alg_crypter_create);
                        }
                }
index 711d2fc..ed7799c 100644 (file)
@@ -48,7 +48,9 @@ af_alg_crypter_t *af_alg_crypter_create(encryption_algorithm_t algo,
 
 /**
  * Probe algorithms and register af_alg_crypter_create().
+ *
+ * @param plugin               plugin name to register algorithms for
  */
-void af_alg_crypter_probe();
+void af_alg_crypter_probe(char *plugin);
 
 #endif /** AF_ALG_CRYPTER_H_ @}*/
index 7c6297d..11074c4 100644 (file)
@@ -59,7 +59,7 @@ static struct {
 /**
  * See header.
  */
-void af_alg_hasher_probe()
+void af_alg_hasher_probe(char *plugin)
 {
        af_alg_ops_t *ops;
        int i;
@@ -70,7 +70,7 @@ void af_alg_hasher_probe()
                if (ops)
                {
                        ops->destroy(ops);
-                       lib->crypto->add_hasher(lib->crypto, algs[i].id, af_alg_plugin_name,
+                       lib->crypto->add_hasher(lib->crypto, algs[i].id, plugin,
                                                        (hasher_constructor_t)af_alg_hasher_create);
                }
        }
index e0833e2..f44ba29 100644 (file)
@@ -46,7 +46,9 @@ af_alg_hasher_t *af_alg_hasher_create(hash_algorithm_t algo);
 
 /**
  * Probe algorithms and register af_alg_hasher_create().
+ *
+ * @param plugin               plugin name to register algorithms for
  */
-void af_alg_hasher_probe();
+void af_alg_hasher_probe(char *plugin);
 
 #endif /** af_alg_HASHER_H_ @}*/
index 7bf1d90..82a227d 100644 (file)
@@ -21,8 +21,6 @@
 
 #include <debug.h>
 
-const char *af_alg_plugin_name = "af-alg";
-
 typedef struct private_af_alg_ops_t private_af_alg_ops_t;
 
 /**
index b7d642c..ad16402 100644 (file)
@@ -33,8 +33,6 @@
 #define SOL_ALG 279
 #endif /* SOL_ALG */
 
-extern const char *af_alg_plugin_name;
-
 typedef struct af_alg_ops_t af_alg_ops_t;
 
 /**
index 54e39f1..c5c1771 100644 (file)
@@ -35,6 +35,12 @@ struct private_af_alg_plugin_t {
        af_alg_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_af_alg_plugin_t *this)
+{
+       return "af-alg";
+}
+
 METHOD(plugin_t, destroy, void,
        private_af_alg_plugin_t *this)
 {
@@ -60,15 +66,16 @@ plugin_t *af_alg_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       af_alg_hasher_probe();
-       af_alg_signer_probe();
-       af_alg_prf_probe();
-       af_alg_crypter_probe();
+       af_alg_hasher_probe(get_name(this));
+       af_alg_signer_probe(get_name(this));
+       af_alg_prf_probe(get_name(this));
+       af_alg_crypter_probe(get_name(this));
 
        return &this->public.plugin;
 }
index 575906b..1c1174a 100644 (file)
@@ -70,7 +70,7 @@ static struct {
 /**
  * See header.
  */
-void af_alg_prf_probe()
+void af_alg_prf_probe(char *plugin)
 {
        af_alg_ops_t *ops;
        int i;
@@ -81,7 +81,7 @@ void af_alg_prf_probe()
                if (ops)
                {
                        ops->destroy(ops);
-                       lib->crypto->add_prf(lib->crypto, algs[i].id, af_alg_plugin_name,
+                       lib->crypto->add_prf(lib->crypto, algs[i].id, plugin,
                                                        (prf_constructor_t)af_alg_prf_create);
                }
        }
index a3dea56..d3275e7 100644 (file)
@@ -46,7 +46,9 @@ af_alg_prf_t *af_alg_prf_create(pseudo_random_function_t algo);
 
 /**
  * Probe algorithms and register af_alg_prf_create().
+ *
+ * @param plugin               plugin name to register algorithms for
  */
-void af_alg_prf_probe();
+void af_alg_prf_probe(char *plugin);
 
 #endif /** AF_ALG_PRF_H_ @}*/
index 3d6f907..34534a0 100644 (file)
@@ -71,7 +71,7 @@ static struct {
 /**
  * See header.
  */
-void af_alg_signer_probe()
+void af_alg_signer_probe(char *plugin)
 {
        af_alg_ops_t *ops;
        int i;
@@ -82,7 +82,7 @@ void af_alg_signer_probe()
                if (ops)
                {
                        ops->destroy(ops);
-                       lib->crypto->add_signer(lib->crypto, algs[i].id, af_alg_plugin_name,
+                       lib->crypto->add_signer(lib->crypto, algs[i].id, plugin,
                                                        (signer_constructor_t)af_alg_signer_create);
                }
        }
index b1d9070..21487a1 100644 (file)
@@ -46,7 +46,9 @@ af_alg_signer_t *af_alg_signer_create(integrity_algorithm_t algo);
 
 /**
  * Probe algorithms and register af_alg_signer_create().
+ *
+ * @param plugin               plugin name to register algorithms for
  */
-void af_alg_signer_probe();
+void af_alg_signer_probe(char *plugin);
 
 #endif /** AF_ALG_SIGNER_H_ @}*/
index bd3c1ac..00cd3f6 100644 (file)
@@ -31,6 +31,12 @@ struct private_agent_plugin_t {
        agent_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_agent_plugin_t *this)
+{
+       return "agent";
+}
+
 METHOD(plugin_t, destroy, void,
        private_agent_plugin_t *this)
 {
@@ -49,6 +55,7 @@ plugin_t *agent_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 5232eca..364fb39 100644 (file)
@@ -19,8 +19,6 @@
 #include <library.h>
 #include "blowfish_crypter.h"
 
-static const char *plugin_name = "blowfish";
-
 typedef struct private_blowfish_plugin_t private_blowfish_plugin_t;
 
 /**
@@ -34,6 +32,12 @@ struct private_blowfish_plugin_t {
        blowfish_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_blowfish_plugin_t *this)
+{
+       return "blowfish";
+}
+
 METHOD(plugin_t, destroy, void,
        private_blowfish_plugin_t *this)
 {
@@ -52,12 +56,13 @@ plugin_t *blowfish_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH, get_name(this),
                                                         (crypter_constructor_t)blowfish_crypter_create);
 
        return &this->public.plugin;
index a4c89b5..cab3c66 100644 (file)
@@ -19,8 +19,6 @@
 
 #include "ccm_aead.h"
 
-static const char *plugin_name = "ccm";
-
 typedef struct private_ccm_plugin_t private_ccm_plugin_t;
 
 /**
@@ -34,6 +32,12 @@ struct private_ccm_plugin_t {
        ccm_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_ccm_plugin_t *this)
+{
+       return "ccm";
+}
+
 METHOD(plugin_t, destroy, void,
        private_ccm_plugin_t *this)
 {
@@ -52,29 +56,34 @@ plugin_t *ccm_plugin_create()
        crypter_t *crypter;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .get_name = _get_name,
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        crypter = lib->crypto->create_crypter(lib->crypto, ENCR_AES_CBC, 0);
        if (crypter)
        {
                crypter->destroy(crypter);
-               lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV8, plugin_name,
+               lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV8, get_name(this),
                                                (aead_constructor_t)ccm_aead_create);
-               lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV12, plugin_name,
+               lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV12, get_name(this),
                                                (aead_constructor_t)ccm_aead_create);
-               lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV16, plugin_name,
+               lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV16, get_name(this),
                                                (aead_constructor_t)ccm_aead_create);
        }
        crypter = lib->crypto->create_crypter(lib->crypto, ENCR_CAMELLIA_CBC, 0);
        if (crypter)
        {
                crypter->destroy(crypter);
-               lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV8, plugin_name,
+               lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV8, get_name(this),
                                                (aead_constructor_t)ccm_aead_create);
-               lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV12, plugin_name,
+               lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV12, get_name(this),
                                                (aead_constructor_t)ccm_aead_create);
-               lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV16, plugin_name,
+               lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV16, get_name(this),
                                                (aead_constructor_t)ccm_aead_create);
        }
 
index 1c3f0c8..055ddf7 100644 (file)
@@ -36,6 +36,12 @@ struct private_constraints_plugin_t {
        constraints_validator_t *validator;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_constraints_plugin_t *this)
+{
+       return "constraints";
+}
+
 METHOD(plugin_t, destroy, void,
        private_constraints_plugin_t *this)
 {
@@ -54,6 +60,7 @@ plugin_t *constraints_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 9f1bf95..b55a165 100644 (file)
@@ -19,8 +19,6 @@
 
 #include "ctr_ipsec_crypter.h"
 
-static const char *plugin_name = "ctr";
-
 typedef struct private_ctr_plugin_t private_ctr_plugin_t;
 
 /**
@@ -34,6 +32,12 @@ struct private_ctr_plugin_t {
        ctr_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_ctr_plugin_t *this)
+{
+       return "ctr";
+}
+
 METHOD(plugin_t, destroy, void,
        private_ctr_plugin_t *this)
 {
@@ -54,6 +58,7 @@ plugin_t *ctr_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
@@ -63,14 +68,14 @@ plugin_t *ctr_plugin_create()
        if (crypter)
        {
                crypter->destroy(crypter);
-               lib->crypto->add_crypter(lib->crypto, ENCR_AES_CTR, plugin_name,
+               lib->crypto->add_crypter(lib->crypto, ENCR_AES_CTR, get_name(this),
                                                (crypter_constructor_t)ctr_ipsec_crypter_create);
        }
        crypter = lib->crypto->create_crypter(lib->crypto, ENCR_CAMELLIA_CBC, 16);
        if (crypter)
        {
                crypter->destroy(crypter);
-               lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CTR, plugin_name,
+               lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CTR, get_name(this),
                                                (crypter_constructor_t)ctr_ipsec_crypter_create);
        }
        return &this->public.plugin;
index 387da03..fe68efd 100644 (file)
@@ -34,6 +34,12 @@ struct private_curl_plugin_t {
        curl_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_curl_plugin_t *this)
+{
+       return "curl";
+}
+
 METHOD(plugin_t, destroy, void,
        private_curl_plugin_t *this)
 {
@@ -54,6 +60,7 @@ plugin_t *curl_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index d420d78..49c4a3d 100644 (file)
@@ -18,8 +18,6 @@
 #include <library.h>
 #include "des_crypter.h"
 
-static const char *plugin_name = "des";
-
 typedef struct private_des_plugin_t private_des_plugin_t;
 
 /**
@@ -33,6 +31,12 @@ struct private_des_plugin_t {
        des_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_des_plugin_t *this)
+{
+       return "des";
+}
+
 METHOD(plugin_t, destroy, void,
        private_des_plugin_t *this)
 {
@@ -51,16 +55,17 @@ plugin_t *des_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       lib->crypto->add_crypter(lib->crypto, ENCR_3DES, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_3DES, get_name(this),
                                                         (crypter_constructor_t)des_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_DES, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_DES, get_name(this),
                                                         (crypter_constructor_t)des_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_DES_ECB, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_DES_ECB, get_name(this),
                                                         (crypter_constructor_t)des_crypter_create);
 
        return &this->public.plugin;
index d11b149..112bf68 100644 (file)
@@ -31,6 +31,12 @@ struct private_dnskey_plugin_t {
        dnskey_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_dnskey_plugin_t *this)
+{
+       return "dnskey";
+}
+
 METHOD(plugin_t, destroy, void,
        private_dnskey_plugin_t *this)
 {
@@ -49,6 +55,7 @@ plugin_t *dnskey_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 3cce6ad..de232fd 100644 (file)
@@ -18,8 +18,6 @@
 #include <library.h>
 #include "fips_prf.h"
 
-static const char *plugin_name = "fips-prf";
-
 typedef struct private_fips_prf_plugin_t private_fips_prf_plugin_t;
 
 /**
@@ -33,6 +31,12 @@ struct private_fips_prf_plugin_t {
        fips_prf_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_fips_prf_plugin_t *this)
+{
+       return "fips-prf";
+}
+
 METHOD(plugin_t, destroy, void,
        private_fips_prf_plugin_t *this)
 {
@@ -52,6 +56,7 @@ plugin_t *fips_prf_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
@@ -61,7 +66,7 @@ plugin_t *fips_prf_plugin_create()
        if (prf)
        {
                prf->destroy(prf);
-               lib->crypto->add_prf(lib->crypto, PRF_FIPS_SHA1_160, plugin_name,
+               lib->crypto->add_prf(lib->crypto, PRF_FIPS_SHA1_160, get_name(this),
                                                         (prf_constructor_t)fips_prf_create);
        }
 
index a438fb0..c86ea1f 100644 (file)
@@ -19,8 +19,6 @@
 
 #include "gcm_aead.h"
 
-static const char *plugin_name = "gcm";
-
 typedef struct private_gcm_plugin_t private_gcm_plugin_t;
 
 /**
@@ -34,6 +32,12 @@ struct private_gcm_plugin_t {
        gcm_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_gcm_plugin_t *this)
+{
+       return "gcm";
+}
+
 METHOD(plugin_t, destroy, void,
        private_gcm_plugin_t *this)
 {
@@ -52,18 +56,23 @@ plugin_t *gcm_plugin_create()
        crypter_t *crypter;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .get_name = _get_name,
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        crypter = lib->crypto->create_crypter(lib->crypto, ENCR_AES_CBC, 0);
        if (crypter)
        {
                crypter->destroy(crypter);
-               lib->crypto->add_aead(lib->crypto, ENCR_AES_GCM_ICV8, plugin_name,
+               lib->crypto->add_aead(lib->crypto, ENCR_AES_GCM_ICV8, get_name(this),
                                                (aead_constructor_t)gcm_aead_create);
-               lib->crypto->add_aead(lib->crypto, ENCR_AES_GCM_ICV12, plugin_name,
+               lib->crypto->add_aead(lib->crypto, ENCR_AES_GCM_ICV12, get_name(this),
                                                (aead_constructor_t)gcm_aead_create);
-               lib->crypto->add_aead(lib->crypto, ENCR_AES_GCM_ICV16, plugin_name,
+               lib->crypto->add_aead(lib->crypto, ENCR_AES_GCM_ICV16, get_name(this),
                                                (aead_constructor_t)gcm_aead_create);
        }
 
index a53fed4..b6a1991 100644 (file)
@@ -29,8 +29,6 @@
 #include <errno.h>
 #include <gcrypt.h>
 
-static const char *plugin_name = "gcrypt";
-
 typedef struct private_gcrypt_plugin_t private_gcrypt_plugin_t;
 
 /**
@@ -95,6 +93,12 @@ static struct gcry_thread_cbs thread_functions = {
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_gcrypt_plugin_t *this)
+{
+       return "gcrypt";
+}
+
 METHOD(plugin_t, destroy, void,
        private_gcrypt_plugin_t *this)
 {
@@ -144,85 +148,86 @@ plugin_t *gcrypt_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
        /* hashers */
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA1, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA1, get_name(this),
                                        (hasher_constructor_t)gcrypt_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_MD4, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_MD4, get_name(this),
                                        (hasher_constructor_t)gcrypt_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_MD5, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_MD5, get_name(this),
                                        (hasher_constructor_t)gcrypt_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA224, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA224, get_name(this),
                                        (hasher_constructor_t)gcrypt_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA256, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA256, get_name(this),
                                        (hasher_constructor_t)gcrypt_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA384, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA384, get_name(this),
                                        (hasher_constructor_t)gcrypt_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA512, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA512, get_name(this),
                                        (hasher_constructor_t)gcrypt_hasher_create);
 
        /* crypters */
-       lib->crypto->add_crypter(lib->crypto, ENCR_3DES, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_3DES, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_CAST, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_CAST, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_DES, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_DES, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_DES_ECB, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_DES_ECB, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_AES_CTR, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_AES_CTR, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
 #ifdef HAVE_GCRY_CIPHER_CAMELLIA
-       lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CBC, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CBC, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CTR, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CTR, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
 #endif /* HAVE_GCRY_CIPHER_CAMELLIA */
-       lib->crypto->add_crypter(lib->crypto, ENCR_SERPENT_CBC, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_SERPENT_CBC, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_TWOFISH_CBC, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_TWOFISH_CBC, get_name(this),
                                        (crypter_constructor_t)gcrypt_crypter_create);
 
        /* random numbers */
-       lib->crypto->add_rng(lib->crypto, RNG_WEAK, plugin_name,
+       lib->crypto->add_rng(lib->crypto, RNG_WEAK, get_name(this),
                                                 (rng_constructor_t)gcrypt_rng_create);
-       lib->crypto->add_rng(lib->crypto, RNG_STRONG, plugin_name,
+       lib->crypto->add_rng(lib->crypto, RNG_STRONG, get_name(this),
                                                 (rng_constructor_t)gcrypt_rng_create);
-       lib->crypto->add_rng(lib->crypto, RNG_TRUE, plugin_name,
+       lib->crypto->add_rng(lib->crypto, RNG_TRUE, get_name(this),
                                                 (rng_constructor_t)gcrypt_rng_create);
 
        /* diffie hellman groups, using modp */
-       lib->crypto->add_dh(lib->crypto, MODP_2048_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_2048_BIT, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_2048_224, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_2048_224, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_2048_256, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_2048_256, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_1536_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_1536_BIT, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_3072_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_3072_BIT, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_4096_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_4096_BIT, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_6144_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_6144_BIT, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_8192_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_8192_BIT, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_1024_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_1024_BIT, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_1024_160, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_1024_160, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_768_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_768_BIT, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create);
-       lib->crypto->add_dh(lib->crypto, MODP_CUSTOM, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_CUSTOM, get_name(this),
                                        (dh_constructor_t)gcrypt_dh_create_custom);
 
        /* RSA */
index e9bfbcc..8ac4e87 100644 (file)
@@ -20,8 +20,6 @@
 #include "gmp_rsa_private_key.h"
 #include "gmp_rsa_public_key.h"
 
-static const char *plugin_name = "gmp";
-
 typedef struct private_gmp_plugin_t private_gmp_plugin_t;
 
 /**
@@ -35,6 +33,12 @@ struct private_gmp_plugin_t {
        gmp_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_gmp_plugin_t *this)
+{
+       return "gmp";
+}
+
 METHOD(plugin_t, destroy, void,
        private_gmp_plugin_t *this)
 {
@@ -61,35 +65,36 @@ plugin_t *gmp_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       lib->crypto->add_dh(lib->crypto, MODP_2048_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_2048_BIT, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_2048_224, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_2048_224, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_2048_256, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_2048_256, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_1536_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_1536_BIT, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_3072_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_3072_BIT, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_4096_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_4096_BIT, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_6144_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_6144_BIT, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_8192_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_8192_BIT, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_1024_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_1024_BIT, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_1024_160, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_1024_160, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_768_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_768_BIT, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create);
 
-       lib->crypto->add_dh(lib->crypto, MODP_CUSTOM, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_CUSTOM, get_name(this),
                                                (dh_constructor_t)gmp_diffie_hellman_create_custom);
 
        lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, FALSE,
index 76d6157..0ac1fb9 100644 (file)
@@ -19,8 +19,6 @@
 #include "hmac_signer.h"
 #include "hmac_prf.h"
 
-static const char *plugin_name = "hmac";
-
 typedef struct private_hmac_plugin_t private_hmac_plugin_t;
 
 /**
@@ -34,6 +32,12 @@ struct private_hmac_plugin_t {
        hmac_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_hmac_plugin_t *this)
+{
+       return "hmac";
+}
+
 METHOD(plugin_t, destroy, void,
        private_hmac_plugin_t *this)
 {
@@ -55,6 +59,7 @@ plugin_t *hmac_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
@@ -64,24 +69,24 @@ plugin_t *hmac_plugin_create()
        if (hasher)
        {
                hasher->destroy(hasher);
-               lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA1, plugin_name,
+               lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA1, get_name(this),
                                                (prf_constructor_t)hmac_prf_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_96, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_96, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_128, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_128, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_160, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_160, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
        }
        hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA256);
        if (hasher)
        {
                hasher->destroy(hasher);
-               lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_256, plugin_name,
+               lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_256, get_name(this),
                                                (prf_constructor_t)hmac_prf_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_256_128, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_256_128, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_256_256, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_256_256, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
 
        }
@@ -89,31 +94,31 @@ plugin_t *hmac_plugin_create()
        if (hasher)
        {
                hasher->destroy(hasher);
-               lib->crypto->add_prf(lib->crypto, PRF_HMAC_MD5, plugin_name,
+               lib->crypto->add_prf(lib->crypto, PRF_HMAC_MD5, get_name(this),
                                                (prf_constructor_t)hmac_prf_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_96, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_96, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_128, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_128, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
        }
        hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA384);
        if (hasher)
        {
                hasher->destroy(hasher);
-               lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_384, plugin_name,
+               lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_384, get_name(this),
                                                (prf_constructor_t)hmac_prf_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_384_192, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_384_192, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_384_384, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_384_384, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
        }
        hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA512);
        if (hasher)
        {
                hasher->destroy(hasher);
-               lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_512, plugin_name,
+               lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_512, get_name(this),
                                                (prf_constructor_t)hmac_prf_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_512_256, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_512_256, get_name(this),
                                                (signer_constructor_t)hmac_signer_create);
        }
 
index 3682ddd..f8ab080 100644 (file)
@@ -31,6 +31,12 @@ struct private_ldap_plugin_t {
        ldap_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_ldap_plugin_t *this)
+{
+       return "ldap";
+}
+
 METHOD(plugin_t, destroy, void,
        private_ldap_plugin_t *this)
 {
@@ -49,6 +55,7 @@ plugin_t *ldap_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index cea1a61..20dd9b8 100644 (file)
@@ -18,8 +18,6 @@
 #include <library.h>
 #include "md4_hasher.h"
 
-static const char *plugin_name = "md4";
-
 typedef struct private_md4_plugin_t private_md4_plugin_t;
 
 /**
@@ -33,6 +31,12 @@ struct private_md4_plugin_t {
        md4_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_md4_plugin_t *this)
+{
+       return "md4";
+}
+
 METHOD(plugin_t, destroy, void,
        private_md4_plugin_t *this)
 {
@@ -51,12 +55,13 @@ plugin_t *md4_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       lib->crypto->add_hasher(lib->crypto, HASH_MD4, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_MD4, get_name(this),
                                                        (hasher_constructor_t)md4_hasher_create);
 
        return &this->public.plugin;
index d111738..8f5c78e 100644 (file)
@@ -18,8 +18,6 @@
 #include <library.h>
 #include "md5_hasher.h"
 
-static const char *plugin_name = "md5";
-
 typedef struct private_md5_plugin_t private_md5_plugin_t;
 
 /**
@@ -33,6 +31,12 @@ struct private_md5_plugin_t {
        md5_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_md5_plugin_t *this)
+{
+       return "md5";
+}
+
 METHOD(plugin_t, destroy, void,
        private_md5_plugin_t *this)
 {
@@ -51,12 +55,13 @@ plugin_t *md5_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       lib->crypto->add_hasher(lib->crypto, HASH_MD5, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_MD5, get_name(this),
                                                        (hasher_constructor_t)md5_hasher_create);
 
        return &this->public.plugin;
index 65d8681..6ed74e2 100644 (file)
@@ -32,6 +32,12 @@ struct private_mysql_plugin_t {
        mysql_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_mysql_plugin_t *this)
+{
+       return "mysql";
+}
+
 METHOD(plugin_t, destroy, void,
        private_mysql_plugin_t *this)
 {
@@ -57,6 +63,7 @@ plugin_t *mysql_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 0050572..f7804bb 100644 (file)
@@ -41,8 +41,6 @@
 #include "openssl_x509.h"
 #include "openssl_crl.h"
 
-static const char *plugin_name = "openssl";
-
 typedef struct private_openssl_plugin_t private_openssl_plugin_t;
 
 /**
@@ -195,6 +193,12 @@ static void threading_cleanup()
        mutex = NULL;
 }
 
+METHOD(plugin_t, get_name, char*,
+       private_openssl_plugin_t *this)
+{
+       return "openssl";
+}
+
 METHOD(plugin_t, destroy, void,
        private_openssl_plugin_t *this)
 {
@@ -250,6 +254,7 @@ plugin_t *openssl_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
@@ -274,85 +279,85 @@ plugin_t *openssl_plugin_create()
        }
 
        /* crypter */
-       lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CBC, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CBC, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_3DES, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_3DES, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_RC5, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_RC5, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_IDEA, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_IDEA, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_CAST, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_CAST, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_DES, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_DES, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_DES_ECB, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_DES_ECB, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
-       lib->crypto->add_crypter(lib->crypto, ENCR_NULL, plugin_name,
+       lib->crypto->add_crypter(lib->crypto, ENCR_NULL, get_name(this),
                                        (crypter_constructor_t)openssl_crypter_create);
 
        /* hasher */
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA1, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA1, get_name(this),
                                        (hasher_constructor_t)openssl_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_MD2, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_MD2, get_name(this),
                                        (hasher_constructor_t)openssl_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_MD4, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_MD4, get_name(this),
                                        (hasher_constructor_t)openssl_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_MD5, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_MD5, get_name(this),
                                        (hasher_constructor_t)openssl_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA224, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA224, get_name(this),
                                        (hasher_constructor_t)openssl_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA256, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA256, get_name(this),
                                        (hasher_constructor_t)openssl_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA384, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA384, get_name(this),
                                        (hasher_constructor_t)openssl_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA512, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA512, get_name(this),
                                        (hasher_constructor_t)openssl_hasher_create);
 
        /* prf */
-       lib->crypto->add_prf(lib->crypto, PRF_KEYED_SHA1, plugin_name,
+       lib->crypto->add_prf(lib->crypto, PRF_KEYED_SHA1, get_name(this),
                                        (prf_constructor_t)openssl_sha1_prf_create);
 
        /* (ec) diffie hellman */
-       lib->crypto->add_dh(lib->crypto, MODP_2048_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_2048_BIT, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_2048_224, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_2048_224, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_2048_256, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_2048_256, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_1536_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_1536_BIT, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
 #ifndef OPENSSL_NO_EC
-       lib->crypto->add_dh(lib->crypto, ECP_256_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, ECP_256_BIT, get_name(this),
                                                (dh_constructor_t)openssl_ec_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, ECP_384_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, ECP_384_BIT, get_name(this),
                                                (dh_constructor_t)openssl_ec_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, ECP_521_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, ECP_521_BIT, get_name(this),
                                                (dh_constructor_t)openssl_ec_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, ECP_224_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, ECP_224_BIT, get_name(this),
                                                (dh_constructor_t)openssl_ec_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, ECP_192_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, ECP_192_BIT, get_name(this),
                                                (dh_constructor_t)openssl_ec_diffie_hellman_create);
 #endif /* OPENSSL_NO_EC */
-       lib->crypto->add_dh(lib->crypto, MODP_3072_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_3072_BIT, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_4096_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_4096_BIT, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_6144_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_6144_BIT, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_8192_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_8192_BIT, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_1024_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_1024_BIT, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_1024_160, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_1024_160, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_768_BIT, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_768_BIT, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->add_dh(lib->crypto, MODP_CUSTOM, plugin_name,
+       lib->crypto->add_dh(lib->crypto, MODP_CUSTOM, get_name(this),
                                                (dh_constructor_t)openssl_diffie_hellman_create);
 
        /* rsa */
index 695823a..0bf03e1 100644 (file)
@@ -23,8 +23,6 @@
 #include <library.h>
 #include <debug.h>
 
-static const char *plugin_name = "padlock";
-
 typedef struct private_padlock_plugin_t private_padlock_plugin_t;
 typedef enum padlock_feature_t padlock_feature_t;
 
@@ -103,6 +101,12 @@ static padlock_feature_t get_padlock_features()
        return 0;
 }
 
+METHOD(plugin_t, get_name, char*,
+       private_padlock_plugin_t *this)
+{
+       return "padlock";
+}
+
 METHOD(plugin_t, destroy, void,
        private_padlock_plugin_t *this)
 {
@@ -138,6 +142,7 @@ plugin_t *padlock_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
@@ -163,21 +168,21 @@ plugin_t *padlock_plugin_create()
 
        if (this->features & PADLOCK_RNG_ENABLED)
        {
-               lib->crypto->add_rng(lib->crypto, RNG_TRUE, plugin_name,
+               lib->crypto->add_rng(lib->crypto, RNG_TRUE, get_name(this),
                                                (rng_constructor_t)padlock_rng_create);
-               lib->crypto->add_rng(lib->crypto, RNG_STRONG, plugin_name,
+               lib->crypto->add_rng(lib->crypto, RNG_STRONG, get_name(this),
                                                (rng_constructor_t)padlock_rng_create);
-               lib->crypto->add_rng(lib->crypto, RNG_WEAK, plugin_name,
+               lib->crypto->add_rng(lib->crypto, RNG_WEAK, get_name(this),
                                                (rng_constructor_t)padlock_rng_create);
        }
        if (this->features & PADLOCK_ACE2_ENABLED)
        {
-               lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, plugin_name,
+               lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, get_name(this),
                                                (crypter_constructor_t)padlock_aes_crypter_create);
        }
        if (this->features & PADLOCK_PHE_ENABLED)
        {
-               lib->crypto->add_hasher(lib->crypto, HASH_SHA1, plugin_name,
+               lib->crypto->add_hasher(lib->crypto, HASH_SHA1, get_name(this),
                                                (hasher_constructor_t)padlock_sha1_hasher_create);
        }
        return &this->public.plugin;
index f2415a3..32aeb23 100644 (file)
@@ -33,6 +33,12 @@ struct private_pem_plugin_t {
        pem_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_pem_plugin_t *this)
+{
+       return "pem";
+}
+
 METHOD(plugin_t, destroy, void,
        private_pem_plugin_t *this)
 {
@@ -55,6 +61,7 @@ plugin_t *pem_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index eaf0a10..160f0d7 100644 (file)
@@ -33,6 +33,12 @@ struct private_pgp_plugin_t {
        pgp_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_pgp_plugin_t *this)
+{
+       return "pgp";
+}
+
 METHOD(plugin_t, destroy, void,
        private_pgp_plugin_t *this)
 {
@@ -59,6 +65,7 @@ plugin_t *pgp_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 33732f8..e953b14 100644 (file)
@@ -32,6 +32,12 @@ struct private_pkcs1_plugin_t {
        pkcs1_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_pkcs1_plugin_t *this)
+{
+       return "pkcs1";
+}
+
 METHOD(plugin_t, destroy, void,
        private_pkcs1_plugin_t *this)
 {
@@ -55,6 +61,7 @@ plugin_t *pkcs1_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 071d2f7..cfa3bba 100644 (file)
@@ -26,8 +26,6 @@
 #include "pkcs11_public_key.h"
 #include "pkcs11_hasher.h"
 
-static const char *plugin_name = "pkcs11";
-
 typedef struct private_pkcs11_plugin_t private_pkcs11_plugin_t;
 
 /**
@@ -103,6 +101,12 @@ static void token_event_cb(private_pkcs11_plugin_t *this, pkcs11_library_t *p11,
        }
 }
 
+METHOD(plugin_t, get_name, char*,
+       private_pkcs11_plugin_t *this)
+{
+       return "pkcs11";
+}
+
 METHOD(plugin_t, destroy, void,
        private_pkcs11_plugin_t *this)
 {
@@ -136,6 +140,7 @@ plugin_t *pkcs11_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
@@ -148,17 +153,17 @@ plugin_t *pkcs11_plugin_create()
        if (lib->settings->get_bool(lib->settings,
                                                        "libstrongswan.plugins.pkcs11.use_hasher", FALSE))
        {
-               lib->crypto->add_hasher(lib->crypto, HASH_MD2, plugin_name,
+               lib->crypto->add_hasher(lib->crypto, HASH_MD2, get_name(this),
                                        (hasher_constructor_t)pkcs11_hasher_create);
-               lib->crypto->add_hasher(lib->crypto, HASH_MD5, plugin_name,
+               lib->crypto->add_hasher(lib->crypto, HASH_MD5, get_name(this),
                                        (hasher_constructor_t)pkcs11_hasher_create);
-               lib->crypto->add_hasher(lib->crypto, HASH_SHA1, plugin_name,
+               lib->crypto->add_hasher(lib->crypto, HASH_SHA1, get_name(this),
                                        (hasher_constructor_t)pkcs11_hasher_create);
-               lib->crypto->add_hasher(lib->crypto, HASH_SHA256, plugin_name,
+               lib->crypto->add_hasher(lib->crypto, HASH_SHA256, get_name(this),
                                        (hasher_constructor_t)pkcs11_hasher_create);
-               lib->crypto->add_hasher(lib->crypto, HASH_SHA384, plugin_name,
+               lib->crypto->add_hasher(lib->crypto, HASH_SHA384, get_name(this),
                                        (hasher_constructor_t)pkcs11_hasher_create);
-               lib->crypto->add_hasher(lib->crypto, HASH_SHA512, plugin_name,
+               lib->crypto->add_hasher(lib->crypto, HASH_SHA512, get_name(this),
                                        (hasher_constructor_t)pkcs11_hasher_create);
        }
 
index 6d8a370..7491160 100644 (file)
@@ -29,6 +29,13 @@ typedef struct plugin_t plugin_t;
 struct plugin_t {
 
        /**
+        * Get the name of the plugin.
+        *
+        * @return              plugin name
+        */
+       char* (*get_name)(plugin_t *this);
+
+       /**
         * Destroy a plugin instance.
         */
        void (*destroy)(plugin_t *this);
index 222ebb9..dafe647 100644 (file)
@@ -43,11 +43,6 @@ struct private_plugin_loader_t {
         * list of loaded plugins
         */
        linked_list_t *plugins;
-
-       /**
-        * names of loaded plugins
-        */
-       linked_list_t *names;
 };
 
 /**
@@ -151,12 +146,12 @@ static bool plugin_loaded(private_plugin_loader_t *this, char *name)
 {
        enumerator_t *enumerator;
        bool found = FALSE;
-       char *current;
+       plugin_t *plugin;
 
-       enumerator = this->names->create_enumerator(this->names);
-       while (enumerator->enumerate(enumerator, &current))
+       enumerator = this->plugins->create_enumerator(this->plugins);
+       while (enumerator->enumerate(enumerator, &plugin))
        {
-               if (streq(name, current))
+               if (streq(plugin->get_name(plugin), name))
                {
                        found = TRUE;
                        break;
@@ -201,7 +196,6 @@ METHOD(plugin_loader_t, load_plugins, bool,
                if (plugin)
                {
                        this->plugins->insert_last(this->plugins, plugin);
-                       this->names->insert_last(this->names, token);
                }
                else
                {
@@ -210,8 +204,8 @@ METHOD(plugin_loader_t, load_plugins, bool,
                                critical_failed = TRUE;
                                DBG1(DBG_LIB, "loading critical plugin '%s' failed", token);
                        }
-                       free(token);
                }
+               free(token);
        }
        enumerator->destroy(enumerator);
        return !critical_failed;
@@ -221,7 +215,6 @@ METHOD(plugin_loader_t, unload, void,
        private_plugin_loader_t *this)
 {
        plugin_t *plugin;
-       char *name;
 
        /* unload plugins in reverse order */
        while (this->plugins->remove_last(this->plugins,
@@ -229,23 +222,18 @@ METHOD(plugin_loader_t, unload, void,
        {
                plugin->destroy(plugin);
        }
-       while (this->names->remove_last(this->names, (void**)&name) == SUCCESS)
-       {
-               free(name);
-       }
 }
 
 METHOD(plugin_loader_t, create_plugin_enumerator, enumerator_t*,
        private_plugin_loader_t *this)
 {
-       return this->names->create_enumerator(this->names);
+       return this->plugins->create_enumerator(this->plugins);
 }
 
 METHOD(plugin_loader_t, destroy, void,
        private_plugin_loader_t *this)
 {
        this->plugins->destroy_offset(this->plugins, offsetof(plugin_t, destroy));
-       this->names->destroy_function(this->names, free);
        free(this);
 }
 
@@ -264,7 +252,6 @@ plugin_loader_t *plugin_loader_create()
                        .destroy = _destroy,
                },
                .plugins = linked_list_create(),
-               .names = linked_list_create(),
        );
 
        return &this->public;
index f72c91c..417b6fe 100644 (file)
@@ -49,9 +49,9 @@ struct plugin_loader_t {
        void (*unload)(plugin_loader_t *this);
 
        /**
-        * Create an enumerator over all loaded plugin names.
+        * Create an enumerator over all loaded plugins.
         *
-        * @return                              enumerator over char*
+        * @return                              enumerator over plugin_t*
         */
        enumerator_t* (*create_plugin_enumerator)(plugin_loader_t *this);
 
index cc12217..68c14a0 100644 (file)
@@ -31,6 +31,12 @@ struct private_pubkey_plugin_t {
        pubkey_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_pubkey_plugin_t *this)
+{
+       return "pubkey";
+}
+
 METHOD(plugin_t, destroy, void,
        private_pubkey_plugin_t *this)
 {
@@ -49,6 +55,7 @@ plugin_t *pubkey_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index cc5cb0a..764ac1b 100644 (file)
@@ -18,8 +18,6 @@
 #include <library.h>
 #include "random_rng.h"
 
-static const char *plugin_name = "random";
-
 typedef struct private_random_plugin_t private_random_plugin_t;
 
 /**
@@ -33,6 +31,12 @@ struct private_random_plugin_t {
        random_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_random_plugin_t *this)
+{
+       return "random";
+}
+
 METHOD(plugin_t, destroy, void,
        private_random_plugin_t *this)
 {
@@ -51,14 +55,15 @@ plugin_t *random_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       lib->crypto->add_rng(lib->crypto, RNG_STRONG, plugin_name,
+       lib->crypto->add_rng(lib->crypto, RNG_STRONG, get_name(this),
                                                 (rng_constructor_t)random_rng_create);
-       lib->crypto->add_rng(lib->crypto, RNG_TRUE, plugin_name,
+       lib->crypto->add_rng(lib->crypto, RNG_TRUE, get_name(this),
                                                 (rng_constructor_t)random_rng_create);
 
        return &this->public.plugin;
index 02393b9..3c2560a 100644 (file)
@@ -36,6 +36,12 @@ struct private_revocation_plugin_t {
        revocation_validator_t *validator;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_revocation_plugin_t *this)
+{
+       return "revocation";
+}
+
 METHOD(plugin_t, destroy, void,
        private_revocation_plugin_t *this)
 {
@@ -54,6 +60,7 @@ plugin_t *revocation_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index dda2cbc..c7e6be7 100644 (file)
@@ -19,8 +19,6 @@
 #include "sha1_hasher.h"
 #include "sha1_prf.h"
 
-static const char *plugin_name = "sha1";
-
 typedef struct private_sha1_plugin_t private_sha1_plugin_t;
 
 /**
@@ -34,6 +32,12 @@ struct private_sha1_plugin_t {
        sha1_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_sha1_plugin_t *this)
+{
+       return "sha1";
+}
+
 METHOD(plugin_t, destroy, void,
        private_sha1_plugin_t *this)
 {
@@ -54,14 +58,15 @@ plugin_t *sha1_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA1, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA1, get_name(this),
                                                        (hasher_constructor_t)sha1_hasher_create);
-       lib->crypto->add_prf(lib->crypto, PRF_KEYED_SHA1, plugin_name,
+       lib->crypto->add_prf(lib->crypto, PRF_KEYED_SHA1, get_name(this),
                                                        (prf_constructor_t)sha1_prf_create);
 
        return &this->public.plugin;
index a5937db..42a2131 100644 (file)
@@ -18,8 +18,6 @@
 #include <library.h>
 #include "sha2_hasher.h"
 
-static const char *plugin_name = "sha2";
-
 typedef struct private_sha2_plugin_t private_sha2_plugin_t;
 
 /**
@@ -33,6 +31,12 @@ struct private_sha2_plugin_t {
        sha2_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_sha2_plugin_t *this)
+{
+       return "sha2";
+}
+
 METHOD(plugin_t, destroy, void,
        private_sha2_plugin_t *this)
 {
@@ -51,18 +55,19 @@ plugin_t *sha2_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
        );
 
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA224, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA224, get_name(this),
                                                        (hasher_constructor_t)sha2_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA256, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA256, get_name(this),
                                                        (hasher_constructor_t)sha2_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA384, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA384, get_name(this),
                                                        (hasher_constructor_t)sha2_hasher_create);
-       lib->crypto->add_hasher(lib->crypto, HASH_SHA512, plugin_name,
+       lib->crypto->add_hasher(lib->crypto, HASH_SHA512, get_name(this),
                                                        (hasher_constructor_t)sha2_hasher_create);
 
        return &this->public.plugin;
index 970e324..911fbd4 100644 (file)
@@ -34,6 +34,12 @@ struct private_soup_plugin_t {
        soup_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_soup_plugin_t *this)
+{
+       return "soup";
+}
+
 METHOD(plugin_t, destroy, void,
        private_soup_plugin_t *this)
 {
@@ -58,6 +64,7 @@ plugin_t *soup_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index e0b8e6c..059f1c4 100644 (file)
@@ -31,6 +31,12 @@ struct private_sqlite_plugin_t {
        sqlite_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_sqlite_plugin_t *this)
+{
+       return "sqlite";
+}
+
 METHOD(plugin_t, destroy, void,
        private_sqlite_plugin_t *this)
 {
@@ -49,6 +55,7 @@ plugin_t *sqlite_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 176bc43..b2419df 100644 (file)
@@ -104,6 +104,12 @@ struct private_test_vectors_plugin_t {
        test_vectors_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_test_vectors_plugin_t *this)
+{
+       return "test-vectors";
+}
+
 METHOD(plugin_t, destroy, void,
        private_test_vectors_plugin_t *this)
 {
@@ -121,6 +127,7 @@ plugin_t *test_vectors_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index d40cc35..1aefda0 100644 (file)
@@ -36,6 +36,12 @@ struct private_x509_plugin_t {
        x509_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_x509_plugin_t *this)
+{
+       return "x509";
+}
+
 METHOD(plugin_t, destroy, void,
        private_x509_plugin_t *this)
 {
@@ -72,6 +78,7 @@ plugin_t *x509_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
index 65e8833..1026be8 100644 (file)
@@ -19,8 +19,6 @@
 #include "xcbc_signer.h"
 #include "xcbc_prf.h"
 
-static const char *plugin_name = "xcbc";
-
 typedef struct private_xcbc_plugin_t private_xcbc_plugin_t;
 
 /**
@@ -34,6 +32,12 @@ struct private_xcbc_plugin_t {
        xcbc_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+       private_xcbc_plugin_t *this)
+{
+       return "xcbc";
+}
+
 METHOD(plugin_t, destroy, void,
        private_xcbc_plugin_t *this)
 {
@@ -55,6 +59,7 @@ plugin_t *xcbc_plugin_create()
        INIT(this,
                .public = {
                        .plugin = {
+                               .get_name = _get_name,
                                .destroy = _destroy,
                        },
                },
@@ -64,18 +69,18 @@ plugin_t *xcbc_plugin_create()
        if (crypter)
        {
                crypter->destroy(crypter);
-               lib->crypto->add_prf(lib->crypto, PRF_AES128_XCBC, plugin_name,
+               lib->crypto->add_prf(lib->crypto, PRF_AES128_XCBC, get_name(this),
                                                (prf_constructor_t)xcbc_prf_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_AES_XCBC_96, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_AES_XCBC_96, get_name(this),
                                                (signer_constructor_t)xcbc_signer_create);
        }
        crypter = lib->crypto->create_crypter(lib->crypto, ENCR_CAMELLIA_CBC, 16);
        if (crypter)
        {
                crypter->destroy(crypter);
-               lib->crypto->add_prf(lib->crypto, PRF_CAMELLIA128_XCBC, plugin_name,
+               lib->crypto->add_prf(lib->crypto, PRF_CAMELLIA128_XCBC, get_name(this),
                                                (prf_constructor_t)xcbc_prf_create);
-               lib->crypto->add_signer(lib->crypto, AUTH_CAMELLIA_XCBC_96, plugin_name,
+               lib->crypto->add_signer(lib->crypto, AUTH_CAMELLIA_XCBC_96, get_name(this),
                                                (signer_constructor_t)xcbc_signer_create);
        }
        return &this->public.plugin;
index ee33172..c5f1776 100644 (file)
@@ -834,7 +834,8 @@ DBG_dump(const char *label, const void *p, size_t len)
 
 static void show_loaded_plugins()
 {
-       char buf[BUF_LEN], *plugin;
+       char buf[BUF_LEN];
+       plugin_t *plugin;
        int len = 0;
        enumerator_t *enumerator;
 
@@ -842,7 +843,7 @@ static void show_loaded_plugins()
        enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
        while (len < BUF_LEN && enumerator->enumerate(enumerator, &plugin))
        {
-               len += snprintf(&buf[len], BUF_LEN-len, "%s ", plugin);
+               len += snprintf(&buf[len], BUF_LEN-len, "%s ", plugin->get_name(plugin));
        }
        enumerator->destroy(enumerator);
        whack_log(RC_COMMENT, "loaded plugins: %s", buf);
index 8414649..2ee54ec 100644 (file)
 #include "xauth_default_provider.h"
 #include "xauth_default_verifier.h"
 
+METHOD(plugin_t, get_name, char*,
+       xauth_plugin_t *this)
+{
+       return "xauth";
+}
+
 METHOD(plugin_t, destroy, void,
        xauth_plugin_t *this)
 {
@@ -34,6 +40,7 @@ plugin_t *xauth_plugin_create()
 
        INIT(this,
                .plugin = {
+                       .get_name = _get_name,
                        .destroy = _destroy,
                },
        );
index 627176c..309bde6 100644 (file)
@@ -239,7 +239,8 @@ options_t *options;
  */
 static void print_plugins()
 {
-       char buf[BUF_LEN], *plugin;
+       char buf[BUF_LEN];
+       plugin_t *plugin;
        int len = 0;
        enumerator_t *enumerator;
 
@@ -247,7 +248,7 @@ static void print_plugins()
        enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
        while (len < BUF_LEN && enumerator->enumerate(enumerator, &plugin))
        {
-               len += snprintf(&buf[len], BUF_LEN-len, "%s ", plugin);
+               len += snprintf(&buf[len], BUF_LEN-len, "%s ", plugin->get_name(plugin));
        }
        enumerator->destroy(enumerator);
        DBG1(DBG_DMN, "loaded plugins: %s", buf);
index 448854a..887b417 100644 (file)
@@ -279,14 +279,15 @@ usage(const char *message)
  */
 static void print_plugins()
 {
-       char buf[BUF_LEN], *plugin;
+       char buf[BUF_LEN];
+       plugin_t *plugin;
        int len = 0;
        enumerator_t *enumerator;
 
        enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
        while (len < BUF_LEN && enumerator->enumerate(enumerator, &plugin))
        {
-               len += snprintf(&buf[len], BUF_LEN-len, "%s ", plugin);
+               len += snprintf(&buf[len], BUF_LEN-len, "%s ", plugin->get_name(plugin));
        }
        enumerator->destroy(enumerator);
        DBG1(DBG_LIB, "  loaded plugins: %s", buf);