r47204 - Merge unbork-openssh-8279-2: Fix OpenSSH-using tests on Fedora 23

Author: hawkowl
Date: Sun Apr 10 07:35:41 2016
New Revision: 47204

Added:
   trunk/twisted/conch/topfiles/8279.misc
Modified:
   trunk/twisted/conch/test/test_ssh.py

Log:
Merge unbork-openssh-8279-2: Fix OpenSSH-using tests on Fedora 23

Author: hawkowl
Reviewer: adiroiban
Fixes: #8279

Modified: trunk/twisted/conch/test/test_ssh.py
==============================================================================
--- trunk/twisted/conch/test/test_ssh.py	(original)
+++ trunk/twisted/conch/test/test_ssh.py	Sun Apr 10 07:35:41 2016
@@ -364,12 +364,12 @@
                 C{(generator, prime)} tupple.
             """
             # In these tests, we hardwire the prime values to those defined by
-            # the diffie-hellman-group1-sha1 key exchange algorithm, to avoid
+            # the diffie-hellman-group14-sha1 key exchange algorithm, to avoid
             # requiring a moduli file when running tests.
             # See OpenSSHFactory.getPrimes.
             return {
                 2048: [
-                    _kex.getDHGeneratorAndPrime('diffie-hellman-group1-sha1')]
+                    _kex.getDHGeneratorAndPrime('diffie-hellman-group14-sha1')]
             }
 
         def getService(self, trans, name):