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

Rework code slightly to prevent several GCC "breaking strict-aliasing rules" warnings 

svn path=/trunk/; revision=29554
This commit is contained in:
Bill Meier 2009-08-25 23:03:10 +00:00
parent 232747f501
commit 8e1021f0c2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-ssl-utils.c
View File

@ -1853,6 +1853,7 @@ tls_check_mac(SslDecoder*decoder, gint ct, gint ver, guint8* data,
gint md;
guint32 len;
guint8 buf[20];
gint16 temp;
md=ssl_get_digest_by_name(digests[decoder->cipher_suite->dig-0x40]);
ssl_debug_printf("tls_check_mac mac type:%s md %d\n",
@ -1873,10 +1874,14 @@ tls_check_mac(SslDecoder*decoder, gint ct, gint ver, guint8* data,
ssl_hmac_update(&hm,buf,1);
/* hash version,data length and data*/
*((gint16*)buf) = g_htons(ver);
/* *((gint16*)buf) = g_htons(ver); */
temp = g_htons(ver);
memcpy(buf, &temp, 2);
ssl_hmac_update(&hm,buf,2);
*((gint16*)buf) = g_htons(datalen);
/* *((gint16*)buf) = g_htons(datalen); */
temp = g_htons(datalen);
memcpy(buf, &temp, 2);
ssl_hmac_update(&hm,buf,2);
ssl_hmac_update(&hm,data,datalen);
@ -1899,6 +1904,7 @@ ssl3_check_mac(SslDecoder*decoder,int ct,guint8* data,
guint32 len;
guint8 buf[64],dgst[20];
gint pad_ct;
gint16 temp;
pad_ct=(decoder->cipher_suite->dig==DIG_SHA)?40:48;
@ -1924,7 +1930,9 @@ ssl3_check_mac(SslDecoder*decoder,int ct,guint8* data,
ssl_md_update(&mc,buf,1);
/* hash data length in network byte order and data*/
*((gint16* )buf) = g_htons(datalen);
/* *((gint16* )buf) = g_htons(datalen); */
temp = g_htons(datalen);
memcpy(buf, &temp, 2);
ssl_md_update(&mc,buf,2);
ssl_md_update(&mc,data,datalen);