From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 23 Feb 2007 15:13:21 +0000 (-0000)
Subject: support of ca info records
X-Git-Tag: 4.0.7~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=113be7f18634553ab066fff0d08c6d8d75f35bd8;p=thirdparty%2Fstrongswan.git

support of ca info records
---

diff --git a/src/starter/args.c b/src/starter/args.c
index 009622c893..82e957f597 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -211,6 +211,7 @@ static const token_info_t token_info[] =
     { ARG_STR,  offsetof(starter_ca_t, crluri), NULL                               },
     { ARG_STR,  offsetof(starter_ca_t, crluri2), NULL                              },
     { ARG_STR,  offsetof(starter_ca_t, ocspuri), NULL                              },
+    { ARG_STR,  offsetof(starter_ca_t, ocspuri2), NULL                             },
 
     /* end keywords */
     { ARG_MISC, 0, NULL  /* KW_HOST */                                             },
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 0b303c5bfc..e0de683761 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -138,6 +138,7 @@ struct starter_ca {
 	char		*crluri;
 	char		*crluri2;
 	char		*ocspuri;
+	char		*ocspuri2;
 
 	bool		strict;
 
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 2f677e367e..dd2b977496 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -97,6 +97,7 @@ typedef enum {
     KW_CRLURI,
     KW_CRLURI2,
     KW_OCSPURI,
+    KW_OCSPURI2,
 
 #define KW_CA_FIRST	KW_CA_SETUP
 #define KW_CA_LAST	KW_OCSPURI
diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index bf9422b9e8..0f943fc3cf 100644
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -77,8 +77,11 @@ cacert,            KW_CACERT
 ldaphost,          KW_LDAPHOST
 ldapbase,          KW_LDAPBASE
 crluri,            KW_CRLURI
+crluri1,           KW_CRLURI
 crluri2,           KW_CRLURI2
 ocspuri,           KW_OCSPURI
+ocspuri1,          KW_OCSPURI
+ocspuri2,          KW_OCSPURI2
 left,              KW_LEFT
 leftnexthop,       KW_LEFTNEXTHOP
 leftsubnet,        KW_LEFTSUBNET
diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index 6239d0ec54..28d777a21a 100644
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -269,11 +269,12 @@ int starter_stroke_add_ca(starter_ca_t *ca)
 
 	msg.type = STR_ADD_CA;
 	msg.length = offsetof(stroke_msg_t, buffer);
-	msg.add_ca.name =    push_string(&msg, ca->name);
-	msg.add_ca.cacert =  push_string(&msg, ca->cacert);
-	msg.add_ca.crluri =  push_string(&msg, ca->crluri);
-	msg.add_ca.crluri2 = push_string(&msg, ca->crluri2);
-	msg.add_ca.ocspuri = push_string(&msg, ca->ocspuri);
+	msg.add_ca.name =     push_string(&msg, ca->name);
+	msg.add_ca.cacert =   push_string(&msg, ca->cacert);
+	msg.add_ca.crluri =   push_string(&msg, ca->crluri);
+	msg.add_ca.crluri2 =  push_string(&msg, ca->crluri2);
+	msg.add_ca.ocspuri =  push_string(&msg, ca->ocspuri);
+	msg.add_ca.ocspuri2 = push_string(&msg, ca->ocspuri2);
 	return send_stroke_msg(&msg);
 }