diff options
Diffstat (limited to 'src/libstrongswan')
5 files changed, 19 insertions, 22 deletions
diff --git a/src/libstrongswan/credentials/certificates/certificate.c b/src/libstrongswan/credentials/certificates/certificate.c index 041e2f1db..24e2d265b 100644 --- a/src/libstrongswan/credentials/certificates/certificate.c +++ b/src/libstrongswan/credentials/certificates/certificate.c @@ -17,7 +17,7 @@ #include <credentials/certificates/x509.h> -ENUM(certificate_type_names, CERT_ANY, CERT_PGP, +ENUM(certificate_type_names, CERT_ANY, CERT_PLUTO_CRL, "ANY", "X509", "X509_CRL", @@ -27,6 +27,9 @@ ENUM(certificate_type_names, CERT_ANY, CERT_PGP, "X509_CHAIN", "TRUSTED_PUBKEY", "PGP", + "PLUTO_CERT", + "PLUTO_AC", + "PLUTO_CRL", ); ENUM(cert_validation_names, VALIDATION_GOOD, VALIDATION_REVOKED, diff --git a/src/libstrongswan/credentials/certificates/certificate.h b/src/libstrongswan/credentials/certificates/certificate.h index 81fce5508..ef26a437a 100644 --- a/src/libstrongswan/credentials/certificates/certificate.h +++ b/src/libstrongswan/credentials/certificates/certificate.h @@ -48,7 +48,13 @@ enum certificate_type_t { /** trusted, preinstalled public key */ CERT_TRUSTED_PUBKEY, /** PGP certificate */ - CERT_PGP, + CERT_GPG, + /** Pluto cert_t (not a certificate_t), either x509 or PGP */ + CERT_PLUTO_CERT, + /** Pluto x509acert_t (not a certificate_t), attribute certificate */ + CERT_PLUTO_AC, + /** Pluto x509crl_t (not a certificate_t), certificate revocation list */ + CERT_PLUTO_CRL, }; /** diff --git a/src/libstrongswan/credentials/credential_factory.h b/src/libstrongswan/credentials/credential_factory.h index bf1d83e59..69a55cf36 100644 --- a/src/libstrongswan/credentials/credential_factory.h +++ b/src/libstrongswan/credentials/credential_factory.h @@ -36,8 +36,6 @@ enum credential_type_t { CRED_PUBLIC_KEY, /** certificates, implemented in certificate_t */ CRED_CERTIFICATE, - /** deprecated pluto style certificates */ - CRED_PLUTO_CERT, }; /** 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; } |