diff options
| -rw-r--r-- | paramiko/kex_gex.py | 26 | ||||
| -rw-r--r-- | paramiko/kex_group1.py | 14 |
2 files changed, 18 insertions, 22 deletions
diff --git a/paramiko/kex_gex.py b/paramiko/kex_gex.py index 4603cbca..8f3a800f 100644 --- a/paramiko/kex_gex.py +++ b/paramiko/kex_gex.py @@ -149,14 +149,11 @@ class KexGex (object): K = pow(self.e, self.x, self.p) key = str(self.transport.get_server_key()) # okay, build up the hash H of (V_C || V_S || I_C || I_S || K_S || min || n || max || p || g || e || f || K) - hm = Message().add(self.transport.remote_version).add(self.transport.local_version) - hm.add(self.transport.remote_kex_init).add(self.transport.local_kex_init).add(key) - hm.add_int(self.min_bits) - hm.add_int(self.preferred_bits) - hm.add_int(self.max_bits) - hm.add_mpint(self.p) - hm.add_mpint(self.g) - hm.add(self.e).add(self.f).add(K) + hm = Message() + hm.add(self.transport.remote_version, self.transport.local_version, + self.transport.remote_kex_init, self.transport.local_kex_init, + key, self.min_bits, self.preferred_bits, self.max_bits, + self.p, self.g, self.e, self.f, K) H = SHA.new(str(hm)).digest() self.transport._set_K_H(K, H) # sign it @@ -178,14 +175,11 @@ class KexGex (object): raise SSHException('Server kex "f" is out of range') K = pow(self.f, self.x, self.p) # okay, build up the hash H of (V_C || V_S || I_C || I_S || K_S || min || n || max || p || g || e || f || K) - hm = Message().add(self.transport.local_version).add(self.transport.remote_version) - hm.add(self.transport.local_kex_init).add(self.transport.remote_kex_init).add(host_key) - hm.add_int(self.min_bits) - hm.add_int(self.preferred_bits) - hm.add_int(self.max_bits) - hm.add_mpint(self.p) - hm.add_mpint(self.g) - hm.add(self.e).add(self.f).add(K) + hm = Message() + hm.add(self.transport.local_version, self.transport.remote_version, + self.transport.local_kex_init, self.transport.remote_kex_init, + host_key, self.min_bits, self.preferred_bits, self.max_bits, + self.p, self.g, self.e, self.f, K) self.transport._set_K_H(K, SHA.new(str(hm)).digest()) self.transport._verify_key(host_key, sig) self.transport._activate_outbound() diff --git a/paramiko/kex_group1.py b/paramiko/kex_group1.py index cb033efd..fb70648a 100644 --- a/paramiko/kex_group1.py +++ b/paramiko/kex_group1.py @@ -90,9 +90,10 @@ class KexGroup1(object): sig = m.get_string() K = pow(self.f, self.x, P) # okay, build up the hash H of (V_C || V_S || I_C || I_S || K_S || e || f || K) - hm = Message().add(self.transport.local_version).add(self.transport.remote_version) - hm.add(self.transport.local_kex_init).add(self.transport.remote_kex_init).add(host_key) - hm.add(self.e).add(self.f).add(K) + hm = Message() + hm.add(self.transport.local_version, self.transport.remote_version, + self.transport.local_kex_init, self.transport.remote_kex_init, + host_key, self.e, self.f, K) self.transport._set_K_H(K, SHA.new(str(hm)).digest()) self.transport._verify_key(host_key, sig) self.transport._activate_outbound() @@ -105,9 +106,10 @@ class KexGroup1(object): K = pow(self.e, self.x, P) key = str(self.transport.get_server_key()) # okay, build up the hash H of (V_C || V_S || I_C || I_S || K_S || e || f || K) - hm = Message().add(self.transport.remote_version).add(self.transport.local_version) - hm.add(self.transport.remote_kex_init).add(self.transport.local_kex_init).add(key) - hm.add(self.e).add(self.f).add(K) + hm = Message() + hm.add(self.transport.remote_version, self.transport.local_version, + self.transport.remote_kex_init, self.transport.local_kex_init, + key, self.e, self.f, K) H = SHA.new(str(hm)).digest() self.transport._set_K_H(K, H) # sign it |