Changeset 35

Timestamp:

02/12/13 13:12:08 (12 years ago)

Author:

tmorgan

Message:

now encoding '/' in percent encoding

fixed bug in POA's stripping of pkcs5 pads

debugging statement changes

Location:

trunk

Files:

• bin/bletchley-analyze (modified) (1 diff)
• lib/bletchley/CBC/__init__.py (modified) (2 diffs)
• lib/bletchley/blobtools.py (modified) (1 diff)

trunk/bin/bletchley-analyze

@@ -81 +81 @@
     line_size = 64
     group_size *= 2 # two hex digits per byte
-    print(group_size)
     hex_blobs = map(binascii.b2a_hex, blobs)
     color_map = buffertools.blockWiseColorMap(group_size, hex_blobs)

trunk/lib/bletchley/CBC/__init__.py

@@ -231 +231 @@
         while(len(last_bytes)!=self.block_size):
             last_bytes = self.decrypt_next_byte(prior, block, last_bytes)
+
+        self.log_message("Decrypted block: %s" % repr(last_bytes))
         return last_bytes
 
@@ -282 +284 @@
             decrypted = self.decrypt_block(self._iv, blocks[0]) + decrypted
             
-        return buffertools.stripPKCS7Pad(decrypted)
+        return buffertools.stripPKCS7Pad(decrypted, self.block_size)
 
 

trunk/lib/bletchley/blobtools.py

@@ -287 +287 @@
     def encode(self, blob):
         if 'plus' in self.dialect:
-            return urllib.quote(blob)
+            return urllib.quote(blob, '')
         else:
-            return urllib.quote_plus(blob)
+            return urllib.quote_plus(blob, '')