diff options
| author | Martin Willi <martin@strongswan.org> | 2009-08-13 15:05:14 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-08-26 11:23:49 +0200 |
| commit | cbb62e8f4c48c795a3cf63899048845ee3bfe75c (patch) | |
| tree | de9adde5bcfa691b214a5423b49141c6a60991bd /src/libstrongswan/plugins/pem/pem_plugin.c | |
| parent | f11a78f10a71756a48e318f00a0772f42226b1ef (diff) | |
| download | strongswan-cbb62e8f4c48c795a3cf63899048845ee3bfe75c.tar.bz2 strongswan-cbb62e8f4c48c795a3cf63899048845ee3bfe75c.tar.xz | |
handle pluto specific certificates under CRED_CERTIFICATE, not as own credential kind
Diffstat (limited to 'src/libstrongswan/plugins/pem/pem_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/pem/pem_plugin.c | 18 |
1 files changed, 8 insertions, 10 deletions
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; } |