Changeset 1672:b10c86602c1e

Timestamp:

06/25/08 16:15:27 (4 months ago)

Author:

klai@…

Branch:

default

Message:

Use new Key interface

Location:

src/Tycoon

Files:

• Auctioneer.py (modified) (2 diffs)
• AuctioneerClient.py (modified) (1 diff)
• BankClient.py (modified) (2 diffs)
• ChildAgent.py (modified) (1 diff)
• KeyCache.py (modified) (2 diffs)

src/Tycoon/Auctioneer.py

@@ -604 +604 @@
             key = DSA()
             try:
-                key.parse_public_key(value[1], 'X509')
+                key.parse_public_key(value[1])
             except:
                 raise TyException("Invalid public key", value[1])
@@ -674 +674 @@
                 # Check if caller is authenticated/authorized
                 key = DSA()
-                key.parse_public_key(public_key[0], "X509")
+                key.parse_public_key(public_key[0])
                 v = self.xmlrpc_server.secure_verify(
                     key, xml, bank_account_name, caller, callee, time_stamp,

src/Tycoon/AuctioneerClient.py

@@ -99 +99 @@
             self.__user_key = DSA()
             self.__user_key.read(
-                self.__options.PublicKeyFileName, "X509",
-                self.__options.PrivateKeyFileName, "PKCS8")
+                self.__options.PublicKeyFileName, 
+                self.__options.PrivateKeyFileName)
         else:
             self.__user_key = bank_account_key

src/Tycoon/BankClient.py

@@ -63 +63 @@
         if not self.__bank_public_key:
             self.__bank_public_key = DSA()
-            self.__bank_public_key.read(bank_public_key_file_name, "X509")
+            self.__bank_public_key.read(bank_public_key_file_name)
         
         # Read in user's bank account key
@@ -70 +70 @@
             self.__bank_account_key = DSA()
             self.__bank_account_key.read(
-                public_key_file_name, "X509", private_key_file_name, "PKCS8")
+                public_key_file_name, private_key_file_name)
             self.__bank_account_key.account_name = bank_account_name
 

src/Tycoon/ChildAgent.py

@@ -74 +74 @@
         if self.options.AdminPublicKeyFileName:
             self.admin_key = DSA()
-            self.admin_key.read(self.options.AdminPublicKeyFileName, "X509")
+            self.admin_key.read(self.options.AdminPublicKeyFileName)
 
         # Set up SIGHUP handler to restart

src/Tycoon/KeyCache.py

@@ -56 +56 @@
         if type(cvalue) == list:
             k = DSA()
-            k.parse_public_key(cvalue[1], "X509")
+            k.parse_public_key(cvalue[1])
             k.account_name = cvalue[0]
             self[key] = k
@@ -67 +67 @@
         key = DSA()
         self[address] = key
-        key.parse_public_key(key_string, "X509")
+        key.parse_public_key(key_string)
         key.account_name = account_name
         file(self.__file_name, "a").write(