Fixes for B&N key generation and Macs with bonded ethernet ports

Error Messages - one fix, one adddition

DeDRM_Macintosh_Application/DeDRM ReadMe.rtf

@@ -1,16 +1,29 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf460
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset134 STHeitiSC-Light;}
 {\colortbl;\red255\green255\blue255;}
 \paperw11900\paperh16840\vieww12000\viewh15840\viewkind0
 \deftab720
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\qc
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\qc\partightenfactor0
 
 \f0\b\fs24 \cf0 DeDRM ReadMe
 \b0 \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
 \cf0 \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\qj
-\cf0 DeDRM is an application that packs all of the python dm removal software into one easy to use program that remembers preferences and settings.\
+\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
+
+\b \cf0 First Use for Mac OS X 10.9 and later\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
+
+\b0 \cf0 The application is not signed, so the first time you run it you will need to change your security options, or hold down the option key when double-clicking on the icon, or control-click or right-button to get the contextual menu to open it.\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
+
+\b \cf0 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\qj\partightenfactor0
+
+\b0 \cf0 \
+\
+DeDRM is an application that packs all of the python dm removal software into one easy to use program that remembers preferences and settings.\
 It works without manual configuration with Kindle for Mac ebooks, Adobe Digital Editions Adept ePub and PDF ebooks, and Barnes & Noble NOOK Study ebooks.\
 \
 To remove the DRM of Kindle ebooks from eInk Kindles, Kindle for Android, other Barnes & Noble ePubs, eReader pdb ebooks, or Mobipocket ebooks, you must first run DeDRM application (by double-clicking it) and set some additional Preferences, depending on the origin of your ebook files:\
@@ -44,35 +57,18 @@ A final preference is the destination folder for the DRM-free copies of your ebo
 \
 Once these preferences have been set, you can drag and drop ebooks (or folders of ebooks) onto the DeDRM droplet to remove the DRM.\
 \
-This program requires Mac OS X 10.4 or above. It will not work on Mac OS X 10.3 or earlier.\
+This program uses notifications, so really needs Mac OS X 10.8 or above. It will not work on Mac OS X 10.4 or earlier. It might work on Mac OS C 10.5-10.7, but the latest Kindle for Mac does not support those System versions.\
 \
 \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
 
 \b \cf0 Installation
 \b0 \
