Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-25 00:38:24 -05:00
Code Issues Projects Releases Wiki Activity

fragattacks: bugfix that MF flag is not correctly set

Browse Source
This commit is contained in:
Mathy Vanhoef 2020-10-17 11:49:57 +04:00
parent 87e3e047ee
commit 08e3267428
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
research/tests_common.py
View File

@ -6,6 +6,11 @@
from fraginternals import * from fraginternals import *
import copy import copy
class FragInfo:
def __init__(self, num=0, morefrag=False):
self.num = num
self.morefrag = morefrag
class PingTest(Test): class PingTest(Test):
def __init__(self, ptype, fragments, separate_with=None, opt=None): def __init__(self, ptype, fragments, separate_with=None, opt=None):
super().__init__(fragments) super().__init__(fragments)
@ -24,15 +29,19 @@ class PingTest(Test):
self.parse_meta_actions() self.parse_meta_actions()
def parse_meta_actions(self): def parse_meta_actions(self):
# Create list of fragment numbers to be used relevant_actions = list(filter(lambda act: act.is_meta(Action.MetaDrop) or act.action == Action.Inject,
self.fragnums = [] self.actions))
next_fragnum = 0
for act in self.actions: # All fragments except the last have the MoreFragment flag set (True)
if act.is_meta(Action.MetaDrop): fraginfos = [FragInfo(fragnum, True) for fragnum in range(len(relevant_actions) - 1)]
next_fragnum += 1 # The last fragment doesn't have the MoreFragment flag set (False)
elif act.action == Action.Inject: fraginfos.append(FragInfo(len(relevant_actions) - 1, False ))
self.fragnums.append(next_fragnum)
next_fragnum += 1 # Now remove fragment info for the MetaDrop actions
self.fraginfos = [fraginfo for fraginfo, act in zip(fraginfos, relevant_actions)
if act.action == Action.Inject]
# Remove all MetaDrop actions
self.actions = list(filter(lambda act: not act.is_meta(Action.MetaDrop), self.actions)) self.actions = list(filter(lambda act: not act.is_meta(Action.MetaDrop), self.actions))
def prepare(self, station): def prepare(self, station):
@ -70,8 +79,12 @@ class PingTest(Test):
else: else:
frame.addr1 = "ff:ff:ff:ff:ff:ff" frame.addr1 = "ff:ff:ff:ff:ff:ff"
# Assign fragment numbers according to MetaDrop rules # Set fragment number and MoreFragment flags according to parsed MetaDrop rules
frame.SC = (frame.SC & 0xfff0) | self.fragnums.pop(0) fraginfo = self.fraginfos.pop(0)
frame.SC = (frame.SC & 0xfff0) | fraginfo.num
if fraginfo.morefrag:
frame.FCfield |= Dot11(FCfield="MF").FCfield
frag.frame = frame frag.frame = frame
# Take into account encryption options # Take into account encryption options