[project @ robey@lag.net-20071029030520-ozmne7y4l6037m8h]

bug discovered while porting to jaramiko: old-style gex wasn't creating
the proper hash. fixed.

Makefile

@@ -65,3 +65,4 @@ test:
 # transport.py
 #
 # POST md5sum on website!
+# RUN setup.py 

paramiko/kex_gex.py

@@ -64,6 +64,7 @@ class KexGex (object):
             # only used for unit tests: we shouldn't ever send this
             m.add_byte(chr(_MSG_KEXDH_GEX_REQUEST_OLD))
             m.add_int(self.preferred_bits)
+            self.old_style = True
         else:
             m.add_byte(chr(_MSG_KEXDH_GEX_REQUEST))
             m.add_int(self.min_bits)
@@ -228,8 +229,10 @@ class KexGex (object):
         hm.add(self.transport.local_version, self.transport.remote_version,
                self.transport.local_kex_init, self.transport.remote_kex_init,
                host_key)
+        if not self.old_style:
             hm.add_int(self.min_bits)
         hm.add_int(self.preferred_bits)
+        if not self.old_style:
             hm.add_int(self.max_bits)
         hm.add_mpint(self.p)
         hm.add_mpint(self.g)

tests/test_kex.py

@@ -179,7 +179,7 @@ class KexTest (unittest.TestCase):
         msg.add_string('fake-sig')
         msg.rewind()
         kex.parse_next(paramiko.kex_gex._MSG_KEXDH_GEX_REPLY, msg)
-        H = 'A265563F2FA87F1A89BF007EE90D58BE2E4A4BD0'
+        H = '807F87B269EF7AC5EC7E75676808776A27D5864C'
         self.assertEquals(self.K, transport._K)
         self.assertEquals(H, hexlify(transport._H).upper())
         self.assertEquals(('fake-host-key', 'fake-sig'), transport._verify)