diff options
| author | Martin Willi <martin@strongswan.org> | 2009-09-09 16:21:21 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-09-10 16:20:19 +0200 |
| commit | 30c06407c6d7319a5c4a02ce4ad510ce5e393084 (patch) | |
| tree | 7328d2470ec255379badfee4e0d955c30d501f55 /src/libstrongswan/plugins/openssl/openssl_plugin.c | |
| parent | 1086d00e41108c7c3287af796d04c3fa0a436e33 (diff) | |
| download | strongswan-30c06407c6d7319a5c4a02ce4ad510ce5e393084.tar.bz2 strongswan-30c06407c6d7319a5c4a02ce4ad510ce5e393084.tar.xz | |
Updated openssl plugin to the new builder API
Diffstat (limited to 'src/libstrongswan/plugins/openssl/openssl_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_plugin.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c index 1cc6f7ce6..a6089c839 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c @@ -175,13 +175,19 @@ static void destroy(private_openssl_plugin_t *this) lib->crypto->remove_dh(lib->crypto, (dh_constructor_t)openssl_ec_diffie_hellman_create); lib->creds->remove_builder(lib->creds, - (builder_constructor_t)openssl_rsa_private_key_builder); + (builder_function_t)openssl_rsa_private_key_load); lib->creds->remove_builder(lib->creds, - (builder_constructor_t)openssl_rsa_public_key_builder); + (builder_function_t)openssl_rsa_private_key_gen); lib->creds->remove_builder(lib->creds, - (builder_constructor_t)openssl_ec_private_key_builder); + (builder_function_t)openssl_rsa_private_key_connect); lib->creds->remove_builder(lib->creds, - (builder_constructor_t)openssl_ec_public_key_builder); + (builder_function_t)openssl_rsa_public_key_load); + lib->creds->remove_builder(lib->creds, + (builder_function_t)openssl_ec_private_key_load); + lib->creds->remove_builder(lib->creds, + (builder_function_t)openssl_ec_private_key_gen); + lib->creds->remove_builder(lib->creds, + (builder_function_t)openssl_ec_public_key_load); ENGINE_cleanup(); EVP_cleanup(); @@ -282,15 +288,22 @@ plugin_t *plugin_create() /* rsa */ lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, - (builder_constructor_t)openssl_rsa_private_key_builder); + (builder_function_t)openssl_rsa_private_key_load); + lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, + (builder_function_t)openssl_rsa_private_key_gen); + lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, + (builder_function_t)openssl_rsa_private_key_connect); lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_RSA, - (builder_constructor_t)openssl_rsa_public_key_builder); + (builder_function_t)openssl_rsa_public_key_load); /* ec */ lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ECDSA, - (builder_constructor_t)openssl_ec_private_key_builder); + (builder_function_t)openssl_ec_private_key_load); + lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ECDSA, + (builder_function_t)openssl_ec_private_key_gen); lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_ECDSA, - (builder_constructor_t)openssl_ec_public_key_builder); + (builder_function_t)openssl_ec_public_key_load); return &this->public.plugin; } + |