URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9ab8209542d911de8e39cf7d1bdbec821d1060c3
Submitter: Balint Reczey (balint@xxxxxxxxxxxxxxx)
Changed: branch: lts-1.12.1
Repository: wireshark
Commits:
9ab8209 by Michael Mann (mmann78@xxxxxxxxxxxx):
Make sure EAPOL body is big enough for a EAPOL_RSN_KEY.
A pointer to a EAPOL_RSN_KEY is set on the packet presuming the
whole EAPOL_RSN_KEY is there. That's not always the case for
fuzzed/malicious captures.
Conflicts:
epan/crypt/airpdcap.c
Cherry picking also changes the comparison according to
commit f42616a6216454656b7b958955d336d7b304714f.
Bug: 11585
Change-Id: Ib94b8aceef444c7820e43b969596efdb8dbecccd
Reviewed-on: https://code.wireshark.org/review/15540
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit 9b0b20b8d5f8c9f7839d58ff6c5900f7e19283b4)
Reviewed-on: https://code.wireshark.org/review/15544
(cherry picked from commit f2c0a286479b208b2c4f68afc218dacfc4ac709e)
Reviewed-on: https://code.wireshark.org/review/16139
Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
Actions performed:
from 5d18307 Make class "type" for USB conversations.
adds 9ab8209 Make sure EAPOL body is big enough for a EAPOL_RSN_KEY.
Summary of changes:
epan/crypt/airpdcap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)