-Mac OS X 10.4 
-\i only
-\i0 : You 
-\i must
-\i0  first install Python 2.7.3 or later 2.7.x version from {\field{\*\fldinst{HYPERLINK "http://python.org/"}}{\fldrslt http://python.org/}}. At the time of writing, the direct download link is {\field{\*\fldinst{HYPERLINK "http://www.python.org/ftp/python/2.7.3/python-2.7.3-macosx10.3.dmg"}}{\fldrslt http://www.python.org/ftp/python/2.7.3/python-2.7.3-macosx10.3.dmg}}.\
-\
-Mac OS X 10.5 and above: You do 
-\i not
-\i0  need to install Python.\
-\
 Drag the DeDRM application from from the DeDRM_Application_Macintosh folder (the location of this ReadMe) to your Applications folder, or anywhere else you find convenient.\
 \
 \
 
-\b First Use for Mac OS X 10.9 and later\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720
-
-\b0 \cf0 The application is not signed, so the first time you run it you will need to change your security options, or hold down the option key when double-clicking on the icon, or control-click or right-button to get the contextual menu to open it.\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720
-
-\b \cf0 \
-\
+\b \
 Use
 \b0 \
 1. To set the preferences, double-click the application and follow the instructions in the dialogs.\
@@ -81,15 +77,16 @@ Use
 \
 
 \b Troubleshooting\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
 
 \b0 \cf0 A log is created on your desktop (DeDRM.log) containing detailed information from all the scripts. If you have any problems decrypting your ebooks, copy the contents of this log in a comment at Apprentice Alf's blog.\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "http://apprenticealf.wordpress.com/"}}{\fldrslt \cf0 http://apprenticealf.wordpress.com/}}\
 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
 
-\b Credits\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720
+\b \cf0 Credits\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
 
 \b0 \cf0 The original inept and ignoble scripts were by i
 \f1 \uc0\u9829 

DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist

@@ -24,7 +24,7 @@
 	<key>CFBundleExecutable</key>
 	<string>droplet</string>
 	<key>CFBundleGetInfoString</key>
-	<string>DeDRM AppleScript 6.3.4 Written 2010–2015 by Apprentice Alf et al.</string>
+	<string>DeDRM AppleScript 6.4.3 Written 2010–2016 by Apprentice Alf et al.</string>
 	<key>CFBundleIconFile</key>
 	<string>DeDRM</string>
 	<key>CFBundleIdentifier</key>
@@ -36,13 +36,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.3.4</string>
+	<string>6.4.3</string>
 	<key>CFBundleSignature</key>
 	<string>dplt</string>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2010–2015 Apprentice Alf and Apprentice Harper</string>
+	<string>Copyright © 2010–2016 Apprentice Alf and Apprentice Harper</string>
 	<key>WindowState</key>
 	<dict>
 		<key>bundleDividerCollapsed</key>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py

@@ -9,8 +9,6 @@ __docformat__ = 'restructuredtext en'
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 #
-# Requires Calibre version 0.7.55 or higher.
-#
 # All credit given to i♥cabbages and The Dark Reverser for the original standalone scripts.
 # We had the much easier job of converting them to a calibre plugin.
 #
@@ -46,6 +44,13 @@ __docformat__ = 'restructuredtext en'
 #   6.3.2 - Fixed Kindle for Android help file
 #   6.3.3 - Bug fix for Kindle for PC support
 #   6.3.4 - Fixes for Kindle for Android, Linux, and Kobo 3.17
+#   6.3.5 - Fixes for Linux, and Kobo 3.19 and more logging
+#   6.3.6 - Fixes for ADE ePub and PDF introduced in 6.3.5
+#   6.4.0 - Updated for new Kindle for PC encryption
+#   6.4.1 - Fix for some new tags in Topaz ebooks.
+#   6.4.2 - Fix for more new tags in Topaz ebooks and very small Topaz ebooks
+#   6.4.3 - Fix for error that only appears when not in debug mode
+#           Also includes fix for Macs with bonded ethernet ports
 
 
 """
@@ -53,7 +58,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 3, 4)
+PLUGIN_VERSION_TUPLE = (6, 4, 3)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'
@@ -85,8 +90,12 @@ class SafeUnbuffered:
     def write(self, data):
         if isinstance(data,unicode):
             data = data.encode(self.encoding,"replace")
-        self.stream.write(data)
-        self.stream.flush()
+        try:
+            self.stream.write(data)
+            self.stream.flush()
+        except:
+            # We can do nothing if a write fails
+            pass
     def __getattr__(self, attr):
         return getattr(self.stream, attr)
 
@@ -96,7 +105,7 @@ class DeDRM(FileTypePlugin):
     supported_platforms     = ['linux', 'osx', 'windows']
     author                  = u"Apprentice Alf, Aprentice Harper, The Dark Reverser and i♥cabbages"
     version                 = PLUGIN_VERSION_TUPLE
-    minimum_calibre_version = (0, 7, 55)  # Compiled python libraries cannot be imported in earlier versions.
+    minimum_calibre_version = (1, 0, 0)  # Compiled python libraries cannot be imported in earlier versions.
     file_types              = set(['epub','pdf','pdb','prc','mobi','pobi','azw','azw1','azw3','azw4','tpz'])
     on_import               = True
     priority                = 600
@@ -296,11 +305,15 @@ class DeDRM(FileTypePlugin):
                     traceback.print_exc()
                     result = 1
 
-                of.close()
+                try:
+                    of.close()
+                except:
+                    print u"{0} v{1}: Exception closing temporary file after {2:.1f} seconds. Ignored.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
 
                 if  result == 0:
                     # Decryption was successful.
                     # Return the modified PersistentTemporary file to calibre.
+                    print u"{0} v{1}: Decrypted with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname,time.time()-self.starttime)
                     return of.name
 
                 print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname,time.time()-self.starttime)
@@ -360,6 +373,7 @@ class DeDRM(FileTypePlugin):
                             except:
                                 print u"{0} v{1}: Exception when saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                                 traceback.print_exc()
+                            print u"{0} v{1}: Decrypted with new default key after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
                             # Return the modified PersistentTemporary file to calibre.
                             return of.name
 

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/config.py

@@ -566,6 +566,19 @@ class AddBandNKeyDialog(QDialog):
         data_group_box_layout.addWidget(ccn_disclaimer_label)
         layout.addSpacing(10)
 
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"Retrieved key:", self))
+        self.key_display = QLabel(u"", self)
+        self.key_display.setToolTip(_(u"Click the Retrieve Key button to fetch your B&N encryption key from the B&N servers"))
+        key_group.addWidget(self.key_display)
+        self.retrieve_button = QtGui.QPushButton(self)
+        self.retrieve_button.setToolTip(_(u"Click to retrieve your B&N encryption key from the B&N servers"))
+        self.retrieve_button.setText(u"Retrieve Key")
+        self.retrieve_button.clicked.connect(self.retrieve_key)
+        key_group.addWidget(self.retrieve_button)
+        layout.addSpacing(10)
+
         self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         self.button_box.accepted.connect(self.accept)
         self.button_box.rejected.connect(self.reject)
@@ -579,8 +592,7 @@ class AddBandNKeyDialog(QDialog):
 
     @property
     def key_value(self):
-        from calibre_plugins.dedrm.ignoblekeyfetch import fetch_key as fetch_bandn_key
-        return fetch_bandn_key(self.user_name,self.cc_number)
+        return unicode(self.key_display.text()).strip()
 
     @property
     def user_name(self):
@@ -590,6 +602,14 @@ class AddBandNKeyDialog(QDialog):
     def cc_number(self):
         return unicode(self.cc_ledit.text()).strip()
 
+    def retrieve_key(self):
+        from calibre_plugins.dedrm.ignoblekeyfetch import fetch_key as fetch_bandn_key
+        fetched_key = fetch_bandn_key(self.user_name,self.cc_number)
+        if fetched_key == "":
+            errmsg = u"Could not retrieve key. Check username, password and intenet connectivity and try again."
+            error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        else:
+            self.key_display.setText(fetched_key)
 
     def accept(self):
         if len(self.key_name) == 0 or len(self.user_name) == 0 or len(self.cc_number) == 0 or self.key_name.isspace() or self.user_name.isspace() or self.cc_number.isspace():
@@ -598,6 +618,10 @@ class AddBandNKeyDialog(QDialog):
         if len(self.key_name) < 4:
             errmsg = u"Key name must be at <i>least</i> 4 characters long!"
             return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_value) == 0:
+            self.retrieve_key()
+            if len(self.key_value) == 0:
+                return
         QDialog.accept(self)
 
 class AddEReaderDialog(QDialog):

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/convert2xml.py

@@ -164,6 +164,7 @@ class PageParser(object):
         self.id = os.path.basename(filename).replace('.dat','')
         self.dict = dict
         self.debug = debug
+        self.first_unknown = True
         self.flat_xml = flat_xml
         self.tagpath = []
         self.doc = []
@@ -262,6 +263,9 @@ class PageParser(object):
         'img.w'                 : (1, 'scalar_number', 0, 0),
         'img.src'               : (1, 'scalar_number', 0, 0),
         'img.color_src'         : (1, 'scalar_number', 0, 0),
+        'img.gridSize'          : (1, 'scalar_number', 0, 0),
+        'img.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
+        'img.gridTopCenter'     : (1, 'scalar_number', 0, 0),
         'img.gridBeginCenter'   : (1, 'scalar_number', 0, 0),
         'img.gridEndCenter'     : (1, 'scalar_number', 0, 0),
         'img.image_type'        : (1, 'scalar_number', 0, 0),
@@ -313,11 +317,16 @@ class PageParser(object):
         'span.gridBeginCenter' : (1, 'scalar_number', 0, 0),
         'span.gridEndCenter' : (1, 'scalar_number', 0, 0),
 
-        'extratokens'            : (1, 'snippets', 1, 0),
-        'extratokens.class'      : (1, 'scalar_text', 0, 0),
-        'extratokens.type'       : (1, 'scalar_text', 0, 0),
-        'extratokens.firstGlyph' : (1, 'scalar_number', 0, 0),
-        'extratokens.lastGlyph'  : (1, 'scalar_number', 0, 0),
+        'extratokens'                   : (1, 'snippets', 1, 0),
+        'extratokens.class'             : (1, 'scalar_text', 0, 0),
+        'extratokens.type'              : (1, 'scalar_text', 0, 0),
+        'extratokens.firstGlyph'        : (1, 'scalar_number', 0, 0),
+        'extratokens.lastGlyph'         : (1, 'scalar_number', 0, 0),
+        'extratokens.gridSize'          : (1, 'scalar_number', 0, 0),
+        'extratokens.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
+        'extratokens.gridTopCenter'     : (1, 'scalar_number', 0, 0),
+        'extratokens.gridBeginCenter'   : (1, 'scalar_number', 0, 0),
+        'extratokens.gridEndCenter'     : (1, 'scalar_number', 0, 0),
 
         'glyph.h'      : (1, 'number', 0, 0),
         'glyph.w'      : (1, 'number', 0, 0),
@@ -506,8 +515,9 @@ class PageParser(object):
         # or an out of sync condition
         else:
             result = []
-            if (self.debug):
+            if (self.debug or self.first_unknown):
                 print 'Unknown Token:', token
+                self.first_unknown = False
             self.tag_pop()
             return result
 

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/genbook.py

@@ -385,7 +385,7 @@ def generateBook(bookDir, raw, fixedimage):
     # print "first normal text page is", spage
 
     # get page height and width from first text page for use in stylesheet scaling
-    pname = 'page%04d.dat' % (pnum + 1)
+    pname = 'page%04d.dat' % (pnum - 1)
     fname = os.path.join(pageDir,pname)
     flat_xml = convert2xml.fromData(dict, fname)
 

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptepub.py

@@ -3,18 +3,19 @@
 
 from __future__ import with_statement
 
-# ineptepub.pyw, version 6.1
+# ineptepub.pyw, version 6.5
 # Copyright © 2009-2010 by i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 
 # Modified 2010–2013 by some_updates, DiapDealer and Apprentice Alf
+# Modified 2015–2016 by Apprentice Harper
 
-# Windows users: Before running this program, you must first install Python 2.6
+# Windows users: Before running this program, you must first install Python 2.7
 #   from <http://www.python.org/download/> and PyCrypto from
 #   <http://www.voidspace.org.uk/python/modules.shtml#pycrypto> (make sure to
-#   install the version for Python 2.6).  Save this script file as
+#   install the version for Python 2.7).  Save this script file as
 #   ineptepub.pyw and double-click on it to run it.
 #
 # Mac OS X users: Save this script file as ineptepub.pyw.  You can run this
@@ -38,13 +39,16 @@ from __future__ import with_statement
 #   6.0 - moved unicode_argv call inside main for Windows DeDRM compatibility
 #   6.1 - Work if TkInter is missing
 #   6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis
+#   6.3 - Add additional check on DER file sanity
+#   6.4 - Remove erroneous check on DER file sanity
+#   6.5 - Completely remove erroneous check on DER file sanity
 
 """
 Decrypt Adobe Digital Editions encrypted ePub books.
 """
 
 __license__ = 'GPL v3'
-__version__ = "6.2"
+__version__ = "6.5"
 
 import sys
 import os

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py

@@ -3,18 +3,19 @@
 
 from __future__ import with_statement
 
-# ineptpdf.pyw, version 7.11
+# ineptpdf.pyw, version 8.0.4
 # Copyright © 2009-2010 by i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 
 # Modified 2010–2012 by some_updates, DiapDealer and Apprentice Alf
+# Modified 2015-2016 by Apprentice Harper
 
-# Windows users: Before running this program, you must first install Python 2.6
+# Windows users: Before running this program, you must first install Python 2.7
 #   from <http://www.python.org/download/> and PyCrypto from
 #   <http://www.voidspace.org.uk/python/modules.shtml#pycrypto> (make sure to
-#   install the version for Python 2.6).  Save this script file as
+#   install the version for Python 2.7).  Save this script file as
 #   ineptpdf.pyw and double-click on it to run it.
 #
 # Mac OS X users: Save this script file as ineptpdf.pyw.  You can run this
@@ -53,13 +54,17 @@ from __future__ import with_statement
 #   7.14 - moved unicode_argv call inside main for Windows DeDRM compatibility
 #   8.0  - Work if TkInter is missing
 #   8.0.1 - Broken Metadata fix.
+#   8.0.2 - Add additional check on DER file sanity
+#   8.0.3 - Remove erroneous check on DER file sanity
+#   8.0.4 - Completely remove erroneous check on DER file sanity
+
 
 """
 Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0.1"
+__version__ = "8.0.4"
 
 import sys
 import os

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kgenpids.py

@@ -199,9 +199,6 @@ def getK4Pids(rec209, token, kindleDatabase):
         # Get the Mazama Random number
         MazamaRandomNumber = (kindleDatabase[1])['MazamaRandomNumber'].decode('hex')
 
-        # Get the kindle account token
-        kindleAccountToken = (kindleDatabase[1])['kindle.account.tokens'].decode('hex')
-
         # Get the IDString used to decode the Kindle Info file
         IDString = (kindleDatabase[1])['IDString'].decode('hex')
 
@@ -212,6 +209,14 @@ def getK4Pids(rec209, token, kindleDatabase):
         print u"Keys not found in the database {0}.".format(kindleDatabase[0])
         return pids
 
+    try:
+        # Get the kindle account token, if present
+        kindleAccountToken = (kindleDatabase[1])['kindle.account.tokens'].decode('hex')
+
+    except KeyError:
+        kindleAccountToken=""
+        pass
+
     # Get the ID string used
     encodedIDString = encodeHash(IDString,charMap1)
 

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py

@@ -4,7 +4,7 @@
 from __future__ import with_statement
 
 # kindlekey.py
-# Copyright © 2010-2015 by some_updates, Apprentice Alf and Apprentice Harper
+# Copyright © 2010-2016 by some_updates, Apprentice Alf and Apprentice Harper
 
 # Revision history:
 #  1.0   - Kindle info file decryption, extracted from k4mobidedrm, etc.
@@ -19,6 +19,9 @@ from __future__ import with_statement
 #  1.8   - Fixes for Kindle for Mac, and non-ascii in Windows user names
 #  1.9   - Fixes for Unicode in Windows user names
 #  2.0   - Added comments and extra fix for non-ascii Windows user names
+#  2.1   - Fixed Kindle for PC encryption changes March 2016
+#  2.2   - Fixes for Macs with bonded ethernet ports
+#          Also removed old .kinfo file support (pre-2011)
 
 
 """
@@ -26,7 +29,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '1.9'
+__version__ = '2.2'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -926,7 +929,7 @@ if iswindows:
         # or the python interface to the 32 vs 64 bit registry is broken
         path = ""
         if 'LOCALAPPDATA' in os.environ.keys():
-			# Python 2.x does not return unicode env. Use Python 3.x
+            # Python 2.x does not return unicode env. Use Python 3.x
             path = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
             # this is just another alternative.
             # path = getEnvironmentVariable('LOCALAPPDATA')
@@ -993,179 +996,120 @@ if iswindows:
     # determine type of kindle info provided and return a
     # database of keynames and values
     def getDBfromFile(kInfoFile):
-        names = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber', 'max_date', 'SIGVERIF']
+        names = [\
+            'kindle.account.tokens',\
+            'kindle.cookie.item',\
+            'eulaVersionAccepted',\
+            'login_date',\
+            'kindle.token.item',\
+            'login',\
+            'kindle.key.item',\
+            'kindle.name.info',\
+            'kindle.device.info',\
+            'MazamaRandomNumber',\
+            'max_date',\
+            'SIGVERIF',\
+            'build_version',\
+            ]
+
         DB = {}
         with open(kInfoFile, 'rb') as infoReader:
-            hdr = infoReader.read(1)
             data = infoReader.read()
+        # assume newest .kinf2011 style .kinf file
+        # the .kinf file uses "/" to separate it into records
+        # so remove the trailing "/" to make it easy to use split
+        data = data[:-1]
+        items = data.split('/')
 
-        if data.find('{') != -1 :
-            # older style kindle-info file
-            items = data.split('{')
-            for item in items:
-                if item != '':
-                    keyhash, rawdata = item.split(':')
-                    keyname = "unknown"
-                    for name in names:
-                        if encodeHash(name,charMap2) == keyhash:
-                            keyname = name
-                            break
-                    if keyname == "unknown":
-                        keyname = keyhash
-                    encryptedValue = decode(rawdata,charMap2)
-                    DB[keyname] = CryptUnprotectData(encryptedValue, "", 0)
-        elif hdr == '/':
-            # else rainier-2-1-1 .kinf file
-            # the .kinf file uses "/" to separate it into records
-            # so remove the trailing "/" to make it easy to use split
-            data = data[:-1]
-            items = data.split('/')
+        # starts with an encoded and encrypted header blob
+        headerblob = items.pop(0)
+        encryptedValue = decode(headerblob, testMap1)
+        cleartext = UnprotectHeaderData(encryptedValue)
+        #print "header  cleartext:",cleartext
+        # now extract the pieces that form the added entropy
+        pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
+        for m in re.finditer(pattern, cleartext):
+            added_entropy = m.group(2) + m.group(4)
 
-            # loop through the item records until all are processed
-            while len(items) > 0:
 
-                # get the first item record
+        # loop through the item records until all are processed
+        while len(items) > 0:
+
+            # get the first item record
+            item = items.pop(0)
+
+            # the first 32 chars of the first record of a group
+            # is the MD5 hash of the key name encoded by charMap5
+            keyhash = item[0:32]
+
+            # the sha1 of raw keyhash string is used to create entropy along
+            # with the added entropy provided above from the headerblob
+            entropy = SHA1(keyhash) + added_entropy
+
+            # the remainder of the first record when decoded with charMap5
+            # has the ':' split char followed by the string representation
+            # of the number of records that follow
+            # and make up the contents
+            srcnt = decode(item[34:],charMap5)
+            rcnt = int(srcnt)
+
+            # read and store in rcnt records of data
+            # that make up the contents value
+            edlst = []
+            for i in xrange(rcnt):
                 item = items.pop(0)
+                edlst.append(item)
 
-                # the first 32 chars of the first record of a group
-                # is the MD5 hash of the key name encoded by charMap5
-                keyhash = item[0:32]
+            # key names now use the new testMap8 encoding
+            keyname = "unknown"
+            for name in names:
+                if encodeHash(name,testMap8) == keyhash:
+                    keyname = name
+                    #print "keyname found from hash:",keyname
+                    break
+            if keyname == "unknown":
+                keyname = keyhash
+                #print "keyname not found, hash is:",keyname
 
-                # the raw keyhash string is used to create entropy for the actual
-                # CryptProtectData Blob that represents that keys contents
-                entropy = SHA1(keyhash)
+            # the testMap8 encoded contents data has had a length
+            # of chars (always odd) cut off of the front and moved
+            # to the end to prevent decoding using testMap8 from
+            # working properly, and thereby preventing the ensuing
+            # CryptUnprotectData call from succeeding.
 
-                # the remainder of the first record when decoded with charMap5
-                # has the ':' split char followed by the string representation
-                # of the number of records that follow
-                # and make up the contents
-                srcnt = decode(item[34:],charMap5)
-                rcnt = int(srcnt)
+            # The offset into the testMap8 encoded contents seems to be:
+            # len(contents)-largest prime number <=  int(len(content)/3)
+            # (in other words split "about" 2/3rds of the way through)
 
-                # read and store in rcnt records of data
-                # that make up the contents value
-                edlst = []
-                for i in xrange(rcnt):
-                    item = items.pop(0)
-                    edlst.append(item)
-
-                keyname = "unknown"
-                for name in names:
-                    if encodeHash(name,charMap5) == keyhash:
-                        keyname = name
-                        break
-                if keyname == "unknown":
-                    keyname = keyhash
-                # the charMap5 encoded contents data has had a length
-                # of chars (always odd) cut off of the front and moved
-                # to the end to prevent decoding using charMap5 from
-                # working properly, and thereby preventing the ensuing
-                # CryptUnprotectData call from succeeding.
-
-                # The offset into the charMap5 encoded contents seems to be:
-                # len(contents)-largest prime number <=  int(len(content)/3)
-                # (in other words split "about" 2/3rds of the way through)
-
-                # move first offsets chars to end to align for decode by charMap5
-                encdata = "".join(edlst)
-                contlen = len(encdata)
-                noffset = contlen - primes(int(contlen/3))[-1]
-
-                # now properly split and recombine
-                # by moving noffset chars from the start of the
-                # string to the end of the string
-                pfx = encdata[0:noffset]
-                encdata = encdata[noffset:]
-                encdata = encdata + pfx
-
-                # decode using Map5 to get the CryptProtect Data
-                encryptedValue = decode(encdata,charMap5)
-                DB[keyname] = CryptUnprotectData(encryptedValue, entropy, 1)
-        else:
-            # else newest .kinf2011 style .kinf file
-            # the .kinf file uses "/" to separate it into records
-            # so remove the trailing "/" to make it easy to use split
-            # need to put back the first char read because it it part
-            # of the added entropy blob
-            data = hdr + data[:-1]
-            items = data.split('/')
-
-            # starts with and encoded and encrypted header blob
-            headerblob = items.pop(0)
-            encryptedValue = decode(headerblob, testMap1)
-            cleartext = UnprotectHeaderData(encryptedValue)
-            # now extract the pieces that form the added entropy
-            pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
-            for m in re.finditer(pattern, cleartext):
-                added_entropy = m.group(2) + m.group(4)
+            # move first offsets chars to end to align for decode by testMap8
+            # by moving noffset chars from the start of the
+            # string to the end of the string
+            encdata = "".join(edlst)
+            #print "encrypted data:",encdata
+            contlen = len(encdata)
+            noffset = contlen - primes(int(contlen/3))[-1]
+            pfx = encdata[0:noffset]
+            encdata = encdata[noffset:]
+            encdata = encdata + pfx
+            #print "rearranged data:",encdata
 
 
-            # loop through the item records until all are processed
-            while len(items) > 0:
-
-                # get the first item record
-                item = items.pop(0)
-
-                # the first 32 chars of the first record of a group
-                # is the MD5 hash of the key name encoded by charMap5
-                keyhash = item[0:32]
-
-                # the sha1 of raw keyhash string is used to create entropy along
-                # with the added entropy provided above from the headerblob
-                entropy = SHA1(keyhash) + added_entropy
-
-                # the remainder of the first record when decoded with charMap5
-                # has the ':' split char followed by the string representation
-                # of the number of records that follow
-                # and make up the contents
-                srcnt = decode(item[34:],charMap5)
-                rcnt = int(srcnt)
-
-                # read and store in rcnt records of data
-                # that make up the contents value
-                edlst = []
-                for i in xrange(rcnt):
-                    item = items.pop(0)
-                    edlst.append(item)
-
-                # key names now use the new testMap8 encoding
-                keyname = "unknown"
-                for name in names:
-                    if encodeHash(name,testMap8) == keyhash:
-                        keyname = name
-                        break
-
-                # the testMap8 encoded contents data has had a length
-                # of chars (always odd) cut off of the front and moved
-                # to the end to prevent decoding using testMap8 from
-                # working properly, and thereby preventing the ensuing
-                # CryptUnprotectData call from succeeding.
-
-                # The offset into the testMap8 encoded contents seems to be:
-                # len(contents)-largest prime number <=  int(len(content)/3)
-                # (in other words split "about" 2/3rds of the way through)
-
-                # move first offsets chars to end to align for decode by testMap8
-                # by moving noffset chars from the start of the
-                # string to the end of the string
-                encdata = "".join(edlst)
-                contlen = len(encdata)
-                noffset = contlen - primes(int(contlen/3))[-1]
-                pfx = encdata[0:noffset]
-                encdata = encdata[noffset:]
-                encdata = encdata + pfx
-
-                # decode using new testMap8 to get the original CryptProtect Data
-                encryptedValue = decode(encdata,testMap8)
-                cleartext = CryptUnprotectData(encryptedValue, entropy, 1)
+            # decode using new testMap8 to get the original CryptProtect Data
+            encryptedValue = decode(encdata,testMap8)
+            #print "decoded data:",encryptedValue.encode('hex')
+            cleartext = CryptUnprotectData(encryptedValue, entropy, 1)
+            if len(cleartext)>0:
+                #print "cleartext data:",cleartext,":end data"
                 DB[keyname] = cleartext
+            #print keyname, cleartext
 
-        if 'kindle.account.tokens' in DB:
+        if len(DB)>6:
             # store values used in decryption
             DB['IDString'] = GetIDString()
             DB['UserName'] = GetUserName()
             print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName().encode('hex'))
         else:
+            print u"Couldn't decrypt file."
             DB = {}
         return DB
 elif isosx:
@@ -1297,11 +1241,9 @@ elif isosx:
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
+        #print out1
         reslst = out1.split('\n')
         cnt = len(reslst)
-        bsdname = None
-        sernum = None
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
             pp = resline.find('\"Serial Number\" = \"')
@@ -1310,31 +1252,24 @@ elif isosx:
                 sernums.append(sernum.strip())
         return sernums
 
-    def GetUserHomeAppSupKindleDirParitionName():
-        home = os.getenv('HOME')
-        dpath =  home + '/Library'
+    def GetDiskPartitionNames():
+        names = []
         cmdline = '/sbin/mount'
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
         reslst = out1.split('\n')
         cnt = len(reslst)
-        disk = ''
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
             if resline.startswith('/dev'):
                 (devpart, mpath) = resline.split(' on ')
                 dpart = devpart[5:]
-                pp = mpath.find('(')
-                if pp >= 0:
-                    mpath = mpath[:pp-1]
-                if dpath.startswith(mpath):
-                    disk = dpart
-        return disk
+                names.append(dpart)
+        return names
 
-    # uses a sub process to get the UUID of the specified disk partition using ioreg
-    def GetDiskPartitionUUIDs(diskpart):
+    # uses a sub process to get the UUID of all disk partitions
+    def GetDiskPartitionUUIDs():
         uuids = []
         uuidnum = os.getenv('MYUUIDNUMBER')
         if uuidnum != None:
@@ -1343,46 +1278,16 @@ elif isosx:
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
+        #print out1
         reslst = out1.split('\n')
         cnt = len(reslst)
-        bsdname = None
-        uuidnum = None
-        foundIt = False
-        nest = 0
-        uuidnest = -1
-        partnest = -2
         for j in xrange(cnt):
             resline = reslst[j]
-            if resline.find('{') >= 0:
-                nest += 1
-            if resline.find('}') >= 0:
-                nest -= 1
             pp = resline.find('\"UUID\" = \"')
             if pp >= 0:
                 uuidnum = resline[pp+10:-1]
                 uuidnum = uuidnum.strip()
-                uuidnest = nest
-                if partnest == uuidnest and uuidnest > 0:
-                    foundIt = True
-                    break
-            bb = resline.find('\"BSD Name\" = \"')
-            if bb >= 0:
-                bsdname = resline[bb+14:-1]
-                bsdname = bsdname.strip()
-                if (bsdname == diskpart):
-                    partnest = nest
-                else :
-                    partnest = -2
-                if partnest == uuidnest and partnest > 0:
-                    foundIt = True
-                    break
-            if nest == 0:
-                partnest = -2
-                uuidnest = -1
-                uuidnum = None
-                bsdname = None
-        if foundIt:
-            uuids.append(uuidnum)
+                uuids.append(uuidnum)
         return uuids
 
     def GetMACAddressesMunged():
@@ -1390,28 +1295,26 @@ elif isosx:
         macnum = os.getenv('MYMACNUM')
         if macnum != None:
             macnums.append(macnum)
-        cmdline = '/sbin/ifconfig en0'
+        cmdline = 'networksetup -listallhardwareports' # en0'
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
         reslst = out1.split('\n')
         cnt = len(reslst)
-        macnum = None
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
-            pp = resline.find('ether ')
+            pp = resline.find('Ethernet Address: ')
             if pp >= 0:
-                macnum = resline[pp+6:-1]
+                #print resline
+                macnum = resline[pp+18:]
                 macnum = macnum.strip()
-                # print 'original mac', macnum
-                # now munge it up the way Kindle app does
-                # by xoring it with 0xa5 and swapping elements 3 and 4
                 maclst = macnum.split(':')
                 n = len(maclst)
                 if n != 6:
-                    fountIt = False
-                    break
+                    continue
+                #print 'original mac', macnum
+                # now munge it up the way Kindle app does
+                # by xoring it with 0xa5 and swapping elements 3 and 4
                 for i in range(6):
                     maclst[i] = int('0x' + maclst[i], 0)
                 mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
@@ -1422,16 +1325,15 @@ elif isosx:
                 mlst[1] = maclst[1] ^ 0xa5
                 mlst[0] = maclst[0] ^ 0xa5
                 macnum = '%0.2x%0.2x%0.2x%0.2x%0.2x%0.2x' % (mlst[0], mlst[1], mlst[2], mlst[3], mlst[4], mlst[5])
-                foundIt = True
-                break
-        if foundIt:
-            macnums.append(macnum)
+                #print 'munged mac', macnum
+                macnums.append(macnum)
         return macnums
 
 
     # uses unix env to get username instead of using sysctlbyname
     def GetUserName():
         username = os.getenv('USER')
+        #print "Username:",username
         return username
 
     def GetIDStrings():
@@ -1439,58 +1341,13 @@ elif isosx:
         strings = []
         strings.extend(GetMACAddressesMunged())
         strings.extend(GetVolumesSerialNumbers())
-        diskpart = GetUserHomeAppSupKindleDirParitionName()
-        strings.extend(GetDiskPartitionUUIDs(diskpart))
+        strings.extend(GetDiskPartitionNames())
+        strings.extend(GetDiskPartitionUUIDs())
         strings.append('9999999999')
-        #print strings
+        #print "ID Strings:\n",strings
         return strings
 
 
-    # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used by Kindle for Mac versions < 1.6.0
-    class CryptUnprotectData(object):
-        def __init__(self, IDString):
-            sp = IDString + '!@#' + GetUserName()
-            passwdData = encode(SHA256(sp),charMap1)
-            salt = '16743'
-            self.crp = LibCrypto()
-            iter = 0x3e8
-            keylen = 0x80
-            key_iv = self.crp.keyivgen(passwdData, salt, iter, keylen)
-            self.key = key_iv[0:32]
-            self.iv = key_iv[32:48]
-            self.crp.set_decrypt_key(self.key, self.iv)
-
-        def decrypt(self, encryptedData):
-            cleartext = self.crp.decrypt(encryptedData)
-            cleartext = decode(cleartext,charMap1)
-            return cleartext
-
-
-    # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used for Kindle for Mac Versions >= 1.6.0
-    class CryptUnprotectDataV2(object):
-        def __init__(self, IDString):
-            sp = GetUserName() + ':&%:' + IDString
-            passwdData = encode(SHA256(sp),charMap5)
-            # salt generation as per the code
-            salt = 0x0512981d * 2 * 1 * 1
-            salt = str(salt) + GetUserName()
-            salt = encode(salt,charMap5)
-            self.crp = LibCrypto()
-            iter = 0x800
-            keylen = 0x400
-            key_iv = self.crp.keyivgen(passwdData, salt, iter, keylen)
-            self.key = key_iv[0:32]
-            self.iv = key_iv[32:48]
-            self.crp.set_decrypt_key(self.key, self.iv)
-
-        def decrypt(self, encryptedData):
-            cleartext = self.crp.decrypt(encryptedData)
-            cleartext = decode(cleartext, charMap5)
-            return cleartext
-
-
     # unprotect the new header blob in .kinf2011
     # used in Kindle for Mac Version >= 1.9.0
     def UnprotectHeaderData(encryptedData):
@@ -1508,8 +1365,7 @@ elif isosx:
 
 
     # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used for Kindle for Mac Versions >= 1.9.0
-    class CryptUnprotectDataV3(object):
+    class CryptUnprotectData(object):
         def __init__(self, entropy, IDString):
             sp = GetUserName() + '+@#$%+' + IDString
             passwdData = encode(SHA256(sp),charMap2)
@@ -1577,206 +1433,118 @@ elif isosx:
     # determine type of kindle info provided and return a
     # database of keynames and values
     def getDBfromFile(kInfoFile):
-        names = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber', 'max_date', 'SIGVERIF']
+        names = [\
+            'kindle.account.tokens',\
+            'kindle.cookie.item',\
+            'eulaVersionAccepted',\
+            'login_date',\
+            'kindle.token.item',\
+            'login',\
+            'kindle.key.item',\
+            'kindle.name.info',\
+            'kindle.device.info',\
+            'MazamaRandomNumber',\
+            'max_date',\
+            'SIGVERIF',\
+            'build_version',\
+            ]
         with open(kInfoFile, 'rb') as infoReader:
-            filehdr = infoReader.read(1)
             filedata = infoReader.read()
 
+        data = filedata[:-1]
+        items = data.split('/')
         IDStrings = GetIDStrings()
         for IDString in IDStrings:
-            DB = {}
             #print "trying IDString:",IDString
             try:
-                hdr = filehdr
-                data = filedata
-                if data.find('[') != -1 :
-                    # older style kindle-info file
-                    cud = CryptUnprotectData(IDString)
-                    items = data.split('[')
-                    for item in items:
-                        if item != '':
-                            keyhash, rawdata = item.split(':')
-                            keyname = 'unknown'
-                            for name in names:
-                                if encodeHash(name,charMap2) == keyhash:
-                                    keyname = name
-                                    break
-                            if keyname == 'unknown':
-                                keyname = keyhash
-                            encryptedValue = decode(rawdata,charMap2)
-                            cleartext = cud.decrypt(encryptedValue)
-                            if len(cleartext) > 0:
-                                DB[keyname] = cleartext
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
-                elif hdr == '/':
-                    # else newer style .kinf file used by K4Mac >= 1.6.0
-                    # the .kinf file uses '/' to separate it into records
-                    # so remove the trailing '/' to make it easy to use split
-                    data = data[:-1]
-                    items = data.split('/')
-                    cud = CryptUnprotectDataV2(IDString)
+                DB = {}
+                items = data.split('/')
+               
+                # the headerblob is the encrypted information needed to build the entropy string
+                headerblob = items.pop(0)
+                encryptedValue = decode(headerblob, charMap1)
+                cleartext = UnprotectHeaderData(encryptedValue)
 
-                    # loop through the item records until all are processed
-                    while len(items) > 0:
+                # now extract the pieces in the same way
+                # this version is different from K4PC it scales the build number by multipying by 735
+                pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
+                for m in re.finditer(pattern, cleartext):
+                    entropy = str(int(m.group(2)) * 0x2df) + m.group(4)
 
-                        # get the first item record
+                cud = CryptUnprotectData(entropy,IDString)
+
+                # loop through the item records until all are processed
+                while len(items) > 0:
+
+                    # get the first item record
+                    item = items.pop(0)
+
+                    # the first 32 chars of the first record of a group
+                    # is the MD5 hash of the key name encoded by charMap5
+                    keyhash = item[0:32]
+                    keyname = 'unknown'
+
+                    # unlike K4PC the keyhash is not used in generating entropy
+                    # entropy = SHA1(keyhash) + added_entropy
+                    # entropy = added_entropy
+
+                    # the remainder of the first record when decoded with charMap5
+                    # has the ':' split char followed by the string representation
+                    # of the number of records that follow
+                    # and make up the contents
+                    srcnt = decode(item[34:],charMap5)
+                    rcnt = int(srcnt)
+
+                    # read and store in rcnt records of data
+                    # that make up the contents value
+                    edlst = []
+                    for i in xrange(rcnt):
                         item = items.pop(0)
+                        edlst.append(item)
 
-                        # the first 32 chars of the first record of a group
-                        # is the MD5 hash of the key name encoded by charMap5
-                        keyhash = item[0:32]
-                        keyname = 'unknown'
+                    keyname = 'unknown'
+                    for name in names:
+                        if encodeHash(name,testMap8) == keyhash:
+                            keyname = name
+                            break
+                    if keyname == 'unknown':
+                        keyname = keyhash
 
-                        # the raw keyhash string is also used to create entropy for the actual
-                        # CryptProtectData Blob that represents that keys contents
-                        # 'entropy' not used for K4Mac only K4PC
-                        # entropy = SHA1(keyhash)
+                    # the testMap8 encoded contents data has had a length
+                    # of chars (always odd) cut off of the front and moved
+                    # to the end to prevent decoding using testMap8 from
+                    # working properly, and thereby preventing the ensuing
+                    # CryptUnprotectData call from succeeding.
 
-                        # the remainder of the first record when decoded with charMap5
-                        # has the ':' split char followed by the string representation
-                        # of the number of records that follow
-                        # and make up the contents
-                        srcnt = decode(item[34:],charMap5)
-                        rcnt = int(srcnt)
+                    # The offset into the testMap8 encoded contents seems to be:
+                    # len(contents) - largest prime number less than or equal to int(len(content)/3)
+                    # (in other words split 'about' 2/3rds of the way through)
 
-                        # read and store in rcnt records of data
-                        # that make up the contents value
-                        edlst = []
-                        for i in xrange(rcnt):
-                            item = items.pop(0)
-                            edlst.append(item)
+                    # move first offsets chars to end to align for decode by testMap8
+                    encdata = ''.join(edlst)
+                    contlen = len(encdata)
 
-                        keyname = 'unknown'
-                        for name in names:
-                            if encodeHash(name,charMap5) == keyhash:
-                                keyname = name
-                                break
-                        if keyname == 'unknown':
-                            keyname = keyhash
+                    # now properly split and recombine
+                    # by moving noffset chars from the start of the
+                    # string to the end of the string
+                    noffset = contlen - primes(int(contlen/3))[-1]
+                    pfx = encdata[0:noffset]
+                    encdata = encdata[noffset:]
+                    encdata = encdata + pfx
 
-                        # the charMap5 encoded contents data has had a length
-                        # of chars (always odd) cut off of the front and moved
-                        # to the end to prevent decoding using charMap5 from
-                        # working properly, and thereby preventing the ensuing
-                        # CryptUnprotectData call from succeeding.
+                    # decode using testMap8 to get the CryptProtect Data
+                    encryptedValue = decode(encdata,testMap8)
+                    cleartext = cud.decrypt(encryptedValue)
+                    # print keyname
+                    # print cleartext
+                    if len(cleartext) > 0:
+                        DB[keyname] = cleartext
 
-                        # The offset into the charMap5 encoded contents seems to be:
-                        # len(contents) - largest prime number less than or equal to int(len(content)/3)
-                        # (in other words split 'about' 2/3rds of the way through)
-
-                        # move first offsets chars to end to align for decode by charMap5
-                        encdata = ''.join(edlst)
-                        contlen = len(encdata)
-
-                        # now properly split and recombine
-                        # by moving noffset chars from the start of the
-                        # string to the end of the string
-                        noffset = contlen - primes(int(contlen/3))[-1]
-                        pfx = encdata[0:noffset]
-                        encdata = encdata[noffset:]
-                        encdata = encdata + pfx
-
-                        # decode using charMap5 to get the CryptProtect Data
-                        encryptedValue = decode(encdata,charMap5)
-                        cleartext = cud.decrypt(encryptedValue)
-                        if len(cleartext) > 0:
-                            DB[keyname] = cleartext
-
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
-                else:
-                    # the latest .kinf2011 version for K4M 1.9.1
-                    # put back the hdr char, it is needed
-                    data = hdr + data
-                    data = data[:-1]
-                    items = data.split('/')
-
-                    # the headerblob is the encrypted information needed to build the entropy string
-                    headerblob = items.pop(0)
-                    encryptedValue = decode(headerblob, charMap1)
-                    cleartext = UnprotectHeaderData(encryptedValue)
-
-                    # now extract the pieces in the same way
-                    # this version is different from K4PC it scales the build number by multipying by 735
-                    pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
-                    for m in re.finditer(pattern, cleartext):
-                        entropy = str(int(m.group(2)) * 0x2df) + m.group(4)
-
-                    cud = CryptUnprotectDataV3(entropy,IDString)
-
-                    # loop through the item records until all are processed
-                    while len(items) > 0:
-
-                        # get the first item record
-                        item = items.pop(0)
-
-                        # the first 32 chars of the first record of a group
-                        # is the MD5 hash of the key name encoded by charMap5
-                        keyhash = item[0:32]
-                        keyname = 'unknown'
-
-                        # unlike K4PC the keyhash is not used in generating entropy
-                        # entropy = SHA1(keyhash) + added_entropy
-                        # entropy = added_entropy
-
-                        # the remainder of the first record when decoded with charMap5
-                        # has the ':' split char followed by the string representation
-                        # of the number of records that follow
-                        # and make up the contents
-                        srcnt = decode(item[34:],charMap5)
-                        rcnt = int(srcnt)
-
-                        # read and store in rcnt records of data
-                        # that make up the contents value
-                        edlst = []
-                        for i in xrange(rcnt):
-                            item = items.pop(0)
-                            edlst.append(item)
-
-                        keyname = 'unknown'
-                        for name in names:
-                            if encodeHash(name,testMap8) == keyhash:
-                                keyname = name
-                                break
-                        if keyname == 'unknown':
-                            keyname = keyhash
-
-                        # the testMap8 encoded contents data has had a length
-                        # of chars (always odd) cut off of the front and moved
-                        # to the end to prevent decoding using testMap8 from
-                        # working properly, and thereby preventing the ensuing
-                        # CryptUnprotectData call from succeeding.
-
-                        # The offset into the testMap8 encoded contents seems to be:
-                        # len(contents) - largest prime number less than or equal to int(len(content)/3)
-                        # (in other words split 'about' 2/3rds of the way through)
-
-                        # move first offsets chars to end to align for decode by testMap8
-                        encdata = ''.join(edlst)
-                        contlen = len(encdata)
-
-                        # now properly split and recombine
-                        # by moving noffset chars from the start of the
-                        # string to the end of the string
-                        noffset = contlen - primes(int(contlen/3))[-1]
-                        pfx = encdata[0:noffset]
-                        encdata = encdata[noffset:]
-                        encdata = encdata + pfx
-
-                        # decode using testMap8 to get the CryptProtect Data
-                        encryptedValue = decode(encdata,testMap8)
-                        cleartext = cud.decrypt(encryptedValue)
-                        # print keyname
-                        # print cleartext
-                        if len(cleartext) > 0:
-                            DB[keyname] = cleartext
-
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
+                if len(DB)>6:
+                    break
             except:
                 pass
-        if 'kindle.account.tokens' in DB:
+        if len(DB)>6:
             # store values used in decryption
             print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(IDString, GetUserName())
             DB['IDString'] = IDString
@@ -1840,7 +1608,7 @@ def cli_main():
     sys.stderr=SafeUnbuffered(sys.stderr)
     argv=unicode_argv()
     progname = os.path.basename(argv[0])
-    print u"{0} v{1}\nCopyright © 2010-2013 some_updates and Apprentice Alf".format(progname,__version__)
+    print u"{0} v{1}\nCopyright © 2010-2016 by some_updates, Apprentice Alf and Apprentice Harper".format(progname,__version__)
 
     try:
         opts, args = getopt.getopt(argv[1:], "hk:")
@@ -1870,7 +1638,7 @@ def cli_main():
         # save to the same directory as the script
         outpath = os.path.dirname(argv[0])
 
-    # make sure the outpath is the
+    # make sure the outpath is canonical
     outpath = os.path.realpath(os.path.normpath(outpath))
 
     if not getkey(outpath, files):

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/mobidedrm.py

@@ -448,6 +448,8 @@ class MobiBook:
                 goodpids.append(pid[0:-2])
             elif len(pid)==8:
                 goodpids.append(pid)
+            else:
+                print u"Warning: PID {0} has wrong number of digits".format(pid)
 
         if self.crypto_type == 1:
             t1_keyvec = 'QDCVEPMU675RUBSZ'
@@ -530,7 +532,7 @@ def cli_main():
             stripped_file = getUnencryptedBook(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)
         except DrmException, e:
-            print u"MobiDeDRM v{0} Error: {0:s}".format(__version__,e.args[0])
+            print u"MobiDeDRM v{0} Error: {1:s}".format(__version__,e.args[0])
             return 1
     return 0
 

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/wineutils.py

@@ -26,6 +26,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
     if not os.path.exists(outdirpath):
         os.makedirs(outdirpath)
 
+    wineprefix = os.path.abspath(os.path.expanduser(os.path.expandvars(wineprefix)))
     if wineprefix != "" and os.path.exists(wineprefix):
          cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
     else:
@@ -38,8 +39,20 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
         result = p2.wait("wait")
     except Exception, e:
         print u"{0} v{1}: Wine subprocess call error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0])
-        return []
+        if wineprefix != "" and os.path.exists(wineprefix):
+            cmdline = u"WINEPREFIX=\"{2}\" wine C:\\Python27\\python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
+        else:
+           cmdline = u"wine C:\\Python27\\python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath)
+        print u"{0} v{1}: Command line: “{2}”".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
 
+        try:
+           cmdline = cmdline.encode(sys.getfilesystemencoding())
+           p2 = Process(cmdline, shell=True, bufsize=1, stdin=None, stdout=sys.stdout, stderr=STDOUT, close_fds=False)
+           result = p2.wait("wait")
+        except Exception, e:
+           print u"{0} v{1}: Wine subprocess call error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0])
+
+    # try finding winekeys anyway, even if above code errored
     winekeys = []
     # get any files with extension in the output dir
     files = [f for f in os.listdir(outdirpath) if f.endswith(extension)]

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # DeDRM.pyw
-# Copyright 2010-2015 some_updates, Apprentice Alf and Apprentice Harper
+# Copyright 2010-2016 some_updates, Apprentice Alf and Apprentice Harper
 
 # Revision history:
 #   6.0.0 - Release along with unified plugin
@@ -19,8 +19,14 @@
 #   6.3.2 - Version bump to match plugin
 #   6.3.3 - Version bump to match plugin
 #   6.3.4 - Version bump to match plugin
+#   6.3.5 - Version bump to match plugin
+#   6.3.6 - Version bump to match plugin
+#   6.4.0 - Fix for Kindle for PC encryption change
+#   6.4.1 - Fix for new tags in Topaz ebooks
+#   6.4.2 - Fix for new tags in Topaz ebooks, and very small Topaz ebooks
+#   6.4.3 - Version bump to match plugin & Mac app
 
-__version__ = '6.3.4'
+__version__ = '6.4.3'
 
 import sys
 import os, os.path

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py

@@ -9,8 +9,6 @@ __docformat__ = 'restructuredtext en'
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 #
-# Requires Calibre version 0.7.55 or higher.
-#
 # All credit given to i♥cabbages and The Dark Reverser for the original standalone scripts.
 # We had the much easier job of converting them to a calibre plugin.
 #
@@ -46,6 +44,13 @@ __docformat__ = 'restructuredtext en'
 #   6.3.2 - Fixed Kindle for Android help file
 #   6.3.3 - Bug fix for Kindle for PC support
 #   6.3.4 - Fixes for Kindle for Android, Linux, and Kobo 3.17
+#   6.3.5 - Fixes for Linux, and Kobo 3.19 and more logging
+#   6.3.6 - Fixes for ADE ePub and PDF introduced in 6.3.5
+#   6.4.0 - Updated for new Kindle for PC encryption
+#   6.4.1 - Fix for some new tags in Topaz ebooks.
+#   6.4.2 - Fix for more new tags in Topaz ebooks and very small Topaz ebooks
+#   6.4.3 - Fix for error that only appears when not in debug mode
+#           Also includes fix for Macs with bonded ethernet ports
 
 
 """
@@ -53,7 +58,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 3, 4)
+PLUGIN_VERSION_TUPLE = (6, 4, 3)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'
@@ -85,8 +90,12 @@ class SafeUnbuffered:
     def write(self, data):
         if isinstance(data,unicode):
             data = data.encode(self.encoding,"replace")
-        self.stream.write(data)
-        self.stream.flush()
+        try:
+            self.stream.write(data)
+            self.stream.flush()
+        except:
+            # We can do nothing if a write fails
+            pass
     def __getattr__(self, attr):
         return getattr(self.stream, attr)
 
@@ -96,7 +105,7 @@ class DeDRM(FileTypePlugin):
     supported_platforms     = ['linux', 'osx', 'windows']
     author                  = u"Apprentice Alf, Aprentice Harper, The Dark Reverser and i♥cabbages"
     version                 = PLUGIN_VERSION_TUPLE
-    minimum_calibre_version = (0, 7, 55)  # Compiled python libraries cannot be imported in earlier versions.
+    minimum_calibre_version = (1, 0, 0)  # Compiled python libraries cannot be imported in earlier versions.
     file_types              = set(['epub','pdf','pdb','prc','mobi','pobi','azw','azw1','azw3','azw4','tpz'])
     on_import               = True
     priority                = 600
@@ -296,11 +305,15 @@ class DeDRM(FileTypePlugin):
                     traceback.print_exc()
                     result = 1
 
-                of.close()
+                try:
+                    of.close()
+                except:
+                    print u"{0} v{1}: Exception closing temporary file after {2:.1f} seconds. Ignored.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
 
                 if  result == 0:
                     # Decryption was successful.
                     # Return the modified PersistentTemporary file to calibre.
+                    print u"{0} v{1}: Decrypted with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname,time.time()-self.starttime)
                     return of.name
 
                 print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname,time.time()-self.starttime)
