diff options
| -rw-r--r-- | src/starter/args.c | 1 | ||||
| -rw-r--r-- | src/starter/confread.h | 1 | ||||
| -rw-r--r-- | src/starter/keywords.h | 1 | ||||
| -rw-r--r-- | src/starter/keywords.txt | 3 | ||||
| -rw-r--r-- | src/starter/starterstroke.c | 11 |
5 files changed, 12 insertions, 5 deletions
diff --git a/src/starter/args.c b/src/starter/args.c index 009622c89..82e957f59 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 0b303c5bf..e0de68376 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 2f677e367..dd2b97749 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 bf9422b9e..0f943fc3c 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 6239d0ec5..28d777a21 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); } |