Changeset 318 for trunk

Timestamp:

05/21/09 16:36:02 (3 years ago)

Author:

ocjhb

Message:

encrypt the wallet storage with pure python blowfish

Location:

trunk/sandbox/jhb

Files:

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

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -262 +262 @@
             def log_message(self,*args,**kwargs):
                 pass
+
         OCHandler.wallet = self.wallet
         self.startInternet()
         
-        #hack to open internet
-        #r = urllib.urlopen('http://google.com')
-        #ip = urllib.urlopen('http://opencoin.org/myownip').read()
         self.httpd = StoppableHTTPServer(("",port),OCHandler)
         self.feedback(u'Receiving coins: waiting at %s' % (self.ip),self.stopReceiveCoinsHTTP)
@@ -287 +285 @@
             addr,services=btsocket.bt_discover()
             if len(services)>0:
-                #choices=services.keys()
-                #choices.sort()
-                #choice=appuifw.popup_menu([unicode(services[x])+": "+x for x in choices],u'Choose port:')
-                #port=services[choices[choice]]
                 port = services[u'opencoin']
             else:
@@ -490 +484 @@
              restore=7,right=8,save=9,up=10,zoom=11)
 icons = dict([(k,appuifw.Icon(mediapath+u'ocicons.mbm',v*2,v*2+1)) for k,v in names.items()])
-startup('network')
+
+startup('storage')
+from oc2 import storage as oc2storage
+password = ''
+while 1:
+    password = appuifw.query(u'password','text')
+
+    if password == None:
+        sys.exit()   
+    startup('encrypted data')
+    storage = oc2storage.CryptedStorage()
+    storage.setPassword(password)
+    storage.setFilename('wallet.bin')
+    try:
+        storage.restore()
+        break
+    except:
+        pass
+
+
+startup('netlib')
 import httplib, urllib
 startup('ui')
@@ -497 +511 @@
 from key_codes import EKeyLeftArrow, EKeyRightArrow
 
-startup('storage')
-from oc2 import storage
 startup('oc wallet')
 from oc2 import wallet
@@ -512 +524 @@
 #appuifw.app.screen='full'
 startup('coins')
-storage = storage.Storage()
-storage.setFilename('wallet.bin')
-storage.restore()
 startup('done')
 w = WalletClient(storage)

trunk/sandbox/jhb/oc2/storage.py

@@ -1 @@
-import UserDict, cPickle
+import UserDict, cPickle, blowfish, random, os, base64
 class Storage(UserDict.UserDict):
 
@@ -17 +17 @@
         return self
 
+class CryptedStorage(Storage):
+
+    prefix = 'salt'
+
+    def setPassword(self,password):
+        self.password = password
+
+
+    def decrypt(self,password,salt,text):
+        key = str(password+salt)
+        cipher = blowfish.Blowfish(key)
+        cipher.initCTR()
+        return cipher.decryptCTR(text)
+
+    def encrypt(self,password,salt,text):       
+        key = str(password+salt)
+        cipher = blowfish.Blowfish(key)
+        cipher.initCTR()
+        return cipher.encryptCTR(text)
+
+
+    def save(self):
+        data = 'opencoin'+base64.b64encode(cPickle.dumps(self.data))
+        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))
+        open(self.filename,'w').write(content)
+        return self
+
+
+    def restore(self):
+        if os.path.exists(self.filename):
+            content = open(self.filename).read()
+            if content.startswith(self.prefix):
+                salt = content[4:20]
+                crypted = base64.b64decode(content[20:])
+                data = self.decrypt(self.password, salt, crypted)
+                if data.startswith('opencoin'):
+                    data = data[8:]
+                else:
+                    raise 'wrong password'
+                data = base64.b64decode(data)                    
+            else:
+                data = content
+            
+            self.data = cPickle.loads(data)
+        return self            
+                            
+
+
+    

trunk/sandbox/jhb/oc2/wallet.py

@@ -131 +131 @@
         if amount != int(orig.amount):
             answer = messages.SpendReject()
-            answer.reason = 'amount of coins does not match announced one'
+            answer.reason = 'amount of coins does not match announced one. Announced: %s, got %s' % (orig.amount, amount)
             return answer
         #do exchange