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

Make Mk16_le() work on both big-endian and little-endian processors and 

on processors that don't support unaligned loads - just use pletohs().

svn path=/trunk/; revision=21534
This commit is contained in:
Guy Harris 2007-04-23 18:11:12 +00:00
parent 6f4a938c64
commit cdb59eed63
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/crypt/airpdcap_tkip.c
View File

@ -35,6 +35,7 @@
/******************************************************************************/
/* File includes */
/* */
#include <epan/pint.h>
#include "airpdcap_system.h"
#include "airpdcap_int.h"
@ -132,9 +133,7 @@ static const UINT16 Sbox[256] = {
#define Mk16(hi, lo) \
((UINT16)((lo) | (((UINT16) (hi)) << 8)))
/* XXX - does this assume a little-endian processor? */
/* For that matter, does it assume a processor that handles unaligned loads? */
#define Mk16_le(v) ((UINT16)*(v))
#define Mk16_le(v) ((UINT16)pletohs(v))
#define _S_(v) \
((UINT16)(Sbox[Lo8(v)] ^ ((Sbox[Hi8(v)] << 8) | (Sbox[Hi8(v)] >> 8))))