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

making review changes #2

Open
idaapayo wants to merge 7 commits from Ida/pbkdf2 into master
pull from: Ida/pbkdf2
merge into: idaapayo:master
Conversation 0 Commits 7 Files Changed 9 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a4f76b19c - Show all commits

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

@ -36,7 +36,7 @@ default_scrypt_kdfparams = {
'salt': os.urandom(32).hex(), 'salt': os.urandom(32).hex(),
} }
pbkdf2_kdfparams = { default_pbkdf2_kdfparams = {
'c': 100000, 'c': 100000,
'dklen': 32, 'dklen': 32,
'prf': 'sha256', 'prf': 'sha256',
@ -64,7 +64,7 @@ class Hashes:
dklen=dklen) dklen=dklen)
@staticmethod @staticmethod
def from_pbkdf2(kdfparams=pbkdf2_kdfparams, passphrase=''): def from_pbkdf2(kdfparams=default_pbkdf2_kdfparams, passphrase=''):
if kdfparams['prf'] == 'hmac-sha256': if kdfparams['prf'] == 'hmac-sha256':
kdfparams['prf'].replace('hmac-sha256','sha256') kdfparams['prf'].replace('hmac-sha256','sha256')

4
tests/test_cli.py
View File

@ -4,7 +4,7 @@ import logging
import os import os
# external imports # external imports
from hexathon import strip_0x, add_0x from hexathon import strip_0x
from pathlib import Path from pathlib import Path
import sys import sys
@ -16,7 +16,7 @@ print(sys.path)
from funga.eth.signer import EIP155Signer from funga.eth.signer import EIP155Signer
from funga.eth.keystore.dict import DictKeystore from funga.eth.keystore.dict import DictKeystore
# import dicttest as d
from funga.eth.cli.handle import SignRequestHandler from funga.eth.cli.handle import SignRequestHandler
from funga.eth.transaction import EIP155Transaction from funga.eth.transaction import EIP155Transaction