aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/sa
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2012-08-23 08:36:24 +0200
committerTobias Brunner <tobias@strongswan.org>2012-08-31 11:40:27 +0200
commitcc4eec56f73ef54386badc8732b1867cbe05b47f (patch)
treed23b3134094aecb96deeedec32b30bd28b0d19e1 /src/libcharon/sa
parent78e8dca94f86b97b7df649c1c96a7fe532019a5f (diff)
downloadstrongswan-cc4eec56f73ef54386badc8732b1867cbe05b47f.tar.bz2
strongswan-cc4eec56f73ef54386badc8732b1867cbe05b47f.tar.xz
Encode EAP-Naks in expanded format if we got an expanded type request
Since methods defined by the IETF (vendor ID 0) could also be encoded in expanded type format the previous check was insufficient.
Diffstat (limited to 'src/libcharon/sa')
-rw-r--r--src/libcharon/sa/ikev2/authenticators/eap_authenticator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
index c9178d061..a340c04d7 100644
--- a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
@@ -404,14 +404,14 @@ static eap_payload_t* client_process_eap(private_eap_authenticator_t *this,
eap_type_names, conf_type);
}
return eap_payload_create_nak(in->get_identifier(in), conf_type,
- conf_vendor, vendor != 0);
+ conf_vendor, in->is_expanded(in));
}
this->method = load_method(this, type, vendor, EAP_PEER);
if (!this->method)
{
DBG1(DBG_IKE, "EAP method not supported, sending EAP_NAK");
return eap_payload_create_nak(in->get_identifier(in), 0, 0,
- vendor != 0);
+ in->is_expanded(in));
}
}