Skip to content

Commit

Permalink
Update extract-blockchain-second-hash.py
Browse files Browse the repository at this point in the history
  • Loading branch information
3rdIteration committed Nov 6, 2019
1 parent bef44b2 commit 1913086
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion extract-scripts/extract-blockchain-second-hash.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def decrypt_current(iter_count):
key = pbkdf2(password, salt_and_iv, iter_count, 32)
decrypted = aes256_cbc_decrypt(key, salt_and_iv, data) # CBC mode
padding = ord(decrypted[-1:]) # ISO 10126 padding length
return decrypted[:-padding] if 1 <= padding <= 16 and re.match('{\s*"guid"', decrypted) else None
return decrypted[:-padding] if 1 <= padding <= 16 and re.search('"guid"', decrypted) else None

# Encryption scheme only used in version 0.0 wallets (N.B. this is untested)
def decrypt_old():
Expand Down

0 comments on commit 1913086

Please sign in to comment.