Support both pycryptodome and pycryptodomex

This commit is contained in:
Hector Martin 2017-07-29 19:20:43 +09:00
parent 1bff584465
commit 4ad9428dfa
3 changed files with 20 additions and 7 deletions

View File

@ -6,7 +6,10 @@
from array import array from array import array
from struct import pack, unpack from struct import pack, unpack
from Cryptodome.Util.number import bytes_to_long, long_to_bytes try:
from Cryptodome.Util.number import bytes_to_long, long_to_bytes
except ImportError:
from Crypto.Util.number import bytes_to_long, long_to_bytes
# y**2 + x*y = x**3 + x + b # 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"+\ ec_b = "\x00\x66\x64\x7e\xde\x6c\x33\x2c\x7f\x8c\x09\x23\xbb\x58\x21"+\

View File

@ -8,11 +8,18 @@ from struct import unpack, pack
import os, os.path import os, os.path
import sys import sys
from Cryptodome.Cipher import AES try:
from Cryptodome.Hash import SHA from Cryptodome.Cipher import AES
from Cryptodome.PublicKey import RSA from Cryptodome.Hash import SHA
from Cryptodome.Util.number import bytes_to_long, long_to_bytes from Cryptodome.PublicKey import RSA
from Cryptodome.Signature import pkcs1_15 from Cryptodome.Util.number import bytes_to_long, long_to_bytes
from Cryptodome.Signature import pkcs1_15
except ImportError:
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
import ec import ec

View File

@ -2,7 +2,10 @@
import sys, os, os.path import sys, os, os.path
import pywii as wii import pywii as wii
from Cryptodome.Hash import SHA try:
from Cryptodome.Hash import SHA
except ImportError:
from Crypto.Hash import SHA
wii.loadkeys() wii.loadkeys()