#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",
"X509_CHAIN",
"TRUSTED_PUBKEY",
"PGP",
+ "PLUTO_CERT",
+ "PLUTO_AC",
+ "PLUTO_CRL",
);
ENUM(cert_validation_names, VALIDATION_GOOD, VALIDATION_REVOKED,
/** 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,
};
/**
CRED_PUBLIC_KEY,
/** certificates, implemented in certificate_t */
CRED_CERTIFICATE,
- /** deprecated pluto style certificates */
- CRED_PLUTO_CERT,
};
/**
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);
-}
-
(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);
}
(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;
}
#include <asn1/asn1.h>
#include <asn1/asn1_parser.h>
#include <asn1/oid.h>
+#include <credentials/certificates/certificate.h>
#include "ac.h"
#include "x509.h"
{
x509acert_t *ac;
- ac = lib->creds->create(lib->creds, CRED_PLUTO_CERT, CRED_TYPE_AC,
- BUILD_FROM_FILE, filelist[n]->d_name, BUILD_END);
+ ac = lib->creds->create(lib->creds, CRED_CERTIFICATE,
+ CERT_PLUTO_AC, BUILD_FROM_FILE, filelist[n]->d_name,
+ BUILD_END);
if (ac)
{
add_acert(ac);
#include <freeswan.h>
-#include "library.h"
+#include <library.h>
+#include <credentials/certificates/certificate.h>
#include "constants.h"
#include "defs.h"
switch (subtype)
{
- case CRED_TYPE_CERTIFICATE:
+ case CERT_PLUTO_CERT:
this->public.add = (void(*)(builder_t *this, builder_part_t part, ...))cert_add;
break;
- case CRED_TYPE_AC:
+ case CERT_PLUTO_AC:
this->public.add = (void(*)(builder_t *this, builder_part_t part, ...))ac_add;
break;
- case CRED_TYPE_CRL:
+ case CERT_PLUTO_CRL:
this->public.add = (void(*)(builder_t *this, builder_part_t part, ...))crl_add;
break;
default:
void init_builder(void)
{
- lib->creds->add_builder(lib->creds, CRED_PLUTO_CERT, 0,
+ lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_PLUTO_CERT,
+ (builder_constructor_t)builder);
+ lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_PLUTO_AC,
+ (builder_constructor_t)builder);
+ lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_PLUTO_CRL,
(builder_constructor_t)builder);
}
#ifndef _BUILDER_H
#define _BUILDER_H
-/* types of pluto credentials */
-typedef enum {
- /* cert_t certificate, either x509 or PGP */
- CRED_TYPE_CERTIFICATE,
- /* x509crl_t certificate revocation list */
- CRED_TYPE_CRL,
- /* x509acert_t attribute certificate */
- CRED_TYPE_AC,
-} cred_type_t;
-
/* register credential builder hooks */
extern void init_builder();
/* unregister credential builder hooks */
#include "library.h"
#include "asn1/asn1.h"
+#include "credentials/certificates/certificate.h"
#include "constants.h"
#include "defs.h"
{
cert_t *cert;
- cert = lib->creds->create(lib->creds, CRED_PLUTO_CERT, CRED_TYPE_CERTIFICATE,
+ cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_PLUTO_CERT,
BUILD_FROM_FILE, filename, BUILD_END);
if (cert)
{
#include <asn1/asn1_parser.h>
#include <asn1/oid.h>
#include <crypto/hashers/hasher.h>
+#include <credentials/certificates/certificate.h>
#include "constants.h"
#include "defs.h"
char *filename = filelist[n]->d_name;
x509crl_t *crl;
- crl = lib->creds->create(lib->creds, CRED_PLUTO_CERT,
- CRED_TYPE_CRL, BUILD_FROM_FILE, filename, BUILD_END);
+ crl = lib->creds->create(lib->creds, CRED_CERTIFICATE,
+ CERT_PLUTO_CRL, BUILD_FROM_FILE, filename, BUILD_END);
if (crl)
{
chunk_t crl_uri;
#include <library.h>
#include <debug.h>
#include <asn1/asn1.h>
+#include <credentials/certificates/certificate.h>
#include "constants.h"
#include "defs.h"
DBG1("crl fetching failed");
return FALSE;
}
- crl = lib->creds->create(lib->creds, CRED_PLUTO_CERT, CRED_TYPE_CRL,
+ crl = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_PLUTO_CRL,
BUILD_BLOB_PEM, blob, BUILD_END);
free(blob.ptr);
if (!crl)