Changeset 250 for trunk

Timestamp:

03/30/09 15:18:20 (3 years ago)

Author:

ocjhb

Message:

playing with cryptostuff

Location:

trunk/sandbox/jhb/oc2

Files:

• container.py (modified) (8 diffs)
• occrypto_rsa.py (added)
• occrypto_tlslite.py (added)
• rsa.py (modified) (4 diffs)
• tests.py (added)
• tlslite_utils (added)
• tlslite_utils/Cryptlib_AES.py (added)
• tlslite_utils/Cryptlib_RC4.py (added)
• tlslite_utils/OpenSSL_RSAKey.py (added)
• tlslite_utils/OpenSSL_TripleDES.py (added)
• tlslite_utils/Python_RSAKey.py (added)
• tlslite_utils/TripleDES.py (added)
• tlslite_utils/__init__.py (added)
• tlslite_utils/cipherfactory.py (added)
• tlslite_utils/cryptomath.py (added)
• tlslite_utils/entropy.c (added)
• tlslite_utils/hmac.py (added)
• tlslite_utils/rijndael.py (added)
• tlslite_utils/xmltools.py (added)

trunk/sandbox/jhb/oc2/container.py

@@ -1 @@
-"""
->>> 
->>> 
-"""
+import simplejson, datetime, binascii
 
-
-
-import simplejson
-
-
-
+################################### Fields ##################################
 
 class Field(object):
@@ -17 +9 @@
         self.default = default
 
-    def getencoded(self,object):
+    def getencoded(self,object,allData=False):
         value = getattr(object,self.name,self.default)
         return value
@@ -24 +16 @@
         setattr(object,self.name,data)
 
-class SubitemField(Field):
+class DateField(Field):
+
+    format = '%d.%m.%Y %H:%M:%S'
+
+    def getencoded(self,object,allData=False):
+        value = getattr(object,self.name,self.default)
+        if not value:
+            value = datetime.datetime.now()
+        return value.strftime(self.format)
+
+    def setdecoded(self,object,data):
+        dt = datetime.datetime.strptime(data,self.format)
+        setattr(object,self.name,dt)
+
+        
+
+class BinaryField(Field):
+    
+    def getencoded(self,object,allData=False):
+        value = getattr(object,self.name,self.default)
+        return binascii.b2a_base64(value).strip()
+
+    def setdecoded(self,object,data):
+        setattr(object,self.name,binascii.a2b_base64(data))
+     
+    
+class OneItemField(Field):
     
     def __init__(self,name,signing=True,default='',klass=dict):
@@ -31 +49 @@
 
 
-    def getencoded(self,object):
+    def getencoded(self,object,allData=False):
+        value = getattr(object,self.name)
+        if value:
+            value = value.getData(allData=allData)
+        else:
+            value = self.default
+        return  value
+        
+    def setdecoded(self,object,data):
+        setattr(object,self.name,self.klass(data))
+
+
+
+
+class SubitemsField(Field):
+    
+    def __init__(self,name,signing=True,default='',klass=dict):
+        Field.__init__(self,name=name,signing=signing,default=default)
+        self.klass = klass
+
+
+    def getencoded(self,object,allData=False):
         out = []
         for item in getattr(object,self.name):
-            out.append(item.getData())
+            out.append(item.getData(allData=allData))
         return out       
         
@@ -43 +82 @@
         setattr(object,self.name,value)     
 
+
+################################### Containers ##################################
               
 
 class Container(object):   
+    
     fields = []
+
     def __init__(self,data={}):
+        self.fromData(data)
+
+    def __xrepr__(self):
+        return "<%s(%s)>" % (self.__class__.__name__,self.getData(True))
+
+    def __xstr__(self):
+        return self.toString()
+
+    def fromData(self,data):
         if type(data) == type(''):
             data = simplejson.loads(data)
@@ -57 +109 @@
             else:               
                 setattr(self,field.name,field.default)
-        setattr(self,'signature',data.get('signature',''))
-        
 
