Changeset 37 for trunk

Timestamp:

02/13/13 19:59:42 (12 years ago)

Author:

tmorgan

Message:

fixed problem with decrypt function when starting with partially completed decryption

File:

• trunk/lib/bletchley/CBC/__init__.py (modified) (2 diffs)

trunk/lib/bletchley/CBC/__init__.py

@@ -270 +270 @@
         
         # Start where we left off last
-        # XXX: test this
+        # XXX: test this more
         else: 
             num_partial = len(self.decrypted) % self.block_size
@@ -277 +277 @@
             decrypted = self.decrypted[num_partial:]
 
-            for i in range(-1-finished_blocks, 0, -1):
-                decrypted = self.decrypt_block(blocks[i-1], blocks[i], partial)
+            for i in range(len(blocks)-1-finished_blocks, 0, -1):
+                decrypted = self.decrypt_block(blocks[i-1], blocks[i], partial) + decrypted
                 partial = ''
-
+                
             # Finally decrypt first block
             decrypted = self.decrypt_block(self._iv, blocks[0]) + decrypted