aggressive-mode: Determine local identity before deriving keys

This might require a PSK, for which the local identity might be necessary.

diff --git a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c
index 0184cb55ea8a5e189d9737ae0f367b7595ed2641..517843d3c8949b625b2b16f56482fc43bdcdbba8 100644 (file)
--- 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);