-    def getData(self,signingOnly=False,signature=False):
+
+    def getData(self,allData=False):
         certdata = []
         for field in self.fields:
-            if signingOnly and not field.signing:
+            if not (allData or field.signing):
                 continue
-            certdata.append((field.name,field.getencoded(self)))
-        if signature:
-            certdata.append(('signature',self.signature))
+            certdata.append((field.name,field.getencoded(self,allData=allData)))
         return certdata
 
-    def toString(self,signature=False):
-        #encoding stuff should be here as well
-        return simplejson.dumps(self.getData(signature=signature))
-        
+    def toString(self,allData=False):
+        return simplejson.dumps(self.getData(allData=allData))
+
+
+class CDD (Container):
+    "Currency Description Document"
+
+    fields = [
+        Field('standard_id'),
+        Field('currency_id'),
+        Field('short_currency_id'),
+        Field('issuer_service_location'),
+        Field('denominations'),
+        Field('issuer_cipher_suite'),
+        Field('options'),
+        Field('issuer_public_master_key'),
+        Field('issuer'),
+        Field('signature',signing=False)
+    ]
+
+class PublicKey(Container):
+    "A public key"
+    fields = [
+        BinaryField('a'),
+        BinaryField('b'),
+        BinaryField('c')
+    ]        
+
+
+class MintKey(Container):
+    "A mintkey, contains key + metadata"
+
+    fields = [
+        Field('key_id'),
+        Field('currency_id'),
+        Field('denomination'),
+        DateField('not_before'),
+        DateField('key_not_after'),
+        DateField('coin_not_after'),
+        OneItemField('public_key',klass=PublicKey),
+        Field('issuer'),
+        Field('signature',signing=False)
+    ]
 
 
@@ -79 +167 @@
     fields = [
         Field('currency'),
-        Field('amount')
+        Field('amount'),
+        Field('signature',signing=False)
     ]
 
@@ -85 +174 @@
     fields = [
         Field('subject'),
-        SubitemField('tokens',klass=Token)
+        SubitemsField('tokens',klass=Token),
     ]        
-class Tests(object):
-     """
-    >>> t = Token()
-    >>> t.currency='opencent'
-    >>> t.amount = 2
-    >>> t.toString()
-    '[["currency", "opencent"], ["amount", 2]]'
-    >>> t.toString(signature=True)
-    '[["currency", "opencent"], ["amount", 2], ["signature", ""]]'
-    >>> t.getData()
-    [('currency', 'opencent'), ('amount', 2)]
-    >>> t2 = Token(t.getData())
-    >>> t2.getData()
-    [('currency', 'opencent'), ('amount', 2)]
-    >>> t.signature = 'mysignature'
-    >>> t.toString(signature=True)
-    '[["currency", "opencent"], ["amount", 2], ["signature", "mysignature"]]'
-    >>> m = Message()
-    >>> m.subject = 'test'
-    >>> m.tokens = [t,t2]
-    >>> m.toString()
-    '[["subject", "test"], ["tokens", [[["currency", "opencent"], ["amount", 2]], [["currency", "opencent"], ["amount", 2]]]]]'
-    >>> m.getData()
-    [('subject', 'test'), ('tokens', [[('currency', 'opencent'), ('amount', 2)], [('currency', 'opencent'), ('amount', 2)]])]
-    >>> m2 = Message(m.getData())
-    >>> m2.getData() == m.getData()
-    True
-    >>> m2.toString() == m2.toString()
-    True
-    """
+    
+
 
 

trunk/sandbox/jhb/oc2/rsa.py

