Changeset 319 for trunk/sandbox/jhb/oc2/storage.py

Timestamp:

05/23/09 02:06:34 (3 years ago)

Author:

ocjhb

Message:

when storing: removed b64, added zlib

Files:

• trunk/sandbox/jhb/oc2/storage.py (modified) (5 diffs)

trunk/sandbox/jhb/oc2/storage.py

@@ -1 @@
-import UserDict, cPickle, blowfish, random, os, base64
+import UserDict, cPickle, blowfish, random, os, base64, zlib
 class Storage(UserDict.UserDict):
 
@@ -17 +17 @@
         return self
 
+class EmptyStorage(Storage):
+    def save(self):
+        pass
+    def restore(self):
+        pass
+
+
 class CryptedStorage(Storage):
 
@@ -23 +30 @@
     def setPassword(self,password):
         self.password = password
-
+        return self
 
     def decrypt(self,password,salt,text):
@@ -39 +46 @@
 
     def save(self):
-        data = 'opencoin'+base64.b64encode(cPickle.dumps(self.data))
+        #data = 'opencoin'+base64.b64encode(cPickle.dumps(self.data))
+        data = 'opencoin'+zlib.compress(cPickle.dumps(self.data),9)
         salt = ''.join([str(random.randint(0,9)) for i in range(0,16)])
         crypted = self.encrypt(self.password,salt,data)
-        content = '%s%s%s' % (self.prefix,salt,base64.b64encode(crypted))
+        #content = '%s%s%s' % (self.prefix,salt,base64.b64encode(crypted))
+        content = '%s%s%s' % (self.prefix,salt,crypted)
         open(self.filename,'w').write(content)
         return self
@@ -52 +61 @@
             if content.startswith(self.prefix):
                 salt = content[4:20]
-                crypted = base64.b64decode(content[20:])
+                #crypted = base64.b64decode(content[20:])
+                crypted = content[20:]
                 data = self.decrypt(self.password, salt, crypted)
                 if data.startswith('opencoin'):
-                    data = data[8:]
+                    data = zlib.decompress(data[8:])
                 else:
-                    raise 'wrong password'
-                data = base64.b64decode(data)                    
+                    raise Exception, 'wrong password'
+                #data = base64.b64decode(data)                    
             else:
                 data = content