diff --git a/README.md b/README.md index a2b3a5f..1056704 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ You can download binaries of those Additionally, you'll need the following packages on your host machine: -* pycryptodome (for PyWii) +* pycryptodomeex (for PyWii) * libpng headers (libpng-dev) * gettext * sox diff --git a/pywii/Common/pywii/ec.py b/pywii/Common/pywii/ec.py index d7058dd..7235312 100644 --- a/pywii/Common/pywii/ec.py +++ b/pywii/Common/pywii/ec.py @@ -6,7 +6,7 @@ from array import array from struct import pack, unpack -from Crypto.Util.number import bytes_to_long, long_to_bytes +from Cryptodome.Util.number import bytes_to_long, long_to_bytes # y**2 + x*y = x**3 + x + b ec_b = "\x00\x66\x64\x7e\xde\x6c\x33\x2c\x7f\x8c\x09\x23\xbb\x58\x21"+\ diff --git a/pywii/Common/pywii/wii.py b/pywii/Common/pywii/wii.py index 19ad366..42b83c2 100644 --- a/pywii/Common/pywii/wii.py +++ b/pywii/Common/pywii/wii.py @@ -8,11 +8,11 @@ from struct import unpack, pack import os, os.path import sys -from Crypto.Cipher import AES -from Crypto.Hash import SHA -from Crypto.PublicKey import RSA -from Crypto.Util.number import bytes_to_long, long_to_bytes -from Crypto.Signature import pkcs1_15 +from Cryptodome.Cipher import AES +from Cryptodome.Hash import SHA +from Cryptodome.PublicKey import RSA +from Cryptodome.Util.number import bytes_to_long, long_to_bytes +from Cryptodome.Signature import pkcs1_15 import ec diff --git a/pywii/pywii-tools/tmdupdatecr.py b/pywii/pywii-tools/tmdupdatecr.py index 3359d45..4fb787d 100755 --- a/pywii/pywii-tools/tmdupdatecr.py +++ b/pywii/pywii-tools/tmdupdatecr.py @@ -2,7 +2,7 @@ import sys, os, os.path import pywii as wii -from Crypto.Hash import SHA +from Cryptodome.Hash import SHA wii.loadkeys()