summaryrefslogtreecommitdiff
path: root/src/stroke
diff options
context:
space:
mode:
Diffstat (limited to 'src/stroke')
-rw-r--r--src/stroke/Makefile.in12
-rw-r--r--src/stroke/stroke.c17
-rw-r--r--src/stroke/stroke_keywords.c78
-rw-r--r--src/stroke/stroke_keywords.h6
-rw-r--r--src/stroke/stroke_keywords.txt6
-rw-r--r--src/stroke/stroke_msg.h24
6 files changed, 8 insertions, 135 deletions
diff --git a/src/stroke/Makefile.in b/src/stroke/Makefile.in
index 978841438..4e8318e0f 100644
--- a/src/stroke/Makefile.in
+++ b/src/stroke/Makefile.in
@@ -197,13 +197,7 @@ includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
ipsecdir = @ipsecdir@
-<<<<<<< HEAD
-ipsecgid = @ipsecgid@
ipsecgroup = @ipsecgroup@
-ipsecuid = @ipsecuid@
-=======
-ipsecgroup = @ipsecgroup@
->>>>>>> upstream/4.5.1
ipsecuser = @ipsecuser@
libcharon_plugins = @libcharon_plugins@
libdir = @libdir@
@@ -224,6 +218,8 @@ nm_ca_dir = @nm_ca_dir@
oldincludedir = @oldincludedir@
openac_plugins = @openac_plugins@
p_plugins = @p_plugins@
+pcsclite_CFLAGS = @pcsclite_CFLAGS@
+pcsclite_LIBS = @pcsclite_LIBS@
pdfdir = @pdfdir@
piddir = @piddir@
pki_plugins = @pki_plugins@
@@ -242,14 +238,12 @@ sbindir = @sbindir@
scepclient_plugins = @scepclient_plugins@
scripts_plugins = @scripts_plugins@
sharedstatedir = @sharedstatedir@
-<<<<<<< HEAD
-=======
soup_CFLAGS = @soup_CFLAGS@
soup_LIBS = @soup_LIBS@
->>>>>>> upstream/4.5.1
srcdir = @srcdir@
strongswan_conf = @strongswan_conf@
sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c
index 4d1b8e7db..2c5a03d77 100644
--- a/src/stroke/stroke.c
+++ b/src/stroke/stroke.c
@@ -197,8 +197,6 @@ static int terminate_connection_srcip(char *start, char *end)
return send_stroke_msg(&msg);
}
-<<<<<<< HEAD
-=======
static int rekey_connection(char *name)
{
stroke_msg_t msg;
@@ -209,7 +207,6 @@ static int rekey_connection(char *name)
return send_stroke_msg(&msg);
}
->>>>>>> upstream/4.5.1
static int route_connection(char *name)
{
stroke_msg_t msg;
@@ -288,12 +285,9 @@ static int reread(stroke_keyword_t kw)
static int purge_flags[] = {
PURGE_OCSP,
- PURGE_IKE,
-<<<<<<< HEAD
-=======
PURGE_CRLS,
PURGE_CERTS,
->>>>>>> upstream/4.5.1
+ PURGE_IKE,
};
static int purge(stroke_keyword_t kw)
@@ -391,13 +385,10 @@ static void exit_usage(char *error)
printf(" stroke rereadsecrets|rereadcrls|rereadall\n");
printf(" Purge ocsp cache entries:\n");
printf(" stroke purgeocsp\n");
-<<<<<<< HEAD
-=======
printf(" Purge CRL cache entries:\n");
printf(" stroke purgecrls\n");
printf(" Purge X509 cache entries:\n");
printf(" stroke purgecerts\n");
->>>>>>> upstream/4.5.1
printf(" Purge IKE_SAs without a CHILD_SA:\n");
printf(" stroke purgeike\n");
printf(" Export credentials to the console:\n");
@@ -468,8 +459,6 @@ int main(int argc, char *argv[])
}
res = terminate_connection_srcip(argv[2], argc > 3 ? argv[3] : NULL);
break;
-<<<<<<< HEAD
-=======
case STROKE_REKEY:
if (argc < 3)
{
@@ -477,7 +466,6 @@ int main(int argc, char *argv[])
}
res = rekey_connection(argv[2]);
break;
->>>>>>> upstream/4.5.1
case STROKE_ROUTE:
if (argc < 3)
{
@@ -526,11 +514,8 @@ int main(int argc, char *argv[])
res = reread(token->kw);
break;
case STROKE_PURGE_OCSP:
-<<<<<<< HEAD
-=======
case STROKE_PURGE_CRLS:
case STROKE_PURGE_CERTS:
->>>>>>> upstream/4.5.1
case STROKE_PURGE_IKE:
res = purge(token->kw);
break;
diff --git a/src/stroke/stroke_keywords.c b/src/stroke/stroke_keywords.c
index 3b2426a42..b43f4b475 100644
--- a/src/stroke/stroke_keywords.c
+++ b/src/stroke/stroke_keywords.c
@@ -54,21 +54,12 @@ struct stroke_token {
stroke_keyword_t kw;
};
-<<<<<<< HEAD
-#define TOTAL_KEYWORDS 34
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 15
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 39
-/* maximum key range = 37, duplicates = 0 */
-=======
#define TOTAL_KEYWORDS 37
#define MIN_WORD_LENGTH 2
#define MAX_WORD_LENGTH 15
#define MIN_HASH_VALUE 2
#define MAX_HASH_VALUE 42
/* maximum key range = 41, duplicates = 0 */
->>>>>>> upstream/4.5.1
#ifdef __GNUC__
__inline
@@ -84,34 +75,6 @@ hash (str, len)
{
static const unsigned char asso_values[] =
{
-<<<<<<< HEAD
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 18, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 0, 4, 1,
- 1, 0, 40, 17, 40, 20, 40, 3, 0, 40,
- 40, 12, 19, 40, 6, 3, 20, 12, 40, 40,
- 10, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
- 40, 40, 40, 40, 40, 40
-=======
43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
@@ -138,7 +101,6 @@ hash (str, len)
43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43
->>>>>>> upstream/4.5.1
};
register int hval = len;
@@ -163,20 +125,6 @@ hash (str, len)
static const struct stroke_token wordlist[] =
{
-<<<<<<< HEAD
- {"add", STROKE_ADD},
- {"del", STROKE_DEL},
- {"down", STROKE_DOWN},
- {"leases", STROKE_LEASES},
- {"listall", STROKE_LIST_ALL},
- {"loglevel", STROKE_LOGLEVEL},
- {"listcrls", STROKE_LIST_CRLS},
- {"listacerts", STROKE_LIST_ACERTS},
- {"route", STROKE_ROUTE},
- {"listaacerts", STROKE_LIST_AACERTS},
- {"listcacerts", STROKE_LIST_CACERTS},
- {"up", STROKE_UP},
-=======
{"up", STROKE_UP},
{"add", STROKE_ADD},
{"del", STROKE_DEL},
@@ -188,31 +136,12 @@ static const struct stroke_token wordlist[] =
{"listaacerts", STROKE_LIST_AACERTS},
{"listcacerts", STROKE_LIST_CACERTS},
{"statusall", STROKE_STATUSALL},
->>>>>>> upstream/4.5.1
{"rereadall", STROKE_REREAD_ALL},
{"listcerts", STROKE_LIST_CERTS},
{"rereadcrls", STROKE_REREAD_CRLS},
{"rereadacerts", STROKE_REREAD_ACERTS},
{"rereadaacerts", STROKE_REREAD_AACERTS},
{"rereadcacerts", STROKE_REREAD_CACERTS},
-<<<<<<< HEAD
- {"status", STROKE_STATUS},
- {"rereadsecrets", STROKE_REREAD_SECRETS},
- {"listocsp", STROKE_LIST_OCSP},
- {"statusall", STROKE_STATUSALL},
- {"listalgs", STROKE_LIST_ALGS},
- {"exportx509", STROKE_EXPORT_X509},
- {"delete", STROKE_DELETE},
- {"listocspcerts", STROKE_LIST_OCSPCERTS},
- {"purgeocsp", STROKE_PURGE_OCSP},
- {"purgeike", STROKE_PURGE_IKE},
- {"unroute", STROKE_UNROUTE},
- {"listcainfos", STROKE_LIST_CAINFOS},
- {"rereadocspcerts", STROKE_REREAD_OCSPCERTS},
- {"listpubkeys", STROKE_LIST_PUBKEYS},
- {"down-srcip", STROKE_DOWN_SRCIP},
- {"listgroups", STROKE_LIST_GROUPS}
-=======
{"leases", STROKE_LEASES},
{"unroute", STROKE_UNROUTE},
{"listocsp", STROKE_LIST_OCSP},
@@ -233,21 +162,14 @@ static const struct stroke_token wordlist[] =
{"loglevel", STROKE_LOGLEVEL},
{"listgroups", STROKE_LIST_GROUPS},
{"purgecerts", STROKE_PURGE_CERTS}
->>>>>>> upstream/4.5.1
};
static const short lookup[] =
{
-<<<<<<< HEAD
- -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, -1, 33
-=======
-1, -1, 0, 1, 2, 3, -1, 4, 5, 6, -1, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, -1, -1, 35,
36
->>>>>>> upstream/4.5.1
};
#ifdef __GNUC__
diff --git a/src/stroke/stroke_keywords.h b/src/stroke/stroke_keywords.h
index 76f6c1be3..ff2ba36ef 100644
--- a/src/stroke/stroke_keywords.h
+++ b/src/stroke/stroke_keywords.h
@@ -25,10 +25,7 @@ typedef enum {
STROKE_UP,
STROKE_DOWN,
STROKE_DOWN_SRCIP,
-<<<<<<< HEAD
-=======
STROKE_REKEY,
->>>>>>> upstream/4.5.1
STROKE_LOGLEVEL,
STROKE_STATUS,
STROKE_STATUSALL,
@@ -52,11 +49,8 @@ typedef enum {
STROKE_REREAD_CRLS,
STROKE_REREAD_ALL,
STROKE_PURGE_OCSP,
-<<<<<<< HEAD
-=======
STROKE_PURGE_CRLS,
STROKE_PURGE_CERTS,
->>>>>>> upstream/4.5.1
STROKE_PURGE_IKE,
STROKE_EXPORT_X509,
STROKE_LEASES,
diff --git a/src/stroke/stroke_keywords.txt b/src/stroke/stroke_keywords.txt
index fcc2ba558..dafd1ab08 100644
--- a/src/stroke/stroke_keywords.txt
+++ b/src/stroke/stroke_keywords.txt
@@ -32,10 +32,7 @@ unroute, STROKE_UNROUTE
up, STROKE_UP
down, STROKE_DOWN
down-srcip, STROKE_DOWN_SRCIP
-<<<<<<< HEAD
-=======
rekey, STROKE_REKEY
->>>>>>> upstream/4.5.1
loglevel, STROKE_LOGLEVEL
status, STROKE_STATUS
statusall, STROKE_STATUSALL
@@ -59,11 +56,8 @@ rereadacerts, STROKE_REREAD_ACERTS
rereadcrls, STROKE_REREAD_CRLS
rereadall, STROKE_REREAD_ALL
purgeocsp, STROKE_PURGE_OCSP
-<<<<<<< HEAD
-=======
purgecrls, STROKE_PURGE_CRLS
purgecerts, STROKE_PURGE_CERTS
->>>>>>> upstream/4.5.1
purgeike, STROKE_PURGE_IKE
exportx509, STROKE_EXPORT_X509
leases, STROKE_LEASES
diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h
index b5fdacc00..9800d4319 100644
--- a/src/stroke/stroke_msg.h
+++ b/src/stroke/stroke_msg.h
@@ -105,15 +105,12 @@ enum purge_flag_t {
PURGE_NONE = 0x0000,
/** purge ocsp cache entries */
PURGE_OCSP = 0x0001,
- /** purge IKE_SAs without a CHILD_SA */
- PURGE_IKE = 0x0002,
-<<<<<<< HEAD
-=======
/** purge CRL cache entries */
- PURGE_CRLS = 0x0004,
+ PURGE_CRLS = 0x0002,
/** purge X509 cache entries */
- PURGE_CERTS = 0x0008,
->>>>>>> upstream/4.5.1
+ PURGE_CERTS = 0x0004,
+ /** purge IKE_SAs without a CHILD_SA */
+ PURGE_IKE = 0x0008,
};
typedef enum export_flag_t export_flag_t;
@@ -152,10 +149,7 @@ struct stroke_end_t {
char *ca;
char *ca2;
char *groups;
-<<<<<<< HEAD
-=======
char *cert_policy;
->>>>>>> upstream/4.5.1
char *updown;
char *address;
u_int16_t ikeport;
@@ -194,11 +188,8 @@ struct stroke_msg_t {
STR_TERMINATE,
/* terminate connection by peers srcip/virtual ip */
STR_TERMINATE_SRCIP,
-<<<<<<< HEAD
-=======
/* rekey a connection */
STR_REKEY,
->>>>>>> upstream/4.5.1
/* show connection status */
STR_STATUS,
/* show verbose connection status */
@@ -231,11 +222,7 @@ struct stroke_msg_t {
/* data for STR_INITIATE, STR_ROUTE, STR_UP, STR_DOWN, ... */
struct {
char *name;
-<<<<<<< HEAD
- } initiate, route, unroute, terminate, status, del_conn, del_ca;
-=======
} initiate, route, unroute, terminate, rekey, status, del_conn, del_ca;
->>>>>>> upstream/4.5.1
/* data for STR_TERMINATE_SRCIP */
struct {
@@ -261,10 +248,7 @@ struct stroke_msg_t {
int proxy_mode;
int install_policy;
u_int32_t reqid;
-<<<<<<< HEAD
-=======
u_int32_t tfc;
->>>>>>> upstream/4.5.1
crl_policy_t crl_policy;
int unique;
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-21 10:22:38 +0000