Changeset 319 for trunk

Timestamp:

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

Author:

ocjhb

Message:

when storing: removed b64, added zlib

Location:

trunk/sandbox/jhb

Files:

• mobile/ocwallet.py (modified) (8 diffs)
• oc2/blowfish.py (modified) (1 diff)
• oc2/documentation.py (modified) (1 diff)
• oc2/storage.py (modified) (5 diffs)
• oc2/transports.py (modified) (1 diff)
• oc2/wallet.py (modified) (2 diffs)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -48 +48 @@
         appuifw.app.title = u'opencoin wallet\nall currencies'
         appuifw.app.menu = [(u'add currency',self.addCurrency),
-                            (u'delete currency',self.delCurrency)]
+                            (u'delete currency',self.delCurrency),
+                            (u'new password',self.newPassword),]
 
     def displayActionMenu(self):
@@ -426 +427 @@
             self.ip = s.getsockname()[0]
 
+    
 
     def stopInternet(self):
         pass
+
+
+    def newPassword(self):
+        password = appuifw.query(u'new password','text')
+        if password != None:
+            self.storage.setPassword(password)
+            appuifw.note(u'new password set','conf')
+
+
+
+
 
 def filmIt(foo=None):
@@ -459 +472 @@
 
 ############################### main code ############################        
+
+#what port do we listen on?
 walletport = 9091
+
+#setting up the environment
 app_lock = e32.Ao_lock()
 appuifw.app.screen='normal'
+
+#this will return normal control to the main code once the exit key is pressed
 appuifw.app.exit_key_handler = app_lock.signal
+
 import oc2
 import sys
+
+#finding out where we are, in order to get the icons
 oc2path = oc2.__file__
 if sys.platform == 'symbian_s60':
@@ -474 +496 @@
         #standalone app
         mediapath = u'%s\\private\\%s\\' % (basedrive,appuifw.app.uid())
+    storagepath=u'e:\\'
 else:
     mediapath = u''
+    storagepath=u''
         
 #only for documenting it
@@ -481 +505 @@
 #filmIt()
 
+#set up the icons
 names = dict(coin=0,opencoin=1,coins=2,detail=3,down=4,left=5,refresh=6,
              restore=7,right=8,save=9,up=10,zoom=11)
@@ -487 +512 @@
 startup('storage')
 from oc2 import storage as oc2storage
+
+#Try to use a password on the data file. Repeat till its sucessfully loaded
 password = ''
 while 1:
@@ -493 +520 @@
     if password == None:
         sys.exit()   
-    startup('encrypted data')
+    startup('data...')
     storage = oc2storage.CryptedStorage()
     storage.setPassword(password)
-    storage.setFilename('wallet.bin')
+    storage.setFilename(storagepath+'wallet.bin')
     try:
         storage.restore()
         break
     except:
+        appuifw.note(u'wrong password','error')
         pass
 
-
+#Load the rest of the libs
 startup('netlib')
 import httplib, urllib
@@ -516 +544 @@
 from oc2 import transports
 startup('media')
-
-
-
 coinsound = audio.Sound.open(mediapath+u'coinsound.wav')
-
-
-#appuifw.app.screen='full'
-startup('coins')
 startup('done')
+
+#Ok, fire up the real wallet
 w = WalletClient(storage)
-import time
+
+#this makes the app running till a signal (by the exit key) is given
 app_lock.wait()
+
+#Saving the data (encrypting it on the fly)
 status('Shut down:saving data...',icons['save'])
 storage.save()
 status('Shut down:exit',icons['save'])
+
+#give a bit of time to read the last message
+import time
 time.sleep(1)

trunk/sandbox/jhb/oc2/blowfish.py

@@ -573 +573 @@
     cipher.initCTR()
     text = "The quick brown fox jumps over the lazy dog"
-    print "\tText:\t\t", text
+    text = 'h' * 100000
+    #print "\tText:\t\t", text
     crypted = cipher.encryptCTR(text)
-    print "\tEncrypted:\t", crypted
+    #print "\tEncrypted:\t", crypted
     cipher.initCTR()
     decrypted = cipher.decryptCTR(crypted)
-    print "\tDecrypted:\t", decrypted
+    #print "\tDecrypted:\t", decrypted

trunk/sandbox/jhb/oc2/documentation.py

@@ -186 +186 @@
 Traceback (most recent call last):
     ....
-SpendReject: amount of coins does not match announced one
+SpendReject: amount of coins does not match announced one. Announced: 5, got 0
 
 >>> alice.requestSpend(bob.listenSpend, alicetid, [coin]) 

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

trunk/sandbox/jhb/oc2/transports.py

@@ -65 +65 @@
         return response            
                     
+class TestTransport(object):
 
+    def __init__(self, *args):
+        self.results = list(args)
+
+    def __call__(self,message):
+        result = self.results.pop(0)
+        
+        if type(result) == type([]) or type(result) == type(()):
+            method = result[0]
+            args = list(result[1:])
+            args.append(message)
+            return method(*args)
+        
+        elif callable(result):
+            return result(message)        
+        
+        else:
+            return result
+

trunk/sandbox/jhb/oc2/wallet.py

@@ -195 +195 @@
 
     def feedback(self,message):
-        print message
+        #print message
+        pass
 
 #################################higher level#############################
@@ -212 +213 @@
         tid = self.makeSerial()
         secrets,data = self.prepareBlanks(transport,cdd,tokenized)
-        response = self.requestTransfer(transport,tid,target,data,[])                         
+        response = self.requestTransfer(transport,tid,target,data,[])
         signatures = response.signatures
         currency['coins'].extend(self.unblindWithSignatures(secrets,signatures))