Changeset 76

Timestamp:

03/11/15 14:06:31 (10 years ago)

Author:

tim

Message:

Fixed off-by-one block error in CBC-R code when a partial encryption is provided

Improved debugging/status messages

File:

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

trunk/lib/bletchley/CBC/__init__.py

@@ -3 +3 @@
 
 Copyright (C) 2010 ELOI SANFÈLIX
-Copyright (C) 2012-2013 Timothy D. Morgan
+Copyright (C) 2012-2015 Timothy D. Morgan
 @author: Eloi Sanfelix < eloi AT limited-entropy.com >
 @author: Timothy D. Morgan < tmorgan {a} vsecurity . com >
@@ -118 +118 @@
     def log_message(self, s):
         if self.log_fh != None:
-            self.log_fh.write(s+'\n')
+            self.log_fh.write('BLETCHLEY: %s\n' % s)
 
 
@@ -343 +343 @@
         ptext = self.decrypt_block(b'\x00'*self.block_size, ciphertext, cache=False)
         prior = buffertools.xorBuffers(ptext, plaintext)
-        self.log_message("Encrypted block: %s to %s with prior %s" % (repr(plaintext), repr(ciphertext), repr(prior)))
+        self.log_message("Encrypted block: %s to %s with prior %s" % (repr(plaintext),
+                                                                      repr(bytes(ciphertext)),
+                                                                      repr(bytes(prior))))
         return prior,ciphertext
     
     
-    def encrypt(self,plaintext, ciphertext=None):
+    def encrypt(self, plaintext, ciphertext=None):
         """Encrypts a plaintext value through "CBC-R" style prior-block
         propagation.
@@ -364 +366 @@
         blocks = buffertools.splitBuffer(buffertools.pkcs7PadBuffer(plaintext, self.block_size), 
                                          self.block_size)
-        if ciphertext != None:
+        if ciphertext not in (None, b''):
             if len(ciphertext) % self.block_size != 0:
                 raise InvalidBlockError(self.block_size,len(ciphertext))
-            num_cblocks = (len(ciphertext) // self.block_size) - 1
-            del blocks[0-num_cblocks:] # we've already encrypted these
-            prior = ciphertext[0:self.block_size]
+
+            cblocks = buffertools.splitBuffer(ciphertext, self.block_size)
+            prior = cblocks[0]
+
+            # remove first block from ciphertext since it'll be re-added later
+            # after the prior is converted to finished ciphertext.
+            del cblocks[0]
+            ciphertext = b''.join(cblocks)
+
+            # now remove the plaintext blocks we've already completed
+            num_finished = len(cblocks)
+            del blocks[len(blocks)-num_finished:]
+            self.log_message("Reusing previous decryption of final %d blocks" % num_finished)
             
         elif (len(self.decrypted) >= self.block_size
             and len(self._ciphertext) >= 2*self.block_size):
+            
+            self.log_message("Reusing previous decryption of final block")
+
             # If possible, reuse work from prior decryption efforts on original
             # message for last block
@@ -382 +397 @@
             del blocks[-1]
         else:
+            self.log_message("Starting decryption from scratch with random final block")
+            
             # Otherwise, select a random last block and generate the prior block
             prior = struct.pack("B"*self.block_size, 
@@ -387 +404 @@
             ciphertext = b''
 
+        self.log_message("Encrypting %d blocks..." % len(blocks))
         try:
             # Continue generating all prior blocks