From: Eduardo Robles Elvira <edulix@wadobo.com>
Date: Thu, 17 Oct 2013 18:21:42 +0000 (+0200)
Subject: fixing aes only mode: it turns out we were not closing correctly the aes stream
X-Git-Tag: v2.2~84
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=f7ababc0bd7b2ce72d42686930453e8f6f2909e2;p=python-delta-tar

fixing aes only mode: it turns out we were not closing correctly the aes stream
---

diff --git a/deltatar/tarfile.py b/deltatar/tarfile.py
index 1832199..5dcfe9d 100644
--- a/deltatar/tarfile.py
+++ b/deltatar/tarfile.py
@@ -540,7 +540,13 @@ class _Stream:
 
 
     def _new_aes_block(self, set_last_block_offset=False):
+        # this basically checks if it comes from new_compression_block() call,
+        # in which case we have to call to close
+        if self.comptype == "tar":
+            self.close(close_fileobj=False)
+            self.closed = False
         self.__write_to_file(self.encryption.close_enc())
+
         if set_last_block_offset:
             self.last_block_offset = self.fileobj.tell()
         self.encryption = aescrypto.AESCrypt(self.password,
@@ -606,7 +612,6 @@ class _Stream:
                 # it to look positive on all boxes.
                 chunk += struct.pack("<L", self.crc & 0xffffffffL)
                 chunk += struct.pack("<L", self.concat_pos & 0xffffFFFFL)
-
             self.__enc_write(chunk)
 
         if close_fileobj and not self._extfileobj:
@@ -824,7 +829,8 @@ class _Stream:
 
             return self.__split_enc_file(buf, last)
         else:
-            return self.fileobj.read(size)
+            buf = self.fileobj.read(size)
+            return buf
 
     def __split_enc_file(self, buf, last):
         if not buf:
diff --git a/runtests.py b/runtests.py
index 19b17f5..0df4650 100644
--- a/runtests.py
+++ b/runtests.py
@@ -27,7 +27,7 @@ from testing.test_deltatar import (DeltaTarTest, DeltaTar2Test,
     DeltaTarStreamTest, DeltaTarGzipTest, DeltaTarGzipStreamTest,
     DeltaTarGzipConcatTest, DeltaTarGzipAes128ConcatTest,
     DeltaTarGzipAes256ConcatTest,
-    #DeltaTarAes128ConcatTest, DeltaTarAes256ConcatTest
+    DeltaTarAes128ConcatTest, DeltaTarAes256ConcatTest
     )
 
 if __name__ == "__main__":