osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Zero security struct to avoid reading garbage value, and remove a redundant test 

svn path=/trunk/; revision=54506
This commit is contained in:
Martin Mathieson 2013-12-31 00:46:53 +00:00
parent a65cbe8e7b
commit 2719103661
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-pdcp-lte.c
View File

@ -1451,11 +1451,6 @@ static guint32 calculate_digest(pdu_security_settings_t *pdu_security_settings,
return 0;
}
/* Only EIA2 supported at the moment */
if (pdu_security_settings->integrity != eia2) {
return 0;
}
/* Can only do if indicated in preferences */
if (!global_pdcp_check_integrity) {
return 0;
@ -1506,11 +1501,11 @@ static guint32 calculate_digest(pdu_security_settings_t *pdu_security_settings,
g_free(message_data);
*calculated = TRUE;
/* TODO: not sure where MAC will be among this...? */
return mac[3];
/* 3GPP TS 33.401 C.2 suggests the first word will be the calculated CMAC. */
return mac[0];
#endif
}
/* TODO: just dropping through until GCRY_MAC_CMAC_AES is available! */
/* Just dropping through until GCRY_MAC_CMAC_AES is available! */
case eia1:
default:
@ -1562,8 +1557,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
gboolean payload_deciphered = FALSE;
/* Initialise security settings */
pdu_security_settings.cipherValid = FALSE;
pdu_security_settings.integrityValid = FALSE;
memset(&pdu_security_settings, 0, sizeof(pdu_security_settings));
/* Set protocol name. */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PDCP-LTE");