From 70e4563e50054c665dde1045635b11a90560092e Mon Sep 17 00:00:00 2001
From: "Marshall T. Vandegrift" <llasram@gmail.com>
Date: Sat, 29 Nov 2008 19:47:09 -0500
Subject: [PATCH] Fix #136: Warn instead of fail on MS-DES block-size error.

---
 src/calibre/ebooks/lit/reader.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/lit/reader.py b/src/calibre/ebooks/lit/reader.py
index aa09224c4b..671e48ab76 100644
--- a/src/calibre/ebooks/lit/reader.py
+++ b/src/calibre/ebooks/lit/reader.py
@@ -367,8 +367,10 @@ class ManifestItem(object):
         return self.internal == other
     
     def __repr__(self):
-        return "ManifestItem(internal=%s, path=%s)" \
-            % (repr(self.internal), repr(self.path))
+        return "ManifestItem(internal=%r, path=%r, mime_type=%r, " \
+            "offset=%d, root=%r, state=%r)" \
+            % (self.internal, self.path, self.mime_type, self.offset,
+               self.root, self.state)
 
 def preserve(function):
     def wrapper(self, *args, **kwargs):
@@ -731,6 +733,11 @@ class LitReader(object):
         return content
 
     def _decrypt(self, content):
+        length = len(content)
+        extra = length & 0x7
+        if extra > 0:
+            self._warn("content length not a multiple of block size")
+            content += "\0" * (8 - extra)
         msdes.deskey(self.bookkey, msdes.DE1)
         return msdes.des(content)