Changeset 1675:b51419e47720

Timestamp:

06/25/08 19:48:54 (8 weeks ago)

Author:

klai@…

Branch:

default

Message:

Fix bugs in using new key interface

Location:

src/Tycoon

Files:

• Auctioneer.py (modified) (2 diffs)
• KeyCache.py (modified) (2 diffs)

src/Tycoon/Auctioneer.py

@@ -61 +61 @@
             for bank_account_name, public_key in account['owners']:
                 key = DSA()
-                key.parse_public_key(public_key, 'X509')
+                key.parse_public_key(public_key)
                 authorized = self.xmlrpc_server.secure_verify(
                     key, xml_str, *params)
@@ -329 +329 @@
         # Verify the sender.
         key = DSA()
-        key.parse_public_key(public_key, "X509")
+        key.parse_public_key(public_key)
         if not self.xmlrpc_server.secure_verify(
             key, xml, host_account_name, public_key, initial_time_stamp,

src/Tycoon/KeyCache.py

@@ -56 +56 @@
         if type(cvalue) == list:
             k = DSA()
-            k.parse_public_key(cvalue[1])
+            k.parse_public_key(" ".join(cvalue[1:]))
             k.account_name = cvalue[0]
             self[key] = k
@@ -77 +77 @@
         """
         if server_name in self:
+            # Canonicalize key string
+            key = self.get(server_name)
+            new_key = DSA()
+            new_key.parse_public_key(server_key)
+            
             # Check if cached key is same as reported key
-            key = self.get(server_name)
-            if key.public_key_string != server_key:
+            if key.public_key_string != new_key.public_key_string:
                 logger.error("%s\n%s\n%s" % (
                     error_1 % (server_name,), error_2,