add pbkdf2 dependency
This commit is contained in:
parent
10e5ec56a1
commit
31226b8a34
10
electrum
10
electrum
|
@ -26,16 +26,6 @@ import sys
|
|||
import time
|
||||
import traceback
|
||||
|
||||
try:
|
||||
import ecdsa # todo: 'ecdsa' imported but unused
|
||||
except ImportError:
|
||||
sys.exit("Error: python-ecdsa does not seem to be installed. Try 'sudo pip install ecdsa'")
|
||||
|
||||
try:
|
||||
import aes # todo: 'aes' imported but unused
|
||||
except ImportError:
|
||||
sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
|
||||
|
||||
|
||||
is_local = os.path.dirname(os.path.realpath(__file__)) == os.getcwd()
|
||||
is_android = 'ANDROID_DATA' in os.environ
|
||||
|
|
|
@ -17,12 +17,34 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
import hashlib, base64, ecdsa, re
|
||||
import hashlib
|
||||
import base64
|
||||
import re
|
||||
import sys
|
||||
import hmac
|
||||
import aes
|
||||
|
||||
|
||||
try:
|
||||
import ecdsa
|
||||
except ImportError:
|
||||
sys.exit("Error: python-ecdsa does not seem to be installed. Try 'sudo pip install ecdsa'")
|
||||
|
||||
try:
|
||||
import aes
|
||||
except ImportError:
|
||||
sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
|
||||
|
||||
try:
|
||||
import pbkdf2
|
||||
except ImportError:
|
||||
sys.exit("Error: pbkdf2 does not seem to be installed. Try 'sudo pip install pbkdf2'")
|
||||
|
||||
|
||||
|
||||
from util import print_error
|
||||
|
||||
|
||||
|
||||
# AES encryption
|
||||
EncodeAES = lambda secret, s: base64.b64encode(aes.encryptData(secret,s))
|
||||
DecodeAES = lambda secret, e: aes.decryptData(secret, base64.b64decode(e))
|
||||
|
|
Loading…
Reference in New Issue