[Nym3-commit] r465 - trunk/nymbaron/Client

[laurent at conuropsis.org]

Author: laurent
Date: 2006-03-08 21:59:58 +0100 (Wed, 08 Mar 2006)
New Revision: 465

Modified:
   trunk/nymbaron/Client/Keyring.py
Log:
Indentation

Modified: trunk/nymbaron/Client/Keyring.py
===================================================================
--- trunk/nymbaron/Client/Keyring.py	2006-03-08 20:58:32 UTC (rev 464)
+++ trunk/nymbaron/Client/Keyring.py	2006-03-08 20:59:58 UTC (rev 465)
@@ -44,65 +44,65 @@
        # TODO : this would need locking. Somewhere.
 
     def __init__(self, keyfile, create = False):
-	self.keyfile = keyfile
-	self.status = 'encrypted'
-	try:
-	    f = open(keyfile, 'r')
-	    self.datastring = f.read()
-	    f.close()
-	except IOError:
-	    if create:
-		f = open(keyfile, "w")
-		f.close()
-		self.data = {}
-		self.status = "clear"
-	    else: raise NewKeyring()
+        self.keyfile = keyfile
+        self.status = 'encrypted'
+        try:
+            f = open(keyfile, 'r')
+            self.datastring = f.read()
+            f.close()
+        except IOError:
+            if create:
+                f = open(keyfile, "w")
+                f.close()
+                self.data = {}
+                self.status = "clear"
+            else: raise NewKeyring()
 
     def _get_unused_handle(self):
-	handle = "42"
-	while self.data.has_key(handle):
-	    handle = Mail.genMid(8)
-	return handle
+        handle = "42"
+        while self.data.has_key(handle):
+            handle = Mail.genMid(8)
+        return handle
 
     def store(self, key):
-	handle = self._get_unused_handle()
-	self.data[handle] = key
-	return handle
+        handle = self._get_unused_handle()
+        self.data[handle] = key
+        return handle
 
     def update_key(self, handle, key):
-	self.data[handle] = key
+        self.data[handle] = key
 
     def get_key(self, handle):
-	return self.data[handle]
+        return self.data[handle]
 
     def save(self, passphrase):
-	"""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)[:AES_KEY_LEN]
-	clear = pickle.dumps(self.data)
-	digest = sha1(clear + salt)
-	encrypted = ctr_crypt(clear + digest, key)
-	try:
-	    f = open(self.keyfile, 'w')
-	    f.write(salt + encrypted)
-	    f.close
-	except IOError:
-	    raise "Duh"
+        """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)[:AES_KEY_LEN]
+        clear = pickle.dumps(self.data)
+        digest = sha1(clear + salt)
+        encrypted = ctr_crypt(clear + digest, key)
+        try:
+            f = open(self.keyfile, 'w')
+            f.write(salt + encrypted)
+            f.close
+        except IOError:
+            raise "Duh"
 
     def decrypt(self, passphrase):
-	"""Decrypt the keyring"""
-	salt = self.datastring[:SALT_LEN]
-	key = sha1(salt + passphrase + salt)
-	key = key[:AES_KEY_LEN]
-	clear = ctr_crypt(self.datastring[SALT_LEN:], key)
-	digest = clear[-DIGEST_LEN:]
-	clear = clear[:-DIGEST_LEN]
-	if sha1(clear + salt) != digest:
-	    return False
-	self.data = pickle.loads(clear)
-	self.status = 'clear'
-	self.passphrase = passphrase
-	return True
+        """Decrypt the keyring"""
+        salt = self.datastring[:SALT_LEN]
+        key = sha1(salt + passphrase + salt)
+        key = key[:AES_KEY_LEN]
+        clear = ctr_crypt(self.datastring[SALT_LEN:], key)
+        digest = clear[-DIGEST_LEN:]
+        clear = clear[:-DIGEST_LEN]
+        if sha1(clear + salt) != digest:
+            return False
+        self.data = pickle.loads(clear)
+        self.status = 'clear'
+        self.passphrase = passphrase
+        return True