Changeset 71 for trunk

Timestamp:

08/26/14 18:37:44 (10 years ago)

Author:

tim

Message:

chosenct and http2py convenience fixes

Location:

trunk

Files:

• bin/bletchley-http2py (modified) (3 diffs)
• lib/bletchley/chosenct.py (modified) (2 diffs)

trunk/bin/bletchley-http2py

@@ -124 +124 @@
 
 # from bletchley import blobtools,buffertools
+# from bletchley import chosenct
 # from bletchley.CBC import *
 
@@ -222 +223 @@
 
 
-def fetch(data):
+def fetch(data, other=None):
     ret_val = False
     connection = newConnection()
@@ -250 +251 @@
 # Byte-by-byte probing of ciphertext
 # ciphertext = blobtools.decode('{ encoding }', data)
-# result = chosenct.probe_bytes(fetch, data, [1,2,4,8,16,32,64,128], max_threads=5)
+# result = chosenct.probe_bytes(fetch, ciphertext, [1,2,4,8,16,32,64,128], max_threads=5)
 # print(result.toHTML())
 ''')

trunk/lib/bletchley/chosenct.py

@@ -75 +75 @@
 
     def _generate_colors(self, s):
+        if isinstance(s, str):
+            s = s.encode('utf-8')
         base=bytes(hashlib.md5(s).digest()[0:6])
         color1 = "#%.2X%.2X%.2X" % tuple(base[:3])
@@ -96 +98 @@
                 message = self._raw_table[offset][v]
                 bg,fg = self._generate_colors(message)
-                message = message.decode('utf-8')
+                if not isinstance(message, str):
+                    message = message.decode('utf-8')
 
                 truncated = message[0:maxlen]