@@ -360,6 +373,7 @@ class DeDRM(FileTypePlugin):
                             except:
                                 print u"{0} v{1}: Exception when saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                                 traceback.print_exc()
+                            print u"{0} v{1}: Decrypted with new default key after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
                             # Return the modified PersistentTemporary file to calibre.
                             return of.name
 

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/config.py

@@ -566,6 +566,19 @@ class AddBandNKeyDialog(QDialog):
         data_group_box_layout.addWidget(ccn_disclaimer_label)
         layout.addSpacing(10)
 
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"Retrieved key:", self))
+        self.key_display = QLabel(u"", self)
+        self.key_display.setToolTip(_(u"Click the Retrieve Key button to fetch your B&N encryption key from the B&N servers"))
+        key_group.addWidget(self.key_display)
+        self.retrieve_button = QtGui.QPushButton(self)
+        self.retrieve_button.setToolTip(_(u"Click to retrieve your B&N encryption key from the B&N servers"))
+        self.retrieve_button.setText(u"Retrieve Key")
+        self.retrieve_button.clicked.connect(self.retrieve_key)
+        key_group.addWidget(self.retrieve_button)
+        layout.addSpacing(10)
+
         self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         self.button_box.accepted.connect(self.accept)
         self.button_box.rejected.connect(self.reject)
@@ -579,8 +592,7 @@ class AddBandNKeyDialog(QDialog):
 
     @property
     def key_value(self):
-        from calibre_plugins.dedrm.ignoblekeyfetch import fetch_key as fetch_bandn_key
-        return fetch_bandn_key(self.user_name,self.cc_number)
+        return unicode(self.key_display.text()).strip()
 
     @property
     def user_name(self):
@@ -590,6 +602,14 @@ class AddBandNKeyDialog(QDialog):
     def cc_number(self):
         return unicode(self.cc_ledit.text()).strip()
 
+    def retrieve_key(self):
+        from calibre_plugins.dedrm.ignoblekeyfetch import fetch_key as fetch_bandn_key
+        fetched_key = fetch_bandn_key(self.user_name,self.cc_number)
+        if fetched_key == "":
+            errmsg = u"Could not retrieve key. Check username, password and intenet connectivity and try again."
+            error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        else:
+            self.key_display.setText(fetched_key)
 
     def accept(self):
         if len(self.key_name) == 0 or len(self.user_name) == 0 or len(self.cc_number) == 0 or self.key_name.isspace() or self.user_name.isspace() or self.cc_number.isspace():
@@ -598,6 +618,10 @@ class AddBandNKeyDialog(QDialog):
         if len(self.key_name) < 4:
             errmsg = u"Key name must be at <i>least</i> 4 characters long!"
             return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_value) == 0:
+            self.retrieve_key()
+            if len(self.key_value) == 0:
+                return
         QDialog.accept(self)
 
 class AddEReaderDialog(QDialog):

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/convert2xml.py

@@ -164,6 +164,7 @@ class PageParser(object):
         self.id = os.path.basename(filename).replace('.dat','')
         self.dict = dict
         self.debug = debug
+        self.first_unknown = True
         self.flat_xml = flat_xml
         self.tagpath = []
         self.doc = []
@@ -262,6 +263,9 @@ class PageParser(object):
         'img.w'                 : (1, 'scalar_number', 0, 0),
         'img.src'               : (1, 'scalar_number', 0, 0),
         'img.color_src'         : (1, 'scalar_number', 0, 0),
+        'img.gridSize'          : (1, 'scalar_number', 0, 0),
+        'img.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
+        'img.gridTopCenter'     : (1, 'scalar_number', 0, 0),
         'img.gridBeginCenter'   : (1, 'scalar_number', 0, 0),
         'img.gridEndCenter'     : (1, 'scalar_number', 0, 0),
         'img.image_type'        : (1, 'scalar_number', 0, 0),
@@ -313,11 +317,16 @@ class PageParser(object):
         'span.gridBeginCenter' : (1, 'scalar_number', 0, 0),
         'span.gridEndCenter' : (1, 'scalar_number', 0, 0),
 
-        'extratokens'            : (1, 'snippets', 1, 0),
-        'extratokens.class'      : (1, 'scalar_text', 0, 0),
-        'extratokens.type'       : (1, 'scalar_text', 0, 0),
-        'extratokens.firstGlyph' : (1, 'scalar_number', 0, 0),
-        'extratokens.lastGlyph'  : (1, 'scalar_number', 0, 0),
+        'extratokens'                   : (1, 'snippets', 1, 0),
+        'extratokens.class'             : (1, 'scalar_text', 0, 0),
+        'extratokens.type'              : (1, 'scalar_text', 0, 0),
+        'extratokens.firstGlyph'        : (1, 'scalar_number', 0, 0),
+        'extratokens.lastGlyph'         : (1, 'scalar_number', 0, 0),
+        'extratokens.gridSize'          : (1, 'scalar_number', 0, 0),
+        'extratokens.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
+        'extratokens.gridTopCenter'     : (1, 'scalar_number', 0, 0),
+        'extratokens.gridBeginCenter'   : (1, 'scalar_number', 0, 0),
+        'extratokens.gridEndCenter'     : (1, 'scalar_number', 0, 0),
 
         'glyph.h'      : (1, 'number', 0, 0),
         'glyph.w'      : (1, 'number', 0, 0),
@@ -506,8 +515,9 @@ class PageParser(object):
         # or an out of sync condition
         else:
             result = []
-            if (self.debug):
+            if (self.debug or self.first_unknown):
                 print 'Unknown Token:', token
+                self.first_unknown = False
             self.tag_pop()
             return result
 

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/genbook.py

@@ -385,7 +385,7 @@ def generateBook(bookDir, raw, fixedimage):
     # print "first normal text page is", spage
 
     # get page height and width from first text page for use in stylesheet scaling
-    pname = 'page%04d.dat' % (pnum + 1)
+    pname = 'page%04d.dat' % (pnum - 1)
     fname = os.path.join(pageDir,pname)
     flat_xml = convert2xml.fromData(dict, fname)
 

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py

@@ -3,18 +3,19 @@
 
 from __future__ import with_statement
 
-# ineptepub.pyw, version 6.1
+# ineptepub.pyw, version 6.5
 # Copyright © 2009-2010 by i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 
 # Modified 2010–2013 by some_updates, DiapDealer and Apprentice Alf
+# Modified 2015–2016 by Apprentice Harper
 
-# Windows users: Before running this program, you must first install Python 2.6
+# Windows users: Before running this program, you must first install Python 2.7
 #   from <http://www.python.org/download/> and PyCrypto from
 #   <http://www.voidspace.org.uk/python/modules.shtml#pycrypto> (make sure to
-#   install the version for Python 2.6).  Save this script file as
+#   install the version for Python 2.7).  Save this script file as
 #   ineptepub.pyw and double-click on it to run it.
 #
 # Mac OS X users: Save this script file as ineptepub.pyw.  You can run this
@@ -38,13 +39,16 @@ from __future__ import with_statement
 #   6.0 - moved unicode_argv call inside main for Windows DeDRM compatibility
 #   6.1 - Work if TkInter is missing
 #   6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis
+#   6.3 - Add additional check on DER file sanity
+#   6.4 - Remove erroneous check on DER file sanity
+#   6.5 - Completely remove erroneous check on DER file sanity
 
 """
 Decrypt Adobe Digital Editions encrypted ePub books.
 """
 
 __license__ = 'GPL v3'
-__version__ = "6.2"
+__version__ = "6.5"
 
 import sys
 import os

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py

@@ -3,18 +3,19 @@
 
 from __future__ import with_statement
 
-# ineptpdf.pyw, version 7.11
+# ineptpdf.pyw, version 8.0.4
 # Copyright © 2009-2010 by i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 
 # Modified 2010–2012 by some_updates, DiapDealer and Apprentice Alf
+# Modified 2015-2016 by Apprentice Harper
 
-# Windows users: Before running this program, you must first install Python 2.6
+# Windows users: Before running this program, you must first install Python 2.7
 #   from <http://www.python.org/download/> and PyCrypto from
 #   <http://www.voidspace.org.uk/python/modules.shtml#pycrypto> (make sure to
-#   install the version for Python 2.6).  Save this script file as
+#   install the version for Python 2.7).  Save this script file as
 #   ineptpdf.pyw and double-click on it to run it.
 #
 # Mac OS X users: Save this script file as ineptpdf.pyw.  You can run this
@@ -53,13 +54,17 @@ from __future__ import with_statement
 #   7.14 - moved unicode_argv call inside main for Windows DeDRM compatibility
 #   8.0  - Work if TkInter is missing
 #   8.0.1 - Broken Metadata fix.
+#   8.0.2 - Add additional check on DER file sanity
+#   8.0.3 - Remove erroneous check on DER file sanity
+#   8.0.4 - Completely remove erroneous check on DER file sanity
+
 
 """
 Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0.1"
+__version__ = "8.0.4"
 
 import sys
 import os

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kgenpids.py

@@ -199,9 +199,6 @@ def getK4Pids(rec209, token, kindleDatabase):
         # Get the Mazama Random number
         MazamaRandomNumber = (kindleDatabase[1])['MazamaRandomNumber'].decode('hex')
 
-        # Get the kindle account token
-        kindleAccountToken = (kindleDatabase[1])['kindle.account.tokens'].decode('hex')
-
         # Get the IDString used to decode the Kindle Info file
         IDString = (kindleDatabase[1])['IDString'].decode('hex')
 
@@ -212,6 +209,14 @@ def getK4Pids(rec209, token, kindleDatabase):
         print u"Keys not found in the database {0}.".format(kindleDatabase[0])
         return pids
 
+    try:
+        # Get the kindle account token, if present
+        kindleAccountToken = (kindleDatabase[1])['kindle.account.tokens'].decode('hex')
+
+    except KeyError:
+        kindleAccountToken=""
+        pass
+
     # Get the ID string used
     encodedIDString = encodeHash(IDString,charMap1)
 

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py

@@ -4,7 +4,7 @@
 from __future__ import with_statement
 
 # kindlekey.py
-# Copyright © 2010-2015 by some_updates, Apprentice Alf and Apprentice Harper
+# Copyright © 2010-2016 by some_updates, Apprentice Alf and Apprentice Harper
 
 # Revision history:
 #  1.0   - Kindle info file decryption, extracted from k4mobidedrm, etc.
@@ -19,6 +19,9 @@ from __future__ import with_statement
 #  1.8   - Fixes for Kindle for Mac, and non-ascii in Windows user names
 #  1.9   - Fixes for Unicode in Windows user names
 #  2.0   - Added comments and extra fix for non-ascii Windows user names
+#  2.1   - Fixed Kindle for PC encryption changes March 2016
+#  2.2   - Fixes for Macs with bonded ethernet ports
+#          Also removed old .kinfo file support (pre-2011)
 
 
 """
@@ -26,7 +29,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '1.9'
+__version__ = '2.2'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -926,7 +929,7 @@ if iswindows:
         # or the python interface to the 32 vs 64 bit registry is broken
         path = ""
         if 'LOCALAPPDATA' in os.environ.keys():
-			# Python 2.x does not return unicode env. Use Python 3.x
+            # Python 2.x does not return unicode env. Use Python 3.x
             path = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
             # this is just another alternative.
             # path = getEnvironmentVariable('LOCALAPPDATA')
@@ -993,179 +996,120 @@ if iswindows:
     # determine type of kindle info provided and return a
     # database of keynames and values
     def getDBfromFile(kInfoFile):
-        names = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber', 'max_date', 'SIGVERIF']
+        names = [\
+            'kindle.account.tokens',\
+            'kindle.cookie.item',\
+            'eulaVersionAccepted',\
+            'login_date',\
+            'kindle.token.item',\
+            'login',\
+            'kindle.key.item',\
+            'kindle.name.info',\
+            'kindle.device.info',\
+            'MazamaRandomNumber',\
+            'max_date',\
+            'SIGVERIF',\
+            'build_version',\
+            ]
+
         DB = {}
         with open(kInfoFile, 'rb') as infoReader:
-            hdr = infoReader.read(1)
             data = infoReader.read()
+        # assume newest .kinf2011 style .kinf file
+        # the .kinf file uses "/" to separate it into records
+        # so remove the trailing "/" to make it easy to use split
+        data = data[:-1]
+        items = data.split('/')
 
-        if data.find('{') != -1 :
-            # older style kindle-info file
-            items = data.split('{')
-            for item in items:
-                if item != '':
-                    keyhash, rawdata = item.split(':')
-                    keyname = "unknown"
-                    for name in names:
-                        if encodeHash(name,charMap2) == keyhash:
-                            keyname = name
-                            break
-                    if keyname == "unknown":
-                        keyname = keyhash
-                    encryptedValue = decode(rawdata,charMap2)
-                    DB[keyname] = CryptUnprotectData(encryptedValue, "", 0)
-        elif hdr == '/':
-            # else rainier-2-1-1 .kinf file
-            # the .kinf file uses "/" to separate it into records
-            # so remove the trailing "/" to make it easy to use split
-            data = data[:-1]
-            items = data.split('/')
+        # starts with an encoded and encrypted header blob
+        headerblob = items.pop(0)
+        encryptedValue = decode(headerblob, testMap1)
+        cleartext = UnprotectHeaderData(encryptedValue)
+        #print "header  cleartext:",cleartext
+        # now extract the pieces that form the added entropy
+        pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
+        for m in re.finditer(pattern, cleartext):
+            added_entropy = m.group(2) + m.group(4)
 
-            # loop through the item records until all are processed
-            while len(items) > 0:
 
-                # get the first item record
+        # loop through the item records until all are processed
+        while len(items) > 0:
+
+            # get the first item record
+            item = items.pop(0)
+
+            # the first 32 chars of the first record of a group
+            # is the MD5 hash of the key name encoded by charMap5
+            keyhash = item[0:32]
+
+            # the sha1 of raw keyhash string is used to create entropy along
+            # with the added entropy provided above from the headerblob
+            entropy = SHA1(keyhash) + added_entropy
+
+            # the remainder of the first record when decoded with charMap5
+            # has the ':' split char followed by the string representation
+            # of the number of records that follow
+            # and make up the contents
+            srcnt = decode(item[34:],charMap5)
+            rcnt = int(srcnt)
+
+            # read and store in rcnt records of data
+            # that make up the contents value
+            edlst = []
+            for i in xrange(rcnt):
                 item = items.pop(0)
+                edlst.append(item)
 
-                # the first 32 chars of the first record of a group
-                # is the MD5 hash of the key name encoded by charMap5
-                keyhash = item[0:32]
+            # key names now use the new testMap8 encoding
+            keyname = "unknown"
+            for name in names:
+                if encodeHash(name,testMap8) == keyhash:
+                    keyname = name
+                    #print "keyname found from hash:",keyname
+                    break
+            if keyname == "unknown":
+                keyname = keyhash
+                #print "keyname not found, hash is:",keyname
 
-                # the raw keyhash string is used to create entropy for the actual
-                # CryptProtectData Blob that represents that keys contents
-                entropy = SHA1(keyhash)
+            # the testMap8 encoded contents data has had a length
+            # of chars (always odd) cut off of the front and moved
+            # to the end to prevent decoding using testMap8 from
+            # working properly, and thereby preventing the ensuing
+            # CryptUnprotectData call from succeeding.
 
-                # the remainder of the first record when decoded with charMap5
-                # has the ':' split char followed by the string representation
-                # of the number of records that follow
-                # and make up the contents
-                srcnt = decode(item[34:],charMap5)
-                rcnt = int(srcnt)
+            # The offset into the testMap8 encoded contents seems to be:
+            # len(contents)-largest prime number <=  int(len(content)/3)
+            # (in other words split "about" 2/3rds of the way through)
 
-                # read and store in rcnt records of data
-                # that make up the contents value
-                edlst = []
-                for i in xrange(rcnt):
-                    item = items.pop(0)
-                    edlst.append(item)
-
-                keyname = "unknown"
-                for name in names:
-                    if encodeHash(name,charMap5) == keyhash:
-                        keyname = name
-                        break
-                if keyname == "unknown":
-                    keyname = keyhash
-                # the charMap5 encoded contents data has had a length
-                # of chars (always odd) cut off of the front and moved
-                # to the end to prevent decoding using charMap5 from
-                # working properly, and thereby preventing the ensuing
-                # CryptUnprotectData call from succeeding.
-
-                # The offset into the charMap5 encoded contents seems to be:
-                # len(contents)-largest prime number <=  int(len(content)/3)
-                # (in other words split "about" 2/3rds of the way through)
-
-                # move first offsets chars to end to align for decode by charMap5
-                encdata = "".join(edlst)
-                contlen = len(encdata)
-                noffset = contlen - primes(int(contlen/3))[-1]
-
-                # now properly split and recombine
-                # by moving noffset chars from the start of the
-                # string to the end of the string
-                pfx = encdata[0:noffset]
-                encdata = encdata[noffset:]
-                encdata = encdata + pfx
-
-                # decode using Map5 to get the CryptProtect Data
-                encryptedValue = decode(encdata,charMap5)
-                DB[keyname] = CryptUnprotectData(encryptedValue, entropy, 1)
-        else:
-            # else newest .kinf2011 style .kinf file
-            # the .kinf file uses "/" to separate it into records
-            # so remove the trailing "/" to make it easy to use split
-            # need to put back the first char read because it it part
-            # of the added entropy blob
-            data = hdr + data[:-1]
-            items = data.split('/')
-
-            # starts with and encoded and encrypted header blob
-            headerblob = items.pop(0)
-            encryptedValue = decode(headerblob, testMap1)
-            cleartext = UnprotectHeaderData(encryptedValue)
-            # now extract the pieces that form the added entropy
-            pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
-            for m in re.finditer(pattern, cleartext):
-                added_entropy = m.group(2) + m.group(4)
+            # move first offsets chars to end to align for decode by testMap8
+            # by moving noffset chars from the start of the
+            # string to the end of the string
+            encdata = "".join(edlst)
+            #print "encrypted data:",encdata
+            contlen = len(encdata)
+            noffset = contlen - primes(int(contlen/3))[-1]
+            pfx = encdata[0:noffset]
+            encdata = encdata[noffset:]
+            encdata = encdata + pfx
+            #print "rearranged data:",encdata
 
 
-            # loop through the item records until all are processed
-            while len(items) > 0:
-
-                # get the first item record
-                item = items.pop(0)
-
-                # the first 32 chars of the first record of a group
-                # is the MD5 hash of the key name encoded by charMap5
-                keyhash = item[0:32]
-
-                # the sha1 of raw keyhash string is used to create entropy along
-                # with the added entropy provided above from the headerblob
-                entropy = SHA1(keyhash) + added_entropy
-
-                # the remainder of the first record when decoded with charMap5
-                # has the ':' split char followed by the string representation
-                # of the number of records that follow
-                # and make up the contents
-                srcnt = decode(item[34:],charMap5)
-                rcnt = int(srcnt)
-
-                # read and store in rcnt records of data
-                # that make up the contents value
-                edlst = []
-                for i in xrange(rcnt):
-                    item = items.pop(0)
-                    edlst.append(item)
-
-                # key names now use the new testMap8 encoding
-                keyname = "unknown"
-                for name in names:
-                    if encodeHash(name,testMap8) == keyhash:
-                        keyname = name
-                        break
-
-                # the testMap8 encoded contents data has had a length
-                # of chars (always odd) cut off of the front and moved
-                # to the end to prevent decoding using testMap8 from
-                # working properly, and thereby preventing the ensuing
-                # CryptUnprotectData call from succeeding.
-
-                # The offset into the testMap8 encoded contents seems to be:
-                # len(contents)-largest prime number <=  int(len(content)/3)
-                # (in other words split "about" 2/3rds of the way through)
-
-                # move first offsets chars to end to align for decode by testMap8
-                # by moving noffset chars from the start of the
-                # string to the end of the string
-                encdata = "".join(edlst)
-                contlen = len(encdata)
-                noffset = contlen - primes(int(contlen/3))[-1]
-                pfx = encdata[0:noffset]
-                encdata = encdata[noffset:]
-                encdata = encdata + pfx
-
-                # decode using new testMap8 to get the original CryptProtect Data
-                encryptedValue = decode(encdata,testMap8)
-                cleartext = CryptUnprotectData(encryptedValue, entropy, 1)
+            # decode using new testMap8 to get the original CryptProtect Data
+            encryptedValue = decode(encdata,testMap8)
+            #print "decoded data:",encryptedValue.encode('hex')
+            cleartext = CryptUnprotectData(encryptedValue, entropy, 1)
+            if len(cleartext)>0:
+                #print "cleartext data:",cleartext,":end data"
                 DB[keyname] = cleartext
+            #print keyname, cleartext
 
-        if 'kindle.account.tokens' in DB:
+        if len(DB)>6:
             # store values used in decryption
             DB['IDString'] = GetIDString()
             DB['UserName'] = GetUserName()
             print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName().encode('hex'))
         else:
+            print u"Couldn't decrypt file."
             DB = {}
         return DB
 elif isosx:
@@ -1297,11 +1241,9 @@ elif isosx:
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
+        #print out1
         reslst = out1.split('\n')
         cnt = len(reslst)
-        bsdname = None
-        sernum = None
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
             pp = resline.find('\"Serial Number\" = \"')
@@ -1310,31 +1252,24 @@ elif isosx:
                 sernums.append(sernum.strip())
         return sernums
 
-    def GetUserHomeAppSupKindleDirParitionName():
-        home = os.getenv('HOME')
-        dpath =  home + '/Library'
+    def GetDiskPartitionNames():
+        names = []
         cmdline = '/sbin/mount'
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
         reslst = out1.split('\n')
         cnt = len(reslst)
-        disk = ''
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
             if resline.startswith('/dev'):
                 (devpart, mpath) = resline.split(' on ')
                 dpart = devpart[5:]
-                pp = mpath.find('(')
-                if pp >= 0:
-                    mpath = mpath[:pp-1]
-                if dpath.startswith(mpath):
-                    disk = dpart
-        return disk
+                names.append(dpart)
+        return names
 
-    # uses a sub process to get the UUID of the specified disk partition using ioreg
-    def GetDiskPartitionUUIDs(diskpart):
+    # uses a sub process to get the UUID of all disk partitions
+    def GetDiskPartitionUUIDs():
         uuids = []
         uuidnum = os.getenv('MYUUIDNUMBER')
         if uuidnum != None:
@@ -1343,46 +1278,16 @@ elif isosx:
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
+        #print out1
         reslst = out1.split('\n')
         cnt = len(reslst)
-        bsdname = None
-        uuidnum = None
-        foundIt = False
-        nest = 0
-        uuidnest = -1
-        partnest = -2
         for j in xrange(cnt):
             resline = reslst[j]
-            if resline.find('{') >= 0:
-                nest += 1
-            if resline.find('}') >= 0:
-                nest -= 1
             pp = resline.find('\"UUID\" = \"')
             if pp >= 0:
                 uuidnum = resline[pp+10:-1]
                 uuidnum = uuidnum.strip()
-                uuidnest = nest
-                if partnest == uuidnest and uuidnest > 0:
-                    foundIt = True
-                    break
-            bb = resline.find('\"BSD Name\" = \"')
-            if bb >= 0:
-                bsdname = resline[bb+14:-1]
-                bsdname = bsdname.strip()
-                if (bsdname == diskpart):
-                    partnest = nest
-                else :
-                    partnest = -2
-                if partnest == uuidnest and partnest > 0:
-                    foundIt = True
-                    break
-            if nest == 0:
-                partnest = -2
-                uuidnest = -1
-                uuidnum = None
-                bsdname = None
-        if foundIt:
-            uuids.append(uuidnum)
+                uuids.append(uuidnum)
         return uuids
 
     def GetMACAddressesMunged():
@@ -1390,28 +1295,26 @@ elif isosx:
         macnum = os.getenv('MYMACNUM')
         if macnum != None:
             macnums.append(macnum)
-        cmdline = '/sbin/ifconfig en0'
+        cmdline = 'networksetup -listallhardwareports' # en0'
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
         reslst = out1.split('\n')
         cnt = len(reslst)
-        macnum = None
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
-            pp = resline.find('ether ')
+            pp = resline.find('Ethernet Address: ')
             if pp >= 0:
-                macnum = resline[pp+6:-1]
+                #print resline
+                macnum = resline[pp+18:]
                 macnum = macnum.strip()
-                # print 'original mac', macnum
-                # now munge it up the way Kindle app does
-                # by xoring it with 0xa5 and swapping elements 3 and 4
                 maclst = macnum.split(':')
                 n = len(maclst)
                 if n != 6:
-                    fountIt = False
-                    break
+                    continue
+                #print 'original mac', macnum
+                # now munge it up the way Kindle app does
+                # by xoring it with 0xa5 and swapping elements 3 and 4
                 for i in range(6):
                     maclst[i] = int('0x' + maclst[i], 0)
                 mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
@@ -1422,16 +1325,15 @@ elif isosx:
                 mlst[1] = maclst[1] ^ 0xa5
                 mlst[0] = maclst[0] ^ 0xa5
                 macnum = '%0.2x%0.2x%0.2x%0.2x%0.2x%0.2x' % (mlst[0], mlst[1], mlst[2], mlst[3], mlst[4], mlst[5])
-                foundIt = True
-                break
-        if foundIt:
-            macnums.append(macnum)
+                #print 'munged mac', macnum
+                macnums.append(macnum)
         return macnums
 
 
     # uses unix env to get username instead of using sysctlbyname
     def GetUserName():
         username = os.getenv('USER')
+        #print "Username:",username
         return username
 
     def GetIDStrings():
@@ -1439,58 +1341,13 @@ elif isosx:
         strings = []
         strings.extend(GetMACAddressesMunged())
         strings.extend(GetVolumesSerialNumbers())
-        diskpart = GetUserHomeAppSupKindleDirParitionName()
-        strings.extend(GetDiskPartitionUUIDs(diskpart))
+        strings.extend(GetDiskPartitionNames())
+        strings.extend(GetDiskPartitionUUIDs())
         strings.append('9999999999')
