Add support for paramiko 4.0.0.

Author: Marcel Vilas

Exscript/key.py

@@ -24,7 +24,7 @@
 Represents a private key.
 """
 from builtins import object
-from paramiko import RSAKey, DSSKey
+from paramiko import RSAKey, ECDSAKey, Ed25519Key
 from paramiko.ssh_exception import SSHException
 
 
@@ -72,11 +72,15 @@ def from_file(filename, password='', keytype=None):
                 keytype = 'rsa'
             except SSHException:
                 try:
-                    DSSKey.from_private_key_file(filename, password=password)
-                    keytype = 'dss'
+                    ECDSAKey.from_private_key_file(filename, password=password)
+                    keytype = 'ecdsa'
                 except SSHException:
-                    msg = 'not a recognized private key: ' + repr(filename)
-                    raise ValueError(msg)
+                    try:
+                        Ed25519Key.from_private_key_file(filename, password=password)
+                        keytype = 'ed25519'
+                    except SSHException:
+                        msg = 'not a recognized private key: ' + repr(filename)
+                        raise ValueError(msg)
         key = PrivateKey(keytype)
         key.filename = filename
         key.password = password

Exscript/protocols/drivers/driver.py

@@ -49,7 +49,7 @@
                          + _any_path + r'?'
                          + r'[: ]?'
                          + _any_path + r'?'
-                         + r'(?:\(' + _filename + '\))?'
+                         + r'(?:\(' + _filename + r'\))?'
                          + r'[\]\-]?'
                          + r'[#>%\$\]] ?'
                          + _unprintable + r'*'

Exscript/protocols/ssh2.py

@@ -50,7 +50,7 @@
 util.log_to_file(os.devnull)
 
 # Register supported key types.
-keymap = {'rsa': paramiko.RSAKey, 'dss': paramiko.DSSKey}
+keymap = {'rsa': paramiko.RSAKey, 'ecdsa': paramiko.ECDSAKey, 'ed25519': paramiko.Ed25519Key}
 for key in keymap:
     PrivateKey.keytypes.add(key)
 
@@ -259,9 +259,11 @@ def _paramiko_auth_key(self, username, keys, password):
     def _paramiko_auth_autokey(self, username, password):
         keyfiles = []
         for cls, file in ((paramiko.RSAKey, '~/.ssh/id_rsa'),  # Unix
-                          (paramiko.DSSKey, '~/.ssh/id_dsa'),  # Unix
+                          (paramiko.ECDSAKey, '~/.ssh/id_ecdsa'),  # Unix
+                          (paramiko.Ed25519Key, '~/.ssh/id_ed25519'),  # Unix
                           (paramiko.RSAKey, '~/ssh/id_rsa'),   # Windows
-                          (paramiko.DSSKey, '~/ssh/id_dsa')):  # Windows
+                          (paramiko.ECDSAKey, '~/ssh/id_ecdsa'),  # Windows
+                          (paramiko.Ed25519Key, '~/ssh/id_ed25519')):  # Windows
             file = os.path.expanduser(file)
             if os.path.isfile(file):
                 keyfiles.append((cls, file))

requirements.txt

@@ -1,4 +1,4 @@
 future
 configparser
 pycryptodomex
-paramiko>=1.17,<=3
+paramiko>=1.17,<5

setup.py

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