Changeset 322 for trunk

Timestamp:

06/01/09 20:52:46 (3 years ago)

Author:

ocjhb

Message:

strenthening the random numbers; ordering coins for inspection; changing wording

Location:

trunk/sandbox/jhb

Files:

• mobile/ocwallet.py (modified) (2 diffs)
• oc2/rsa.py (modified) (2 diffs)
• oc2/wallet.py (modified) (2 diffs)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -18 +18 @@
         self.wallet.feedback = self.feedback
         self.displayWalletMenu()        
-        self.actions=[(u'Send',u'Send coins to someone',icons['right'],self.spendCoins),
-                      (u'Receive',u'Receive coins',icons['left'],self.receiveCoins),
-                      (u'Freshen up',u'Freshen up the coins',icons['refresh'],self.freshenUp),
-                      (u'Mint',u'new coins from issuer',icons['down'],self.mintCoins),
-                      (u'Redeem',u'redeem from issuer',icons['up'],self.redeemCoins),
+        self.actions=[(u'Pay',u'Send coins',icons['right'],self.spendCoins),
+                      (u'Receive',u'receive coins',icons['left'],self.receiveCoins),
+                      (u'Get change',u'Optimize change',icons['refresh'],self.freshenUp),
+                      (u'Widthdraw',u'Get from issuer',icons['down'],self.mintCoins),
+                      (u'Exchange',u'Send coins back ',icons['up'],self.redeemCoins),
                       (u'Details',u'See what coins you hold',icons['coins'],self.inspectCurrency),]
 
@@ -447 +447 @@
             import socket
             if sys.platform == 'symbian_s60':
-                self.feedback(u'Preparing internet access:searching access points')
+                self.feedback(u'Prepare internet:search access')
                 aps = [ap['name'] for ap in socket.access_points()]
                 aps.sort()
-                apid = appuifw.popup_menu(aps,u'select access point')
+                apid = appuifw.popup_menu(aps,u'select access')
                 if apid == None:
                     return None
-                self.feedback(u'Preparing internet access:setting access point')
+                self.feedback(u'Prepare interne:set access')
 
                 socket.set_default_access_point(aps[apid])

trunk/sandbox/jhb/oc2/rsa.py

@@ -1 +1 @@
 """RSA module
 
-!!! This is just a playground, for understanding some bits and pieces,
-this is not at all serious crypto production code!!!
-
-
-
-Module for calculating large primes, and RSA encryption, decryption,
-signing and verification. Includes generating public and private keys.
+This is a module based on the works by Sybren Stuvel, Marloes de Boer and Ivo Tamboer,
+tlslite, helped by Nils Toedtmann, done wrong by Joerg Baach ;-)
+
+This file still needs serious audit before you can trust it for anything productive
+
 """
-
-__author__ = "Sybren Stuvel, Marloes de Boer and Ivo Tamboer"
-__date__ = "2004-11-17"
 
 # NOTE: Python's modulo can return negative numbers. We compensate for
@@ -20 +15 @@
 import random    # For picking semi-random numbers
 import types
+from hashlib import sha256
 
 # Get os.urandom PRNG
 import os
 def getRandomBytes(howMany):
-    bits = howMany * 8
+    factor = 8 * 8 #bytesize time security factor
+    bits = howMany * factor
+    if bits % factor:
+        bits = bits+(16-(bits % factor))
     number = random.getrandbits(bits)
-    return numberToBytes(number)
+    bytes =  numberToBytes(number)
+    out = ''
+
+    #Assuming we haven't used a good source of randomness, but the
+    #Mersenne twister, we hash a bit to make it secure
+    while bytes:        
+        out += sha256(bytes[:factor]).digest()
+        bytes = bytes[factor:]
+    return stringToBytes(out[:howMany])
+        
   
 

trunk/sandbox/jhb/oc2/wallet.py

@@ -245 +245 @@
         secrets = []
         data = []
+        self.feedback('Talking to issuer: preparing blanks')
         for denomination in values:
             mkc = mkcs[str(denomination)]
@@ -271 +272 @@
     def getAllCoins(self,currencyId):
         currency = self.getCurrency(currencyId)
-        return currency['coins']
+        tmp = [(int(c.denomination),c) for c in currency['coins']]
+        tmp.sort()
+        return [t[1] for t in tmp]