diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-06-05 21:23:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-06-05 21:23:32 +0000 |
| commit | a4aec4051ddbfb2e6d61894d252dad8056a5de7f (patch) | |
| tree | 0d424fbce27d70d7754d2e3f63b519ca50918c11 | |
| parent | 9bb2c30bc2d02fbdb1dd83612723ecccaafad8f9 (diff) | |
| download | wireshark-a4aec4051ddbfb2e6d61894d252dad8056a5de7f.tar.gz wireshark-a4aec4051ddbfb2e6d61894d252dad8056a5de7f.tar.bz2 wireshark-a4aec4051ddbfb2e6d61894d252dad8056a5de7f.zip | |
hmac-md5 authentication support for IS-IS, from Hannes Gredler.
svn path=/trunk/; revision=3517
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | packet-isis-clv.c | 60 | ||||
| -rw-r--r-- | packet-isis-hello.c | 4 |
3 files changed, 38 insertions, 27 deletions
@@ -591,6 +591,7 @@ Hannes Gredler <hannes@juniper.net> { OSI network layer over PPP support Many ISIS enhancements Juniper Networks vendor ID in RADIUS dissector + hmac-md5 authentication support for IS-IS } Inoue <inoue@ainet.or.jp> { diff --git a/packet-isis-clv.c b/packet-isis-clv.c index 8b5253a043..bf8c55dab9 100644 --- a/packet-isis-clv.c +++ b/packet-isis-clv.c @@ -1,7 +1,7 @@ /* packet-isis-clv.c * Common CLV decode routines. * - * $Id: packet-isis-clv.c,v 1.11 2001/05/14 18:40:15 guy Exp $ + * $Id: packet-isis-clv.c,v 1.12 2001/06/05 21:23:32 guy Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer @@ -133,7 +133,7 @@ isis_dissect_authentication_clv(const u_char *pd, int offset, guint length, u_char pw_type; char sbuf[300]; /* 255 + header info area */ char *s = sbuf; - int use_cleartext; + int auth_unsupported; if ( length <= 0 ) { return; @@ -141,38 +141,48 @@ isis_dissect_authentication_clv(const u_char *pd, int offset, guint length, pw_type = pd[offset++]; length--; - use_cleartext = FALSE; + auth_unsupported = FALSE; + switch (pw_type) { case 1: - s += sprintf ( s, "type 1, clear text" ); - use_cleartext = TRUE; + s += sprintf ( s, "clear text (1), password (length %d) = ", length ); + + if ( length > 0 ) { + strncpy(s, &pd[offset], length); + s[length] = 0; + } else { + strcat(s, "no clear-text password found!!!" ); + } + break; + case 54: + s += sprintf ( s, "hmac-md5 (54), password (length %d) = ", length ); + + if ( length == 16 ) { + s += sprintf ( s, "0x%02x", pd[offset++] ); + length--; + while (length > 0) { + s += sprintf ( s, "%02x", pd[offset++] ); + length--; + } + s = 0; + } else { + strcat(s, "illegal hmac-md5 digest format (must be 16 bytes)" ); + } break; default: - s += sprintf ( s, "type 0x%02x, (must be 1)", pw_type ); + s += sprintf ( s, "type 0x%02x (0x%02x): ", pw_type, length ); + auth_unsupported=TRUE; break; } - s += sprintf ( s, " (0x%02x): ", length ); - - if ( use_cleartext ) { - if ( length > 0 ) { - strncpy(s, &pd[offset], length); - /* null terminate */ - s[length] = 0; - } else { - strcat(s, "<<no password found!!!>>" ); - } - /* NOTE, s no longer valid */ - } proto_tree_add_text ( tree, NullTVB, offset - 1, length + 1, "%s %s", meaning, sbuf ); - if ( !use_cleartext ) { - if ( length ) { - isis_dissect_unknown(offset, length, tree, fd, - "Unknown autheticion type" ); - } - } -} + + if ( auth_unsupported ) { + isis_dissect_unknown(offset, length, tree, fd, + "Unknown authentication type" ); + } +} /* * Name: isis_dissect_hostname_clv() diff --git a/packet-isis-hello.c b/packet-isis-hello.c index 14670067e5..5526a397d1 100644 --- a/packet-isis-hello.c +++ b/packet-isis-hello.c @@ -1,7 +1,7 @@ /* packet-isis-hello.c * Routines for decoding isis hello packets and their CLVs * - * $Id: packet-isis-hello.c,v 1.14 2001/05/14 18:40:15 guy Exp $ + * $Id: packet-isis-hello.c,v 1.15 2001/06/05 21:23:32 guy Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer @@ -352,7 +352,7 @@ static void dissect_hello_auth_clv(const u_char *pd, int offset, guint length, int id_length, frame_data *fd, proto_tree *tree) { isis_dissect_authentication_clv(pd, offset, length, fd, tree, - "Per Link authentication" ); + "authentication" ); } /* |