diff options
Diffstat (limited to 'src/libstrongswan/credentials')
| -rw-r--r-- | src/libstrongswan/credentials/certificates/certificate.c | 5 | ||||
| -rw-r--r-- | src/libstrongswan/credentials/certificates/certificate.h | 8 | ||||
| -rw-r--r-- | src/libstrongswan/credentials/credential_factory.h | 2 |
3 files changed, 11 insertions, 4 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, }; /** |