@@ -328 +328 @@
     key consists of a dict {d: ...., p: ...., q: ....).
     """
-    
+    return (dummypub,dummypriv) 
     (p, q, e, d) = gen_keys(nbits)
 
@@ -529 +529 @@
 
 
-
+dummypub = {
+'e': 59343568823711559206614914329434374961303042335788099534897501357955675804133L, 
+'n': 32793647770017443581051908007908006621376604150499221366839445678176407494654130256572721798731647281073382247358431120858829497973290288823842062554766872356043862368004460824686561544242774370448685624290963022007959843337482265073763255429596031300239158232169931316001844162136279539357507455710562227577L
+}
+
+dummypriv = {
+'q': 3660876769483489857077409618418989781902917148342703560038011826242773069902176126219730148875372119227365538620396693688963051979724315365417720940740849L, 
+'p': 8957867154497055858370988090953024497950216741166048812169220114248696092230327733254526217831517389137130597830562133311139440841609128753512364848094473L, 
+'d': 12619589565384678078150569778102981741046267149118420445896125941979396328586657133712760591528167393457329828435758755256948329844592838106750783634900284025380032774546264335257012829516042607077111098646252442031819834114954318384114125879377117610343879752299012777002244350133926279173002674800640331117L}
 
 
@@ -537 +545 @@
     if 1:
         import time
-        #(pub,priv) =  gen_pubpriv_keys(1024)
+        (pub,priv) =  gen_pubpriv_keys(1024)
         if 1:
-            pub = {'e': 59343568823711559206614914329434374961303042335788099534897501357955675804133L, 
-                   'n': 32793647770017443581051908007908006621376604150499221366839445678176407494654130256572721798731647281073382247358431120858829497973290288823842062554766872356043862368004460824686561544242774370448685624290963022007959843337482265073763255429596031300239158232169931316001844162136279539357507455710562227577L}
-            priv = {'q': 3660876769483489857077409618418989781902917148342703560038011826242773069902176126219730148875372119227365538620396693688963051979724315365417720940740849L, 
-                    'p': 8957867154497055858370988090953024497950216741166048812169220114248696092230327733254526217831517389137130597830562133311139440841609128753512364848094473L, 
-                    'd': 12619589565384678078150569778102981741046267149118420445896125941979396328586657133712760591528167393457329828435758755256948329844592838106750783634900284025380032774546264335257012829516042607077111098646252442031819834114954318384114125879377117610343879752299012777002244350133926279173002674800640331117L}
+            pass   
         if 0:                    
             (pub,priv) = ({'e': 3197601411731116245564574341873883965700807663084732800379376818822337768214254275271880556652543127861042149268538435129289119875433847550131501030387489L, 'n': 10010369815382334240798530070718437854966721919010883362239947723044651469296597049454697875962523892167961291050690952736009970933207150773523631818070845272169487515533531012017986671583117870935704791444203091193928433685036216475710517809854134259468721246954372989146266743601614235731605829521314456547427727170490340220674730134652649494795255568521600458207445549064461533102227417295842548674337715761362209701734789853469920681184060067484771558465649908138716260602630770402224385695023184536234858539880642604697788322269392260439339765412460944589951571879796455505538134420317166479947358156062601693631L}, {'q': 71965600310892660429596898829670710653460148180418095123381449844052583795523012040229068564004895983101524115981347946055591335247903874583493068435665706247560257067715751690858970054084093796406191757154228889454862489531588573733962647071944624542539072044760521321849853532919544810806179365743581833777L, 'p': 139099372090795607726534110588106724714748422622835743921578772078079056922772905042826722454890797681407412421239584468016215098928247799729322355221381502409668675456356288320338371140589835466925402699800592201081119770108520423450701555386146286042071274331899104700802281153510654832285005494641183409903L, 'd': 2303141903135405741196770316647349478451046851656460345238126953851335354457956582261071364112927329063172609648667594153989314522741915259780604774082900187421379799944807777478001765690017634728386784574675440128718738783220812396390380020488828055736972630556491383856716073773079586029351343732817861978611326631064317705218919924700761528865528832464733884127079042865050020476303293874373222849912706661252250304706695160160822827622086731394008802874568358702895903468129589361385276702313798198182238681153517515581052056557552995405472004415453043300567819425403784410663519000867938462388941313183838315329L})                    
@@ -591 +595 @@
         #blinding
         t = time.time()
-        message = 's'*64
+        #message = 'f'*65
+        message = 'c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2'
         print len(message)
         #print 'cleartext ', message