support of ca info records
authorAndreas Steffen <andreas.steffen@strongswan.org>
Fri, 23 Feb 2007 15:13:21 +0000 (15:13 -0000)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Fri, 23 Feb 2007 15:13:21 +0000 (15:13 -0000)
src/starter/args.c
src/starter/confread.h
src/starter/keywords.h
src/starter/keywords.txt
src/starter/starterstroke.c

index 009622c..82e957f 100644 (file)
@@ -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 */                                             },
index 0b303c5..e0de683 100644 (file)
@@ -138,6 +138,7 @@ struct starter_ca {
        char            *crluri;
        char            *crluri2;
        char            *ocspuri;
+       char            *ocspuri2;
 
        bool            strict;
 
index 2f677e3..dd2b977 100644 (file)
@@ -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
index bf9422b..0f943fc 100644 (file)
@@ -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
index 6239d0e..28d777a 100644 (file)
@@ -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);
 }