[Nym3-commit] r156 - trunk/nym3/Client

[laurent at komite.net]

Author: laurent
Date: 2005-01-24 23:14:46 +0100 (Mon, 24 Jan 2005)
New Revision: 156

Modified:
   trunk/nym3/Client/Keyring.py
Log:
Finish keyring decrypt.


Modified: trunk/nym3/Client/Keyring.py
===================================================================
--- trunk/nym3/Client/Keyring.py	2005-01-23 19:17:34 UTC (rev 155)
+++ trunk/nym3/Client/Keyring.py	2005-01-24 22:14:46 UTC (rev 156)
@@ -1,6 +1,7 @@
 # $Id$
 
 import pickle
+import random
 from mixminion.Crypto import sha1, ctr_crypt, AES_KEY_LEN
 
 
@@ -26,7 +27,18 @@
 	digest = clear[:-DIGEST_LEN]
 	# Should digest really be a digest, or merely a fixed MAGIC
 	# string ? TODO.
-	if sha1(clear) != digest:
+	if sha1(clear + salt) != digest:
 	    raise "Bad password"
-	self.data = clear
+	self.data = pickle.loads(clear)
 	self.status = 'clear'
+	self.passphrase = passphrase
+
+    def save(self):
+	"""Save the current keyring to file"""
+	salt = ""
+	for i in range(0, SALT_LEN):
+	    salt = salt + chr(random.randint(0, 255))
+	key = sha1(salt + passphrase + salt)
+	pass
+
+