diff options
| author |   tobhe <tobhe@openbsd.org> | 2020-09-04 19:32:27 +0000 |
|---|---|---|
| committer | tobhe <tobhe@openbsd.org> | 2020-09-04 19:32:27 +0000 |
| commit | 9ea1d614edeac2933de034cd5dec825a862c61e5 (patch) | |
| tree | 4236587e82c1c6efa6fb66de472d0e59992e7ec5 | |
| parent | Restrict the size of the page table to 2G such that it never occupies more (diff) | |
| download | wireguard-openbsd-9ea1d614edeac2933de034cd5dec825a862c61e5.tar.xz wireguard-openbsd-9ea1d614edeac2933de034cd5dec825a862c61e5.zip | |
INFORMATIONAL and CREATE_CHILD_SA exchanges cannot be initiated at the
same time.
| -rw-r--r-- | sbin/iked/ikev2.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c index b4a3ab3c65a..0b538e57c93 100644 --- a/sbin/iked/ikev2.c +++ b/sbin/iked/ikev2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ikev2.c,v 1.252 2020/08/28 13:37:52 tobhe Exp $ */ +/* $OpenBSD: ikev2.c,v 1.253 2020/09/04 19:32:27 tobhe Exp $ */ /* * Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de> @@ -6119,7 +6119,6 @@ ikev2_child_sa_drop(struct iked *env, struct iked_spi *drop) struct iked_sa *sa; struct ikev2_delete *del; uint32_t spi32; - int acquired; key.csa_spi = *drop; csa = RB_FIND(iked_activesas, &env->sc_activesas, &key); @@ -6145,7 +6144,6 @@ ikev2_child_sa_drop(struct iked *env, struct iked_spi *drop) spi32 = htobe32(csa->csa_spi.spi); else spi32 = htobe32(csa->csa_peerspi); - acquired = csa->csa_acquired; if (ikev2_childsa_delete(env, sa, csa->csa_saproto, csa->csa_peerspi, NULL, 0)) @@ -6170,15 +6168,6 @@ ikev2_child_sa_drop(struct iked *env, struct iked_spi *drop) sa->sa_stateflags |= IKED_REQ_INF; - /* Don't automatically re-initiate Child SAs that have been acquired */ - if (acquired) - goto done; - - /* Initiate Child SA creation */ - if (ikev2_send_create_child_sa(env, sa, NULL, drop->spi_protoid)) - log_warnx("%s: failed to initiate a CREATE_CHILD_SA exchange", - __func__); - done: ibuf_release(buf); return (0); |