summaryrefslogtreecommitdiff
path: root/sbin/iked/iked.c
diff options
context:
space:
mode:
authortobhe <tobhe@cvs.openbsd.org>2019-11-30 16:07:13 +0000
committertobhe <tobhe@cvs.openbsd.org>2019-11-30 16:07:13 +0000
commitcb43a078ac95466feff5be22893bca657c14f7d6 (patch)
tree41a91bfc7a55653a91d8cdba9a2e516ccc95727f /sbin/iked/iked.c
parenta3c7e41df8e63187f6b4f9079f8ee609318a02e5 (diff)
The message sent in config_setmode starts the handshake in the ikev2 process
and thus must be sent last. ok reyk@
Diffstat (limited to 'sbin/iked/iked.c')
-rw-r--r--sbin/iked/iked.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sbin/iked/iked.c b/sbin/iked/iked.c
index b417ad8ddf7..6714e0b2088 100644
--- a/sbin/iked/iked.c
+++ b/sbin/iked/iked.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iked.c,v 1.37 2019/05/11 16:30:23 patrick Exp $ */
+/* $OpenBSD: iked.c,v 1.38 2019/11/30 16:07:12 tobhe Exp $ */
/*
* Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de>
@@ -254,8 +254,9 @@ parent_configure(struct iked *env)
config_setmobike(env);
config_setfragmentation(env);
config_setcoupled(env, env->sc_decoupled ? 0 : 1);
- config_setmode(env, env->sc_passive ? 1 : 0);
config_setocsp(env);
+ /* Must be last */
+ config_setmode(env, env->sc_passive ? 1 : 0);
return (0);
}
@@ -286,8 +287,9 @@ parent_reload(struct iked *env, int reset, const char *filename)
config_setmobike(env);
config_setfragmentation(env);
config_setcoupled(env, env->sc_decoupled ? 0 : 1);
- config_setmode(env, env->sc_passive ? 1 : 0);
config_setocsp(env);
+ /* Must be last */
+ config_setmode(env, env->sc_passive ? 1 : 0);
} else {
config_setreset(env, reset, PROC_IKEV2);
config_setreset(env, reset, PROC_CERT);