Changeset 318 for trunk/sandbox/jhb/mobile/ocwallet.py

Timestamp:

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

Author:

ocjhb

Message:

encrypt the wallet storage with pure python blowfish

Files:

• trunk/sandbox/jhb/mobile/ocwallet.py (modified) (5 diffs)

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)