1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

From Holger Schurig; add support for EAP-TTLS.

Browse Source 
svn path=/trunk/; revision=9966
This commit is contained in:
Guy Harris 2004-02-03 18:22:32 +00:00
parent 1d2c791ab6
commit c6ddebb4e6
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -2052,6 +2052,7 @@ And assorted fixes and enhancements by the people listed above and by:
David Richards <drichards [AT] alum.mit.edu> David Richards <drichards [AT] alum.mit.edu>
Shusaku Ueda <ueda [AT] sra.co.jp> Shusaku Ueda <ueda [AT] sra.co.jp>
Jonathan Perkins <jonathan.perkins [AT] ipaccess.com> Jonathan Perkins <jonathan.perkins [AT] ipaccess.com>
Holger Schurig <h.schurig [AT] mn-logistik.de>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c. give his permission to use his version of snprintf.c.

1
doc/ethereal.pod
View File

@ -2121,6 +2121,7 @@ B<http://www.ethereal.com>.
David Richards <drichards [AT] alum.mit.edu> David Richards <drichards [AT] alum.mit.edu>
Shusaku Ueda <ueda [AT] sra.co.jp> Shusaku Ueda <ueda [AT] sra.co.jp>
Jonathan Perkins <jonathan.perkins [AT] ipaccess.com> Jonathan Perkins <jonathan.perkins [AT] ipaccess.com>
Holger Schurig <h.schurig [AT] mn-logistik.de>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c. permission to use his version of snprintf.c.

6
packet-eap.c
View File

@ -2,7 +2,7 @@
* Routines for EAP Extensible Authentication Protocol dissection * Routines for EAP Extensible Authentication Protocol dissection
* RFC 2284 * RFC 2284
* *
* $Id: packet-eap.c,v 1.34 2003/04/20 11:36:13 guy Exp $ * $Id: packet-eap.c,v 1.35 2004/02/03 18:22:32 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com> * By Gerald Combs <gerald@ethereal.com>
@ -70,6 +70,7 @@ References:
#define EAP_TYPE_NAK 3 #define EAP_TYPE_NAK 3
#define EAP_TYPE_TLS 13 #define EAP_TYPE_TLS 13
#define EAP_TYPE_LEAP 17 #define EAP_TYPE_LEAP 17
#define EAP_TYPE_TTLS 21
static const value_string eap_type_vals[] = { static const value_string eap_type_vals[] = {
{EAP_TYPE_ID, "Identity [RFC2284]" }, {EAP_TYPE_ID, "Identity [RFC2284]" },
@ -92,7 +93,7 @@ static const value_string eap_type_vals[] = {
{ 18, "Nokia IP smart card authentication [Haverinen]" }, { 18, "Nokia IP smart card authentication [Haverinen]" },
{ 19, "SRP-SHA1 Part 1 [Carlson]" }, { 19, "SRP-SHA1 Part 1 [Carlson]" },
{ 20, "SRP-SHA1 Part 2 [Carlson]" }, { 20, "SRP-SHA1 Part 2 [Carlson]" },
{ 21, "EAP-TTLS [Funk]" }, {EAP_TYPE_TTLS,"EAP-TTLS [Funk]" },
{ 22, "Remote Access Service [Fields]" }, { 22, "Remote Access Service [Fields]" },
{ 23, "UMTS Authentication and Key Agreement [Haverinen]" }, { 23, "UMTS Authentication and Key Agreement [Haverinen]" },
{ 24, "EAP-3Com Wireless [Young]" }, { 24, "EAP-3Com Wireless [Young]" },
@ -431,6 +432,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/********************************************************************* /*********************************************************************
EAP-TLS EAP-TLS
**********************************************************************/ **********************************************************************/
case EAP_TYPE_TTLS:
case EAP_TYPE_TLS: case EAP_TYPE_TLS:
{ {
guint8 flags = tvb_get_guint8(tvb, offset); guint8 flags = tvb_get_guint8(tvb, offset);