aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/encoding/payloads/eap_payload.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2012-08-21 17:11:14 +0200
committerTobias Brunner <tobias@strongswan.org>2012-08-31 11:40:27 +0200
commit78e8dca94f86b97b7df649c1c96a7fe532019a5f (patch)
tree616a674ad523879957258f298f37a815900f47c0 /src/libcharon/encoding/payloads/eap_payload.c
parent34742f1bf89d1ea734655baf86bf0b18447abcd3 (diff)
downloadstrongswan-78e8dca94f86b97b7df649c1c96a7fe532019a5f.tar.bz2
strongswan-78e8dca94f86b97b7df649c1c96a7fe532019a5f.tar.xz
Allow clients to request a configured EAP method via EAP-Nak
Diffstat (limited to 'src/libcharon/encoding/payloads/eap_payload.c')
-rw-r--r--src/libcharon/encoding/payloads/eap_payload.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libcharon/encoding/payloads/eap_payload.c b/src/libcharon/encoding/payloads/eap_payload.c
index 4420f281b..15a9972f2 100644
--- a/src/libcharon/encoding/payloads/eap_payload.c
+++ b/src/libcharon/encoding/payloads/eap_payload.c
@@ -336,7 +336,8 @@ static void write_type(bio_writer_t *writer, eap_type_t type, u_int32_t vendor,
/*
* Described in header
*/
-eap_payload_t *eap_payload_create_nak(u_int8_t identifier, bool expanded)
+eap_payload_t *eap_payload_create_nak(u_int8_t identifier, eap_type_t type,
+ u_int32_t vendor, bool expanded)
{
enumerator_t *enumerator;
eap_type_t reg_type;
@@ -356,6 +357,11 @@ eap_payload_t *eap_payload_create_nak(u_int8_t identifier, bool expanded)
enumerator = charon->eap->create_enumerator(charon->eap, EAP_PEER);
while (enumerator->enumerate(enumerator, &reg_type, &reg_vendor))
{
+ if ((type && type != reg_type) ||
+ (type && vendor && vendor != reg_vendor))
+ { /* the preferred type is only sent if we actually find it */
+ continue;
+ }
if (!reg_vendor || expanded)
{
write_type(writer, reg_type, reg_vendor, expanded);