diff options
| author | Robey Pointer <robey@lag.net> | 2004-09-11 20:43:09 +0000 |
|---|---|---|
| committer | Robey Pointer <robey@lag.net> | 2004-09-11 20:43:09 +0000 |
| commit | 5176b1ab85703e8f6faaa15f4c4809634fd47cb0 (patch) | |
| tree | 062a37fc834eaa68720c4b294c47844e3707484b /paramiko/kex_gex.py | |
| parent | 0e66dd47acdd63dbe251edb651f09dcb20a0ade7 (diff) | |
| download | paramiko-5176b1ab85703e8f6faaa15f4c4809634fd47cb0.tar.gz | |
[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-83]
tweak Message.add() in the key exchanges
use the new Message.add() behavior to make a little code here much easier
to read.
Diffstat (limited to 'paramiko/kex_gex.py')
| -rw-r--r-- | paramiko/kex_gex.py | 26 |
1 files changed, 10 insertions, 16 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() |