Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

extract-blockchain-second-hash.py was failing for newer wallets #343

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

extract-blockchain-second-hash.py was failing for newer wallets #343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion extract-scripts/extract-blockchain-second-hash.py
View file
Open in desktop
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