Wireshark-commits: [Wireshark-commits] master 0ec8bd5: dot11decrypt: Separate key extraction step f
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0ec8bd50c7a63e27a672fdc313188a5daa149695
Submitter: "Roland Knall <rknall@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
0ec8bd5 by Mikael Kanstrup (mikael.kanstrup@xxxxxxxx):
dot11decrypt: Separate key extraction step from decryption step
As a step towards removing the parsing of frames inside dot11decrypt
engine separate the key extraction step from the decryption step.
Two new functions for extracting keys are now provided by the
do11decrypt engine. One to be called for EAPOL key frames that
will extract and feed the engine with keys present in 4-way handshake
and group handshake messages. And one to be called for TDLS action
frames to extract keys and feed the engine with keys during TDLS
session establishement.
The old Dot11DecryptPacketProcess function called for all 802.11
frames is simplified and now only has one purpose. To decrypt
encrypted packets. Hence renamed to Dot11DecryptDecryptPacket.
Change-Id: Idb38d538f435ec352c6bbb200a09bc2a2347c42e
Reviewed-on: https://code.wireshark.org/review/34928
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@xxxxxxxxx>
Actions performed:
from 23850a3 CMS: reset object_identifier_id after dissecting ContentInfo
add 0ec8bd5 dot11decrypt: Separate key extraction step from decryption step
Summary of changes:
epan/crypt/dot11decrypt.c | 477 ++++++++++++++++---------------------
epan/crypt/dot11decrypt_system.h | 94 ++++++--
epan/dissectors/packet-eapol.c | 12 +-
epan/dissectors/packet-eapol.h | 8 +
epan/dissectors/packet-ieee80211.c | 142 ++++++++---
5 files changed, 399 insertions(+), 334 deletions(-)
