diff options
| author | tobhe <tobhe@cvs.openbsd.org> | 2020-03-27 15:50:32 +0000 |
|---|---|---|
| committer | tobhe <tobhe@cvs.openbsd.org> | 2020-03-27 15:50:32 +0000 |
| commit | 20352427346bb87b0ab7903df992597dd27b5059 (patch) | |
| tree | 6260ebd7c2da5f75db357f4a9030640af4c87f63 | |
| parent | 22fc8b1e15138ff0846153d37cdf71fa9cbb6b25 (diff) | |
Copy EAP ID to new SA when rekeying IKE SA.
From Bernardo Vieira <bernardocv (at) gmail (dot) com>
ok patrick@
| -rw-r--r-- | sbin/iked/ikev2.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c index 3d0c13f7e25..d9b246cc7e8 100644 --- a/sbin/iked/ikev2.c +++ b/sbin/iked/ikev2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ikev2.c,v 1.203 2020/03/27 12:20:48 tobhe Exp $ */ +/* $OpenBSD: ikev2.c,v 1.204 2020/03/27 15:50:31 tobhe Exp $ */ /* * Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de> @@ -3860,7 +3860,10 @@ ikev2_ikesa_enable(struct iked *env, struct iked_sa *sa, struct iked_sa *nsa) nsa->sa_tag = sa->sa_tag; sa->sa_tag = NULL; } - + if (sa->sa_eapid) { + nsa->sa_eapid = sa->sa_eapid; + sa->sa_eapid = NULL; + } log_debug("%s: activating new IKE SA", __func__); sa_state(env, nsa, IKEV2_STATE_ESTABLISHED); ikev2_enable_timer(env, nsa); |