add pbkdf2 dependency

diff --git a/electrum b/electrum
index 76a000b..aeb1b88 100755 (executable)
--- a/electrum
+++ b/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

diff --git a/lib/bitcoin.py b/lib/bitcoin.py
index ff38695..aba02f8 100644 (file)
--- a/lib/bitcoin.py
+++ b/lib/bitcoin.py
@@ -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))

diff --git a/setup.py b/setup.py
index a654efb..27a6712 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ data_files += [
 setup(
     name="Electrum",
     version=version.ELECTRUM_VERSION,
-    install_requires=['slowaes', 'ecdsa>=0.9'],
+    install_requires=['slowaes', 'ecdsa>=0.9', 'pbkdf2'],
     package_dir={
         'electrum': 'lib',
         'electrum_gui': 'gui',