-        #print strings
+        #print "ID Strings:\n",strings
         return strings
 
 
-    # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used by Kindle for Mac versions < 1.6.0
-    class CryptUnprotectData(object):
-        def __init__(self, IDString):
-            sp = IDString + '!@#' + GetUserName()
-            passwdData = encode(SHA256(sp),charMap1)
-            salt = '16743'
-            self.crp = LibCrypto()
-            iter = 0x3e8
-            keylen = 0x80
-            key_iv = self.crp.keyivgen(passwdData, salt, iter, keylen)
-            self.key = key_iv[0:32]
-            self.iv = key_iv[32:48]
-            self.crp.set_decrypt_key(self.key, self.iv)
-
-        def decrypt(self, encryptedData):
-            cleartext = self.crp.decrypt(encryptedData)
-            cleartext = decode(cleartext,charMap1)
-            return cleartext
-
-
-    # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used for Kindle for Mac Versions >= 1.6.0
-    class CryptUnprotectDataV2(object):
-        def __init__(self, IDString):
-            sp = GetUserName() + ':&%:' + IDString
-            passwdData = encode(SHA256(sp),charMap5)
-            # salt generation as per the code
-            salt = 0x0512981d * 2 * 1 * 1
-            salt = str(salt) + GetUserName()
-            salt = encode(salt,charMap5)
-            self.crp = LibCrypto()
-            iter = 0x800
-            keylen = 0x400
-            key_iv = self.crp.keyivgen(passwdData, salt, iter, keylen)
-            self.key = key_iv[0:32]
-            self.iv = key_iv[32:48]
-            self.crp.set_decrypt_key(self.key, self.iv)
-
-        def decrypt(self, encryptedData):
-            cleartext = self.crp.decrypt(encryptedData)
-            cleartext = decode(cleartext, charMap5)
-            return cleartext
-
-
     # unprotect the new header blob in .kinf2011
     # used in Kindle for Mac Version >= 1.9.0
     def UnprotectHeaderData(encryptedData):
@@ -1508,8 +1365,7 @@ elif isosx:
 
 
     # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used for Kindle for Mac Versions >= 1.9.0
-    class CryptUnprotectDataV3(object):
+    class CryptUnprotectData(object):
         def __init__(self, entropy, IDString):
             sp = GetUserName() + '+@#$%+' + IDString
             passwdData = encode(SHA256(sp),charMap2)
@@ -1577,206 +1433,118 @@ elif isosx:
     # determine type of kindle info provided and return a
     # database of keynames and values
     def getDBfromFile(kInfoFile):
-        names = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber', 'max_date', 'SIGVERIF']
+        names = [\
+            'kindle.account.tokens',\
+            'kindle.cookie.item',\
+            'eulaVersionAccepted',\
+            'login_date',\
+            'kindle.token.item',\
+            'login',\
+            'kindle.key.item',\
+            'kindle.name.info',\
+            'kindle.device.info',\
+            'MazamaRandomNumber',\
+            'max_date',\
+            'SIGVERIF',\
+            'build_version',\
+            ]
         with open(kInfoFile, 'rb') as infoReader:
-            filehdr = infoReader.read(1)
             filedata = infoReader.read()
 
+        data = filedata[:-1]
+        items = data.split('/')
         IDStrings = GetIDStrings()
         for IDString in IDStrings:
-            DB = {}
             #print "trying IDString:",IDString
             try:
-                hdr = filehdr
-                data = filedata
-                if data.find('[') != -1 :
-                    # older style kindle-info file
-                    cud = CryptUnprotectData(IDString)
-                    items = data.split('[')
-                    for item in items:
-                        if item != '':
-                            keyhash, rawdata = item.split(':')
-                            keyname = 'unknown'
-                            for name in names:
-                                if encodeHash(name,charMap2) == keyhash:
-                                    keyname = name
-                                    break
-                            if keyname == 'unknown':
-                                keyname = keyhash
-                            encryptedValue = decode(rawdata,charMap2)
-                            cleartext = cud.decrypt(encryptedValue)
-                            if len(cleartext) > 0:
-                                DB[keyname] = cleartext
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
-                elif hdr == '/':
-                    # else newer style .kinf file used by K4Mac >= 1.6.0
-                    # the .kinf file uses '/' to separate it into records
-                    # so remove the trailing '/' to make it easy to use split
-                    data = data[:-1]
-                    items = data.split('/')
-                    cud = CryptUnprotectDataV2(IDString)
+                DB = {}
+                items = data.split('/')
+               
+                # the headerblob is the encrypted information needed to build the entropy string
+                headerblob = items.pop(0)
+                encryptedValue = decode(headerblob, charMap1)
+                cleartext = UnprotectHeaderData(encryptedValue)
 
-                    # loop through the item records until all are processed
-                    while len(items) > 0:
+                # now extract the pieces in the same way
+                # this version is different from K4PC it scales the build number by multipying by 735
+                pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
+                for m in re.finditer(pattern, cleartext):
+                    entropy = str(int(m.group(2)) * 0x2df) + m.group(4)
 
-                        # get the first item record
+                cud = CryptUnprotectData(entropy,IDString)
+
+                # loop through the item records until all are processed
+                while len(items) > 0:
+
+                    # get the first item record
+                    item = items.pop(0)
+
+                    # the first 32 chars of the first record of a group
+                    # is the MD5 hash of the key name encoded by charMap5
+                    keyhash = item[0:32]
+                    keyname = 'unknown'
+
+                    # unlike K4PC the keyhash is not used in generating entropy
+                    # entropy = SHA1(keyhash) + added_entropy
+                    # entropy = added_entropy
+
+                    # the remainder of the first record when decoded with charMap5
+                    # has the ':' split char followed by the string representation
+                    # of the number of records that follow
+                    # and make up the contents
+                    srcnt = decode(item[34:],charMap5)
+                    rcnt = int(srcnt)
+
+                    # read and store in rcnt records of data
+                    # that make up the contents value
+                    edlst = []
+                    for i in xrange(rcnt):
                         item = items.pop(0)
+                        edlst.append(item)
 
-                        # the first 32 chars of the first record of a group
-                        # is the MD5 hash of the key name encoded by charMap5
-                        keyhash = item[0:32]
-                        keyname = 'unknown'
+                    keyname = 'unknown'
+                    for name in names:
+                        if encodeHash(name,testMap8) == keyhash:
+                            keyname = name
+                            break
+                    if keyname == 'unknown':
+                        keyname = keyhash
 
-                        # the raw keyhash string is also used to create entropy for the actual
-                        # CryptProtectData Blob that represents that keys contents
-                        # 'entropy' not used for K4Mac only K4PC
-                        # entropy = SHA1(keyhash)
+                    # the testMap8 encoded contents data has had a length
+                    # of chars (always odd) cut off of the front and moved
+                    # to the end to prevent decoding using testMap8 from
+                    # working properly, and thereby preventing the ensuing
+                    # CryptUnprotectData call from succeeding.
 
-                        # the remainder of the first record when decoded with charMap5
-                        # has the ':' split char followed by the string representation
-                        # of the number of records that follow
-                        # and make up the contents
-                        srcnt = decode(item[34:],charMap5)
-                        rcnt = int(srcnt)
+                    # The offset into the testMap8 encoded contents seems to be:
+                    # len(contents) - largest prime number less than or equal to int(len(content)/3)
+                    # (in other words split 'about' 2/3rds of the way through)
 
-                        # read and store in rcnt records of data
-                        # that make up the contents value
-                        edlst = []
-                        for i in xrange(rcnt):
-                            item = items.pop(0)
-                            edlst.append(item)
+                    # move first offsets chars to end to align for decode by testMap8
+                    encdata = ''.join(edlst)
+                    contlen = len(encdata)
 
-                        keyname = 'unknown'
-                        for name in names:
-                            if encodeHash(name,charMap5) == keyhash:
-                                keyname = name
-                                break
-                        if keyname == 'unknown':
-                            keyname = keyhash
+                    # now properly split and recombine
+                    # by moving noffset chars from the start of the
+                    # string to the end of the string
+                    noffset = contlen - primes(int(contlen/3))[-1]
+                    pfx = encdata[0:noffset]
+                    encdata = encdata[noffset:]
+                    encdata = encdata + pfx
 
-                        # the charMap5 encoded contents data has had a length
-                        # of chars (always odd) cut off of the front and moved
-                        # to the end to prevent decoding using charMap5 from
-                        # working properly, and thereby preventing the ensuing
-                        # CryptUnprotectData call from succeeding.
+                    # decode using testMap8 to get the CryptProtect Data
+                    encryptedValue = decode(encdata,testMap8)
+                    cleartext = cud.decrypt(encryptedValue)
+                    # print keyname
+                    # print cleartext
+                    if len(cleartext) > 0:
+                        DB[keyname] = cleartext
 
-                        # The offset into the charMap5 encoded contents seems to be:
-                        # len(contents) - largest prime number less than or equal to int(len(content)/3)
-                        # (in other words split 'about' 2/3rds of the way through)
-
-                        # move first offsets chars to end to align for decode by charMap5
-                        encdata = ''.join(edlst)
-                        contlen = len(encdata)
-
-                        # now properly split and recombine
-                        # by moving noffset chars from the start of the
-                        # string to the end of the string
-                        noffset = contlen - primes(int(contlen/3))[-1]
-                        pfx = encdata[0:noffset]
-                        encdata = encdata[noffset:]
-                        encdata = encdata + pfx
-
-                        # decode using charMap5 to get the CryptProtect Data
-                        encryptedValue = decode(encdata,charMap5)
-                        cleartext = cud.decrypt(encryptedValue)
-                        if len(cleartext) > 0:
-                            DB[keyname] = cleartext
-
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
-                else:
-                    # the latest .kinf2011 version for K4M 1.9.1
-                    # put back the hdr char, it is needed
-                    data = hdr + data
-                    data = data[:-1]
-                    items = data.split('/')
-
-                    # the headerblob is the encrypted information needed to build the entropy string
-                    headerblob = items.pop(0)
-                    encryptedValue = decode(headerblob, charMap1)
-                    cleartext = UnprotectHeaderData(encryptedValue)
-
-                    # now extract the pieces in the same way
-                    # this version is different from K4PC it scales the build number by multipying by 735
-                    pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
-                    for m in re.finditer(pattern, cleartext):
-                        entropy = str(int(m.group(2)) * 0x2df) + m.group(4)
-
-                    cud = CryptUnprotectDataV3(entropy,IDString)
-
-                    # loop through the item records until all are processed
-                    while len(items) > 0:
-
-                        # get the first item record
-                        item = items.pop(0)
-
-                        # the first 32 chars of the first record of a group
-                        # is the MD5 hash of the key name encoded by charMap5
-                        keyhash = item[0:32]
-                        keyname = 'unknown'
-
-                        # unlike K4PC the keyhash is not used in generating entropy
-                        # entropy = SHA1(keyhash) + added_entropy
-                        # entropy = added_entropy
-
-                        # the remainder of the first record when decoded with charMap5
-                        # has the ':' split char followed by the string representation
-                        # of the number of records that follow
-                        # and make up the contents
-                        srcnt = decode(item[34:],charMap5)
-                        rcnt = int(srcnt)
-
-                        # read and store in rcnt records of data
-                        # that make up the contents value
-                        edlst = []
-                        for i in xrange(rcnt):
-                            item = items.pop(0)
-                            edlst.append(item)
-
-                        keyname = 'unknown'
-                        for name in names:
-                            if encodeHash(name,testMap8) == keyhash:
-                                keyname = name
-                                break
-                        if keyname == 'unknown':
-                            keyname = keyhash
-
-                        # the testMap8 encoded contents data has had a length
-                        # of chars (always odd) cut off of the front and moved
-                        # to the end to prevent decoding using testMap8 from
-                        # working properly, and thereby preventing the ensuing
-                        # CryptUnprotectData call from succeeding.
-
-                        # The offset into the testMap8 encoded contents seems to be:
-                        # len(contents) - largest prime number less than or equal to int(len(content)/3)
-                        # (in other words split 'about' 2/3rds of the way through)
-
-                        # move first offsets chars to end to align for decode by testMap8
-                        encdata = ''.join(edlst)
-                        contlen = len(encdata)
-
-                        # now properly split and recombine
-                        # by moving noffset chars from the start of the
-                        # string to the end of the string
-                        noffset = contlen - primes(int(contlen/3))[-1]
-                        pfx = encdata[0:noffset]
-                        encdata = encdata[noffset:]
-                        encdata = encdata + pfx
-
-                        # decode using testMap8 to get the CryptProtect Data
-                        encryptedValue = decode(encdata,testMap8)
-                        cleartext = cud.decrypt(encryptedValue)
-                        # print keyname
-                        # print cleartext
-                        if len(cleartext) > 0:
-                            DB[keyname] = cleartext
-
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
+                if len(DB)>6:
+                    break
             except:
                 pass
-        if 'kindle.account.tokens' in DB:
+        if len(DB)>6:
             # store values used in decryption
             print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(IDString, GetUserName())
             DB['IDString'] = IDString
@@ -1840,7 +1608,7 @@ def cli_main():
     sys.stderr=SafeUnbuffered(sys.stderr)
     argv=unicode_argv()
     progname = os.path.basename(argv[0])
-    print u"{0} v{1}\nCopyright © 2010-2013 some_updates and Apprentice Alf".format(progname,__version__)
+    print u"{0} v{1}\nCopyright © 2010-2016 by some_updates, Apprentice Alf and Apprentice Harper".format(progname,__version__)
 
     try:
         opts, args = getopt.getopt(argv[1:], "hk:")
@@ -1870,7 +1638,7 @@ def cli_main():
         # save to the same directory as the script
         outpath = os.path.dirname(argv[0])
 
-    # make sure the outpath is the
+    # make sure the outpath is canonical
     outpath = os.path.realpath(os.path.normpath(outpath))
 
     if not getkey(outpath, files):

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/mobidedrm.py

@@ -448,6 +448,8 @@ class MobiBook:
                 goodpids.append(pid[0:-2])
             elif len(pid)==8:
                 goodpids.append(pid)
+            else:
+                print u"Warning: PID {0} has wrong number of digits".format(pid)
 
         if self.crypto_type == 1:
             t1_keyvec = 'QDCVEPMU675RUBSZ'
@@ -530,7 +532,7 @@ def cli_main():
             stripped_file = getUnencryptedBook(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)
         except DrmException, e:
-            print u"MobiDeDRM v{0} Error: {0:s}".format(__version__,e.args[0])
+            print u"MobiDeDRM v{0} Error: {1:s}".format(__version__,e.args[0])
             return 1
     return 0
 

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/wineutils.py

@@ -26,6 +26,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
     if not os.path.exists(outdirpath):
         os.makedirs(outdirpath)
 
+    wineprefix = os.path.abspath(os.path.expanduser(os.path.expandvars(wineprefix)))
     if wineprefix != "" and os.path.exists(wineprefix):
          cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
     else:
@@ -38,8 +39,20 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
         result = p2.wait("wait")
     except Exception, e:
         print u"{0} v{1}: Wine subprocess call error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0])
-        return []
+        if wineprefix != "" and os.path.exists(wineprefix):
+            cmdline = u"WINEPREFIX=\"{2}\" wine C:\\Python27\\python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
+        else:
+           cmdline = u"wine C:\\Python27\\python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath)
+        print u"{0} v{1}: Command line: “{2}”".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
 
+        try:
+           cmdline = cmdline.encode(sys.getfilesystemencoding())
+           p2 = Process(cmdline, shell=True, bufsize=1, stdin=None, stdout=sys.stdout, stderr=STDOUT, close_fds=False)
+           result = p2.wait("wait")
+        except Exception, e:
+           print u"{0} v{1}: Wine subprocess call error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0])
+
+    # try finding winekeys anyway, even if above code errored
     winekeys = []
     # get any files with extension in the output dir
     files = [f for f in os.listdir(outdirpath) if f.endswith(extension)]

DeDRM_calibre_plugin/DeDRM_plugin/__init__.py

@@ -9,8 +9,6 @@ __docformat__ = 'restructuredtext en'
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 #
-# Requires Calibre version 0.7.55 or higher.
-#
 # All credit given to i♥cabbages and The Dark Reverser for the original standalone scripts.
 # We had the much easier job of converting them to a calibre plugin.
 #
@@ -46,6 +44,13 @@ __docformat__ = 'restructuredtext en'
 #   6.3.2 - Fixed Kindle for Android help file
 #   6.3.3 - Bug fix for Kindle for PC support
 #   6.3.4 - Fixes for Kindle for Android, Linux, and Kobo 3.17
+#   6.3.5 - Fixes for Linux, and Kobo 3.19 and more logging
+#   6.3.6 - Fixes for ADE ePub and PDF introduced in 6.3.5
+#   6.4.0 - Updated for new Kindle for PC encryption
+#   6.4.1 - Fix for some new tags in Topaz ebooks.
+#   6.4.2 - Fix for more new tags in Topaz ebooks and very small Topaz ebooks
+#   6.4.3 - Fix for error that only appears when not in debug mode
+#           Also includes fix for Macs with bonded ethernet ports
 
 
 """
@@ -53,7 +58,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 3, 4)
+PLUGIN_VERSION_TUPLE = (6, 4, 3)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'
@@ -85,8 +90,12 @@ class SafeUnbuffered:
     def write(self, data):
         if isinstance(data,unicode):
             data = data.encode(self.encoding,"replace")
-        self.stream.write(data)
-        self.stream.flush()
+        try:
+            self.stream.write(data)
+            self.stream.flush()
+        except:
+            # We can do nothing if a write fails
+            pass
     def __getattr__(self, attr):
         return getattr(self.stream, attr)
 
@@ -96,7 +105,7 @@ class DeDRM(FileTypePlugin):
     supported_platforms     = ['linux', 'osx', 'windows']
     author                  = u"Apprentice Alf, Aprentice Harper, The Dark Reverser and i♥cabbages"
     version                 = PLUGIN_VERSION_TUPLE
-    minimum_calibre_version = (0, 7, 55)  # Compiled python libraries cannot be imported in earlier versions.
+    minimum_calibre_version = (1, 0, 0)  # Compiled python libraries cannot be imported in earlier versions.
     file_types              = set(['epub','pdf','pdb','prc','mobi','pobi','azw','azw1','azw3','azw4','tpz'])
     on_import               = True
     priority                = 600
@@ -296,11 +305,15 @@ class DeDRM(FileTypePlugin):
                     traceback.print_exc()
                     result = 1
 
-                of.close()
+                try:
+                    of.close()
+                except:
+                    print u"{0} v{1}: Exception closing temporary file after {2:.1f} seconds. Ignored.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
 
                 if  result == 0:
                     # Decryption was successful.
                     # Return the modified PersistentTemporary file to calibre.
+                    print u"{0} v{1}: Decrypted with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname,time.time()-self.starttime)
                     return of.name
 
                 print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname,time.time()-self.starttime)
@@ -360,6 +373,7 @@ class DeDRM(FileTypePlugin):
                             except:
                                 print u"{0} v{1}: Exception when saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                                 traceback.print_exc()
+                            print u"{0} v{1}: Decrypted with new default key after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
                             # Return the modified PersistentTemporary file to calibre.
                             return of.name
 

DeDRM_calibre_plugin/DeDRM_plugin/config.py

@@ -566,6 +566,19 @@ class AddBandNKeyDialog(QDialog):
         data_group_box_layout.addWidget(ccn_disclaimer_label)
         layout.addSpacing(10)
 
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"Retrieved key:", self))
+        self.key_display = QLabel(u"", self)
+        self.key_display.setToolTip(_(u"Click the Retrieve Key button to fetch your B&N encryption key from the B&N servers"))
+        key_group.addWidget(self.key_display)
+        self.retrieve_button = QtGui.QPushButton(self)
+        self.retrieve_button.setToolTip(_(u"Click to retrieve your B&N encryption key from the B&N servers"))
+        self.retrieve_button.setText(u"Retrieve Key")
+        self.retrieve_button.clicked.connect(self.retrieve_key)
+        key_group.addWidget(self.retrieve_button)
+        layout.addSpacing(10)
+
         self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         self.button_box.accepted.connect(self.accept)
         self.button_box.rejected.connect(self.reject)
@@ -579,8 +592,7 @@ class AddBandNKeyDialog(QDialog):
 
     @property
     def key_value(self):
-        from calibre_plugins.dedrm.ignoblekeyfetch import fetch_key as fetch_bandn_key
-        return fetch_bandn_key(self.user_name,self.cc_number)
+        return unicode(self.key_display.text()).strip()
 
     @property
     def user_name(self):
@@ -590,6 +602,14 @@ class AddBandNKeyDialog(QDialog):
     def cc_number(self):
         return unicode(self.cc_ledit.text()).strip()
 
+    def retrieve_key(self):
+        from calibre_plugins.dedrm.ignoblekeyfetch import fetch_key as fetch_bandn_key
+        fetched_key = fetch_bandn_key(self.user_name,self.cc_number)
+        if fetched_key == "":
+            errmsg = u"Could not retrieve key. Check username, password and intenet connectivity and try again."
+            error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        else:
+            self.key_display.setText(fetched_key)
 
     def accept(self):
         if len(self.key_name) == 0 or len(self.user_name) == 0 or len(self.cc_number) == 0 or self.key_name.isspace() or self.user_name.isspace() or self.cc_number.isspace():
@@ -598,6 +618,10 @@ class AddBandNKeyDialog(QDialog):
         if len(self.key_name) < 4:
             errmsg = u"Key name must be at <i>least</i> 4 characters long!"
             return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_value) == 0:
+            self.retrieve_key()
+            if len(self.key_value) == 0:
+                return
         QDialog.accept(self)
 
 class AddEReaderDialog(QDialog):

DeDRM_calibre_plugin/DeDRM_plugin/convert2xml.py

@@ -164,6 +164,7 @@ class PageParser(object):
         self.id = os.path.basename(filename).replace('.dat','')
         self.dict = dict
         self.debug = debug
+        self.first_unknown = True
         self.flat_xml = flat_xml
         self.tagpath = []
         self.doc = []
@@ -262,6 +263,9 @@ class PageParser(object):
         'img.w'                 : (1, 'scalar_number', 0, 0),
         'img.src'               : (1, 'scalar_number', 0, 0),
         'img.color_src'         : (1, 'scalar_number', 0, 0),
+        'img.gridSize'          : (1, 'scalar_number', 0, 0),
+        'img.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
+        'img.gridTopCenter'     : (1, 'scalar_number', 0, 0),
         'img.gridBeginCenter'   : (1, 'scalar_number', 0, 0),
         'img.gridEndCenter'     : (1, 'scalar_number', 0, 0),
         'img.image_type'        : (1, 'scalar_number', 0, 0),
@@ -313,11 +317,16 @@ class PageParser(object):
         'span.gridBeginCenter' : (1, 'scalar_number', 0, 0),
         'span.gridEndCenter' : (1, 'scalar_number', 0, 0),
 
-        'extratokens'            : (1, 'snippets', 1, 0),
-        'extratokens.class'      : (1, 'scalar_text', 0, 0),
-        'extratokens.type'       : (1, 'scalar_text', 0, 0),
-        'extratokens.firstGlyph' : (1, 'scalar_number', 0, 0),
-        'extratokens.lastGlyph'  : (1, 'scalar_number', 0, 0),
+        'extratokens'                   : (1, 'snippets', 1, 0),
+        'extratokens.class'             : (1, 'scalar_text', 0, 0),
+        'extratokens.type'              : (1, 'scalar_text', 0, 0),
+        'extratokens.firstGlyph'        : (1, 'scalar_number', 0, 0),
+        'extratokens.lastGlyph'         : (1, 'scalar_number', 0, 0),
+        'extratokens.gridSize'          : (1, 'scalar_number', 0, 0),
+        'extratokens.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
+        'extratokens.gridTopCenter'     : (1, 'scalar_number', 0, 0),
+        'extratokens.gridBeginCenter'   : (1, 'scalar_number', 0, 0),
+        'extratokens.gridEndCenter'     : (1, 'scalar_number', 0, 0),
 
         'glyph.h'      : (1, 'number', 0, 0),
         'glyph.w'      : (1, 'number', 0, 0),
@@ -506,8 +515,9 @@ class PageParser(object):
         # or an out of sync condition
         else:
             result = []
-            if (self.debug):
+            if (self.debug or self.first_unknown):
                 print 'Unknown Token:', token
+                self.first_unknown = False
             self.tag_pop()
             return result
 

DeDRM_calibre_plugin/DeDRM_plugin/genbook.py

@@ -385,7 +385,7 @@ def generateBook(bookDir, raw, fixedimage):
     # print "first normal text page is", spage
 
     # get page height and width from first text page for use in stylesheet scaling
-    pname = 'page%04d.dat' % (pnum + 1)
+    pname = 'page%04d.dat' % (pnum - 1)
     fname = os.path.join(pageDir,pname)
     flat_xml = convert2xml.fromData(dict, fname)
 

DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py

@@ -3,18 +3,19 @@
 
 from __future__ import with_statement
 
-# ineptepub.pyw, version 6.1
+# ineptepub.pyw, version 6.5
 # Copyright © 2009-2010 by i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 
 # Modified 2010–2013 by some_updates, DiapDealer and Apprentice Alf
+# Modified 2015–2016 by Apprentice Harper
 
-# Windows users: Before running this program, you must first install Python 2.6
+# Windows users: Before running this program, you must first install Python 2.7
 #   from <http://www.python.org/download/> and PyCrypto from
 #   <http://www.voidspace.org.uk/python/modules.shtml#pycrypto> (make sure to
-#   install the version for Python 2.6).  Save this script file as
+#   install the version for Python 2.7).  Save this script file as
 #   ineptepub.pyw and double-click on it to run it.
 #
 # Mac OS X users: Save this script file as ineptepub.pyw.  You can run this
@@ -38,13 +39,16 @@ from __future__ import with_statement
 #   6.0 - moved unicode_argv call inside main for Windows DeDRM compatibility
 #   6.1 - Work if TkInter is missing
 #   6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis
+#   6.3 - Add additional check on DER file sanity
+#   6.4 - Remove erroneous check on DER file sanity
+#   6.5 - Completely remove erroneous check on DER file sanity
 
 """
 Decrypt Adobe Digital Editions encrypted ePub books.
 """
 
 __license__ = 'GPL v3'
-__version__ = "6.2"
+__version__ = "6.5"
 
 import sys
 import os

DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py

@@ -3,18 +3,19 @@
 
 from __future__ import with_statement
 
-# ineptpdf.pyw, version 7.11
+# ineptpdf.pyw, version 8.0.4
 # Copyright © 2009-2010 by i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 
 # Modified 2010–2012 by some_updates, DiapDealer and Apprentice Alf
+# Modified 2015-2016 by Apprentice Harper
 
-# Windows users: Before running this program, you must first install Python 2.6
+# Windows users: Before running this program, you must first install Python 2.7
 #   from <http://www.python.org/download/> and PyCrypto from
 #   <http://www.voidspace.org.uk/python/modules.shtml#pycrypto> (make sure to
-#   install the version for Python 2.6).  Save this script file as
+#   install the version for Python 2.7).  Save this script file as
 #   ineptpdf.pyw and double-click on it to run it.
 #
 # Mac OS X users: Save this script file as ineptpdf.pyw.  You can run this
@@ -53,13 +54,17 @@ from __future__ import with_statement
 #   7.14 - moved unicode_argv call inside main for Windows DeDRM compatibility
 #   8.0  - Work if TkInter is missing
 #   8.0.1 - Broken Metadata fix.
+#   8.0.2 - Add additional check on DER file sanity
+#   8.0.3 - Remove erroneous check on DER file sanity
+#   8.0.4 - Completely remove erroneous check on DER file sanity
+
 
 """
 Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0.1"
