diff options
Diffstat (limited to 'src/libstrongswan/plugins/pem')
| -rw-r--r-- | src/libstrongswan/plugins/pem/pem_builder.c | 8 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/pem/pem_plugin.c | 18 |
2 files changed, 8 insertions, 18 deletions
diff --git a/src/libstrongswan/plugins/pem/pem_builder.c b/src/libstrongswan/plugins/pem/pem_builder.c index 4d8a32a07..72cc8a301 100644 --- a/src/libstrongswan/plugins/pem/pem_builder.c +++ b/src/libstrongswan/plugins/pem/pem_builder.c @@ -561,11 +561,3 @@ builder_t *certificate_pem_builder(certificate_type_t type) return pem_builder(CRED_CERTIFICATE, type); } -/** - * Pluto specific cert builder. - */ -builder_t *pluto_pem_builder(certificate_type_t type) -{ - return pem_builder(CRED_PLUTO_CERT, type); -} - diff --git a/src/libstrongswan/plugins/pem/pem_plugin.c b/src/libstrongswan/plugins/pem/pem_plugin.c index 7d82ae38c..5289361f2 100644 --- a/src/libstrongswan/plugins/pem/pem_plugin.c +++ b/src/libstrongswan/plugins/pem/pem_plugin.c @@ -42,8 +42,6 @@ static void destroy(private_pem_plugin_t *this) (builder_constructor_t)public_key_pem_builder); lib->creds->remove_builder(lib->creds, (builder_constructor_t)certificate_pem_builder); - lib->creds->remove_builder(lib->creds, - (builder_constructor_t)pluto_pem_builder); free(this); } @@ -91,16 +89,16 @@ plugin_t *plugin_create() (builder_constructor_t)certificate_pem_builder); lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_TRUSTED_PUBKEY, (builder_constructor_t)certificate_pem_builder); - lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_PGP, + lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_GPG, (builder_constructor_t)certificate_pem_builder); - /* pluto specific credentials formats */ - lib->creds->add_builder(lib->creds, CRED_PLUTO_CERT, 0, - (builder_constructor_t)pluto_cert_pem_builder); - lib->creds->add_builder(lib->creds, CRED_PLUTO_CRL, 0, - (builder_constructor_t)pluto_crl_pem_builder); - lib->creds->add_builder(lib->creds, CRED_PLUTO_AC, 0, - (builder_constructor_t)pluto_ac_pem_builder); + /* register pluto specific certificate formats */ + lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_PLUTO_CERT, + (builder_constructor_t)certificate_pem_builder); + lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_PLUTO_AC, + (builder_constructor_t)certificate_pem_builder); + lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_PLUTO_CRL, + (builder_constructor_t)certificate_pem_builder); return &this->public.plugin; } |