ikev2: Merge EAP client authentication details if EAP methods provides them

diff --git a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
index eed6d1996d8ee076f8f5e9c6afda881c76d2316a..ebef319300c087ea2c869effa92055e2738cbe61 100644 (file)
--- a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
@@ -522,6 +522,13 @@ METHOD(authenticator_t, process_server, status_t,
                {
                        return FAILED;
                }
+               if (this->method->get_auth)
+               {
+                       auth_cfg_t *auth;
+
+                       auth = this->ike_sa->get_auth_cfg(this->ike_sa, FALSE);
+                       auth->merge(auth, this->method->get_auth(this->method), FALSE);
+               }
                return NEED_MORE;
        }