+__version__ = "8.0.4"
 
 import sys
 import os

DeDRM_calibre_plugin/DeDRM_plugin/kgenpids.py

@@ -199,9 +199,6 @@ def getK4Pids(rec209, token, kindleDatabase):
         # Get the Mazama Random number
         MazamaRandomNumber = (kindleDatabase[1])['MazamaRandomNumber'].decode('hex')
 
-        # Get the kindle account token
-        kindleAccountToken = (kindleDatabase[1])['kindle.account.tokens'].decode('hex')
-
         # Get the IDString used to decode the Kindle Info file
         IDString = (kindleDatabase[1])['IDString'].decode('hex')
 
@@ -212,6 +209,14 @@ def getK4Pids(rec209, token, kindleDatabase):
         print u"Keys not found in the database {0}.".format(kindleDatabase[0])
         return pids
 
+    try:
+        # Get the kindle account token, if present
+        kindleAccountToken = (kindleDatabase[1])['kindle.account.tokens'].decode('hex')
+
+    except KeyError:
+        kindleAccountToken=""
+        pass
+
     # Get the ID string used
     encodedIDString = encodeHash(IDString,charMap1)
 

DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py

@@ -4,7 +4,7 @@
 from __future__ import with_statement
 
 # kindlekey.py
-# Copyright © 2010-2015 by some_updates, Apprentice Alf and Apprentice Harper
+# Copyright © 2010-2016 by some_updates, Apprentice Alf and Apprentice Harper
 
 # Revision history:
 #  1.0   - Kindle info file decryption, extracted from k4mobidedrm, etc.
@@ -19,6 +19,9 @@ from __future__ import with_statement
 #  1.8   - Fixes for Kindle for Mac, and non-ascii in Windows user names
 #  1.9   - Fixes for Unicode in Windows user names
 #  2.0   - Added comments and extra fix for non-ascii Windows user names
+#  2.1   - Fixed Kindle for PC encryption changes March 2016
+#  2.2   - Fixes for Macs with bonded ethernet ports
+#          Also removed old .kinfo file support (pre-2011)
 
 
 """
@@ -26,7 +29,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '1.9'
+__version__ = '2.2'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -926,7 +929,7 @@ if iswindows:
         # or the python interface to the 32 vs 64 bit registry is broken
         path = ""
         if 'LOCALAPPDATA' in os.environ.keys():
-			# Python 2.x does not return unicode env. Use Python 3.x
+            # Python 2.x does not return unicode env. Use Python 3.x
             path = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
             # this is just another alternative.
             # path = getEnvironmentVariable('LOCALAPPDATA')
@@ -993,179 +996,120 @@ if iswindows:
     # determine type of kindle info provided and return a
     # database of keynames and values
     def getDBfromFile(kInfoFile):
-        names = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber', 'max_date', 'SIGVERIF']
+        names = [\
+            'kindle.account.tokens',\
+            'kindle.cookie.item',\
+            'eulaVersionAccepted',\
+            'login_date',\
+            'kindle.token.item',\
+            'login',\
+            'kindle.key.item',\
+            'kindle.name.info',\
+            'kindle.device.info',\
+            'MazamaRandomNumber',\
+            'max_date',\
+            'SIGVERIF',\
+            'build_version',\
+            ]
+
         DB = {}
         with open(kInfoFile, 'rb') as infoReader:
-            hdr = infoReader.read(1)
             data = infoReader.read()
+        # assume newest .kinf2011 style .kinf file
+        # the .kinf file uses "/" to separate it into records
+        # so remove the trailing "/" to make it easy to use split
+        data = data[:-1]
+        items = data.split('/')
 
-        if data.find('{') != -1 :
-            # older style kindle-info file
-            items = data.split('{')
-            for item in items:
-                if item != '':
-                    keyhash, rawdata = item.split(':')
-                    keyname = "unknown"
-                    for name in names:
-                        if encodeHash(name,charMap2) == keyhash:
-                            keyname = name
-                            break
-                    if keyname == "unknown":
-                        keyname = keyhash
-                    encryptedValue = decode(rawdata,charMap2)
-                    DB[keyname] = CryptUnprotectData(encryptedValue, "", 0)
-        elif hdr == '/':
-            # else rainier-2-1-1 .kinf file
-            # the .kinf file uses "/" to separate it into records
-            # so remove the trailing "/" to make it easy to use split
-            data = data[:-1]
-            items = data.split('/')
+        # starts with an encoded and encrypted header blob
+        headerblob = items.pop(0)
+        encryptedValue = decode(headerblob, testMap1)
+        cleartext = UnprotectHeaderData(encryptedValue)
+        #print "header  cleartext:",cleartext
+        # now extract the pieces that form the added entropy
+        pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
+        for m in re.finditer(pattern, cleartext):
+            added_entropy = m.group(2) + m.group(4)
 
-            # loop through the item records until all are processed
-            while len(items) > 0:
 
-                # get the first item record
+        # loop through the item records until all are processed
+        while len(items) > 0:
+
+            # get the first item record
+            item = items.pop(0)
+
+            # the first 32 chars of the first record of a group
+            # is the MD5 hash of the key name encoded by charMap5
+            keyhash = item[0:32]
+
+            # the sha1 of raw keyhash string is used to create entropy along
+            # with the added entropy provided above from the headerblob
+            entropy = SHA1(keyhash) + added_entropy
+
+            # the remainder of the first record when decoded with charMap5
+            # has the ':' split char followed by the string representation
+            # of the number of records that follow
+            # and make up the contents
+            srcnt = decode(item[34:],charMap5)
+            rcnt = int(srcnt)
+
+            # read and store in rcnt records of data
+            # that make up the contents value
+            edlst = []
+            for i in xrange(rcnt):
                 item = items.pop(0)
+                edlst.append(item)
 
-                # the first 32 chars of the first record of a group
-                # is the MD5 hash of the key name encoded by charMap5
-                keyhash = item[0:32]
+            # key names now use the new testMap8 encoding
+            keyname = "unknown"
+            for name in names:
+                if encodeHash(name,testMap8) == keyhash:
+                    keyname = name
+                    #print "keyname found from hash:",keyname
+                    break
+            if keyname == "unknown":
+                keyname = keyhash
+                #print "keyname not found, hash is:",keyname
 
-                # the raw keyhash string is used to create entropy for the actual
-                # CryptProtectData Blob that represents that keys contents
-                entropy = SHA1(keyhash)
+            # the testMap8 encoded contents data has had a length
+            # of chars (always odd) cut off of the front and moved
+            # to the end to prevent decoding using testMap8 from
+            # working properly, and thereby preventing the ensuing
+            # CryptUnprotectData call from succeeding.
 
-                # the remainder of the first record when decoded with charMap5
-                # has the ':' split char followed by the string representation
-                # of the number of records that follow
-                # and make up the contents
-                srcnt = decode(item[34:],charMap5)
-                rcnt = int(srcnt)
+            # The offset into the testMap8 encoded contents seems to be:
+            # len(contents)-largest prime number <=  int(len(content)/3)
+            # (in other words split "about" 2/3rds of the way through)
 
-                # read and store in rcnt records of data
-                # that make up the contents value
-                edlst = []
-                for i in xrange(rcnt):
-                    item = items.pop(0)
-                    edlst.append(item)
-
-                keyname = "unknown"
-                for name in names:
-                    if encodeHash(name,charMap5) == keyhash:
-                        keyname = name
-                        break
-                if keyname == "unknown":
-                    keyname = keyhash
-                # the charMap5 encoded contents data has had a length
-                # of chars (always odd) cut off of the front and moved
-                # to the end to prevent decoding using charMap5 from
-                # working properly, and thereby preventing the ensuing
-                # CryptUnprotectData call from succeeding.
-
-                # The offset into the charMap5 encoded contents seems to be:
-                # len(contents)-largest prime number <=  int(len(content)/3)
-                # (in other words split "about" 2/3rds of the way through)
-
-                # move first offsets chars to end to align for decode by charMap5
-                encdata = "".join(edlst)
-                contlen = len(encdata)
-                noffset = contlen - primes(int(contlen/3))[-1]
-
-                # now properly split and recombine
-                # by moving noffset chars from the start of the
-                # string to the end of the string
-                pfx = encdata[0:noffset]
-                encdata = encdata[noffset:]
-                encdata = encdata + pfx
-
-                # decode using Map5 to get the CryptProtect Data
-                encryptedValue = decode(encdata,charMap5)
-                DB[keyname] = CryptUnprotectData(encryptedValue, entropy, 1)
-        else:
-            # else newest .kinf2011 style .kinf file
-            # the .kinf file uses "/" to separate it into records
-            # so remove the trailing "/" to make it easy to use split
-            # need to put back the first char read because it it part
-            # of the added entropy blob
-            data = hdr + data[:-1]
-            items = data.split('/')
-
-            # starts with and encoded and encrypted header blob
-            headerblob = items.pop(0)
-            encryptedValue = decode(headerblob, testMap1)
-            cleartext = UnprotectHeaderData(encryptedValue)
-            # now extract the pieces that form the added entropy
-            pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
-            for m in re.finditer(pattern, cleartext):
-                added_entropy = m.group(2) + m.group(4)
+            # move first offsets chars to end to align for decode by testMap8
+            # by moving noffset chars from the start of the
+            # string to the end of the string
+            encdata = "".join(edlst)
+            #print "encrypted data:",encdata
+            contlen = len(encdata)
+            noffset = contlen - primes(int(contlen/3))[-1]
+            pfx = encdata[0:noffset]
+            encdata = encdata[noffset:]
+            encdata = encdata + pfx
+            #print "rearranged data:",encdata
 
 
-            # loop through the item records until all are processed
-            while len(items) > 0:
-
-                # get the first item record
-                item = items.pop(0)
-
-                # the first 32 chars of the first record of a group
-                # is the MD5 hash of the key name encoded by charMap5
-                keyhash = item[0:32]
-
-                # the sha1 of raw keyhash string is used to create entropy along
-                # with the added entropy provided above from the headerblob
-                entropy = SHA1(keyhash) + added_entropy
-
-                # the remainder of the first record when decoded with charMap5
-                # has the ':' split char followed by the string representation
-                # of the number of records that follow
-                # and make up the contents
-                srcnt = decode(item[34:],charMap5)
-                rcnt = int(srcnt)
-
-                # read and store in rcnt records of data
-                # that make up the contents value
-                edlst = []
-                for i in xrange(rcnt):
-                    item = items.pop(0)
-                    edlst.append(item)
-
-                # key names now use the new testMap8 encoding
-                keyname = "unknown"
-                for name in names:
-                    if encodeHash(name,testMap8) == keyhash:
-                        keyname = name
-                        break
-
-                # the testMap8 encoded contents data has had a length
-                # of chars (always odd) cut off of the front and moved
-                # to the end to prevent decoding using testMap8 from
-                # working properly, and thereby preventing the ensuing
-                # CryptUnprotectData call from succeeding.
-
-                # The offset into the testMap8 encoded contents seems to be:
-                # len(contents)-largest prime number <=  int(len(content)/3)
-                # (in other words split "about" 2/3rds of the way through)
-
-                # move first offsets chars to end to align for decode by testMap8
-                # by moving noffset chars from the start of the
-                # string to the end of the string
-                encdata = "".join(edlst)
-                contlen = len(encdata)
-                noffset = contlen - primes(int(contlen/3))[-1]
-                pfx = encdata[0:noffset]
-                encdata = encdata[noffset:]
-                encdata = encdata + pfx
-
-                # decode using new testMap8 to get the original CryptProtect Data
-                encryptedValue = decode(encdata,testMap8)
-                cleartext = CryptUnprotectData(encryptedValue, entropy, 1)
+            # decode using new testMap8 to get the original CryptProtect Data
+            encryptedValue = decode(encdata,testMap8)
+            #print "decoded data:",encryptedValue.encode('hex')
+            cleartext = CryptUnprotectData(encryptedValue, entropy, 1)
+            if len(cleartext)>0:
+                #print "cleartext data:",cleartext,":end data"
                 DB[keyname] = cleartext
+            #print keyname, cleartext
 
-        if 'kindle.account.tokens' in DB:
+        if len(DB)>6:
             # store values used in decryption
             DB['IDString'] = GetIDString()
             DB['UserName'] = GetUserName()
             print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName().encode('hex'))
         else:
+            print u"Couldn't decrypt file."
             DB = {}
         return DB
 elif isosx:
@@ -1297,11 +1241,9 @@ elif isosx:
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
+        #print out1
         reslst = out1.split('\n')
         cnt = len(reslst)
-        bsdname = None
-        sernum = None
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
             pp = resline.find('\"Serial Number\" = \"')
@@ -1310,31 +1252,24 @@ elif isosx:
                 sernums.append(sernum.strip())
         return sernums
 
-    def GetUserHomeAppSupKindleDirParitionName():
-        home = os.getenv('HOME')
-        dpath =  home + '/Library'
+    def GetDiskPartitionNames():
+        names = []
         cmdline = '/sbin/mount'
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
         reslst = out1.split('\n')
         cnt = len(reslst)
-        disk = ''
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
             if resline.startswith('/dev'):
                 (devpart, mpath) = resline.split(' on ')
                 dpart = devpart[5:]
-                pp = mpath.find('(')
-                if pp >= 0:
-                    mpath = mpath[:pp-1]
-                if dpath.startswith(mpath):
-                    disk = dpart
-        return disk
+                names.append(dpart)
+        return names
 
-    # uses a sub process to get the UUID of the specified disk partition using ioreg
-    def GetDiskPartitionUUIDs(diskpart):
+    # uses a sub process to get the UUID of all disk partitions
+    def GetDiskPartitionUUIDs():
         uuids = []
         uuidnum = os.getenv('MYUUIDNUMBER')
         if uuidnum != None:
@@ -1343,46 +1278,16 @@ elif isosx:
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
+        #print out1
         reslst = out1.split('\n')
         cnt = len(reslst)
-        bsdname = None
-        uuidnum = None
-        foundIt = False
-        nest = 0
-        uuidnest = -1
-        partnest = -2
         for j in xrange(cnt):
             resline = reslst[j]
-            if resline.find('{') >= 0:
-                nest += 1
-            if resline.find('}') >= 0:
-                nest -= 1
             pp = resline.find('\"UUID\" = \"')
             if pp >= 0:
                 uuidnum = resline[pp+10:-1]
                 uuidnum = uuidnum.strip()
-                uuidnest = nest
-                if partnest == uuidnest and uuidnest > 0:
-                    foundIt = True
-                    break
-            bb = resline.find('\"BSD Name\" = \"')
-            if bb >= 0:
-                bsdname = resline[bb+14:-1]
-                bsdname = bsdname.strip()
-                if (bsdname == diskpart):
-                    partnest = nest
-                else :
-                    partnest = -2
-                if partnest == uuidnest and partnest > 0:
-                    foundIt = True
-                    break
-            if nest == 0:
-                partnest = -2
-                uuidnest = -1
-                uuidnum = None
-                bsdname = None
-        if foundIt:
-            uuids.append(uuidnum)
+                uuids.append(uuidnum)
         return uuids
 
     def GetMACAddressesMunged():
@@ -1390,28 +1295,26 @@ elif isosx:
         macnum = os.getenv('MYMACNUM')
         if macnum != None:
             macnums.append(macnum)
-        cmdline = '/sbin/ifconfig en0'
+        cmdline = 'networksetup -listallhardwareports' # en0'
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
         reslst = out1.split('\n')
         cnt = len(reslst)
-        macnum = None
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
-            pp = resline.find('ether ')
+            pp = resline.find('Ethernet Address: ')
             if pp >= 0:
-                macnum = resline[pp+6:-1]
+                #print resline
+                macnum = resline[pp+18:]
                 macnum = macnum.strip()
-                # print 'original mac', macnum
-                # now munge it up the way Kindle app does
-                # by xoring it with 0xa5 and swapping elements 3 and 4
                 maclst = macnum.split(':')
                 n = len(maclst)
                 if n != 6:
-                    fountIt = False
-                    break
+                    continue
+                #print 'original mac', macnum
+                # now munge it up the way Kindle app does
+                # by xoring it with 0xa5 and swapping elements 3 and 4
                 for i in range(6):
                     maclst[i] = int('0x' + maclst[i], 0)
                 mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
@@ -1422,16 +1325,15 @@ elif isosx:
                 mlst[1] = maclst[1] ^ 0xa5
                 mlst[0] = maclst[0] ^ 0xa5
                 macnum = '%0.2x%0.2x%0.2x%0.2x%0.2x%0.2x' % (mlst[0], mlst[1], mlst[2], mlst[3], mlst[4], mlst[5])
-                foundIt = True
-                break
-        if foundIt:
-            macnums.append(macnum)
+                #print 'munged mac', macnum
+                macnums.append(macnum)
         return macnums
 
 
     # uses unix env to get username instead of using sysctlbyname
     def GetUserName():
         username = os.getenv('USER')
+        #print "Username:",username
         return username
 
     def GetIDStrings():
@@ -1439,58 +1341,13 @@ elif isosx:
         strings = []
         strings.extend(GetMACAddressesMunged())
         strings.extend(GetVolumesSerialNumbers())
-        diskpart = GetUserHomeAppSupKindleDirParitionName()
-        strings.extend(GetDiskPartitionUUIDs(diskpart))
+        strings.extend(GetDiskPartitionNames())
+        strings.extend(GetDiskPartitionUUIDs())
         strings.append('9999999999')
-        #print strings
+        #print "ID Strings:\n",strings
         return strings
 
 
-    # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used by Kindle for Mac versions < 1.6.0
-    class CryptUnprotectData(object):
-        def __init__(self, IDString):
-            sp = IDString + '!@#' + GetUserName()
-            passwdData = encode(SHA256(sp),charMap1)
-            salt = '16743'
-            self.crp = LibCrypto()
-            iter = 0x3e8
-            keylen = 0x80
-            key_iv = self.crp.keyivgen(passwdData, salt, iter, keylen)
-            self.key = key_iv[0:32]
-            self.iv = key_iv[32:48]
-            self.crp.set_decrypt_key(self.key, self.iv)
-
-        def decrypt(self, encryptedData):
-            cleartext = self.crp.decrypt(encryptedData)
-            cleartext = decode(cleartext,charMap1)
-            return cleartext
-
-
-    # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used for Kindle for Mac Versions >= 1.6.0
-    class CryptUnprotectDataV2(object):
-        def __init__(self, IDString):
-            sp = GetUserName() + ':&%:' + IDString
-            passwdData = encode(SHA256(sp),charMap5)
-            # salt generation as per the code
-            salt = 0x0512981d * 2 * 1 * 1
-            salt = str(salt) + GetUserName()
-            salt = encode(salt,charMap5)
-            self.crp = LibCrypto()
-            iter = 0x800
-            keylen = 0x400
-            key_iv = self.crp.keyivgen(passwdData, salt, iter, keylen)
-            self.key = key_iv[0:32]
-            self.iv = key_iv[32:48]
-            self.crp.set_decrypt_key(self.key, self.iv)
-
-        def decrypt(self, encryptedData):
-            cleartext = self.crp.decrypt(encryptedData)
-            cleartext = decode(cleartext, charMap5)
-            return cleartext
-
-
     # unprotect the new header blob in .kinf2011
     # used in Kindle for Mac Version >= 1.9.0
     def UnprotectHeaderData(encryptedData):
@@ -1508,8 +1365,7 @@ elif isosx:
 
 
     # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used for Kindle for Mac Versions >= 1.9.0
-    class CryptUnprotectDataV3(object):
+    class CryptUnprotectData(object):
         def __init__(self, entropy, IDString):
             sp = GetUserName() + '+@#$%+' + IDString
             passwdData = encode(SHA256(sp),charMap2)
@@ -1577,206 +1433,118 @@ elif isosx:
     # determine type of kindle info provided and return a
     # database of keynames and values
     def getDBfromFile(kInfoFile):
-        names = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber', 'max_date', 'SIGVERIF']
+        names = [\
+            'kindle.account.tokens',\
+            'kindle.cookie.item',\
+            'eulaVersionAccepted',\
+            'login_date',\
+            'kindle.token.item',\
+            'login',\
+            'kindle.key.item',\
+            'kindle.name.info',\
+            'kindle.device.info',\
+            'MazamaRandomNumber',\
+            'max_date',\
+            'SIGVERIF',\
+            'build_version',\
+            ]
         with open(kInfoFile, 'rb') as infoReader:
-            filehdr = infoReader.read(1)
             filedata = infoReader.read()
 
+        data = filedata[:-1]
+        items = data.split('/')
         IDStrings = GetIDStrings()
         for IDString in IDStrings:
-            DB = {}
             #print "trying IDString:",IDString
             try:
-                hdr = filehdr
-                data = filedata
-                if data.find('[') != -1 :
-                    # older style kindle-info file
-                    cud = CryptUnprotectData(IDString)
-                    items = data.split('[')
-                    for item in items:
-                        if item != '':
-                            keyhash, rawdata = item.split(':')
-                            keyname = 'unknown'
-                            for name in names:
-                                if encodeHash(name,charMap2) == keyhash:
-                                    keyname = name
-                                    break
-                            if keyname == 'unknown':
-                                keyname = keyhash
-                            encryptedValue = decode(rawdata,charMap2)
-                            cleartext = cud.decrypt(encryptedValue)
-                            if len(cleartext) > 0:
-                                DB[keyname] = cleartext
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
-                elif hdr == '/':
-                    # else newer style .kinf file used by K4Mac >= 1.6.0
-                    # the .kinf file uses '/' to separate it into records
-                    # so remove the trailing '/' to make it easy to use split
-                    data = data[:-1]
-                    items = data.split('/')
-                    cud = CryptUnprotectDataV2(IDString)
+                DB = {}
+                items = data.split('/')
+               
+                # the headerblob is the encrypted information needed to build the entropy string
+                headerblob = items.pop(0)
+                encryptedValue = decode(headerblob, charMap1)
+                cleartext = UnprotectHeaderData(encryptedValue)
 
-                    # loop through the item records until all are processed
-                    while len(items) > 0:
+                # now extract the pieces in the same way
+                # this version is different from K4PC it scales the build number by multipying by 735
+                pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
+                for m in re.finditer(pattern, cleartext):
+                    entropy = str(int(m.group(2)) * 0x2df) + m.group(4)
 
-                        # get the first item record
+                cud = CryptUnprotectData(entropy,IDString)
+
+                # loop through the item records until all are processed
+                while len(items) > 0:
+
+                    # get the first item record
+                    item = items.pop(0)
+
+                    # the first 32 chars of the first record of a group
+                    # is the MD5 hash of the key name encoded by charMap5
+                    keyhash = item[0:32]
+                    keyname = 'unknown'
+
+                    # unlike K4PC the keyhash is not used in generating entropy
+                    # entropy = SHA1(keyhash) + added_entropy
+                    # entropy = added_entropy
+
+                    # the remainder of the first record when decoded with charMap5
+                    # has the ':' split char followed by the string representation
+                    # of the number of records that follow
+                    # and make up the contents
+                    srcnt = decode(item[34:],charMap5)
+                    rcnt = int(srcnt)
+
+                    # read and store in rcnt records of data
+                    # that make up the contents value
+                    edlst = []
+                    for i in xrange(rcnt):
                         item = items.pop(0)
+                        edlst.append(item)
 
-                        # the first 32 chars of the first record of a group
-                        # is the MD5 hash of the key name encoded by charMap5
-                        keyhash = item[0:32]
-                        keyname = 'unknown'
+                    keyname = 'unknown'
+                    for name in names:
+                        if encodeHash(name,testMap8) == keyhash:
+                            keyname = name
+                            break
+                    if keyname == 'unknown':
+                        keyname = keyhash
 
-                        # the raw keyhash string is also used to create entropy for the actual
-                        # CryptProtectData Blob that represents that keys contents
-                        # 'entropy' not used for K4Mac only K4PC
-                        # entropy = SHA1(keyhash)
+                    # the testMap8 encoded contents data has had a length
+                    # of chars (always odd) cut off of the front and moved
+                    # to the end to prevent decoding using testMap8 from
+                    # working properly, and thereby preventing the ensuing
+                    # CryptUnprotectData call from succeeding.
 
-                        # the remainder of the first record when decoded with charMap5
-                        # has the ':' split char followed by the string representation
-                        # of the number of records that follow
-                        # and make up the contents
-                        srcnt = decode(item[34:],charMap5)
-                        rcnt = int(srcnt)
+                    # The offset into the testMap8 encoded contents seems to be:
+                    # len(contents) - largest prime number less than or equal to int(len(content)/3)
+                    # (in other words split 'about' 2/3rds of the way through)
 
-                        # read and store in rcnt records of data
-                        # that make up the contents value
-                        edlst = []
-                        for i in xrange(rcnt):
-                            item = items.pop(0)
-                            edlst.append(item)
+                    # move first offsets chars to end to align for decode by testMap8
+                    encdata = ''.join(edlst)
+                    contlen = len(encdata)
 
-                        keyname = 'unknown'
-                        for name in names:
-                            if encodeHash(name,charMap5) == keyhash:
-                                keyname = name
-                                break
-                        if keyname == 'unknown':
-                            keyname = keyhash
+                    # now properly split and recombine
+                    # by moving noffset chars from the start of the
+                    # string to the end of the string
+                    noffset = contlen - primes(int(contlen/3))[-1]
+                    pfx = encdata[0:noffset]
+                    encdata = encdata[noffset:]
+                    encdata = encdata + pfx
 
-                        # the charMap5 encoded contents data has had a length
-                        # of chars (always odd) cut off of the front and moved
-                        # to the end to prevent decoding using charMap5 from
-                        # working properly, and thereby preventing the ensuing
-                        # CryptUnprotectData call from succeeding.
+                    # decode using testMap8 to get the CryptProtect Data
+                    encryptedValue = decode(encdata,testMap8)
+                    cleartext = cud.decrypt(encryptedValue)
+                    # print keyname
+                    # print cleartext
+                    if len(cleartext) > 0:
+                        DB[keyname] = cleartext
 
-                        # The offset into the charMap5 encoded contents seems to be:
-                        # len(contents) - largest prime number less than or equal to int(len(content)/3)
-                        # (in other words split 'about' 2/3rds of the way through)
-
-                        # move first offsets chars to end to align for decode by charMap5
-                        encdata = ''.join(edlst)
-                        contlen = len(encdata)
-
-                        # now properly split and recombine
-                        # by moving noffset chars from the start of the
-                        # string to the end of the string
-                        noffset = contlen - primes(int(contlen/3))[-1]
-                        pfx = encdata[0:noffset]
-                        encdata = encdata[noffset:]
-                        encdata = encdata + pfx
-
-                        # decode using charMap5 to get the CryptProtect Data
-                        encryptedValue = decode(encdata,charMap5)
-                        cleartext = cud.decrypt(encryptedValue)
-                        if len(cleartext) > 0:
-                            DB[keyname] = cleartext
-
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
-                else:
-                    # the latest .kinf2011 version for K4M 1.9.1
-                    # put back the hdr char, it is needed
-                    data = hdr + data
-                    data = data[:-1]
-                    items = data.split('/')
-
-                    # the headerblob is the encrypted information needed to build the entropy string
-                    headerblob = items.pop(0)
-                    encryptedValue = decode(headerblob, charMap1)
-                    cleartext = UnprotectHeaderData(encryptedValue)
-
-                    # now extract the pieces in the same way
-                    # this version is different from K4PC it scales the build number by multipying by 735
-                    pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
-                    for m in re.finditer(pattern, cleartext):
-                        entropy = str(int(m.group(2)) * 0x2df) + m.group(4)
-
-                    cud = CryptUnprotectDataV3(entropy,IDString)
-
-                    # loop through the item records until all are processed
-                    while len(items) > 0:
-
-                        # get the first item record
-                        item = items.pop(0)
-
-                        # the first 32 chars of the first record of a group
-                        # is the MD5 hash of the key name encoded by charMap5
-                        keyhash = item[0:32]
-                        keyname = 'unknown'
-
-                        # unlike K4PC the keyhash is not used in generating entropy
-                        # entropy = SHA1(keyhash) + added_entropy
-                        # entropy = added_entropy
-
-                        # the remainder of the first record when decoded with charMap5
-                        # has the ':' split char followed by the string representation
-                        # of the number of records that follow
-                        # and make up the contents
-                        srcnt = decode(item[34:],charMap5)
-                        rcnt = int(srcnt)
-
-                        # read and store in rcnt records of data
-                        # that make up the contents value
-                        edlst = []
-                        for i in xrange(rcnt):
-                            item = items.pop(0)
-                            edlst.append(item)
-
-                        keyname = 'unknown'
-                        for name in names:
-                            if encodeHash(name,testMap8) == keyhash:
-                                keyname = name
-                                break
-                        if keyname == 'unknown':
-                            keyname = keyhash
-
-                        # the testMap8 encoded contents data has had a length
-                        # of chars (always odd) cut off of the front and moved
-                        # to the end to prevent decoding using testMap8 from
-                        # working properly, and thereby preventing the ensuing
-                        # CryptUnprotectData call from succeeding.
-
-                        # The offset into the testMap8 encoded contents seems to be:
-                        # len(contents) - largest prime number less than or equal to int(len(content)/3)
-                        # (in other words split 'about' 2/3rds of the way through)
-
-                        # move first offsets chars to end to align for decode by testMap8
-                        encdata = ''.join(edlst)
-                        contlen = len(encdata)
-
-                        # now properly split and recombine
-                        # by moving noffset chars from the start of the
-                        # string to the end of the string
-                        noffset = contlen - primes(int(contlen/3))[-1]
-                        pfx = encdata[0:noffset]
-                        encdata = encdata[noffset:]
-                        encdata = encdata + pfx
-
-                        # decode using testMap8 to get the CryptProtect Data
-                        encryptedValue = decode(encdata,testMap8)
-                        cleartext = cud.decrypt(encryptedValue)
-                        # print keyname
-                        # print cleartext
-                        if len(cleartext) > 0:
-                            DB[keyname] = cleartext
-
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
+                if len(DB)>6:
+                    break
             except:
                 pass
-        if 'kindle.account.tokens' in DB:
+        if len(DB)>6:
             # store values used in decryption
             print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(IDString, GetUserName())
             DB['IDString'] = IDString
@@ -1840,7 +1608,7 @@ def cli_main():
     sys.stderr=SafeUnbuffered(sys.stderr)
     argv=unicode_argv()
     progname = os.path.basename(argv[0])
-    print u"{0} v{1}\nCopyright © 2010-2013 some_updates and Apprentice Alf".format(progname,__version__)
+    print u"{0} v{1}\nCopyright © 2010-2016 by some_updates, Apprentice Alf and Apprentice Harper".format(progname,__version__)
 
     try:
         opts, args = getopt.getopt(argv[1:], "hk:")
@@ -1870,7 +1638,7 @@ def cli_main():
         # save to the same directory as the script
         outpath = os.path.dirname(argv[0])
 
-    # make sure the outpath is the
+    # make sure the outpath is canonical
     outpath = os.path.realpath(os.path.normpath(outpath))
 
     if not getkey(outpath, files):

DeDRM_calibre_plugin/DeDRM_plugin/mobidedrm.py

@@ -448,6 +448,8 @@ class MobiBook:
                 goodpids.append(pid[0:-2])
             elif len(pid)==8:
                 goodpids.append(pid)
+            else:
+                print u"Warning: PID {0} has wrong number of digits".format(pid)
 
         if self.crypto_type == 1:
             t1_keyvec = 'QDCVEPMU675RUBSZ'
@@ -530,7 +532,7 @@ def cli_main():
             stripped_file = getUnencryptedBook(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)
         except DrmException, e:
-            print u"MobiDeDRM v{0} Error: {0:s}".format(__version__,e.args[0])
+            print u"MobiDeDRM v{0} Error: {1:s}".format(__version__,e.args[0])
             return 1
     return 0
 

DeDRM_calibre_plugin/DeDRM_plugin/wineutils.py

@@ -39,8 +39,20 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
         result = p2.wait("wait")
     except Exception, e:
         print u"{0} v{1}: Wine subprocess call error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0])
-        return []
+        if wineprefix != "" and os.path.exists(wineprefix):
+            cmdline = u"WINEPREFIX=\"{2}\" wine C:\\Python27\\python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
+        else:
+           cmdline = u"wine C:\\Python27\\python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath)
+        print u"{0} v{1}: Command line: “{2}”".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
 
+        try:
+           cmdline = cmdline.encode(sys.getfilesystemencoding())
+           p2 = Process(cmdline, shell=True, bufsize=1, stdin=None, stdout=sys.stdout, stderr=STDOUT, close_fds=False)
+           result = p2.wait("wait")
+        except Exception, e:
+           print u"{0} v{1}: Wine subprocess call error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0])
+
+    # try finding winekeys anyway, even if above code errored
     winekeys = []
     # get any files with extension in the output dir
     files = [f for f in os.listdir(outdirpath) if f.endswith(extension)]

Obok_calibre_plugin/obok_plugin/__init__.py

@@ -19,7 +19,7 @@ except NameError:
 PLUGIN_NAME = 'Obok DeDRM'
 PLUGIN_SAFE_NAME = PLUGIN_NAME.strip().lower().replace(' ', '_')
 PLUGIN_DESCRIPTION = _('Removes DRM from Kobo kepubs and adds them to the library.')
-PLUGIN_VERSION_TUPLE = (3, 1, 4)
+PLUGIN_VERSION_TUPLE = (6, 3, 6)
 PLUGIN_VERSION = '.'.join([str(x) for x in PLUGIN_VERSION_TUPLE])
 HELPFILE_NAME = PLUGIN_SAFE_NAME + '_Help.htm'
 PLUGIN_AUTHORS = 'Anon'
@@ -29,7 +29,7 @@ class ObokDeDRMAction(InterfaceActionBase):
 
     name                    = PLUGIN_NAME
     description             = PLUGIN_DESCRIPTION
-    supported_platforms     = ['windows', 'osx']
+    supported_platforms     = ['windows', 'osx', 'linux' ]
     author                  = PLUGIN_AUTHORS
     version                 = PLUGIN_VERSION_TUPLE
     minimum_calibre_version = (1, 0, 0)

Obok_calibre_plugin/obok_plugin/action.py

@@ -78,8 +78,30 @@ class InterfacePluginAction(InterfaceAction):
         self.current_idx = self.gui.library_view.currentIndex()
 
         print ('Running {}'.format(PLUGIN_NAME + ' v' + PLUGIN_VERSION))
+        #
+        # search for connected device in case serials are saved
+        tmpserials = cfg['kobo_serials']
+        device_path = None
+        try:
+            device = self.parent().device_manager.connected_device
+            if (device):
+                device_path = device._main_prefix
+                debug_print("get_device_settings - device_path=", device_path)
+            else:
+                debug_print("didn't find device")
+        except:
+            debug_print("Exception getting device path. Probably not an E-Ink Kobo device")
+
         # Get the Kobo Library object (obok v3.01)
-        self.library = KoboLibrary()
+        self.library = KoboLibrary(tmpserials, device_path)
+        debug_print ("got kobodir %s" % self.library.kobodir)
+        if (self.library.kobodir == ''):
+            # linux and no device connected, but could be extended
+            # to the case where on Windows/Mac the prog is not installed
+            msg = _('<p>Could not find Kobo Library\n<p>Windows/Mac: do you have Kobo Desktop installed?\n<p>Windows/Mac/Linux: In case you have an Kobo eInk device, connect the device.')
+            showErrorDlg(msg, None)
+            return
+
 
         # Get a list of Kobo titles
         books = self.build_book_list()

Obok_calibre_plugin/obok_plugin/config.py

@@ -3,15 +3,23 @@ from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 
 try:
-    from PyQt5.Qt import (QWidget, QLabel, QVBoxLayout, QHBoxLayout, QComboBox)
+    from PyQt5.Qt import (Qt, QGroupBox, QListWidget, QLineEdit, QDialogButtonBox, QWidget, QLabel, QDialog, QVBoxLayout, QAbstractItemView, QIcon, QHBoxLayout, QComboBox, QListWidgetItem)
 except ImportError:
-    from PyQt4.Qt import (QWidget, QLabel, QVBoxLayout, QHBoxLayout, QComboBox)
-    
+    from PyQt4.Qt import (Qt, QGroupBox, QListWidget, QLineEdit, QDialogButtonBox, QWidget, QLabel, QDialog, QVBoxLayout, QAbstractItemView, QIcon, QHBoxLayout, QComboBox, QListWidgetItem)
+
+try:
+    from PyQt5 import Qt as QtGui
+except ImportError:
+    from PyQt4 import QtGui
+
+from calibre.gui2 import (error_dialog, question_dialog, info_dialog, open_url)
 from calibre.utils.config import JSONConfig, config_dir
 
 plugin_prefs = JSONConfig('plugins/obok_dedrm_prefs')
 plugin_prefs.defaults['finding_homes_for_formats'] = 'Ask'
+plugin_prefs.defaults['kobo_serials'] = []
 
+from calibre_plugins.obok_dedrm.__init__ import PLUGIN_NAME, PLUGIN_VERSION
 from calibre_plugins.obok_dedrm.utilities import (debug_print)
 try:
     debug_print("obok::config.py - loading translations")
@@ -26,7 +34,10 @@ class ConfigWidget(QWidget):
         self.plugin_action = plugin_action
         layout = QVBoxLayout(self)
         self.setLayout(layout)
-        
+
+        # copy of preferences
+        self.tmpserials = plugin_prefs['kobo_serials']
+
         combo_label = QLabel(_('When should Obok try to insert EPUBs into existing calibre entries?'), self)
         layout.addWidget(combo_label)
         self.find_homes = QComboBox()
@@ -35,6 +46,178 @@ class ConfigWidget(QWidget):
         self.find_homes.addItems([_('Ask'), _('Always'), _('Never')])
         index = self.find_homes.findText(plugin_prefs['finding_homes_for_formats'])
         self.find_homes.setCurrentIndex(index)
+
+        self.serials_button = QtGui.QPushButton(self)
+        self.serials_button.setToolTip(_(u"Click to manage Kobo serial numbers for Kobo ebooks"))
+        self.serials_button.setText(u"Kobo devices serials")
+        self.serials_button.clicked.connect(self.edit_serials)
+        layout.addWidget(self.serials_button)
+
+
+    def edit_serials(self):
+        d = ManageKeysDialog(self,u"Kobo device serial numbers",self.tmpserials, AddSerialDialog)
+        d.exec_()
+
     
     def save_settings(self):
         plugin_prefs['finding_homes_for_formats'] = unicode(self.find_homes.currentText())
+        plugin_prefs['kobo_serials'] = self.tmpserials
+
+
+
+
+class ManageKeysDialog(QDialog):
+    def __init__(self, parent, key_type_name, plugin_keys, create_key, keyfile_ext = u""):
+        QDialog.__init__(self,parent)
+        self.parent = parent
+        self.key_type_name = key_type_name
+        self.plugin_keys = plugin_keys
+        self.create_key = create_key
+        self.keyfile_ext = keyfile_ext
+        self.json_file = (keyfile_ext == u"k4i")
+
+        self.setWindowTitle("{0} {1}: Manage {2}s".format(PLUGIN_NAME, PLUGIN_VERSION, self.key_type_name))
+
+        # Start Qt Gui dialog layout
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        keys_group_box = QGroupBox(_(u"{0}s".format(self.key_type_name)), self)
+        layout.addWidget(keys_group_box)
+        keys_group_box_layout = QHBoxLayout()
+        keys_group_box.setLayout(keys_group_box_layout)
+
+        self.listy = QListWidget(self)
+        self.listy.setToolTip(u"{0}s that will be used to decrypt ebooks".format(self.key_type_name))
+        self.listy.setSelectionMode(QAbstractItemView.SingleSelection)
+        self.populate_list()
+        keys_group_box_layout.addWidget(self.listy)
+
+        button_layout = QVBoxLayout()
+        keys_group_box_layout.addLayout(button_layout)
+        self._add_key_button = QtGui.QToolButton(self)
+        self._add_key_button.setIcon(QIcon(I('plus.png')))
+        self._add_key_button.setToolTip(u"Create new {0}".format(self.key_type_name))
+        self._add_key_button.clicked.connect(self.add_key)
+        button_layout.addWidget(self._add_key_button)
+
+        self._delete_key_button = QtGui.QToolButton(self)
+        self._delete_key_button.setToolTip(_(u"Delete highlighted key"))
+        self._delete_key_button.setIcon(QIcon(I('list_remove.png')))
+        self._delete_key_button.clicked.connect(self.delete_key)
+        button_layout.addWidget(self._delete_key_button)
+
+        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        button_layout.addItem(spacerItem)
+
+        layout.addSpacing(5)
+        migrate_layout = QHBoxLayout()
+        layout.addLayout(migrate_layout)
+        migrate_layout.addStretch()
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Close)
+        self.button_box.rejected.connect(self.close)
+        migrate_layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    def populate_list(self):
+        if type(self.plugin_keys) == dict:
+            for key in self.plugin_keys.keys():
+                self.listy.addItem(QListWidgetItem(key))
+        else:
+            for key in self.plugin_keys:
+                self.listy.addItem(QListWidgetItem(key))
+
+    def add_key(self):
+        d = self.create_key(self)
+        d.exec_()
+
+        if d.result() != d.Accepted:
+            # New key generation cancelled.
+            return
+        new_key_value = d.key_value
+        if new_key_value in self.plugin_keys:
+            info_dialog(None, "{0} {1}: Duplicate {2}".format(PLUGIN_NAME, PLUGIN_VERSION,self.key_type_name),
+                        u"This {0} is already in the list of {0}s has not been added.".format(self.key_type_name), show=True)
+            return
+
+        self.plugin_keys.append(d.key_value)
+        self.listy.clear()
+        self.populate_list()
+
+    def rename_key(self):
+        if not self.listy.currentItem():
+            errmsg = u"No {0} selected to rename. Highlight a keyfile first.".format(self.key_type_name)
+            r = error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+            return
+
+        d = RenameKeyDialog(self)
+        d.exec_()
+
+        if d.result() != d.Accepted:
+            # rename cancelled or moot.
+            return
+        keyname = unicode(self.listy.currentItem().text())
+        if not question_dialog(self, "{0} {1}: Confirm Rename".format(PLUGIN_NAME, PLUGIN_VERSION), u"Do you really want to rename the {2} named <strong>{0}</strong> to <strong>{1}</strong>?".format(keyname,d.key_name,self.key_type_name), show_copy_button=False, default_yes=False):
+            return
+        self.plugin_keys[d.key_name] = self.plugin_keys[keyname]
+        del self.plugin_keys[keyname]
+
+        self.listy.clear()
+        self.populate_list()
+
+    def delete_key(self):
+        if not self.listy.currentItem():
+            return
+        keyname = unicode(self.listy.currentItem().text())
+        if not question_dialog(self, "{0} {1}: Confirm Delete".format(PLUGIN_NAME, PLUGIN_VERSION), u"Do you really want to delete the {1} <strong>{0}</strong>?".format(keyname, self.key_type_name), show_copy_button=False, default_yes=False):
+            return
+        self.plugin_keys.remove(keyname)
+
+        self.listy.clear()
+        self.populate_list()
+
+class AddSerialDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Add New eInk Kobo Serial Number".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox(u"", self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"EInk Kobo Serial Number:", self))
+        self.key_ledit = QLineEdit("", self)
+        self.key_ledit.setToolTip(u"Enter an eInk Kobo serial number. EInk Kobo serial numbers are 13 characters long and usually start with a 'N'. Kobo Serial Numbers are case-sensitive, so be sure to enter the upper and lower case letters unchanged.")
+        key_group.addWidget(self.key_ledit)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text()).strip()
+
+    @property
+    def key_value(self):
+        return unicode(self.key_ledit.text()).strip()
+
+    def accept(self):
+        if len(self.key_name) == 0 or self.key_name.isspace():
+            errmsg = u"Please enter an eInk Kindle Serial Number or click Cancel in the dialog."
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) != 13:
+            errmsg = u"EInk Kobo Serial Numbers must be 13 characters long. This is {0:d} characters long.".format(len(self.key_name))
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)

Obok_calibre_plugin/obok_plugin/obok/obok.py

@@ -1,6 +1,27 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+# Version 3.2.0 January 2016
+# Update for latest version of Windows Desktop app.
+# Support Kobo devices in the command line version.
+#
+# Version 3.1.9 November 2015
+# Handle Kobo Desktop under wine on Linux
+#
+# Version 3.1.8 November 2015
+# Handle the case of Kobo Arc or Vox device (i.e. don't crash).
+#
+# Version 3.1.7 October 2015
+# Handle the case of no device or database more gracefully.
+#
+# Version 3.1.6 September 2015
+# Enable support for Kobo devices
+# More character encoding fixes (unicode strings)
+#
+# Version 3.1.5 September 2015
+# Removed requirement that a purchase has been made.
+# Also add in character encoding fixes
+#
 # Version 3.1.4 September 2015
 # Updated for version 3.17 of the Windows Desktop app.
 #
@@ -115,7 +136,8 @@
 #
 """Manage all Kobo books, either encrypted or DRM-free."""
 
-__version__ = '3.1.3'
+__version__ = '3.1.9'
+__about__ =  u"Obok v{0}\nCopyright © 2012-2015 Physisticated et al.".format(__version__)
 
 import sys
 import os
@@ -129,6 +151,18 @@ import hashlib
 import xml.etree.ElementTree as ET
 import string
 import shutil
+import argparse
+
+can_parse_xml = True
+try:
+  from xml.etree import ElementTree as ET
+  # print u"using xml.etree for xml parsing"
+except ImportError:
+  can_parse_xml = False
+  # print u"Cannot find xml.etree, disabling extraction of serial numbers"
+
+# List of all known hash keys
+KOBO_HASH_KEYS = ['88b3a2e13', 'XzUhGYdFp', 'NoCanLook']
 
 class ENCRYPTIONError(Exception):
     pass
@@ -215,6 +249,24 @@ def _load_crypto():
 
 AES = _load_crypto()
 
+# Wrap a stream so that output gets flushed immediately
+# and also make sure that any unicode strings get
+# encoded using "replace" before writing them.
+class SafeUnbuffered:
+    def __init__(self, stream):
+        self.stream = stream
+        self.encoding = stream.encoding
+        if self.encoding == None:
+            self.encoding = "utf-8"
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode(self.encoding,"replace")
+        self.stream.write(data)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+
 class KoboLibrary(object):
     """The Kobo library.
 
