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

fragattack: test output improvements

Browse Source
This commit is contained in:
Mathy Vanhoef 2020-08-05 00:35:24 +04:00
parent 4350e3d24a
commit d3e11e9bc1
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
research/fraginternals.py
View File

@ -249,7 +249,7 @@ class Test(metaclass=abc.ABCMeta):
if self.check_fn != None:
self.time_completed = time.time()
else:
log(STATUS, "All frames sent. You must manually check if the test succeeded (see README).", color="green")
log(STATUS, ">>> All frames sent. You must manually check if the test succeeded (see README).", color="green")
self.done = True
def get_actions(self, action):

15
research/tests_common.py
View File

@ -38,12 +38,15 @@ class PingTest(Test):
def prepare(self, station):
log(STATUS, "Generating ping test", color="green")
# TODO: We can only automatically check result if the last action happens while being connected...????
# Generate the header and payload
header, request, self.check_fn = generate_request(station, self.ptype, icmp_size=self.icmp_size, \
header, request, check_fn = generate_request(station, self.ptype, icmp_size=self.icmp_size, \
padding=self.padding, to_self=self.to_self, dport=self.dport)
# We can automatically detect the result if the last fragment was sent after a connected event.
# Note we might get a reply during a rekey handshake, and this will be handled properly.
if any([act.trigger >= Action.AfterAuth for act in self.actions]):
self.check_fn = check_fn
if self.as_msdu == 1:
# Set the A-MSDU frame type flag in the QoS header
header.Reserved = 1
@ -220,9 +223,9 @@ class EapolAmsduTest(Test):
# Set the A-MSDU frame type flag in the QoS header
header.Reserved = 1
# We can automatically detect result if the last fragment was
# sent after the authentication
if self.actions[-1].trigger >= Action.AfterAuth:
# We can automatically detect the result if the last fragment was sent after a connected event.
# Note we might get a reply during a rekey handshake, and this will be handled properly.
if any([act.trigger >= Action.AfterAuth for act in self.actions]):
self.check_fn = check_fn
mac_src = station.mac