Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions dploot/triage/wifi.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from binascii import unhexlify
from binascii import hexlify, unhexlify
import itertools
import logging
import ntpath
Expand Down Expand Up @@ -33,7 +33,7 @@ def __init__(
ssid: str,
auth: str,
encryption: str,
password: Optional[str] = None,
password: Optional[bytes] = None,
xml_data: Any = None,
eap_username: Optional[str] = None,
eap_domain: Optional[str] = None,
Expand Down Expand Up @@ -76,7 +76,8 @@ def dump(self) -> None:
if self.auth.upper() in ["WPAPSK", "WPA2PSK", "WPA3SAE"]:
print("AuthType:\t%s" % self.auth.upper())
print("Encryption:\t%s" % self.encryption.upper())
print("Preshared key:\t%s" % self.password)
print("Preshared key:\t%s" % self.password.decode("latin-1", errors="backslashreplace"))
print("Preshared key(hex):\t%s" % hexlify(self.password).decode('ascii'))
elif self.auth.upper() in ["WPA", "WPA2"]:
print("AuthType:\t%s EAP" % self.auth.upper())
print("Encryption:\t%s" % self.encryption.upper())
Expand Down Expand Up @@ -209,9 +210,10 @@ def triage_wifi(self) -> List[WifiCred]:
ssid=ssid,
auth=auth_type,
encryption=encryption,
password=password.decode(
"latin-1", errors="backslashreplace"
),
password=password,
# password=password.decode(
# "latin-1", errors="backslashreplace"
#),
xml_data=main,
)
elif auth_type in ["WPA", "WPA2"]:
Expand Down