denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Willi
2009-08-26 11:23:49 +02:00
parent f11a78f10a
commit cbb62e8f4c
11 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/credentials/certificates/certificate.c
+4 -1
View File
@@ -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
+7 -1
View File
@@ -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
-2
View File
@@ -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,
};
/**
src/libstrongswan/plugins/pem/pem_builder.c
-8
View File
@@ -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);
}
src/libstrongswan/plugins/pem/pem_plugin.c
+8 -10
View File
@@ -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;
}