Changeset 3

Timestamp:

10/17/12 18:09:53 (12 years ago)

Author:

tmorgan

Message:

fixed python2-isms
added PaddingOracle? package to install script

Files:

• bletchley-distutils (modified) (1 diff)
• doc/TODO (added)
• lib/bletchley/PaddingOracle/CBCREncryptionOracle.py (modified) (1 diff)
• lib/bletchley/PaddingOracle/TimingWebPaddingOracle.py (modified) (4 diffs)

bletchley-distutils

@@ -6 +6 @@
 sys.dont_write_bytecode = False
 
-setup(name='bletchley', version=BLETCHLEY_VERSION, package_dir={'':'lib'}, packages=['bletchley'])
+setup(name='bletchley', version=BLETCHLEY_VERSION, package_dir={'':'lib'}, packages=['bletchley', 'bletchley.PaddingOracle'])

lib/bletchley/PaddingOracle/CBCREncryptionOracle.py

@@ -38 +38 @@
     def encrypt_block(self,input_block, prev_block = None):
         if (len(input_block) != self.blockSize):
-            print "Received input block of len ",len(input_block)
+            print("Received input block of len ",len(input_block))
             raise InvalidBlockError(self.blockSize,len(input_block))
         

lib/bletchley/PaddingOracle/TimingWebPaddingOracle.py

@@ -38 +38 @@
         
         if(encoder== None and decoder!=None) or (encoder!=None and decoder==None):
-            print "ERROR: Encoder and decoder must be both set or not set at all. Disabling both."
+            print("ERROR: Encoder and decoder must be both set or not set at all. Disabling both.")
             self.encoder = None
             self.decoder = None
@@ -82 +82 @@
     def test_oracle(self):
         if(self.oracle_name == None or self.oracle_value == None):
-            print "ERROR: Cannot test_oracle if no oracle variable defined"
+            print("ERROR: Cannot test_oracle if no oracle variable defined")
             return
         
@@ -116 +116 @@
             #FIXME most likely this will find a difference
             if(time1 != time2):
-                print "Found difference for i="+hex(b)
-                print "Original timing: " + str(time1)
-                print "Bad timing: " + str(time2)
+                print("Found difference for i="+hex(b))
+                print("Original timing: " + str(time1))
+                print("Bad timing: " + str(time2))
                 self.time_threshold = abs(time1 - time2) / 2 + min(time1,time2)
                 if(time1 > time2):
@@ -125 +125 @@
                     self.oracle_type = 0x02 #Normal timing is lower than threshold
                 return True
-        print "ERROR: Could not find a difference."
+        print("ERROR: Could not find a difference.")
         return False
     
     def oracle(self,ctext):
         if(self.time_threshold == None):
-            print "ERROR: Oracle not defined!"
+            print("ERROR: Oracle not defined!")
         else: