Fix some errors

bip38.py

@@ -1,76 +1,74 @@
 #!/usr/bin/python
 #import Crypto
 
-from Crypto.Cipher import AES
+import base58
 import scrypt
-import hashlib
+from Crypto.Cipher import AES
 from bitcoin import *
-import binascii
-import base58
 
 
-def bip38_encrypt(privkey,passphrase):
+def bip38_encrypt(privkey, passphrase):
     '''BIP0038 non-ec-multiply encryption. Returns BIP0038 encrypted privkey.'''
     privformat = get_privkey_format(privkey)
-    if privformat in ['wif_compressed','hex_compressed']:
+    if privformat in ['wif_compressed', 'hex_compressed']:
         compressed = True
         flagbyte = '\xe0'
         if privformat == 'wif_compressed':
-            privkey = encode_privkey(privkey,'hex_compressed')
+            privkey = encode_privkey(privkey, 'hex_compressed')
             privformat = get_privkey_format(privkey)
     if privformat in ['wif', 'hex']:
         compressed = False
         flagbyte = '\xc0'
     if privformat == 'wif':
-        privkey = encode_privkey(privkey,'hex')
+        privkey = encode_privkey(privkey, 'hex')
         privformat = get_privkey_format(privkey)
     pubkey = privtopub(privkey)
     addr = pubtoaddr(pubkey)
-    addresshash = hashlib.sha256(hashlib.sha256(addr).digest()).digest()[0:4]
+    addresshash = hashlib.sha256(hashlib.sha256(addr.encode('utf-8')).digest()).digest()[0:4]
+    addreshash_text = binascii.hexlify(addresshash)
     key = scrypt.hash(passphrase, addresshash, 16384, 8, 8)
     derivedhalf1 = key[0:32]
     derivedhalf2 = key[32:64]
-    aes = AES.new(derivedhalf2)
-    encryptedhalf1 = aes.encrypt(binascii.unhexlify('%0.32x' % (long(privkey[0:32], 16) ^ long(binascii.hexlify(derivedhalf1[0:16]), 16))))
-    encryptedhalf2 = aes.encrypt(binascii.unhexlify('%0.32x' % (long(privkey[32:64], 16) ^ long(binascii.hexlify(derivedhalf1[16:32]), 16))))
-    encrypted_privkey = ('\x01\x42' + flagbyte + addresshash + encryptedhalf1 + encryptedhalf2)
-    encrypted_privkey += hashlib.sha256(hashlib.sha256(encrypted_privkey).digest()).digest()[:4] # b58check for encrypted privkey
+    aes = AES.new(derivedhalf2, AES.MODE_ECB)
+    encryptedhalf1 = aes.encrypt(binascii.unhexlify('%0.32x' % (int(privkey[0:32], 16) ^ int(binascii.hexlify(derivedhalf1[0:16]), 16))))
+    encryptedhalf2 = aes.encrypt(binascii.unhexlify('%0.32x' % (int(privkey[32:64], 16) ^ int(binascii.hexlify(derivedhalf1[16:32]), 16))))
+    encrypted_privkey = (b'\x01\x42' + flagbyte.encode('latin1') + addresshash + encryptedhalf1 + encryptedhalf2)
+    encrypted_privkey += hashlib.sha256(hashlib.sha256(encrypted_privkey).digest()).digest()[:4]  # b58check for encrypted privkey
     encrypted_privkey = base58.b58encode(encrypted_privkey)
     return encrypted_privkey
 
 
-def bip38_decrypt(encrypted_privkey,passphrase):
+def bip38_decrypt(encrypted_privkey, passphrase):
     '''BIP0038 non-ec-multiply decryption. Returns WIF privkey.'''
     d = base58.b58decode(encrypted_privkey)
     d = d[2:]
     flagbyte = d[0:1]
     d = d[1:]
-    if flagbyte == '\xc0':
+    if flagbyte == b'\xc0':
         compressed = False
-    if flagbyte == '\xe0':
+    if flagbyte == b'\xe0':
         compressed = True
     addresshash = d[0:4]
     d = d[4:-4]
-    key = scrypt.hash(passphrase,addresshash, 16384, 8, 8)
+    key = scrypt.hash(passphrase, addresshash, 16384, 8, 8)
     derivedhalf1 = key[0:32]
     derivedhalf2 = key[32:64]
     encryptedhalf1 = d[0:16]
     encryptedhalf2 = d[16:32]
-    aes = AES.new(derivedhalf2)
+    aes = AES.new(derivedhalf2, AES.MODE_ECB)
     decryptedhalf2 = aes.decrypt(encryptedhalf2)
     decryptedhalf1 = aes.decrypt(encryptedhalf1)
     priv = decryptedhalf1 + decryptedhalf2
-    priv = binascii.unhexlify('%064x' % (long(binascii.hexlify(priv), 16) ^ long(binascii.hexlify(derivedhalf1), 16)))
+    priv = binascii.unhexlify('%064x' % (int(binascii.hexlify(priv), 16) ^ int(binascii.hexlify(derivedhalf1), 16)))
     pub = privtopub(priv)
     if compressed:
-        pub = encode_pubkey(pub,'hex_compressed')
-        wif = encode_privkey(priv,'wif_compressed')
+        pub = encode_pubkey(pub, 'hex_compressed')
+        wif = encode_privkey(priv, 'wif_compressed')
     else:
-        wif = encode_privkey(priv,'wif')
+        wif = encode_privkey(priv, 'wif')
     addr = pubtoaddr(pub)
-    if hashlib.sha256(hashlib.sha256(addr).digest()).digest()[0:4] != addresshash:
+    if hashlib.sha256(hashlib.sha256(addr.encode('utf-8')).digest()).digest()[0:4] != addresshash:
         print('Verification failed. Password is incorrect.')
         return ''
     else:
-        return wif
-
+        return wif

requirements.txt

@@ -0,0 +1,5 @@
+scrypt>=0.8.24
+base58>=2.1.1
+crypto>=1.4.1
+bitcoin>=1.1.42
+pycryptodome>=3.9.9