mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-28 10:58:26 +00:00
Extract all active keys
This commit is contained in:
parent
2a20731b00
commit
23139faa62
@ -11,6 +11,12 @@
|
|||||||
- Added hash-mode: ENCsecurity Datavault (MD5/keychain)
|
- Added hash-mode: ENCsecurity Datavault (MD5/keychain)
|
||||||
- Added hash-mode: Dahua NVR/DVR/HVR (md5($salt1.strtoupper(md5($salt2.$pass))))
|
- Added hash-mode: Dahua NVR/DVR/HVR (md5($salt1.strtoupper(md5($salt2.$pass))))
|
||||||
|
|
||||||
|
##
|
||||||
|
## Bugs
|
||||||
|
##
|
||||||
|
|
||||||
|
- Fixed keys extraction in luks2hashcat - now extracts all active keys
|
||||||
|
|
||||||
##
|
##
|
||||||
## Technical
|
## Technical
|
||||||
##
|
##
|
||||||
|
@ -273,8 +273,13 @@ def extract_version1(file):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# check for any active key
|
# check for any active key
|
||||||
|
if all(key.active not in [KeyVersion1.Active.ENABLED, KeyVersion1.Active.ENABLED_OLD] for key in header.keys):
|
||||||
|
# all keys are disabled
|
||||||
|
raise ValueError("all keys are disabled")
|
||||||
|
|
||||||
for key in header.keys:
|
for key in header.keys:
|
||||||
if key.active not in [KeyVersion1.Active.ENABLED, KeyVersion1.Active.ENABLED_OLD]:
|
if key.active not in [KeyVersion1.Active.ENABLED, KeyVersion1.Active.ENABLED_OLD]:
|
||||||
|
# skip inactive keys
|
||||||
continue
|
continue
|
||||||
|
|
||||||
hash = SIGNATURE + "$".join(
|
hash = SIGNATURE + "$".join(
|
||||||
@ -294,10 +299,6 @@ def extract_version1(file):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
print(hash)
|
print(hash)
|
||||||
break
|
|
||||||
else:
|
|
||||||
# all keys are disabled
|
|
||||||
raise ValueError("all keys are disabled")
|
|
||||||
|
|
||||||
|
|
||||||
# main
|
# main
|
||||||
|
Loading…
Reference in New Issue
Block a user