diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-05-26 11:23:12 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-05-26 11:23:12 +0200 |
| commit | 4366494d72c58ab6a926f60b1639d3e76e5c9213 (patch) | |
| tree | 8ba3d05f025225e21f2d156d60c1abacc766b74f /src/libcharon/plugins/stroke/stroke_config.c | |
| parent | 7b476029e6475ed5d5e4511760b1fe489385c4db (diff) | |
| parent | 0afe0eca67d696a4842462dea949739ba0554a8b (diff) | |
| download | strongswan-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/libcharon/plugins/stroke/stroke_config.c')
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c index a9d073684..d47787d72 100644 --- a/src/libcharon/plugins/stroke/stroke_config.c +++ b/src/libcharon/plugins/stroke/stroke_config.c @@ -1074,7 +1074,8 @@ static child_cfg_t *build_child_cfg(private_stroke_config_t *this, .options = (msg->add_conn.proxy_mode ? OPT_PROXY_MODE : 0) | (msg->add_conn.ipcomp ? OPT_IPCOMP : 0) | (msg->add_conn.me.hostaccess ? OPT_HOSTACCESS : 0) | - (msg->add_conn.install_policy ? 0 : OPT_NO_POLICIES), + (msg->add_conn.install_policy ? 0 : OPT_NO_POLICIES) | + (msg->add_conn.sha256_96 ? OPT_SHA256_96 : 0), .tfc = msg->add_conn.tfc, .inactivity = msg->add_conn.inactivity, .dpd_action = map_action(msg->add_conn.dpd.action), |