diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-06-14 22:09:14 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-06-14 22:09:14 +0000 |
| commit | 1d567d6e6bb74956ff1425468346cd397876b721 (patch) | |
| tree | c090e324bc4834ba655dcc92e79b281d8636066a /epan/crypt/airpdcap_ccmp.c | |
| parent | 7cd5781110bb13e6a1b48f68f2892aa5db07edd4 (diff) | |
| download | wireshark-1d567d6e6bb74956ff1425468346cd397876b721.tar.gz | |
The 802.11 dissector calculates the header size, so pass that value to
the WEP/WPA decryption code instead of re-calculating it. Fixes bug
1639.
Remove fcsPresent, radiotapPresent, and associated code from airpdcap.c
since they were always FALSE. Glib-ize some data types. Fixup white
space.
Update the release notes.
svn path=/trunk/; revision=22104
Diffstat (limited to 'epan/crypt/airpdcap_ccmp.c')
| -rw-r--r-- | epan/crypt/airpdcap_ccmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/crypt/airpdcap_ccmp.c b/epan/crypt/airpdcap_ccmp.c index 7205ab9442..f0ee8e3e64 100644 --- a/epan/crypt/airpdcap_ccmp.c +++ b/epan/crypt/airpdcap_ccmp.c @@ -208,6 +208,7 @@ static void ccmp_init_blocks( INT AirPDcapCcmpDecrypt( UINT8 *m, + gint mac_header_len, INT len, UCHAR TK1[16]) { @@ -219,7 +220,7 @@ INT AirPDcapCcmpDecrypt( UINT i; UINT8 *pos; UINT space; - INT z=AIRPDCAP_HEADER_LEN(m[1]); + INT z = mac_header_len; rijndael_ctx key; UINT64 PN; UINT8 *ivp=m+z; |