[minion-cvs] OOps; I guess that function didnt actually exist

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv27151/lib/mixminion/server

Modified Files:
	ServerKeys.py ServerMain.py 
Log Message:
OOps; I guess that function didnt actually exist

Index: ServerKeys.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerKeys.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- ServerKeys.py	6 Dec 2004 19:26:31 -0000	1.69
+++ ServerKeys.py	6 Dec 2004 20:02:23 -0000	1.70
@@ -243,6 +243,11 @@
 
         return key
 
+    def getIdentityKeyDigest(self):
+        """DOCDOC"""
+        k = self.getIdentityKey()
+        return mixminion.Crypto.sha1(mixminion.Crypto.pk_encode_public_key(k))
+
     def publishKeys(self, allKeys=0):
         """Publish server descriptors to the directory server.  Ordinarily,
            only unpublished descriptors are sent.  If allKeys is true,

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- ServerMain.py	6 Dec 2004 19:26:31 -0000	1.136
+++ ServerMain.py	6 Dec 2004 20:02:23 -0000	1.137
@@ -865,7 +865,7 @@
         outgoingDir = os.path.join(queueDir, "outgoing")
         LOG.debug("Initializing outgoing queue")
         self.outgoingQueue = OutgoingQueue(outgoingDir,
-                                           self.keyring.getKeyDigest())
+                                   self.keyring.getIdentityKeyDigest())
         self.outgoingQueue.configure(config)
         LOG.debug("Found %d pending packets in outgoing queue",
                        self.outgoingQueue.count())