From e5f0f9ff969f867faf3fb243468d658c4ab9e154 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 8 Jun 2012 16:15:22 +0200 Subject: [PATCH] Enforce uniqueness policy in IKEv1 main and aggressive modes --- src/libcharon/sa/ikev1/tasks/aggressive_mode.c | 16 ++++++++++++++++ src/libcharon/sa/ikev1/tasks/main_mode.c | 13 +++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c index db27ae12f..66e6451ea 100644 --- a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c +++ b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c @@ -293,6 +293,14 @@ METHOD(task_t, build_i, status_t, } this->id_data = chunk_empty; + if (charon->ike_sa_manager->check_uniqueness(charon->ike_sa_manager, + this->ike_sa, FALSE)) + { + DBG1(DBG_IKE, "cancelling Aggressive Mode due to uniqueness " + "policy"); + return send_notify(this, AUTHENTICATION_FAILED); + } + switch (this->method) { case AUTH_XAUTH_INIT_PSK: @@ -441,6 +449,14 @@ METHOD(task_t, process_r, status_t, return send_delete(this); } + if (charon->ike_sa_manager->check_uniqueness(charon->ike_sa_manager, + this->ike_sa, FALSE)) + { + DBG1(DBG_IKE, "cancelling Aggressive Mode due to uniqueness " + "policy"); + return send_delete(this); + } + switch (this->method) { case AUTH_XAUTH_INIT_PSK: diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c index 23c90ba6b..419c9d36d 100644 --- a/src/libcharon/sa/ikev1/tasks/main_mode.c +++ b/src/libcharon/sa/ikev1/tasks/main_mode.c @@ -493,6 +493,12 @@ METHOD(task_t, build_r, status_t, { return send_notify(this, AUTHENTICATION_FAILED); } + if (charon->ike_sa_manager->check_uniqueness(charon->ike_sa_manager, + this->ike_sa, FALSE)) + { + DBG1(DBG_IKE, "cancelling Main Mode due to uniqueness policy"); + return send_notify(this, AUTHENTICATION_FAILED); + } switch (this->method) { @@ -616,6 +622,13 @@ METHOD(task_t, process_i, status_t, "cancelling"); return send_delete(this); } + if (charon->ike_sa_manager->check_uniqueness(charon->ike_sa_manager, + this->ike_sa, FALSE)) + { + DBG1(DBG_IKE, "cancelling Main Mode due to uniqueness policy"); + return send_delete(this); + } + switch (this->method) { case AUTH_XAUTH_INIT_PSK: