From: Martin Willi <martin@revosec.ch>
Date: Tue, 2 Jun 2015 09:27:19 +0000 (+0200)
Subject: ikev1: Raise PROPOSAL_MISMATCH_IKE alert during Main Mode
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55d8d8c810f57201f5612093e99d3334156b7951;p=thirdparty%2Fstrongswan.git

ikev1: Raise PROPOSAL_MISMATCH_IKE alert during Main Mode
---

diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c
index 3ea4a2a85e..29dd6e332f 100644
--- a/src/libcharon/sa/ikev1/tasks/main_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/main_mode.c
@@ -395,12 +395,15 @@ METHOD(task_t, process_r, status_t,
 														   EXT_STRONGSWAN);
 			this->proposal = this->ike_cfg->select_proposal(this->ike_cfg,
 															list, private);
-			list->destroy_offset(list, offsetof(proposal_t, destroy));
 			if (!this->proposal)
 			{
 				DBG1(DBG_IKE, "no proposal found");
+				charon->bus->alert(charon->bus, ALERT_PROPOSAL_MISMATCH_IKE,
+								   list, TRUE);
+				list->destroy_offset(list, offsetof(proposal_t, destroy));
 				return send_notify(this, NO_PROPOSAL_CHOSEN);
 			}
+			list->destroy_offset(list, offsetof(proposal_t, destroy));
 			this->ike_sa->set_proposal(this->ike_sa, this->proposal);
 
 			this->method = sa_payload->get_auth_method(sa_payload);