use pycryptodomex as preferred crypto library. #154

Author: knipknap

Exscript/protocols/ssh2.py

@@ -31,7 +31,10 @@
 import select
 import socket
 import paramiko
-import Crypto
+try:
+    import Cryptodome as Crypto
+except ImportError:
+    import Crypto
 from binascii import hexlify
 from paramiko import util
 from paramiko.ssh_exception import SSHException, AuthenticationException, \

Exscript/servers/sshd.py

@@ -28,7 +28,10 @@
 import base64
 import socket
 import threading
-import Crypto
+try:
+    import Cryptodome as Crypto
+except ImportError:
+    import Crypto
 import paramiko
 from copy import deepcopy
 from paramiko import ServerInterface

Exscript/util/crypt.py

@@ -31,7 +31,10 @@
 import sys
 import string
 import random
-from Crypto.Hash import MD4
+try:
+    from Cryptodome.Hash import MD4
+except ImportError:
+    from Crypto.Hash import MD4
 
 _VALIDSEEDCHARACTERS = string.ascii_letters + string.digits
 

requirements.txt

@@ -1,4 +1,4 @@
 future
 configparser
-pycrypto
+pycryptodomex
 paramiko>=1.17

setup.py

@@ -23,7 +23,7 @@
       package_data     = {},
       packages         = find_packages(),
       scripts          = ['scripts/exscript', 'scripts/otp'],
-      install_requires = ['future', 'configparser', 'paramiko', 'pycrypto'],
+      install_requires = ['future', 'configparser', 'paramiko', 'pycryptodomex'],
       extras_require   = {},
       keywords         = ' '.join(['exscript',
                                    'telnet',