dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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.
This commit is contained in:
Robey Pointer 2004-09-11 20:43:09 +00:00
parent 0e66dd47ac
commit 5176b1ab85
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
paramiko/kex_gex.py
View File

@ -149,14 +149,11 @@ class KexGex (object):
K = pow(self.e, self.x, self.p) K = pow(self.e, self.x, self.p)
key = str(self.transport.get_server_key()) 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) # 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 = Message()
hm.add(self.transport.remote_kex_init).add(self.transport.local_kex_init).add(key) hm.add(self.transport.remote_version, self.transport.local_version,
hm.add_int(self.min_bits) self.transport.remote_kex_init, self.transport.local_kex_init,
hm.add_int(self.preferred_bits) key, self.min_bits, self.preferred_bits, self.max_bits,
hm.add_int(self.max_bits) self.p, self.g, self.e, self.f, K)
hm.add_mpint(self.p)
hm.add_mpint(self.g)
hm.add(self.e).add(self.f).add(K)
H = SHA.new(str(hm)).digest() H = SHA.new(str(hm)).digest()
self.transport._set_K_H(K, H) self.transport._set_K_H(K, H)
# sign it # sign it
@ -178,14 +175,11 @@ class KexGex (object):
raise SSHException('Server kex "f" is out of range') raise SSHException('Server kex "f" is out of range')
K = pow(self.f, self.x, self.p) 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) # 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 = Message()
hm.add(self.transport.local_kex_init).add(self.transport.remote_kex_init).add(host_key) hm.add(self.transport.local_version, self.transport.remote_version,
hm.add_int(self.min_bits) self.transport.local_kex_init, self.transport.remote_kex_init,
hm.add_int(self.preferred_bits) host_key, self.min_bits, self.preferred_bits, self.max_bits,
hm.add_int(self.max_bits) self.p, self.g, self.e, self.f, K)
hm.add_mpint(self.p)
hm.add_mpint(self.g)
hm.add(self.e).add(self.f).add(K)
self.transport._set_K_H(K, SHA.new(str(hm)).digest()) self.transport._set_K_H(K, SHA.new(str(hm)).digest())
self.transport._verify_key(host_key, sig) self.transport._verify_key(host_key, sig)
self.transport._activate_outbound() self.transport._activate_outbound()

14
paramiko/kex_group1.py
View File

@ -90,9 +90,10 @@ class KexGroup1(object):
sig = m.get_string() sig = m.get_string()
K = pow(self.f, self.x, P) 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) # 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 = Message()
hm.add(self.transport.local_kex_init).add(self.transport.remote_kex_init).add(host_key) hm.add(self.transport.local_version, self.transport.remote_version,
hm.add(self.e).add(self.f).add(K) 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._set_K_H(K, SHA.new(str(hm)).digest())
self.transport._verify_key(host_key, sig) self.transport._verify_key(host_key, sig)
self.transport._activate_outbound() self.transport._activate_outbound()
@ -105,9 +106,10 @@ class KexGroup1(object):
K = pow(self.e, self.x, P) K = pow(self.e, self.x, P)
key = str(self.transport.get_server_key()) 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) # 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 = Message()
hm.add(self.transport.remote_kex_init).add(self.transport.local_kex_init).add(key) hm.add(self.transport.remote_version, self.transport.local_version,
hm.add(self.e).add(self.f).add(K) self.transport.remote_kex_init, self.transport.local_kex_init,
key, self.e, self.f, K)
H = SHA.new(str(hm)).digest() H = SHA.new(str(hm)).digest()
self.transport._set_K_H(K, H) self.transport._set_K_H(K, H)
# sign it # sign it