aboutsummaryrefslogtreecommitdiffstats
path: root/src/starter/args.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2017-05-26 11:23:12 +0200
committerTobias Brunner <tobias@strongswan.org>2017-05-26 11:23:12 +0200
commit4366494d72c58ab6a926f60b1639d3e76e5c9213 (patch)
tree8ba3d05f025225e21f2d156d60c1abacc766b74f /src/starter/args.c
parent7b476029e6475ed5d5e4511760b1fe489385c4db (diff)
parent0afe0eca67d696a4842462dea949739ba0554a8b (diff)
downloadstrongswan-4366494d72c58ab6a926f60b1639d3e76e5c9213.tar.bz2
strongswan-4366494d72c58ab6a926f60b1639d3e76e5c9213.tar.xz
Merge branch 'sha-256-96'
Adds an option to locally configure 96-bit truncation for HMAC-SHA256 when negotiated using the official algorithm identifier. This is for compatibility with peers that incorrectly use this shorter truncation (like Linux does by default). Fixes #1353.
Diffstat (limited to 'src/starter/args.c')
-rw-r--r--src/starter/args.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/starter/args.c b/src/starter/args.c
index 7f010d350..477a52082 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -165,6 +165,7 @@ static const token_info_t token_info[] =
{ ARG_TIME, offsetof(starter_conn_t, dpd_timeout), NULL },
{ ARG_ENUM, offsetof(starter_conn_t, dpd_action), LST_dpd_action },
{ ARG_ENUM, offsetof(starter_conn_t, close_action), LST_dpd_action },
+ { ARG_ENUM, offsetof(starter_conn_t, sha256_96), LST_bool },
{ ARG_TIME, offsetof(starter_conn_t, inactivity), NULL },
{ ARG_MISC, 0, NULL /* KW_MODECONFIG */ },
{ ARG_MISC, 0, NULL /* KW_XAUTH */ },