diff options
| author |   mikeb <mikeb@openbsd.org> | 2010-12-23 15:11:19 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2010-12-23 15:11:19 +0000 |
| commit | e2a8a12bf13864c5922afb1f9f0204d7f09cfce3 (patch) | |
| tree | 6ea5400ba2e80637c9ba399102c5685e6b6b18bc | |
| parent | regen (diff) | |
| download | wireguard-openbsd-e2a8a12bf13864c5922afb1f9f0204d7f09cfce3.tar.xz wireguard-openbsd-e2a8a12bf13864c5922afb1f9f0204d7f09cfce3.zip | |
always add a none payload, should fix ike sa rekeying for responders; ok reyk
| -rw-r--r-- | sbin/iked/ikev2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c index 7cda085070e..88763cc3855 100644 --- a/sbin/iked/ikev2.c +++ b/sbin/iked/ikev2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ikev2.c,v 1.28 2010/12/22 17:53:54 reyk Exp $ */ +/* $OpenBSD: ikev2.c,v 1.29 2010/12/23 15:11:19 mikeb Exp $ */ /* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */ /* @@ -2428,11 +2428,11 @@ ikev2_resp_create_child_sa(struct iked *env, struct iked_message *msg) goto done; if ((len = ikev2_add_ts(e, IKEV2_PAYLOAD_TSr, sa)) == -1) goto done; - - if (ikev2_next_payload(pld, len, IKEV2_PAYLOAD_NONE) == -1) - goto done; } + if (ikev2_next_payload(pld, len, IKEV2_PAYLOAD_NONE) == -1) + goto done; + ret = ikev2_msg_send_encrypt(env, sa, &e, IKEV2_EXCHANGE_CREATE_CHILD_SA, IKEV2_PAYLOAD_SA, 1); |