chaintool/funga-eth
4
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Ida/pbkdf2 #2

Closed
idaapayo wants to merge 8 commits from idaapayo/funga-eth:Ida/pbkdf2 into master
pull from: idaapayo/funga-eth:Ida/pbkdf2
merge into: chaintool:master
Conversation 1 Commits 8 Files Changed 5 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 23a94c3ba1 - Show all commits

2
funga/eth/keystore/keyfile.py
View File

@ -97,7 +97,7 @@ class Ciphers:
return ciphertext return ciphertext
def to_dict(private_key_bytes, kdf :str, passphrase=''): def to_dict(private_key_bytes, kdf='scrypt', passphrase=''):
lash commented 2022-01-24 17:59:43 +01:00
Outdated
Review
Copy Link

can we have scrypt as default please? that makes it backward compatible

can we have scrypt as default please? that makes it backward compatible
private_key = coincurve.PrivateKey(secret=private_key_bytes) private_key = coincurve.PrivateKey(secret=private_key_bytes)
if kdf == 'scrypt': if kdf == 'scrypt':

2
funga/eth/runnable/keyfile.py
View File

@ -79,7 +79,7 @@ def main():
else: else:
pk_bytes = os.urandom(32) pk_bytes = os.urandom(32)
pk = coincurve.PrivateKey(secret=pk_bytes) pk = coincurve.PrivateKey(secret=pk_bytes)
o = to_dict(pk_bytes, 'scrypt', passphrase) o = to_dict(pk_bytes, passphrase)
lash commented 2022-01-24 18:00:17 +01:00
Outdated
Review
Copy Link

... and then you don't have to change this.

... and then you don't have to change this.
r = json.dumps(o) r = json.dumps(o)
print(r) print(r)