From a9141cffb0d80e52255e69cbb50fb9179d055786 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 16 Aug 2008 10:17:22 +0300 Subject: [PATCH] Updated EAP-TTLSv0 references to use RFC 5281 --- src/eap_common/eap_defs.h | 2 +- src/eap_common/eap_ttls.h | 2 +- src/eap_peer/eap_ttls.c | 12 ++++++------ src/eap_server/eap_ttls.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/eap_common/eap_defs.h b/src/eap_common/eap_defs.h index abf7a9e1e..2cb2bb77b 100644 --- a/src/eap_common/eap_defs.h +++ b/src/eap_common/eap_defs.h @@ -53,7 +53,7 @@ typedef enum { EAP_TYPE_TLS = 13 /* RFC 2716 */, EAP_TYPE_LEAP = 17 /* Cisco proprietary */, EAP_TYPE_SIM = 18 /* RFC 4186 */, - EAP_TYPE_TTLS = 21 /* draft-ietf-pppext-eap-ttls-02.txt */, + EAP_TYPE_TTLS = 21 /* RFC 5281 */, EAP_TYPE_AKA = 23 /* RFC 4187 */, EAP_TYPE_PEAP = 25 /* draft-josefsson-pppext-eap-tls-eap-06.txt */, EAP_TYPE_MSCHAPV2 = 26 /* draft-kamath-pppext-eap-mschapv2-00.txt */, diff --git a/src/eap_common/eap_ttls.h b/src/eap_common/eap_ttls.h index f69af1488..797d08478 100644 --- a/src/eap_common/eap_ttls.h +++ b/src/eap_common/eap_ttls.h @@ -1,5 +1,5 @@ /* - * EAP server/peer: EAP-TTLS (draft-ietf-pppext-eap-ttls-03.txt) + * EAP server/peer: EAP-TTLS (RFC 5281) * Copyright (c) 2004-2007, Jouni Malinen * * This program is free software; you can redistribute it and/or modify diff --git a/src/eap_peer/eap_ttls.c b/src/eap_peer/eap_ttls.c index 3dbed1b62..737c3c104 100644 --- a/src/eap_peer/eap_ttls.c +++ b/src/eap_peer/eap_ttls.c @@ -1,5 +1,5 @@ /* - * EAP peer method: EAP-TTLS (draft-ietf-pppext-eap-ttls-03.txt) + * EAP peer method: EAP-TTLS (RFC 5281) * Copyright (c) 2004-2008, Jouni Malinen * * This program is free software; you can redistribute it and/or modify @@ -27,7 +27,7 @@ /* Maximum supported TTLS version - * 0 = draft-ietf-pppext-eap-ttls-03.txt / draft-funk-eap-ttls-v0-00.txt + * 0 = RFC 5281 * 1 = draft-funk-eap-ttls-v1-00.txt */ #ifndef EAP_TTLS_VERSION @@ -1810,10 +1810,10 @@ static struct wpabuf * eap_ttls_process(struct eap_sm *sm, void *priv, if (eap_ttls_process_start(sm, data, flags, ret) < 0) return NULL; - /* draft-ietf-pppext-eap-ttls-03.txt, Ch. 8.1: - * EAP-TTLS Start packet may, in a future specification, be - * allowed to contain data. Client based on this draft version - * must ignore such data but must not reject the Start packet. + /* RFC 5281, Ch. 9.2: + * "This packet MAY contain additional information in the form + * of AVPs, which may provide useful hints to the client" + * For now, ignore any potential extra data. */ left = 0; } else if (!data->ssl_initialized) { diff --git a/src/eap_server/eap_ttls.c b/src/eap_server/eap_ttls.c index 13c9e1127..1ff9ea042 100644 --- a/src/eap_server/eap_ttls.c +++ b/src/eap_server/eap_ttls.c @@ -1,5 +1,5 @@ /* - * hostapd / EAP-TTLS (draft-ietf-pppext-eap-ttls-05.txt) + * hostapd / EAP-TTLS (RFC 5281) * Copyright (c) 2004-2008, Jouni Malinen * * This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ /* Maximum supported TTLS version - * 0 = draft-ietf-pppext-eap-ttls-03.txt / draft-funk-eap-ttls-v0-00.txt + * 0 = RFC 5281 * 1 = draft-funk-eap-ttls-v1-00.txt */ #ifndef EAP_TTLS_VERSION