@@ -222,23 +274,93 @@ class KoboLibrary(object):
     written by the Kobo Desktop Edition application, including the list
     of books, their titles, and the user's encryption key(s)."""
 
-    def __init__ (self):
-        print u"Obok v{0}\nCopyright © 2012-2015 Physisticated et al.".format(__version__)
-        if sys.platform.startswith('win'):
-            if sys.getwindowsversion().major > 5:
-                self.kobodir = os.environ['LOCALAPPDATA']
-            else:
-                self.kobodir = os.path.join(os.environ['USERPROFILE'], 'Local Settings', 'Application Data')
-            self.kobodir = os.path.join(self.kobodir, 'Kobo', 'Kobo Desktop Edition')
-        elif sys.platform.startswith('darwin'):
-            self.kobodir = os.path.join(os.environ['HOME'], 'Library', 'Application Support', 'Kobo', 'Kobo Desktop Edition')
-        self.bookdir = os.path.join(self.kobodir, 'kepub')
-        kobodb = os.path.join(self.kobodir, 'Kobo.sqlite')
-        self.__sqlite = sqlite3.connect(kobodb)
-        self.__cursor = self.__sqlite.cursor()
-        self._userkeys = []
-        self._books = []
-        self._volumeID = []
+    def __init__ (self, serials = [], device_path = None):
+        print __about__
+        self.kobodir = u""
+        kobodb = u""
+
+        # Order of checks
+        # 1. first check if a device_path has been passed in, and whether
+        #    we can find the sqlite db in the respective place
+        # 2. if 1., and we got some serials passed in (from saved
+        #    settings in calibre), just use it
+        # 3. if 1. worked, but we didn't get serials, try to parse them
+        #    from the device, if this didn't work, unset everything
+        # 4. if by now we don't have kobodir set, give up on device and
+        #    try to use the Desktop app.
+
+        # step 1. check whether this looks like a real device
+        if (device_path):
+            # we got a device path
+            self.kobodir = os.path.join(device_path, u".kobo")
+            # devices use KoboReader.sqlite
+            kobodb  = os.path.join(self.kobodir, u"KoboReader.sqlite")
+            if (not(os.path.isfile(kobodb))):
+                # device path seems to be wrong, unset it
+                device_path = u""
+                self.kobodir = u""
+                kobodb  = u""
+
+        if (self.kobodir):
+            # step 3. we found a device but didn't get serials, try to get them
+            if (len(serials) == 0):
+                # we got a device path but no saved serial
+                # try to get the serial from the device
+                # print u"get_device_settings - device_path = {0}".format(device_path)
+                # get serial from device_path/.adobe-digital-editions/device.xml
+                if can_parse_xml:
+                    devicexml = os.path.join(device_path, '.adobe-digital-editions', 'device.xml')
+                    # print u"trying to load {0}".format(devicexml)
+                    if (os.path.exists(devicexml)):
+                        # print u"trying to parse {0}".format(devicexml)
+                        xmltree = ET.parse(devicexml)
+                        for node in xmltree.iter():
+                            if "deviceSerial" in node.tag:
+                                serial = node.text
+                                # print u"found serial {0}".format(serial)
+                                serials.append(serial)
+                                break
+                    else:
+                        # print u"cannot get serials from device."
+                        device_path = u""
+                        self.kobodir = u""
+                        kobodb  = u""
+
+        if (self.kobodir == u""):
+            # step 4. we haven't found a device with serials, so try desktop apps
+            if sys.platform.startswith('win'):
+                import _winreg as winreg
+                if sys.getwindowsversion().major > 5:
+                    if 'LOCALAPPDATA' in os.environ.keys():
+                        # Python 2.x does not return unicode env. Use Python 3.x
+                        self.kobodir = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
+                if (self.kobodir == u""):
+                    if 'USERPROFILE' in os.environ.keys():
+                        # Python 2.x does not return unicode env. Use Python 3.x
+                        self.kobodir = os.path.join(winreg.ExpandEnvironmentStrings(u"%USERPROFILE%"), u"Local Settings", u"Application Data")
+                self.kobodir = os.path.join(self.kobodir, u"Kobo", u"Kobo Desktop Edition")
+            elif sys.platform.startswith('darwin'):
+                self.kobodir = os.path.join(os.environ['HOME'], u"Library", u"Application Support", u"Kobo", u"Kobo Desktop Edition")
+            elif linux_path != None:
+                # Probably Linux, let's get the wine prefix and path to Kobo.
+                self.kobodir = os.path.join(linux_path, u"Local Settings", u"Application Data", u"Kobo", u"Kobo Desktop Edition")
+            # desktop versions use Kobo.sqlite
+            kobodb = os.path.join(self.kobodir, u"Kobo.sqlite")
+            # check for existence of file
+            if (not(os.path.isfile(kobodb))):
+                # give up here, we haven't found anything useful
+                self.kobodir = u""
+                kobodb  = u""
+
+        
+        if (self.kobodir != u""):
+            self.bookdir = os.path.join(self.kobodir, u"kepub")
+            self.__sqlite = sqlite3.connect(kobodb)
+            self.__cursor = self.__sqlite.cursor()
+            self._userkeys = []
+            self._books = []
+            self._volumeID = []
+            self._serials = serials
 
     def close (self):
         """Closes the database used by the library."""
@@ -279,7 +401,7 @@ class KoboLibrary(object):
 
     def __bookfile (self, volumeid):
         """The filename needed to open a given book."""
