X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/46f6e51d596cb47c718baa3959c2e9bb28c5e0c1..2a579c6b18e16138a1296e6942c84cde163d0717:/print-radius.c diff --git a/print-radius.c b/print-radius.c index 9cf4a919..26da4832 100644 --- a/print-radius.c +++ b/print-radius.c @@ -16,20 +16,22 @@ * RFC 2869: * "RADIUS Extensions" * - * Alfredo Andres Omella (aandres@mfom.es) v0.1 2000/09/15 + * Alfredo Andres Omella (aandres@s21sec.com) v0.1 2000/09/15 * * TODO: Among other things to print ok MacIntosh and Vendor values */ #ifndef lint static const char rcsid[] = - "$Id: print-radius.c,v 1.2 2000-10-08 08:48:48 guy Exp $"; + "$Id: print-radius.c,v 1.6 2001-03-19 03:58:11 guy Exp $"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include + #include #include @@ -40,9 +42,6 @@ static const char rcsid[] = #include "addrtoname.h" #include "extract.h" -#include "ip.h" -#include "udp.h" - #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) ) #define PRINT_HEX(bytes_len, ptr_data) \ @@ -112,15 +111,15 @@ static void print_attr_time(register u_char *, u_int, u_short); static void print_attr_strange(register u_char *, u_int, u_short); -struct radius_hdr { u_char code; /* Radius packet code */ - u_char id; /* Radius packet id */ - u_short len; /* Radius total length */ - u_char auth[16]; /* Authenticator */ +struct radius_hdr { u_int8_t code; /* Radius packet code */ + u_int8_t id; /* Radius packet id */ + u_int16_t len; /* Radius total length */ + u_int8_t auth[16]; /* Authenticator */ }; -struct radius_attr { u_char type; /* Attribute type */ - u_char len; /* Attribute length */ +struct radius_attr { u_int8_t type; /* Attribute type */ + u_int8_t len; /* Attribute length */ }; @@ -470,8 +469,15 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code ) static void print_attr_num(register u_char *data, u_int length, u_short attr_code ) { + u_int8_t tag; u_int32_t timeout; + if (length != 4) + { + printf("{length %u != 4}", length); + return; + } + TCHECK2(data[0],4); /* This attribute has standard values */ if (attr_type[attr_code].siz_subtypes) @@ -486,10 +492,14 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) printf("{Tag[Unused]"); else printf("{Tag[%d]", *data); - data_value = EXTRACT_24BITS(++data); + data++; + data_value = EXTRACT_24BITS(data); } else - data_value = EXTRACT_32BITS(++data); + { + data++; + data_value = EXTRACT_32BITS(data); + } if ( data_value <= (attr_type[attr_code].siz_subtypes - 1 + attr_type[attr_code].first_subtype) ) printf("{%s}",table[data_value]); @@ -542,10 +552,12 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) break; case TUNNEL_PREFERENCE: - if (!*data) - printf("{Tag[Unused] %d}",EXTRACT_24BITS(++data) ); + tag = *data; + data++; + if (tag == 0) + printf("{Tag[Unused] %d}",EXTRACT_24BITS(data) ); else - printf("{Tag[%d] %d}", *data, EXTRACT_24BITS(++data) ); + printf("{Tag[%d] %d}", tag, EXTRACT_24BITS(data) ); break; default: @@ -573,6 +585,12 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) static void print_attr_address(register u_char *data, u_int length, u_short attr_code ) { + if (length != 4) + { + printf("{length %u != 4}", length); + return; + } + TCHECK2(data[0],4); switch(attr_code) @@ -610,9 +628,22 @@ print_attr_address(register u_char *data, u_int length, u_short attr_code ) /*************************************/ static void print_attr_time(register u_char *data, u_int length, u_short attr_code) { + time_t attr_time; + char string[26]; + + if (length != 4) + { + printf("{length %u != 4}", length); + return; + } + TCHECK2(data[0],4); - printf("{%s}", ctime( ((const time_t *)EXTRACT_32BITS(data) )) ); + attr_time = EXTRACT_32BITS(data); + strcpy(string, ctime(&attr_time)); + /* Get rid of the newline */ + string[24] = '\0'; + printf("{%.24s}", string); return; trunc: @@ -629,43 +660,66 @@ static void print_attr_time(register u_char *data, u_int length, u_short attr_co /***********************************/ static void print_attr_strange(register u_char *data, u_int length, u_short attr_code) { - u_short len_data = 8; + u_short len_data; switch(attr_code) { case ARAP_PASS: + if (length != 16) + { + printf("{length %u != 16}", length); + return; + } printf("{User_challenge["); TCHECK2(data[0],8); + len_data = 8; PRINT_HEX(len_data, data); printf("] User_resp["); TCHECK2(data[0],8); + len_data = 8; PRINT_HEX(len_data, data); printf("]}"); break; case ARAP_FEATURES: + if (length != 14) + { + printf("{length %u != 14}", length); + return; + } + TCHECK2(data[0],1); if (*data) printf("{User_can_change_pass"); else printf("{User_cant_change_pass"); - TCHECK2(data[0],1); data++; + TCHECK2(data[0],1); printf(" Min_pass_len[%d]",*data); + data++; printf(" Pass_created_at["); - TCHECK2(data[0],8); + TCHECK2(data[0],4); + len_data = 4; PRINT_HEX(len_data, data); printf("] Pass_expired_in["); - TCHECK2(data[0],8); + TCHECK2(data[0],4); + len_data = 4; PRINT_HEX(len_data, data); printf("] Current_time["); - TCHECK2(data[0],8); + len_data = 4; + TCHECK2(data[0],4); PRINT_HEX(len_data, data); printf("]}"); break; case ARAP_CHALLENGE_RESP: + if (length < 8) + { + printf("{length %u != 8}", length); + return; + } printf("{"); TCHECK2(data[0],8); + len_data = 8; PRINT_HEX(len_data, data); printf("}"); break; @@ -699,9 +753,13 @@ radius_attr_print(register u_char *attr, u_int length) { printf(" %s",attr_type[rad_attr->type].name); - if ( attr_type[rad_attr->type].print_func ) - (*attr_type[rad_attr->type].print_func)( ((char *)(rad_attr+1)), + if (rad_attr->len > 2) + { + if ( attr_type[rad_attr->type].print_func ) + (*attr_type[rad_attr->type].print_func)( + ((u_char *)(rad_attr+1)), rad_attr->len - 2, rad_attr->type); + } } } else @@ -778,5 +836,5 @@ radius_print(const u_char *dat, u_int length) printf(" [id %d]", rad->id); if (i) - radius_attr_print( ((char *)(rad+1)), i); + radius_attr_print( ((u_char *)(rad+1)), i); }