aboutsummaryrefslogtreecommitdiffstats
path: root/src/pluto/builder.c
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2009-08-13 15:05:14 +0200
committerMartin Willi <martin@strongswan.org>2009-08-26 11:23:49 +0200
commitcbb62e8f4c48c795a3cf63899048845ee3bfe75c (patch)
treede9adde5bcfa691b214a5423b49141c6a60991bd /src/pluto/builder.c
parentf11a78f10a71756a48e318f00a0772f42226b1ef (diff)
downloadstrongswan-cbb62e8f4c48c795a3cf63899048845ee3bfe75c.tar.bz2
strongswan-cbb62e8f4c48c795a3cf63899048845ee3bfe75c.tar.xz
handle pluto specific certificates under CRED_CERTIFICATE, not as own credential kind
Diffstat (limited to 'src/pluto/builder.c')
-rw-r--r--src/pluto/builder.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/pluto/builder.c b/src/pluto/builder.c
index d392f58fc..d631fd2c2 100644
--- a/src/pluto/builder.c
+++ b/src/pluto/builder.c
@@ -23,7 +23,8 @@
#include <freeswan.h>
-#include "library.h"
+#include <library.h>
+#include <credentials/certificates/certificate.h>
#include "constants.h"
#include "defs.h"
@@ -206,13 +207,13 @@ static builder_t *builder(credential_type_t type, int subtype)
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:
@@ -227,7 +228,11 @@ static builder_t *builder(credential_type_t type, int subtype)
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);
}