handle pluto specific certificates under CRED_CERTIFICATE, not as own credential kind

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,

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,
 };
 
 /**

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,
 };
 
 /**