support of ca info records

diff --git a/src/starter/args.c b/src/starter/args.c
index 009622c8930c0b01a1df916918421f4eaf2a9cc9..82e957f597b7d302b2d01809312830c25be81365 100644 (file)
--- 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 0b303c5bfcb709b29246eb57ee1c1c720d4afe83..e0de683761f43a360d5dddad3e13b97bd3c3d388 100644 (file)
--- 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 2f677e367e2d60b1ff990bdc1be9ead12424aa6e..dd2b97749630089822eba323cfe04c1683e68665 100644 (file)
--- 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 bf9422b9e8df6aa2ab35022ef04b383ba3c0a65b..0f943fc3cfc159cc606db223136e05586ee6688c 100644 (file)
--- 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 6239d0ec540b1d51843696587c1892f3abbf7c86..28d777a21a90b4076c94d10ef2a8abf6655fa70f 100644 (file)
--- 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);
 }