r47193 - try using just the rsa keys

Author: hawkowl
Date: Sat Apr  9 01:18:08 2016
New Revision: 47193

Modified:
   branches/unbork-openssh-8279/twisted/conch/test/test_cftp.py
   branches/unbork-openssh-8279/twisted/conch/test/test_ssh.py

Log:
try using just the rsa keys

Modified: branches/unbork-openssh-8279/twisted/conch/test/test_cftp.py
==============================================================================
--- branches/unbork-openssh-8279/twisted/conch/test/test_cftp.py	(original)
+++ branches/unbork-openssh-8279/twisted/conch/test/test_cftp.py	Sat Apr  9 01:18:08 2016
@@ -888,13 +888,13 @@
 
 class CFTPClientTestBase(SFTPTestBase):
     def setUp(self):
-        f = open('dsa_test.pub','w')
-        f.write(test_ssh.publicDSA_openssh)
+        f = open('rsa_test.pub','w')
+        f.write(test_ssh.publicRSA_openssh)
         f.close()
-        f = open('dsa_test','w')
-        f.write(test_ssh.privateDSA_openssh)
+        f = open('rsa_test','w')
+        f.write(test_ssh.privateRSA_openssh)
         f.close()
-        os.chmod('dsa_test', 33152)
+        os.chmod('rsa_test', 33152)
         f = open('kh_test','w')
         f.write('127.0.0.1 ' + test_ssh.publicRSA_openssh)
         f.close()
@@ -921,7 +921,7 @@
         return defer.maybeDeferred(self.server.stopListening)
 
     def tearDown(self):
-        for f in ['dsa_test.pub', 'dsa_test', 'kh_test']:
+        for f in ['rsa_test.pub', 'rsa_test', 'kh_test']:
             try:
                 os.remove(f)
             except:
@@ -947,7 +947,7 @@
                '--known-hosts kh_test '
                '--user-authentications publickey '
                '--host-key-algorithms ssh-rsa '
-               '-i dsa_test '
+               '-i rsa_test '
                '-a '
                '-v '
                '127.0.0.1')
@@ -1291,7 +1291,7 @@
                     '--known-hosts kh_test '
                     '--user-authentications publickey '
                     '--host-key-algorithms ssh-rsa '
-                    '-i dsa_test '
+                    '-i rsa_test '
                     '-a '
                     '-v -b %s 127.0.0.1') % (port, fn)
         cmds = test_conch._makeArgs(cmds.split(), mod='cftp')[1:]
@@ -1403,17 +1403,17 @@
         # the version without doing anything else; if we can't, we will get a
         # configuration error.
         d = getProcessValue(
-            'ssh', ('-o', 'PubkeyAcceptedKeyTypes=ssh-dss', '-V'))
+            'ssh', ('-o', 'PubkeyAcceptedKeyTypes=ssh-rsa', '-V'))
         def hasPAKT(status):
             if status == 0:
-                args = ('-o', 'PubkeyAcceptedKeyTypes=ssh-dss')
+                args = ('-o', 'PubkeyAcceptedKeyTypes=ssh-rsa')
             else:
                 args = ()
             # Pass -F /dev/null to avoid the user's configuration file from
             # being loaded, as it may contain settings that cause our tests to
             # fail or hang.
             args += ('-F', '/dev/null',
-                     '-o', 'IdentityFile=dsa_test',
+                     '-o', 'IdentityFile=rsa_test',
                      '-o', 'UserKnownHostsFile=kh_test',
                      '-o', 'HostKeyAlgorithms=ssh-rsa',
                      '-o', 'Port=%i' % (port,), '-b', fn, '[email protected]')

Modified: branches/unbork-openssh-8279/twisted/conch/test/test_ssh.py
==============================================================================
--- branches/unbork-openssh-8279/twisted/conch/test/test_ssh.py	(original)
+++ branches/unbork-openssh-8279/twisted/conch/test/test_ssh.py	Sat Apr  9 01:18:08 2016
@@ -460,7 +460,7 @@
             return defer.succeed(keys.Key.fromString(privateDSA_openssh))
 
         def getPublicKey(self):
-            return keys.Key.fromString(publicDSA_openssh)
+            return keys.Key.fromString(publicRSA_openssh)
 
 
     class ConchTestClientConnection(connection.SSHConnection):
@@ -530,7 +530,7 @@
         @return: L{twisted.conch.checkers.SSHPublicKeyChecker}
         """
         conchTestPublicKeyDB = checkers.InMemorySSHKeyDB(
-            {'testuser': [keys.Key.fromString(publicDSA_openssh)]})
+            {'testuser': [keys.Key.fromString(publicRSA_openssh)]})
         return checkers.SSHPublicKeyChecker(conchTestPublicKeyDB)