Remove pluto specific certificate types
authorTobias Brunner <tobias@strongswan.org>
Fri, 12 Apr 2013 16:41:26 +0000 (18:41 +0200)
committerTobias Brunner <tobias@strongswan.org>
Wed, 8 May 2013 13:02:40 +0000 (15:02 +0200)
src/libstrongswan/credentials/certificates/certificate.c
src/libstrongswan/credentials/certificates/certificate.h
src/libstrongswan/plugins/pem/pem_plugin.c

index bc4209c..b281c16 100644 (file)
@@ -18,7 +18,7 @@
 #include <utils/debug.h>
 #include <credentials/certificates/x509.h>
 
-ENUM(certificate_type_names, CERT_ANY, CERT_PLUTO_CRL,
+ENUM(certificate_type_names, CERT_ANY, CERT_GPG,
        "ANY",
        "X509",
        "X509_CRL",
@@ -28,9 +28,6 @@ ENUM(certificate_type_names, CERT_ANY, CERT_PLUTO_CRL,
        "TRUSTED_PUBKEY",
        "PKCS10_REQUEST",
        "PGP",
-       "PLUTO_CERT",
-       "PLUTO_AC",
-       "PLUTO_CRL",
 );
 
 ENUM(cert_validation_names, VALIDATION_GOOD, VALIDATION_REVOKED,
index b7a88ff..d59126b 100644 (file)
@@ -52,10 +52,6 @@ enum certificate_type_t {
        CERT_PKCS10_REQUEST,
        /** PGP certificate */
        CERT_GPG,
-       /** Pluto cert_t (not a certificate_t), either x509 or PGP */
-       CERT_PLUTO_CERT,
-       /** Pluto x509crl_t (not a certificate_t), certificate revocation list */
-       CERT_PLUTO_CRL,
 };
 
 /**
index d74ab9e..9b0795f 100644 (file)
@@ -104,12 +104,6 @@ METHOD(plugin_t, get_features, int,
                PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
                        PLUGIN_PROVIDE(CERT_DECODE, CERT_GPG),
                                PLUGIN_DEPENDS(CERT_DECODE, CERT_GPG),
-
-               /* pluto specific certificate formats */
-               PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
-                       PLUGIN_PROVIDE(CERT_DECODE, CERT_PLUTO_CERT),
-               PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
-                       PLUGIN_PROVIDE(CERT_DECODE, CERT_PLUTO_CRL),
        };
        *features = f;
        return countof(f);