diff --git a/.appveyor.yml b/.appveyor.yml index 39b739f..aa3baa4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -37,7 +37,7 @@ install: - python -m pip install --upgrade pip - pip install virtualenv - pip install -U setuptools - - pip install pycryptodome + - pip install pycryptodomex - pip install pbkdf2 - pip install Pillow - pip install pyreadline diff --git a/docs/_sources/virtualsmartcard/README.txt b/docs/_sources/virtualsmartcard/README.txt index be688fb..cb2c29d 100644 --- a/docs/_sources/virtualsmartcard/README.txt +++ b/docs/_sources/virtualsmartcard/README.txt @@ -103,7 +103,7 @@ Depending on your usage of the |vpicc| you may need to install the following: - Python_ - pyscard_ (relaying a local smart card with `--type=relay`) -- PyCrypto_, PBKDF2_, PIL_, readline_ or PyReadline_ (emulation of electronic +- PyCryptodome_, PBKDF2_, PIL_, readline_ or PyReadline_ (emulation of electronic passport with `--type=ePass`) - OpenPACE_ (emulation of German identity card with `--type=nPA`) - libqrencode_ (to print a QR code on the command line for `vpcd-config`; an @@ -314,7 +314,7 @@ Notes and References .. _PCSC-lite: https://pcsclite.apdu.fr/ .. _Python: http://www.python.org/ .. _pyscard: http://pyscard.sourceforge.net/ -.. _PyCrypto: http://pycrypto.org/ +.. _PyCryptodome: https://www.pycryptodome.org/ .. _PBKDF2: https://www.dlitz.net/software/python-pbkdf2/ .. _readline: https://docs.python.org/3.3/library/readline.html .. _PyReadline: https://pypi.python.org/pypi/pyreadline diff --git a/docs/virtualsmartcard/README.html b/docs/virtualsmartcard/README.html index 8f13faf..19091db 100644 --- a/docs/virtualsmartcard/README.html +++ b/docs/virtualsmartcard/README.html @@ -211,7 +211,7 @@ responses via NFC to a contact-less smart card that signs the mail.
PyCrypto 5, PBKDF2 6, PIL 9, readline 7 or PyReadline 8 (emulation of electronic +
PyCryptodome 5, PBKDF2 6, PIL 9, readline 7 or PyReadline 8 (emulation of electronic passport with –type=ePass)
OpenPACE 10 (emulation of German identity card with –type=nPA)
libqrencode 11 (to print a QR code on the command line for vpcd-config; an @@ -563,7 +563,7 @@ more than welcome! Please use our http://pyscard.sourceforge.net/
https://www.dlitz.net/software/python-pbkdf2/
@@ -619,4 +619,4 @@ more than welcome! Please use our 256 Bit, 0x60 => 512 Bit, 0x80 => 1024 """ - from Crypto.PublicKey import RSA - from Crypto.Util.randpool import RandomPool + from Cryptodome.PublicKey import RSA keynumber = p1 # TODO: Check if key exists @@ -110,8 +109,7 @@ class CryptoflexSE(Security_Environment): else: keylength = keylength_dict[p2] - rnd = RandomPool() - PublicKey = RSA.generate(keylength, rnd.get_bytes) + PublicKey = RSA.generate(keylength) self.dst.key = PublicKey e_in = struct.unpack("