From 3d966d6d0a323bc38f112814998cb8b7dc39d384 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 16 Jun 2022 16:36:04 +0200 Subject: [PATCH] aggressive-mode: Determine local identity before deriving keys This might require a PSK, for which the local identity might be necessary. --- src/libcharon/sa/ikev1/tasks/aggressive_mode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c index 0184cb55e..517843d3c 100644 --- a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c +++ b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c @@ -604,14 +604,15 @@ METHOD(task_t, build_r, status_t, { return send_notify(this, NO_PROPOSAL_CHOSEN); } + + id = this->ph1->get_id(this->ph1, this->peer_cfg, TRUE); + this->ike_sa->set_my_id(this->ike_sa, id->clone(id)); + if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method)) { return send_notify(this, INVALID_KEY_INFORMATION); } - id = this->ph1->get_id(this->ph1, this->peer_cfg, TRUE); - this->ike_sa->set_my_id(this->ike_sa, id->clone(id)); - id_payload = id_payload_create_from_identification(PLV1_ID, id); message->add_payload(message, &id_payload->payload_interface);