-        return os.path.join(self.kobodir, 'kepub', volumeid)
+        return os.path.join(self.kobodir, u"kepub", volumeid)
 
     def __getmacaddrs (self):
         """The list of all MAC addresses on this machine."""
@@ -295,13 +417,25 @@ class KoboLibrary(object):
             output = subprocess.check_output('/sbin/ifconfig -a', shell=True)
             matches = c.findall(output)
             for m in matches:
-                # print "m:",m[0]
+                # print u"m:{0}".format(m[0])
                 macaddrs.append(m[0].upper())
+        else:
+            # probably linux, let's try ipconfig under wine
+            c = re.compile('\s(' + '[0-9a-f]{2}-' * 5 + '[0-9a-f]{2})(\s|$)', re.IGNORECASE)
+            for line in os.popen('ipconfig /all'):
+                m = c.search(line)
+                if m:
+                    macaddrs.append(re.sub("-", ":", m.group(1)).upper())
+
+        # extend the list of macaddrs in any case with the serials
+        # cannot hurt ;-)
+        macaddrs.extend(self._serials)
+
         return macaddrs
 
     def __getuserids (self):
         userids = []
-        cursor = self.__cursor.execute('SELECT UserID FROM user WHERE HasMadePurchase = "true"')
+        cursor = self.__cursor.execute('SELECT UserID FROM user')
         row = cursor.fetchone()
         while row is not None:
             try:
@@ -315,16 +449,11 @@ class KoboLibrary(object):
     def __getuserkeys (self, macaddr):
         userids = self.__getuserids()
         userkeys = []
-        # This version is used for versions before 3.17.0.
-        deviceid = hashlib.sha256('NoCanLook' + macaddr).hexdigest()
-        for userid in userids:
-            userkey = hashlib.sha256(deviceid + userid).hexdigest()
-            userkeys.append(binascii.a2b_hex(userkey[32:]))
-        # This version is used for 3.17.0 and later.
-        deviceid = hashlib.sha256('XzUhGYdFp' + macaddr).hexdigest()
-        for userid in userids:
-            userkey = hashlib.sha256(deviceid + userid).hexdigest()
-            userkeys.append(binascii.a2b_hex(userkey[32:]))
+        for hash in KOBO_HASH_KEYS:
+            deviceid = hashlib.sha256(hash + macaddr).hexdigest()
+            for userid in userids:
+                userkey = hashlib.sha256(deviceid + userid).hexdigest()
+                userkeys.append(binascii.a2b_hex(userkey[32:]))
         return userkeys
 
 class KoboBook(object):
@@ -432,13 +561,13 @@ class KoboFile(object):
             if contents[:5]=="<?xml":
                 return True
             else:
-                print "Bad XML: ",contents[:5]
+                print u"Bad XML: {0}".format(contents[:5])
                 raise ValueError
         if self.mimetype == 'image/jpeg':
             if contents[:3] == '\xff\xd8\xff':
                 return True
             else:
-                print "Bad JPEG: ", contents[:3].encode('hex')
+                print u"Bad JPEG: {0}".format(contents[:3].encode('hex'))
                 raise ValueError()
         return False
 
@@ -460,36 +589,44 @@ class KoboFile(object):
             contents = contents[:-padding]
         return contents
 
-if __name__ == '__main__':
+def cli_main():
+    description = __about__
+    epilog = u"Parsing of arguments failed."
+    parser = argparse.ArgumentParser(prog=sys.argv[0], description=description, epilog=epilog)
+    parser.add_argument('--devicedir', default='/media/KOBOeReader', help="directory of connected Kobo device")
+    args = vars(parser.parse_args())
+    serials = []
+    devicedir = u""
+    if args['devicedir']:
+        devicedir = args['devicedir']
 
-    lib = KoboLibrary()
+    lib = KoboLibrary(serials, devicedir)
 
     for i, book in enumerate(lib.books):
-        print ('%d: %s' % (i + 1, book.title)).encode('ascii', 'ignore')
+        print u"{0}: {1}".format(i + 1, book.title)
 
-    num_string = raw_input("Convert book number... ")
+    num_string = raw_input(u"Convert book number... ")
     try:
         num = int(num_string)
         book = lib.books[num - 1]
     except (ValueError, IndexError):
         exit()
 
-    print "Converting", book.title
+    print u"Converting {0}".format(book.title)
 
     zin = zipfile.ZipFile(book.filename, "r")
     # make filename out of Unicode alphanumeric and whitespace equivalents from title
-    outname = "%s.epub" % (re.sub('[^\s\w]', '', book.title, 0, re.UNICODE))
+    outname = u"{0}.epub".format(re.sub('[^\s\w]', '_', book.title, 0, re.UNICODE))
 
     if (book.type == 'drm-free'):
-        print "DRM-free book, conversion is not needed"
+        print u"DRM-free book, conversion is not needed"
         shutil.copyfile(book.filename, outname)
-        print "Book saved as", os.path.join(os.getcwd(), outname)
+        print u"Book saved as {0}".format(os.path.join(os.getcwd(), outname))
         exit(0)
 
     result = 1
     for userkey in lib.userkeys:
-        # print "Trying key: ",userkey.encode('hex_codec')
-        confirmedGood = False
+        print u"Trying key: {0}".format(userkey.encode('hex_codec'))
         try:
             zout = zipfile.ZipFile(outname, "w", zipfile.ZIP_DEFLATED)
             for filename in zin.namelist():
@@ -498,18 +635,25 @@ if __name__ == '__main__':
                     file = book.encryptedfiles[filename]
                     contents = file.decrypt(userkey, contents)
                     # Parse failures mean the key is probably wrong.
-                    if not confirmedGood:
-                        confirmedGood = file.check(contents)
+                    file.check(contents)
                 zout.writestr(filename, contents)
             zout.close()
-            print "Book saved as", os.path.join(os.getcwd(), outname)
+            print u"Decryption succeeded."
+            print u"Book saved as {0}".format(os.path.join(os.getcwd(), outname))
             result = 0
             break
         except ValueError:
-            print "Decryption failed, trying next key"
+            print u"Decryption failed."
             zout.close()
             os.remove(outname)
 
     zin.close()
     lib.close()
-    exit(result)
+    if result != 0:
+        print u"Could not decrypt book with any of the keys found."
+    return result
+
+if __name__ == '__main__':
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    sys.exit(cli_main())

Obok_calibre_plugin/obok_plugin_ReadMe.txt

@@ -1,7 +1,7 @@
 obok_plugin.zip
 ================
 
-This plugin will remove the DRM from Kobo ebooks download on Mac or Windows using the Kobo desktop application.
+This plugin will remove the DRM from Kobo ebooks download on Mac or Windows using the Kobo desktop application, or from Kobo ebooks on an attached E-Ink Kobo reader (but not a Kobo Arc or Kobo Vox). If both are available, ebooks will be read from the attached E-Ink Kobo reader. To import from the desktop application, unplug the Kobo reader.
 
 
 Installation
@@ -11,7 +11,7 @@ Do NOT select "Get plugins to enhance calibre" as this is reserved for 'official
 
 Customization
 -------------
-No customization is required, except choosing which menus will show the plugin.
+No customization is required, except choosing which menus will show the plugin. Altough the ability to enter a device serial number is given, this should not need to be filled in, as the serial number should be picked up automatically from the attached Kobo reader.
 
 
 Using the plugin
@@ -47,6 +47,7 @@ Credits
 -------
 The original obok script was by Physisticated
 The plugin conversion was done anonymously.
+The Kobo reader support was added by norbusan
 
-Improvements to the script and the plugin adaption have been by numerous people since.
+Additional improvements to the script and the plugin adaption by numerous anonymous people.
 

Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw

@@ -4,7 +4,7 @@
 from __future__ import with_statement
 
 # kindlekey.py
-# Copyright © 2010-2015 by some_updates, Apprentice Alf and Apprentice Harper
+# Copyright © 2010-2016 by some_updates, Apprentice Alf and Apprentice Harper
 
 # Revision history:
 #  1.0   - Kindle info file decryption, extracted from k4mobidedrm, etc.
@@ -19,6 +19,9 @@ from __future__ import with_statement
 #  1.8   - Fixes for Kindle for Mac, and non-ascii in Windows user names
 #  1.9   - Fixes for Unicode in Windows user names
 #  2.0   - Added comments and extra fix for non-ascii Windows user names
+#  2.1   - Fixed Kindle for PC encryption changes March 2016
+#  2.2   - Fixes for Macs with bonded ethernet ports
+#          Also removed old .kinfo file support (pre-2011)
 
 
 """
@@ -26,7 +29,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '1.9'
+__version__ = '2.2'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -926,7 +929,7 @@ if iswindows:
         # or the python interface to the 32 vs 64 bit registry is broken
         path = ""
         if 'LOCALAPPDATA' in os.environ.keys():
-			# Python 2.x does not return unicode env. Use Python 3.x
+            # Python 2.x does not return unicode env. Use Python 3.x
             path = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
             # this is just another alternative.
             # path = getEnvironmentVariable('LOCALAPPDATA')
@@ -993,179 +996,120 @@ if iswindows:
     # determine type of kindle info provided and return a
     # database of keynames and values
     def getDBfromFile(kInfoFile):
-        names = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber', 'max_date', 'SIGVERIF']
+        names = [\
+            'kindle.account.tokens',\
+            'kindle.cookie.item',\
+            'eulaVersionAccepted',\
+            'login_date',\
+            'kindle.token.item',\
+            'login',\
+            'kindle.key.item',\
+            'kindle.name.info',\
+            'kindle.device.info',\
+            'MazamaRandomNumber',\
+            'max_date',\
+            'SIGVERIF',\
+            'build_version',\
+            ]
+
         DB = {}
         with open(kInfoFile, 'rb') as infoReader:
-            hdr = infoReader.read(1)
             data = infoReader.read()
+        # assume newest .kinf2011 style .kinf file
+        # the .kinf file uses "/" to separate it into records
+        # so remove the trailing "/" to make it easy to use split
+        data = data[:-1]
+        items = data.split('/')
 
-        if data.find('{') != -1 :
-            # older style kindle-info file
-            items = data.split('{')
-            for item in items:
-                if item != '':
-                    keyhash, rawdata = item.split(':')
-                    keyname = "unknown"
-                    for name in names:
-                        if encodeHash(name,charMap2) == keyhash:
-                            keyname = name
-                            break
-                    if keyname == "unknown":
-                        keyname = keyhash
-                    encryptedValue = decode(rawdata,charMap2)
-                    DB[keyname] = CryptUnprotectData(encryptedValue, "", 0)
-        elif hdr == '/':
-            # else rainier-2-1-1 .kinf file
-            # the .kinf file uses "/" to separate it into records
-            # so remove the trailing "/" to make it easy to use split
-            data = data[:-1]
-            items = data.split('/')
+        # starts with an encoded and encrypted header blob
+        headerblob = items.pop(0)
+        encryptedValue = decode(headerblob, testMap1)
+        cleartext = UnprotectHeaderData(encryptedValue)
+        #print "header  cleartext:",cleartext
+        # now extract the pieces that form the added entropy
+        pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
+        for m in re.finditer(pattern, cleartext):
+            added_entropy = m.group(2) + m.group(4)
 
-            # loop through the item records until all are processed
-            while len(items) > 0:
 
-                # get the first item record
+        # loop through the item records until all are processed
+        while len(items) > 0:
+
+            # get the first item record
+            item = items.pop(0)
+
+            # the first 32 chars of the first record of a group
+            # is the MD5 hash of the key name encoded by charMap5
+            keyhash = item[0:32]
+
+            # the sha1 of raw keyhash string is used to create entropy along
+            # with the added entropy provided above from the headerblob
+            entropy = SHA1(keyhash) + added_entropy
+
+            # the remainder of the first record when decoded with charMap5
+            # has the ':' split char followed by the string representation
+            # of the number of records that follow
+            # and make up the contents
+            srcnt = decode(item[34:],charMap5)
+            rcnt = int(srcnt)
+
+            # read and store in rcnt records of data
+            # that make up the contents value
+            edlst = []
+            for i in xrange(rcnt):
                 item = items.pop(0)
+                edlst.append(item)
 
-                # the first 32 chars of the first record of a group
-                # is the MD5 hash of the key name encoded by charMap5
-                keyhash = item[0:32]
+            # key names now use the new testMap8 encoding
+            keyname = "unknown"
+            for name in names:
+                if encodeHash(name,testMap8) == keyhash:
+                    keyname = name
+                    #print "keyname found from hash:",keyname
+                    break
+            if keyname == "unknown":
+                keyname = keyhash
+                #print "keyname not found, hash is:",keyname
 
-                # the raw keyhash string is used to create entropy for the actual
-                # CryptProtectData Blob that represents that keys contents
-                entropy = SHA1(keyhash)
+            # the testMap8 encoded contents data has had a length
+            # of chars (always odd) cut off of the front and moved
+            # to the end to prevent decoding using testMap8 from
+            # working properly, and thereby preventing the ensuing
+            # CryptUnprotectData call from succeeding.
 
-                # the remainder of the first record when decoded with charMap5
-                # has the ':' split char followed by the string representation
-                # of the number of records that follow
-                # and make up the contents
-                srcnt = decode(item[34:],charMap5)
-                rcnt = int(srcnt)
+            # The offset into the testMap8 encoded contents seems to be:
+            # len(contents)-largest prime number <=  int(len(content)/3)
+            # (in other words split "about" 2/3rds of the way through)
 
-                # read and store in rcnt records of data
-                # that make up the contents value
-                edlst = []
-                for i in xrange(rcnt):
-                    item = items.pop(0)
-                    edlst.append(item)
-
-                keyname = "unknown"
-                for name in names:
-                    if encodeHash(name,charMap5) == keyhash:
-                        keyname = name
-                        break
-                if keyname == "unknown":
-                    keyname = keyhash
-                # the charMap5 encoded contents data has had a length
-                # of chars (always odd) cut off of the front and moved
-                # to the end to prevent decoding using charMap5 from
-                # working properly, and thereby preventing the ensuing
-                # CryptUnprotectData call from succeeding.
-
-                # The offset into the charMap5 encoded contents seems to be:
-                # len(contents)-largest prime number <=  int(len(content)/3)
-                # (in other words split "about" 2/3rds of the way through)
-
-                # move first offsets chars to end to align for decode by charMap5
-                encdata = "".join(edlst)
-                contlen = len(encdata)
-                noffset = contlen - primes(int(contlen/3))[-1]
-
-                # now properly split and recombine
-                # by moving noffset chars from the start of the
-                # string to the end of the string
-                pfx = encdata[0:noffset]
-                encdata = encdata[noffset:]
-                encdata = encdata + pfx
-
-                # decode using Map5 to get the CryptProtect Data
-                encryptedValue = decode(encdata,charMap5)
-                DB[keyname] = CryptUnprotectData(encryptedValue, entropy, 1)
-        else:
-            # else newest .kinf2011 style .kinf file
-            # the .kinf file uses "/" to separate it into records
-            # so remove the trailing "/" to make it easy to use split
-            # need to put back the first char read because it it part
-            # of the added entropy blob
-            data = hdr + data[:-1]
-            items = data.split('/')
-
-            # starts with and encoded and encrypted header blob
-            headerblob = items.pop(0)
-            encryptedValue = decode(headerblob, testMap1)
-            cleartext = UnprotectHeaderData(encryptedValue)
-            # now extract the pieces that form the added entropy
-            pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
-            for m in re.finditer(pattern, cleartext):
-                added_entropy = m.group(2) + m.group(4)
+            # move first offsets chars to end to align for decode by testMap8
+            # by moving noffset chars from the start of the
+            # string to the end of the string
+            encdata = "".join(edlst)
+            #print "encrypted data:",encdata
+            contlen = len(encdata)
+            noffset = contlen - primes(int(contlen/3))[-1]
+            pfx = encdata[0:noffset]
+            encdata = encdata[noffset:]
+            encdata = encdata + pfx
+            #print "rearranged data:",encdata
 
 
-            # loop through the item records until all are processed
-            while len(items) > 0:
-
-                # get the first item record
-                item = items.pop(0)
-
-                # the first 32 chars of the first record of a group
-                # is the MD5 hash of the key name encoded by charMap5
-                keyhash = item[0:32]
-
-                # the sha1 of raw keyhash string is used to create entropy along
-                # with the added entropy provided above from the headerblob
-                entropy = SHA1(keyhash) + added_entropy
-
-                # the remainder of the first record when decoded with charMap5
-                # has the ':' split char followed by the string representation
-                # of the number of records that follow
-                # and make up the contents
-                srcnt = decode(item[34:],charMap5)
-                rcnt = int(srcnt)
-
-                # read and store in rcnt records of data
-                # that make up the contents value
-                edlst = []
-                for i in xrange(rcnt):
-                    item = items.pop(0)
-                    edlst.append(item)
-
-                # key names now use the new testMap8 encoding
-                keyname = "unknown"
-                for name in names:
-                    if encodeHash(name,testMap8) == keyhash:
-                        keyname = name
-                        break
-
-                # the testMap8 encoded contents data has had a length
-                # of chars (always odd) cut off of the front and moved
-                # to the end to prevent decoding using testMap8 from
-                # working properly, and thereby preventing the ensuing
-                # CryptUnprotectData call from succeeding.
-
-                # The offset into the testMap8 encoded contents seems to be:
-                # len(contents)-largest prime number <=  int(len(content)/3)
-                # (in other words split "about" 2/3rds of the way through)
-
-                # move first offsets chars to end to align for decode by testMap8
-                # by moving noffset chars from the start of the
-                # string to the end of the string
-                encdata = "".join(edlst)
-                contlen = len(encdata)
-                noffset = contlen - primes(int(contlen/3))[-1]
-                pfx = encdata[0:noffset]
-                encdata = encdata[noffset:]
-                encdata = encdata + pfx
-
-                # decode using new testMap8 to get the original CryptProtect Data
-                encryptedValue = decode(encdata,testMap8)
-                cleartext = CryptUnprotectData(encryptedValue, entropy, 1)
+            # decode using new testMap8 to get the original CryptProtect Data
+            encryptedValue = decode(encdata,testMap8)
+            #print "decoded data:",encryptedValue.encode('hex')
+            cleartext = CryptUnprotectData(encryptedValue, entropy, 1)
+            if len(cleartext)>0:
+                #print "cleartext data:",cleartext,":end data"
                 DB[keyname] = cleartext
+            #print keyname, cleartext
 
-        if 'kindle.account.tokens' in DB:
+        if len(DB)>6:
             # store values used in decryption
             DB['IDString'] = GetIDString()
             DB['UserName'] = GetUserName()
             print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName().encode('hex'))
         else:
+            print u"Couldn't decrypt file."
             DB = {}
         return DB
 elif isosx:
@@ -1297,11 +1241,9 @@ elif isosx:
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
+        #print out1
         reslst = out1.split('\n')
         cnt = len(reslst)
-        bsdname = None
-        sernum = None
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
             pp = resline.find('\"Serial Number\" = \"')
@@ -1310,31 +1252,24 @@ elif isosx:
                 sernums.append(sernum.strip())
         return sernums
 
-    def GetUserHomeAppSupKindleDirParitionName():
-        home = os.getenv('HOME')
-        dpath =  home + '/Library'
+    def GetDiskPartitionNames():
+        names = []
         cmdline = '/sbin/mount'
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
         reslst = out1.split('\n')
         cnt = len(reslst)
-        disk = ''
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
             if resline.startswith('/dev'):
                 (devpart, mpath) = resline.split(' on ')
                 dpart = devpart[5:]
-                pp = mpath.find('(')
-                if pp >= 0:
-                    mpath = mpath[:pp-1]
-                if dpath.startswith(mpath):
-                    disk = dpart
-        return disk
+                names.append(dpart)
+        return names
 
-    # uses a sub process to get the UUID of the specified disk partition using ioreg
-    def GetDiskPartitionUUIDs(diskpart):
+    # uses a sub process to get the UUID of all disk partitions
+    def GetDiskPartitionUUIDs():
         uuids = []
         uuidnum = os.getenv('MYUUIDNUMBER')
         if uuidnum != None:
@@ -1343,46 +1278,16 @@ elif isosx:
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
+        #print out1
         reslst = out1.split('\n')
         cnt = len(reslst)
-        bsdname = None
-        uuidnum = None
-        foundIt = False
-        nest = 0
-        uuidnest = -1
-        partnest = -2
         for j in xrange(cnt):
             resline = reslst[j]
-            if resline.find('{') >= 0:
-                nest += 1
-            if resline.find('}') >= 0:
-                nest -= 1
             pp = resline.find('\"UUID\" = \"')
             if pp >= 0:
                 uuidnum = resline[pp+10:-1]
                 uuidnum = uuidnum.strip()
-                uuidnest = nest
-                if partnest == uuidnest and uuidnest > 0:
-                    foundIt = True
-                    break
-            bb = resline.find('\"BSD Name\" = \"')
-            if bb >= 0:
-                bsdname = resline[bb+14:-1]
-                bsdname = bsdname.strip()
-                if (bsdname == diskpart):
-                    partnest = nest
-                else :
-                    partnest = -2
-                if partnest == uuidnest and partnest > 0:
-                    foundIt = True
-                    break
-            if nest == 0:
-                partnest = -2
-                uuidnest = -1
-                uuidnum = None
-                bsdname = None
-        if foundIt:
-            uuids.append(uuidnum)
+                uuids.append(uuidnum)
         return uuids
 
     def GetMACAddressesMunged():
@@ -1390,28 +1295,26 @@ elif isosx:
         macnum = os.getenv('MYMACNUM')
         if macnum != None:
             macnums.append(macnum)
-        cmdline = '/sbin/ifconfig en0'
+        cmdline = 'networksetup -listallhardwareports' # en0'
         cmdline = cmdline.encode(sys.getfilesystemencoding())
         p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
         out1, out2 = p.communicate()
         reslst = out1.split('\n')
         cnt = len(reslst)
-        macnum = None
-        foundIt = False
         for j in xrange(cnt):
             resline = reslst[j]
-            pp = resline.find('ether ')
+            pp = resline.find('Ethernet Address: ')
             if pp >= 0:
-                macnum = resline[pp+6:-1]
+                #print resline
+                macnum = resline[pp+18:]
                 macnum = macnum.strip()
-                # print 'original mac', macnum
-                # now munge it up the way Kindle app does
-                # by xoring it with 0xa5 and swapping elements 3 and 4
                 maclst = macnum.split(':')
                 n = len(maclst)
                 if n != 6:
-                    fountIt = False
-                    break
+                    continue
+                #print 'original mac', macnum
+                # now munge it up the way Kindle app does
+                # by xoring it with 0xa5 and swapping elements 3 and 4
                 for i in range(6):
                     maclst[i] = int('0x' + maclst[i], 0)
                 mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
@@ -1422,16 +1325,15 @@ elif isosx:
                 mlst[1] = maclst[1] ^ 0xa5
                 mlst[0] = maclst[0] ^ 0xa5
                 macnum = '%0.2x%0.2x%0.2x%0.2x%0.2x%0.2x' % (mlst[0], mlst[1], mlst[2], mlst[3], mlst[4], mlst[5])
-                foundIt = True
-                break
-        if foundIt:
-            macnums.append(macnum)
+                #print 'munged mac', macnum
+                macnums.append(macnum)
         return macnums
 
 
     # uses unix env to get username instead of using sysctlbyname
     def GetUserName():
         username = os.getenv('USER')
+        #print "Username:",username
         return username
 
     def GetIDStrings():
@@ -1439,58 +1341,13 @@ elif isosx:
         strings = []
         strings.extend(GetMACAddressesMunged())
         strings.extend(GetVolumesSerialNumbers())
-        diskpart = GetUserHomeAppSupKindleDirParitionName()
-        strings.extend(GetDiskPartitionUUIDs(diskpart))
+        strings.extend(GetDiskPartitionNames())
+        strings.extend(GetDiskPartitionUUIDs())
         strings.append('9999999999')
-        #print strings
+        #print "ID Strings:\n",strings
         return strings
 
 
-    # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used by Kindle for Mac versions < 1.6.0
-    class CryptUnprotectData(object):
-        def __init__(self, IDString):
-            sp = IDString + '!@#' + GetUserName()
-            passwdData = encode(SHA256(sp),charMap1)
-            salt = '16743'
-            self.crp = LibCrypto()
-            iter = 0x3e8
-            keylen = 0x80
-            key_iv = self.crp.keyivgen(passwdData, salt, iter, keylen)
-            self.key = key_iv[0:32]
-            self.iv = key_iv[32:48]
-            self.crp.set_decrypt_key(self.key, self.iv)
-
-        def decrypt(self, encryptedData):
-            cleartext = self.crp.decrypt(encryptedData)
-            cleartext = decode(cleartext,charMap1)
-            return cleartext
-
-
-    # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used for Kindle for Mac Versions >= 1.6.0
-    class CryptUnprotectDataV2(object):
-        def __init__(self, IDString):
-            sp = GetUserName() + ':&%:' + IDString
-            passwdData = encode(SHA256(sp),charMap5)
-            # salt generation as per the code
-            salt = 0x0512981d * 2 * 1 * 1
-            salt = str(salt) + GetUserName()
-            salt = encode(salt,charMap5)
-            self.crp = LibCrypto()
-            iter = 0x800
-            keylen = 0x400
-            key_iv = self.crp.keyivgen(passwdData, salt, iter, keylen)
-            self.key = key_iv[0:32]
-            self.iv = key_iv[32:48]
-            self.crp.set_decrypt_key(self.key, self.iv)
-
-        def decrypt(self, encryptedData):
-            cleartext = self.crp.decrypt(encryptedData)
-            cleartext = decode(cleartext, charMap5)
-            return cleartext
-
-
     # unprotect the new header blob in .kinf2011
     # used in Kindle for Mac Version >= 1.9.0
     def UnprotectHeaderData(encryptedData):
@@ -1508,8 +1365,7 @@ elif isosx:
 
 
     # implements an Pseudo Mac Version of Windows built-in Crypto routine
-    # used for Kindle for Mac Versions >= 1.9.0
-    class CryptUnprotectDataV3(object):
+    class CryptUnprotectData(object):
         def __init__(self, entropy, IDString):
             sp = GetUserName() + '+@#$%+' + IDString
             passwdData = encode(SHA256(sp),charMap2)
@@ -1577,206 +1433,118 @@ elif isosx:
     # determine type of kindle info provided and return a
     # database of keynames and values
     def getDBfromFile(kInfoFile):
-        names = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber', 'max_date', 'SIGVERIF']
+        names = [\
+            'kindle.account.tokens',\
+            'kindle.cookie.item',\
+            'eulaVersionAccepted',\
+            'login_date',\
+            'kindle.token.item',\
+            'login',\
+            'kindle.key.item',\
+            'kindle.name.info',\
+            'kindle.device.info',\
+            'MazamaRandomNumber',\
+            'max_date',\
+            'SIGVERIF',\
+            'build_version',\
+            ]
         with open(kInfoFile, 'rb') as infoReader:
-            filehdr = infoReader.read(1)
             filedata = infoReader.read()
 
+        data = filedata[:-1]
+        items = data.split('/')
         IDStrings = GetIDStrings()
         for IDString in IDStrings:
-            DB = {}
             #print "trying IDString:",IDString
             try:
-                hdr = filehdr
-                data = filedata
-                if data.find('[') != -1 :
-                    # older style kindle-info file
-                    cud = CryptUnprotectData(IDString)
-                    items = data.split('[')
-                    for item in items:
-                        if item != '':
-                            keyhash, rawdata = item.split(':')
-                            keyname = 'unknown'
-                            for name in names:
-                                if encodeHash(name,charMap2) == keyhash:
-                                    keyname = name
-                                    break
-                            if keyname == 'unknown':
-                                keyname = keyhash
-                            encryptedValue = decode(rawdata,charMap2)
-                            cleartext = cud.decrypt(encryptedValue)
-                            if len(cleartext) > 0:
-                                DB[keyname] = cleartext
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
-                elif hdr == '/':
-                    # else newer style .kinf file used by K4Mac >= 1.6.0
-                    # the .kinf file uses '/' to separate it into records
-                    # so remove the trailing '/' to make it easy to use split
-                    data = data[:-1]
-                    items = data.split('/')
-                    cud = CryptUnprotectDataV2(IDString)
+                DB = {}
+                items = data.split('/')
+               
+                # the headerblob is the encrypted information needed to build the entropy string
+                headerblob = items.pop(0)
+                encryptedValue = decode(headerblob, charMap1)
+                cleartext = UnprotectHeaderData(encryptedValue)
 
-                    # loop through the item records until all are processed
-                    while len(items) > 0:
+                # now extract the pieces in the same way
+                # this version is different from K4PC it scales the build number by multipying by 735
+                pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
+                for m in re.finditer(pattern, cleartext):
+                    entropy = str(int(m.group(2)) * 0x2df) + m.group(4)
 
-                        # get the first item record
+                cud = CryptUnprotectData(entropy,IDString)
+
+                # loop through the item records until all are processed
+                while len(items) > 0:
+
+                    # get the first item record
+                    item = items.pop(0)
+
+                    # the first 32 chars of the first record of a group
+                    # is the MD5 hash of the key name encoded by charMap5
+                    keyhash = item[0:32]
+                    keyname = 'unknown'
+
+                    # unlike K4PC the keyhash is not used in generating entropy
+                    # entropy = SHA1(keyhash) + added_entropy
+                    # entropy = added_entropy
+
+                    # the remainder of the first record when decoded with charMap5
+                    # has the ':' split char followed by the string representation
+                    # of the number of records that follow
+                    # and make up the contents
+                    srcnt = decode(item[34:],charMap5)
+                    rcnt = int(srcnt)
+
+                    # read and store in rcnt records of data
+                    # that make up the contents value
+                    edlst = []
+                    for i in xrange(rcnt):
                         item = items.pop(0)
+                        edlst.append(item)
 
-                        # the first 32 chars of the first record of a group
-                        # is the MD5 hash of the key name encoded by charMap5
-                        keyhash = item[0:32]
-                        keyname = 'unknown'
+                    keyname = 'unknown'
+                    for name in names:
+                        if encodeHash(name,testMap8) == keyhash:
+                            keyname = name
+                            break
+                    if keyname == 'unknown':
+                        keyname = keyhash
 
-                        # the raw keyhash string is also used to create entropy for the actual
-                        # CryptProtectData Blob that represents that keys contents
-                        # 'entropy' not used for K4Mac only K4PC
-                        # entropy = SHA1(keyhash)
+                    # the testMap8 encoded contents data has had a length
+                    # of chars (always odd) cut off of the front and moved
+                    # to the end to prevent decoding using testMap8 from
+                    # working properly, and thereby preventing the ensuing
+                    # CryptUnprotectData call from succeeding.
 
-                        # the remainder of the first record when decoded with charMap5
-                        # has the ':' split char followed by the string representation
-                        # of the number of records that follow
-                        # and make up the contents
-                        srcnt = decode(item[34:],charMap5)
-                        rcnt = int(srcnt)
+                    # The offset into the testMap8 encoded contents seems to be:
+                    # len(contents) - largest prime number less than or equal to int(len(content)/3)
+                    # (in other words split 'about' 2/3rds of the way through)
 
-                        # read and store in rcnt records of data
-                        # that make up the contents value
-                        edlst = []
-                        for i in xrange(rcnt):
-                            item = items.pop(0)
-                            edlst.append(item)
+                    # move first offsets chars to end to align for decode by testMap8
+                    encdata = ''.join(edlst)
+                    contlen = len(encdata)
 
-                        keyname = 'unknown'
-                        for name in names:
-                            if encodeHash(name,charMap5) == keyhash:
-                                keyname = name
-                                break
-                        if keyname == 'unknown':
-                            keyname = keyhash
+                    # now properly split and recombine
+                    # by moving noffset chars from the start of the
+                    # string to the end of the string
+                    noffset = contlen - primes(int(contlen/3))[-1]
+                    pfx = encdata[0:noffset]
+                    encdata = encdata[noffset:]
+                    encdata = encdata + pfx
 
-                        # the charMap5 encoded contents data has had a length
-                        # of chars (always odd) cut off of the front and moved
-                        # to the end to prevent decoding using charMap5 from
-                        # working properly, and thereby preventing the ensuing
-                        # CryptUnprotectData call from succeeding.
+                    # decode using testMap8 to get the CryptProtect Data
+                    encryptedValue = decode(encdata,testMap8)
+                    cleartext = cud.decrypt(encryptedValue)
+                    # print keyname
+                    # print cleartext
+                    if len(cleartext) > 0:
+                        DB[keyname] = cleartext
 
-                        # The offset into the charMap5 encoded contents seems to be:
-                        # len(contents) - largest prime number less than or equal to int(len(content)/3)
-                        # (in other words split 'about' 2/3rds of the way through)
-
-                        # move first offsets chars to end to align for decode by charMap5
-                        encdata = ''.join(edlst)
-                        contlen = len(encdata)
-
-                        # now properly split and recombine
-                        # by moving noffset chars from the start of the
-                        # string to the end of the string
-                        noffset = contlen - primes(int(contlen/3))[-1]
-                        pfx = encdata[0:noffset]
-                        encdata = encdata[noffset:]
-                        encdata = encdata + pfx
-
-                        # decode using charMap5 to get the CryptProtect Data
-                        encryptedValue = decode(encdata,charMap5)
-                        cleartext = cud.decrypt(encryptedValue)
-                        if len(cleartext) > 0:
-                            DB[keyname] = cleartext
-
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
-                else:
-                    # the latest .kinf2011 version for K4M 1.9.1
-                    # put back the hdr char, it is needed
-                    data = hdr + data
-                    data = data[:-1]
-                    items = data.split('/')
-
-                    # the headerblob is the encrypted information needed to build the entropy string
-                    headerblob = items.pop(0)
-                    encryptedValue = decode(headerblob, charMap1)
-                    cleartext = UnprotectHeaderData(encryptedValue)
-
-                    # now extract the pieces in the same way
-                    # this version is different from K4PC it scales the build number by multipying by 735
-                    pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
-                    for m in re.finditer(pattern, cleartext):
-                        entropy = str(int(m.group(2)) * 0x2df) + m.group(4)
-
-                    cud = CryptUnprotectDataV3(entropy,IDString)
-
-                    # loop through the item records until all are processed
-                    while len(items) > 0:
-
-                        # get the first item record
-                        item = items.pop(0)
-
-                        # the first 32 chars of the first record of a group
-                        # is the MD5 hash of the key name encoded by charMap5
-                        keyhash = item[0:32]
-                        keyname = 'unknown'
-
-                        # unlike K4PC the keyhash is not used in generating entropy
-                        # entropy = SHA1(keyhash) + added_entropy
-                        # entropy = added_entropy
-
-                        # the remainder of the first record when decoded with charMap5
-                        # has the ':' split char followed by the string representation
-                        # of the number of records that follow
-                        # and make up the contents
-                        srcnt = decode(item[34:],charMap5)
-                        rcnt = int(srcnt)
-
-                        # read and store in rcnt records of data
-                        # that make up the contents value
-                        edlst = []
-                        for i in xrange(rcnt):
-                            item = items.pop(0)
-                            edlst.append(item)
-
-                        keyname = 'unknown'
-                        for name in names:
-                            if encodeHash(name,testMap8) == keyhash:
-                                keyname = name
-                                break
-                        if keyname == 'unknown':
-                            keyname = keyhash
-
-                        # the testMap8 encoded contents data has had a length
-                        # of chars (always odd) cut off of the front and moved
-                        # to the end to prevent decoding using testMap8 from
-                        # working properly, and thereby preventing the ensuing
-                        # CryptUnprotectData call from succeeding.
-
-                        # The offset into the testMap8 encoded contents seems to be:
-                        # len(contents) - largest prime number less than or equal to int(len(content)/3)
-                        # (in other words split 'about' 2/3rds of the way through)
-
-                        # move first offsets chars to end to align for decode by testMap8
-                        encdata = ''.join(edlst)
-                        contlen = len(encdata)
-
-                        # now properly split and recombine
-                        # by moving noffset chars from the start of the
-                        # string to the end of the string
-                        noffset = contlen - primes(int(contlen/3))[-1]
-                        pfx = encdata[0:noffset]
-                        encdata = encdata[noffset:]
-                        encdata = encdata + pfx
-
-                        # decode using testMap8 to get the CryptProtect Data
-                        encryptedValue = decode(encdata,testMap8)
-                        cleartext = cud.decrypt(encryptedValue)
-                        # print keyname
-                        # print cleartext
-                        if len(cleartext) > 0:
-                            DB[keyname] = cleartext
-
-                    if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-                        break
+                if len(DB)>6:
+                    break
             except:
                 pass
-        if 'kindle.account.tokens' in DB:
+        if len(DB)>6:
             # store values used in decryption
             print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(IDString, GetUserName())
             DB['IDString'] = IDString
@@ -1840,7 +1608,7 @@ def cli_main():
     sys.stderr=SafeUnbuffered(sys.stderr)
     argv=unicode_argv()
     progname = os.path.basename(argv[0])
-    print u"{0} v{1}\nCopyright © 2010-2013 some_updates and Apprentice Alf".format(progname,__version__)
+    print u"{0} v{1}\nCopyright © 2010-2016 by some_updates, Apprentice Alf and Apprentice Harper".format(progname,__version__)
 
     try:
         opts, args = getopt.getopt(argv[1:], "hk:")
@@ -1870,7 +1638,7 @@ def cli_main():
         # save to the same directory as the script
         outpath = os.path.dirname(argv[0])
 
-    # make sure the outpath is the
+    # make sure the outpath is canonical
     outpath = os.path.realpath(os.path.normpath(outpath))
 
     if not getkey(outpath, files):

Other_Tools/Kobo/obok.py

@@ -1,6 +1,27 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+# Version 3.2.0 January 2016
+# Update for latest version of Windows Desktop app.
+# Support Kobo devices in the command line version.
+#
+# Version 3.1.9 November 2015
+# Handle Kobo Desktop under wine on Linux
+#
+# Version 3.1.8 November 2015
+# Handle the case of Kobo Arc or Vox device (i.e. don't crash).
+#
+# Version 3.1.7 October 2015
+# Handle the case of no device or database more gracefully.
+#
+# Version 3.1.6 September 2015
+# Enable support for Kobo devices
+# More character encoding fixes (unicode strings)
+#
+# Version 3.1.5 September 2015
+# Removed requirement that a purchase has been made.
+# Also add in character encoding fixes
+#
 # Version 3.1.4 September 2015
 # Updated for version 3.17 of the Windows Desktop app.
 #
@@ -115,7 +136,8 @@
 #
 """Manage all Kobo books, either encrypted or DRM-free."""
 
-__version__ = '3.1.3'
+__version__ = '3.1.9'
+__about__ =  u"Obok v{0}\nCopyright © 2012-2015 Physisticated et al.".format(__version__)
 
 import sys
 import os
@@ -129,6 +151,18 @@ import hashlib
 import xml.etree.ElementTree as ET
 import string
 import shutil
+import argparse
+
+can_parse_xml = True
+try:
+  from xml.etree import ElementTree as ET
+  # print u"using xml.etree for xml parsing"
+except ImportError:
+  can_parse_xml = False
+  # print u"Cannot find xml.etree, disabling extraction of serial numbers"
+
+# List of all known hash keys
+KOBO_HASH_KEYS = ['88b3a2e13', 'XzUhGYdFp', 'NoCanLook']
 
 class ENCRYPTIONError(Exception):
     pass
@@ -215,6 +249,24 @@ def _load_crypto():
 
 AES = _load_crypto()
 
+# Wrap a stream so that output gets flushed immediately
+# and also make sure that any unicode strings get
+# encoded using "replace" before writing them.
+class SafeUnbuffered:
+    def __init__(self, stream):
+        self.stream = stream
+        self.encoding = stream.encoding
+        if self.encoding == None:
+            self.encoding = "utf-8"
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode(self.encoding,"replace")
+        self.stream.write(data)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+
 class KoboLibrary(object):
     """The Kobo library.
 
