Apply a mutual EAP auth_cfg not before the EAP method completes

diff --git a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
index aa064403336ae078454a30f3da381288e58717bb..b8359cc88f4683f29d6bcc6da7b546653694fdb0 100644 (file)
--- a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
@@ -667,6 +667,16 @@ METHOD(authenticator_t, build_client, status_t,
 METHOD(authenticator_t, is_mutual, bool,
        private_eap_authenticator_t *this)
 {
+       if (this->method)
+       {
+               u_int32_t vendor;
+
+               if (this->method->get_type(this->method, &vendor) != EAP_IDENTITY ||
+                       vendor != 0)
+               {
+                       return this->method->is_mutual(this->method);
+               }
+       }
        /* we don't know yet, but insist on it after EAP is complete */
        this->require_mutual = TRUE;
        return TRUE;

diff --git a/src/libcharon/sa/ikev2/tasks/ike_auth.c b/src/libcharon/sa/ikev2/tasks/ike_auth.c
index 970e38cf55a2bb59b1c2b67a3400b7cf2a918f77..942f97cf5eee6f94a3d13efcc69b3a5fa4000c10 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/ike_auth.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth.c
@@ -980,7 +980,10 @@ METHOD(task_t, process_i, status_t,
                        goto peer_auth_failed;
                }
 
-               apply_auth_cfg(this, FALSE);
+               if (!mutual_eap)
+               {
+                       apply_auth_cfg(this, FALSE);
+               }
        }
 
        if (this->my_auth)
@@ -989,6 +992,10 @@ METHOD(task_t, process_i, status_t,
                {
                        case SUCCESS:
                                apply_auth_cfg(this, TRUE);
+                               if (this->my_auth->is_mutual(this->my_auth))
+                               {
+                                       apply_auth_cfg(this, FALSE);
+                               }
                                this->my_auth->destroy(this->my_auth);
                                this->my_auth = NULL;
                                this->do_another_auth = do_another_auth(this);