From Emanuele Caratti:

just use "g_free()" to free the buffer in "md5_xor()", as it
	doesn't throw exceptions;

	temporarily #ifdef out "tacplus_acct_flags" pending the
	arrival of code to dissect the TACACS+ accounting stuff.

svn path=/trunk/; revision=8566
This commit is contained in:
Guy Harris 2003-09-29 18:50:47 +00:00
parent 11c747bd5f
commit e62a1a7386
2 changed files with 5 additions and 4 deletions

View File

@ -5,7 +5,7 @@
* Full Tacacs+ parsing with decryption by
* Emanuele Caratti <wiz@iol.it>
*
* $Id: packet-tacacs.c,v 1.28 2003/09/23 21:37:11 guy Exp $
* $Id: packet-tacacs.c,v 1.29 2003/09/29 18:50:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -945,7 +945,6 @@ md5_xor( u_char *data, char *key, int data_len, u_char *session_id, u_char versi
md5_buff = (md5_byte_t*)g_malloc(md5_len+MD5_LEN);
CLEANUP_PUSH( g_free, md5_buff );
mdp = md5_buff;
*(guint32*)mdp = *(guint32*)session_id;
@ -974,5 +973,5 @@ md5_xor( u_char *data, char *key, int data_len, u_char *session_id, u_char versi
md5_append(&mdcontext, md5_buff, md5_len);
md5_finish(&mdcontext,hash);
}
CLEANUP_CALL_AND_POP;
g_free( md5_buff );
}

View File

@ -2,7 +2,7 @@
* Routines for cisco tacplus packet dissection
* Copyright 2000, Emanuele Caratti <wiz@iol.it>
*
* $Id: packet-tacacs.h,v 1.3 2003/09/20 09:41:48 guy Exp $
* $Id: packet-tacacs.h,v 1.4 2003/09/29 18:50:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -414,11 +414,13 @@ static value_string tacplus_acct_status[] = {
{TAC_PLUS_ACCT_STATUS_FOLLOW, "Follow"},
{0, NULL}};
#ifdef __TAC_ACCOUNTING__
static value_string tacplus_acct_flags[] = {
{TAC_PLUS_ACCT_FLAG_MORE, "More (deprecated)"},
{TAC_PLUS_ACCT_FLAG_START, "Start"},
{TAC_PLUS_ACCT_FLAG_STOP, "Stop"},
{TAC_PLUS_ACCT_FLAG_WATCHDOG,"Update"},
{0, NULL}};
#endif
#endif /* __PACKET_TACACS_H__ */