@@ -222,23 +274,93 @@ class KoboLibrary(object):
     written by the Kobo Desktop Edition application, including the list
     of books, their titles, and the user's encryption key(s)."""
 
-    def __init__ (self):
-        print u"Obok v{0}\nCopyright © 2012-2015 Physisticated et al.".format(__version__)
-        if sys.platform.startswith('win'):
-            if sys.getwindowsversion().major > 5:
-                self.kobodir = os.environ['LOCALAPPDATA']
-            else:
-                self.kobodir = os.path.join(os.environ['USERPROFILE'], 'Local Settings', 'Application Data')
-            self.kobodir = os.path.join(self.kobodir, 'Kobo', 'Kobo Desktop Edition')
-        elif sys.platform.startswith('darwin'):
-            self.kobodir = os.path.join(os.environ['HOME'], 'Library', 'Application Support', 'Kobo', 'Kobo Desktop Edition')
-        self.bookdir = os.path.join(self.kobodir, 'kepub')
-        kobodb = os.path.join(self.kobodir, 'Kobo.sqlite')
-        self.__sqlite = sqlite3.connect(kobodb)
-        self.__cursor = self.__sqlite.cursor()
-        self._userkeys = []
-        self._books = []
-        self._volumeID = []
+    def __init__ (self, serials = [], device_path = None):
+        print __about__
+        self.kobodir = u""
+        kobodb = u""
+
+        # Order of checks
+        # 1. first check if a device_path has been passed in, and whether
+        #    we can find the sqlite db in the respective place
+        # 2. if 1., and we got some serials passed in (from saved
+        #    settings in calibre), just use it
+        # 3. if 1. worked, but we didn't get serials, try to parse them
+        #    from the device, if this didn't work, unset everything
+        # 4. if by now we don't have kobodir set, give up on device and
+        #    try to use the Desktop app.
+
+        # step 1. check whether this looks like a real device
+        if (device_path):
+            # we got a device path
+            self.kobodir = os.path.join(device_path, u".kobo")
+            # devices use KoboReader.sqlite
+            kobodb  = os.path.join(self.kobodir, u"KoboReader.sqlite")
+            if (not(os.path.isfile(kobodb))):
+                # device path seems to be wrong, unset it
+                device_path = u""
+                self.kobodir = u""
+                kobodb  = u""
+
+        if (self.kobodir):
+            # step 3. we found a device but didn't get serials, try to get them
+            if (len(serials) == 0):
+                # we got a device path but no saved serial
+                # try to get the serial from the device
+                # print u"get_device_settings - device_path = {0}".format(device_path)
+                # get serial from device_path/.adobe-digital-editions/device.xml
+                if can_parse_xml:
+                    devicexml = os.path.join(device_path, '.adobe-digital-editions', 'device.xml')
+                    # print u"trying to load {0}".format(devicexml)
+                    if (os.path.exists(devicexml)):
+                        # print u"trying to parse {0}".format(devicexml)
+                        xmltree = ET.parse(devicexml)
+                        for node in xmltree.iter():
+                            if "deviceSerial" in node.tag:
+                                serial = node.text
+                                # print u"found serial {0}".format(serial)
+                                serials.append(serial)
+                                break
+                    else:
+                        # print u"cannot get serials from device."
+                        device_path = u""
+                        self.kobodir = u""
+                        kobodb  = u""
+
+        if (self.kobodir == u""):
+            # step 4. we haven't found a device with serials, so try desktop apps
+            if sys.platform.startswith('win'):
+                import _winreg as winreg
+                if sys.getwindowsversion().major > 5:
+                    if 'LOCALAPPDATA' in os.environ.keys():
+                        # Python 2.x does not return unicode env. Use Python 3.x
+                        self.kobodir = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
+                if (self.kobodir == u""):
+                    if 'USERPROFILE' in os.environ.keys():
+                        # Python 2.x does not return unicode env. Use Python 3.x
+                        self.kobodir = os.path.join(winreg.ExpandEnvironmentStrings(u"%USERPROFILE%"), u"Local Settings", u"Application Data")
+                self.kobodir = os.path.join(self.kobodir, u"Kobo", u"Kobo Desktop Edition")
+            elif sys.platform.startswith('darwin'):
+                self.kobodir = os.path.join(os.environ['HOME'], u"Library", u"Application Support", u"Kobo", u"Kobo Desktop Edition")
+            elif linux_path != None:
+                # Probably Linux, let's get the wine prefix and path to Kobo.
+                self.kobodir = os.path.join(linux_path, u"Local Settings", u"Application Data", u"Kobo", u"Kobo Desktop Edition")
+            # desktop versions use Kobo.sqlite
+            kobodb = os.path.join(self.kobodir, u"Kobo.sqlite")
+            # check for existence of file
+            if (not(os.path.isfile(kobodb))):
+                # give up here, we haven't found anything useful
+                self.kobodir = u""
+                kobodb  = u""
+
+        
+        if (self.kobodir != u""):
+            self.bookdir = os.path.join(self.kobodir, u"kepub")
+            self.__sqlite = sqlite3.connect(kobodb)
+            self.__cursor = self.__sqlite.cursor()
+            self._userkeys = []
+            self._books = []
+            self._volumeID = []
+            self._serials = serials
 
     def close (self):
         """Closes the database used by the library."""
@@ -279,7 +401,7 @@ class KoboLibrary(object):
 
     def __bookfile (self, volumeid):
         """The filename needed to open a given book."""
-        return os.path.join(self.kobodir, 'kepub', volumeid)
+        return os.path.join(self.kobodir, u"kepub", volumeid)
 
     def __getmacaddrs (self):
         """The list of all MAC addresses on this machine."""
@@ -295,13 +417,25 @@ class KoboLibrary(object):
             output = subprocess.check_output('/sbin/ifconfig -a', shell=True)
             matches = c.findall(output)
             for m in matches:
-                # print "m:",m[0]
+                # print u"m:{0}".format(m[0])
                 macaddrs.append(m[0].upper())
+        else:
+            # probably linux, let's try ipconfig under wine
+            c = re.compile('\s(' + '[0-9a-f]{2}-' * 5 + '[0-9a-f]{2})(\s|$)', re.IGNORECASE)
+            for line in os.popen('ipconfig /all'):
+                m = c.search(line)
+                if m:
+                    macaddrs.append(re.sub("-", ":", m.group(1)).upper())
+
+        # extend the list of macaddrs in any case with the serials
+        # cannot hurt ;-)
+        macaddrs.extend(self._serials)
+
         return macaddrs
 
     def __getuserids (self):
         userids = []
-        cursor = self.__cursor.execute('SELECT UserID FROM user WHERE HasMadePurchase = "true"')
+        cursor = self.__cursor.execute('SELECT UserID FROM user')
         row = cursor.fetchone()
         while row is not None:
             try:
@@ -315,16 +449,11 @@ class KoboLibrary(object):
     def __getuserkeys (self, macaddr):
         userids = self.__getuserids()
         userkeys = []
-        # This version is used for versions before 3.17.0.
-        deviceid = hashlib.sha256('NoCanLook' + macaddr).hexdigest()
-        for userid in userids:
-            userkey = hashlib.sha256(deviceid + userid).hexdigest()
-            userkeys.append(binascii.a2b_hex(userkey[32:]))
-        # This version is used for 3.17.0 and later.
-        deviceid = hashlib.sha256('XzUhGYdFp' + macaddr).hexdigest()
-        for userid in userids:
-            userkey = hashlib.sha256(deviceid + userid).hexdigest()
-            userkeys.append(binascii.a2b_hex(userkey[32:]))
+        for hash in KOBO_HASH_KEYS:
+            deviceid = hashlib.sha256(hash + macaddr).hexdigest()
+            for userid in userids:
+                userkey = hashlib.sha256(deviceid + userid).hexdigest()
+                userkeys.append(binascii.a2b_hex(userkey[32:]))
         return userkeys
 
 class KoboBook(object):
@@ -432,13 +561,13 @@ class KoboFile(object):
             if contents[:5]=="<?xml":
                 return True
             else:
-                print "Bad XML: ",contents[:5]
+                print u"Bad XML: {0}".format(contents[:5])
                 raise ValueError
         if self.mimetype == 'image/jpeg':
             if contents[:3] == '\xff\xd8\xff':
                 return True
             else:
-                print "Bad JPEG: ", contents[:3].encode('hex')
+                print u"Bad JPEG: {0}".format(contents[:3].encode('hex'))
                 raise ValueError()
         return False
 
@@ -460,36 +589,44 @@ class KoboFile(object):
             contents = contents[:-padding]
         return contents
 
-if __name__ == '__main__':
+def cli_main():
+    description = __about__
+    epilog = u"Parsing of arguments failed."
+    parser = argparse.ArgumentParser(prog=sys.argv[0], description=description, epilog=epilog)
+    parser.add_argument('--devicedir', default='/media/KOBOeReader', help="directory of connected Kobo device")
+    args = vars(parser.parse_args())
+    serials = []
+    devicedir = u""
+    if args['devicedir']:
+        devicedir = args['devicedir']
 
-    lib = KoboLibrary()
+    lib = KoboLibrary(serials, devicedir)
 
     for i, book in enumerate(lib.books):
-        print ('%d: %s' % (i + 1, book.title)).encode('ascii', 'ignore')
+        print u"{0}: {1}".format(i + 1, book.title)
 
-    num_string = raw_input("Convert book number... ")
+    num_string = raw_input(u"Convert book number... ")
     try:
         num = int(num_string)
         book = lib.books[num - 1]
     except (ValueError, IndexError):
         exit()
 
-    print "Converting", book.title
+    print u"Converting {0}".format(book.title)
 
     zin = zipfile.ZipFile(book.filename, "r")
     # make filename out of Unicode alphanumeric and whitespace equivalents from title
-    outname = "%s.epub" % (re.sub('[^\s\w]', '', book.title, 0, re.UNICODE))
+    outname = u"{0}.epub".format(re.sub('[^\s\w]', '_', book.title, 0, re.UNICODE))
 
     if (book.type == 'drm-free'):
-        print "DRM-free book, conversion is not needed"
+        print u"DRM-free book, conversion is not needed"
         shutil.copyfile(book.filename, outname)
-        print "Book saved as", os.path.join(os.getcwd(), outname)
+        print u"Book saved as {0}".format(os.path.join(os.getcwd(), outname))
         exit(0)
 
     result = 1
     for userkey in lib.userkeys:
-        # print "Trying key: ",userkey.encode('hex_codec')
-        confirmedGood = False
+        print u"Trying key: {0}".format(userkey.encode('hex_codec'))
         try:
             zout = zipfile.ZipFile(outname, "w", zipfile.ZIP_DEFLATED)
             for filename in zin.namelist():
@@ -498,18 +635,25 @@ if __name__ == '__main__':
                     file = book.encryptedfiles[filename]
                     contents = file.decrypt(userkey, contents)
                     # Parse failures mean the key is probably wrong.
-                    if not confirmedGood:
-                        confirmedGood = file.check(contents)
+                    file.check(contents)
                 zout.writestr(filename, contents)
             zout.close()
-            print "Book saved as", os.path.join(os.getcwd(), outname)
+            print u"Decryption succeeded."
+            print u"Book saved as {0}".format(os.path.join(os.getcwd(), outname))
             result = 0
             break
         except ValueError:
-            print "Decryption failed, trying next key"
+            print u"Decryption failed."
             zout.close()
             os.remove(outname)
 
     zin.close()
     lib.close()
-    exit(result)
+    if result != 0:
+        print u"Could not decrypt book with any of the keys found."
+    return result
+
+if __name__ == '__main__':
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    sys.exit(cli_main())

Other_Tools/Scuolabook_DRM/Scuolabook_ReadMe.txt

@@ -1,10 +1,4 @@
-How-to:
-1) Make sure you can read all PDF files on Scuolabook Reader.
-2) Run Scuolabook DRM Remover.
-3) Get your free books from the directory where you started the program.
+The latest Scuolabook tool can be found at Hex's own blog:
+https://thisishex.wordpress.com/scuolabook-drm-remover/
 
-Note:
-It is recommended to use Scuolabook version 2.0.1 and refuse all updates
-because the encryption algorithm may change making this tool useless.
-
-Hex
+Harper.

ReadMe_First.txt

@@ -12,7 +12,7 @@ The is archive includes tools to remove DRM from:
  - Adobe Digital Editions PDFs
  - Mobipocket ebooks
  - eReader PDB books
- - Scuolabooks (Windows only solution by Hex)
+ - Scuolabooks (Link to solution by Hex)
 
 These tools do NOT work with Apple's iBooks FairPlay DRM (see end of this file.)
 
@@ -78,7 +78,7 @@ Rocket_ebooks
 Information about the now-obsolete Rocket ebook format and DRM, along with source for a tool to remove the DRM.
 
 Scuolabook_DRM
-A windows-only application (including source code) for removing DRM from ScuolaBooks PDFs, created by "Hex" and included with permission.
+A link to the tool for removing DRM from ScuolaBooks PDFs, created by "Hex".
 
 
 Windows and Python