[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-41]

make get_remote_server_key() return a PKey object
a good suggestion from roger binns: make get_remote_server_key() just return
a pkey object instead of a tuple of strings.  all the strings can be extracted
from the pkey object, as well as other potentially useful things.

1 files changed, 3 insertions, 3 deletions

diff --git a/demo.py b/demo.py
index 3a642289..c9dd5014 100755
--- a/demo.py
+++ b/demo.py
@@ -70,12 +70,12 @@ try:
     # print repr(t)
 
     keys = load_host_keys()
-    keytype, hostkey = t.get_remote_server_key()
+    key = t.get_remote_server_key()
     if not keys.has_key(hostname):
         print '*** WARNING: Unknown host key!'
-    elif not keys[hostname].has_key(keytype):
+    elif not keys[hostname].has_key(key.get_name()):
         print '*** WARNING: Unknown host key!'
-    elif keys[hostname][keytype] != hostkey:
+    elif keys[hostname][key.get_name()] != str(key):
         print '*** WARNING: Host key has changed!!!'
         sys.exit(1)
     else: