Remove debugging dialog from Mac App. Update version to 6.5.1

More escaping of characters, and added a Q&A about ActiveState Python on Windows. (The current installer has a bug.)

.gitignore

@@ -37,7 +37,6 @@ nosetests.xml
 coverage.xml
 
 # Translations
-*.mo
 *.pot
 
 # Django stuff:

Calibre_Plugins/Ignobleepub ReadMe.txt

@@ -1,38 +0,0 @@
-Ignoble Epub DeDRM - ignobleepub_v01.6_plugin.zip
-
-All credit given to I♥Cabbages for the original standalone scripts.
-I had the much easier job of converting them to a calibre plugin.
-
-This plugin is meant to decrypt Barnes & Noble Epubs that are protected with Adobe's Adept encryption. It is meant to function without having to install any dependencies... other than having calibre installed, of course. It will still work if you have Python and PyCrypto already installed, but they aren't necessary.
-
-
-Installation:
-
-Go to calibre's Preferences page.  Do **NOT** select "Get plugins to enhance calibre" as this is reserved for "official" calibre plugins, instead select "Change calibre behavior". Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file  (ignobleepub_vXX_plugin.zip) and click the 'Add' button. you're done.
-
-Please note:  calibre does not provide any immediate feedback to indicate that adding the plugin was a success. You can always click on the File-Type plugins to see if the plugin was added.
-
-
-Configuration:
-
-1) The easiest way to configure the plugin is to enter your name (Barnes & Noble account name) and credit card number (the one used to purchase the books) into the plugin's customization window. It's the same info you would enter into the ignoblekeygen script. Highlight the plugin (Ignoble Epub DeDRM) and click the "Customize Plugin" button on calibre's Preferences->Plugins page. Enter the name and credit card number separated by a comma: Your Name,1234123412341234
-
-If you've purchased books with more than one credit card, separate that other info with a colon: Your Name,1234123412341234:Other Name,2345234523452345
-
-** NOTE ** The above method is your only option if you don't have/can't run the original I♥Cabbages scripts on your particular machine. Your credit card number will be on display in calibre's Plugin configuration page when using the above method. If other people have access to your computer, you may want to use the second configuration method below.
-
-
-2) If you already have keyfiles generated with I <3 Cabbages' ignoblekeygen.pyw script, you can put those keyfiles into calibre's configuration directory. The easiest way to find the correct directory is to go to calibre's Preferences page... click on the 'Miscellaneous' button (looks like a gear),  and then click the 'Open calibre configuration directory' button. Paste your keyfiles in there. Just make sure that they have different names and are saved with the '.b64' extension (like the ignoblekeygen script produces). This directory isn't touched when upgrading calibre, so it's quite safe to leave them there.
-
-All keyfiles from method 2 and all data entered from method 1 will be used to attempt to decrypt a book. You can use method 1 or method 2, or a combination of both.
-
-
-Troubleshooting:
-
-If you find that it's not working for you (imported epubs still have DRM), you can save a lot of time and trouble by trying to add the epub to calibre with the command line tools. This will print out a lot of helpful debugging info that can be copied into any online help requests. I'm going to ask you to do it first, anyway, so you might as well get used to it. ;)
-
-Open a command prompt (terminal) and change to the directory where the ebook you're trying to import resides. Then type the command "calibredb add your_ebook.epub". Don't type the quotes and obviously change the 'your_ebook.epub' to whatever the filename of your book is. Copy the resulting output and paste it into any online help request you make.
-
-** Note: the Mac version of calibre doesn't install the command line tools by default. If you go to the 'Preferences' page and click on the miscellaneous button, you'll see the option to install the command line tools.
-
-

Calibre_Plugins/Ineptepub ReadMe.txt

@@ -1,39 +0,0 @@
-Inept Epub DeDRM - ineptepub_v01.7_plugin.zip
-
-All credit given to I♥Cabbages for the original standalone scripts.
-I had the much easier job of converting them to a Calibre plugin.
-
-This plugin is meant to decrypt Adobe Digital Edition Epubs that are protected with Adobe's Adept encryption. It is meant to function without having to install any dependencies... other than having Calibre installed, of course. It will still work if you have Python and PyCrypto already installed, but they aren't necessary.
-
-
-Installation:
-
-Go to Calibre's Preferences page. Do **NOT** select "Get plugins to enhance calibre" as this is reserved for "official" calibre plugins, instead select "Cahnge calibre behavior". Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file (ineptepub_vXX_plugin.zip) and click the 'Add' button. you're done.
-
-Please note:  Calibre does not provide any immediate feedback to indicate that adding the plugin was a success. You can always click on the File-Type plugins to see if the plugin was added.
-
-
-Configuration:
-
-When first run, the plugin will attempt to find your Adobe Digital Editions installation (on Windows and Mac OS's). If successful, it will create an 'adeptkey.der' file and save it in Calibre's configuration directory. It will use that file on subsequent runs. If there are already '*.der' files in the directory, the plugin won't attempt to find the Adobe Digital Editions installation installation.
-
-So if you have Adobe Digital Editions installation installed on the same machine as Calibre... you are ready to go. If not... keep reading.
-
-If you already have keyfiles generated with I♥Cabbages' ineptkey.pyw script, you can put those keyfiles in Calibre's configuration directory. The easiest way to find the correct directory is to go to Calibre's Preferences page... click on the 'Miscellaneous' button (looks like a gear),  and then click the 'Open Calibre configuration directory' button. Paste your keyfiles in there. Just make sure that they have different names and are saved with the '.der' extension (like the ineptkey script produces). This directory isn't touched when upgrading Calibre, so it's quite safe to leave them there.
-
-Since there is no Linux version of Adobe Digital Editions, Linux users will have to obtain a keyfile through other methods and put the file in Calibre's configuration directory.
-
-All keyfiles with a '.der' extension found in Calibre's configuration directory will be used to attempt to decrypt a book.
-
-
-** NOTE ** There is no plugin customization data for the Inept Epub DeDRM plugin.
-
-
-Troubleshooting:
-
-If you find that it's not working for you (imported epubs still have DRM), you can save a lot of time and trouble by trying to add the epub to Calibre with the command line tools. This will print out a lot of helpful debugging info that can be copied into any online help requests. I'm going to ask you to do it first, anyway, so you might as well get used to it. ;)
-
-Open a command prompt (terminal) and change to the directory where the ebook you're trying to import resides. Then type the command "calibredb add your_ebook.epub". Don't type the quotes and obviously change the 'your_ebook.epub' to whatever the filename of your book is. Copy the resulting output and paste it into any online help request you make.
-
-** Note: the Mac version of Calibre doesn't install the command line tools by default. If you go to the 'Preferences' page and click on the miscellaneous button, you'll see the option to install the command line tools.
-

Calibre_Plugins/Ineptpdf ReadMe.txt

@@ -1,39 +0,0 @@
-Inept PDF Plugin - ineptpdf_v01.5_plugin.zip
-
-All credit given to I♥Cabbages for the original standalone scripts.
-I had the much easier job of converting them to a Calibre plugin.
-
-This plugin is meant to decrypt Adobe Digital Edition PDFs that are protected with Adobe's Adept encryption. It is meant to function without having to install any dependencies... other than having Calibre installed, of course. It will still work if you have Python, PyCrypto and/or OpenSSL already installed, but they aren't necessary.
-
-
-Installation:
-
-Go to Calibre's Preferences page.  Do **NOT** select "Get plugins to enhance calibre" as this is reserved for "official" plugins, instead select "Change calibre behavior". Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file (ineptpdf_vXX_plugin.zip) and click the 'Add' button. you're done.
-
-Please note:  Calibre does not provide any immediate feedback to indicate that adding the plugin was a success. You can always click on the File-Type plugins to see if the plugin was added.
-
-
-Configuration:
-
-When first run, the plugin will attempt to find your Adobe Digital Editions installation (on Windows and Mac OS's). If successful, it will create an 'adeptkey.der' file and save it in Calibre's configuration directory. It will use that file on subsequent runs. If there are already '*.der' files in the directory, the plugin won't attempt to find the Adobe Digital Editions installation installation.
-
-So if you have Adobe Digital Editions installation installed on the same machine as Calibre... you are ready to go. If not... keep reading.
-
-If you already have keyfiles generated with I <3 Cabbages' ineptkey.pyw script, you can put those keyfiles in Calibre's configuration directory. The easiest way to find the correct directory is to go to Calibre's Preferences page... click on the 'Miscellaneous' button (looks like a gear),  and then click the 'Open Calibre configuration directory' button. Paste your keyfiles in there. Just make sure that
-they have different names and are saved with the '.der' extension (like the ineptkey script produces). This directory isn't touched when upgrading Calibre, so it's quite safe to leave them there.
-
-Since there is no Linux version of Adobe Digital Editions, Linux users will have to obtain a keyfile through other methods and put the file in Calibre's configuration directory.
-
-All keyfiles with a '.der' extension found in Calibre's configuration directory will be used to attempt to decrypt a book.
-
-** NOTE ** There is no plugin customization data for the Inept PDF plugin.
-
-
-Troubleshooting:
-
-If you find that it's not working for you (imported PDFs still have DRM), you can save a lot of time and trouble by trying to add the PDF to Calibre with the command line tools. This will print out a lot of helpful debugging info that can be copied into any online help requests. I'm going to ask you to do it first, anyway, so you might as well get used to it. ;)
-
-Open a command prompt (terminal) and change to the directory where the ebook you're trying to import resides. Then type the command "calibredb add your_ebook.pdf". Don't type the quotes and obviously change the 'your_ebook.pdf' to whatever the filename of your book is. Copy the resulting output and paste it into any online help request you make.
-
-** Note: the Mac version of Calibre doesn't install the command line tools by default. If you go to the 'Preferences' page and click on the miscellaneous button, you'll see the option to install the command line tools.
-

Calibre_Plugins/K4MobiDeDRM ReadMe.txt

@@ -1,37 +0,0 @@
-K4MobiDeDRM_v04.5_plugin.zip
-
-Credit given to The Dark Reverser for the original standalone script. Credit also to the many people who have updated and expanded that script since then.
-
-Plugin for K4PC, K4Mac, eInk Kindles and Mobipocket.
-
-This plugin supersedes MobiDeDRM, K4DeDRM, and K4PCDeDRM and K4X plugins.  If you install this plugin, those plugins can be safely removed.
-
-This plugin is meant to remove the DRM from .prc, .mobi, .azw, .azw1, .azw3, .azw4 and .tpz ebooks.   Calibre can then convert them to whatever format you desire. It is meant to function without having to install any  dependencies except for Calibre being on your same machine and in the same account as your "Kindle for PC" or "Kindle for Mac" application if you are going to remove the DRM from those types of books.
-
-
-Installation:
-
-Go to Calibre's Preferences page.  Do **NOT** select "Get Plugins to enhance calibre" as this is reserved for official calibre plugins", instead select "Change calibre behavior". Under "Advanced" click on the on the Plugins button. Click on the "Load plugin from file" button at the bottom of the screen.  Use the file dialog button to select the plugin's zip file  (K4MobiDeDRM_vXX_plugin.zip) and click the "Add" (or it may say "Open" button.  Then click on the "Yes" button in the warning dialog that appears.  A Confirmation dialog appears that says the plugin has been installed.
-
-
-Configuration:
-
-Highlight the plugin (K4MobiDeDRM under the "File type plugins" category) and click the "Customize Plugin" button on Calibre's Preferences->Plugins page. If you have an eInk Kindle enter the 16 digit serial number (these typically begin "B0..."). If you have more than one eInk Kindle, you can enter multiple serial numbers separated by commas (no spaces). If you have Mobipocket books, enter your 10 digit PID.  If you have more than one PID, separate them with commax (no spaces).
-
-This configuration step is not needed if you only want to decode "Kindle for PC" or "Kindle for Mac" books. 
-
-
-Linux Systems Only:
-
-If you install Kindle for PC in Wine, the plugin should be able to decode files from that Kindle for PC installation under Wine. You might need to enter a Wine Prefix if it's not already set in your Environment variables.
-
-
-Troubleshooting:
-
-If you find that it's not working for you, you can save a lot of time and trouble by trying to add the DRMed ebook to Calibre with the command line tools. This will print out a lot of helpful debugging info that can be copied into any online help requests. I'm going to ask you to do it first, anyway, so you might as well get used to it. ;)
-
-Open a command prompt (terminal) and change to the directory where the ebook you're trying to import resides. Then type the command "calibredb add your_ebook_file". Don't type the quotes and obviously change the 'your_ebook_file' to whatever the filename of your book is (including any file name extension like .azw). Copy the resulting output and paste it into any online help request you make.
-
-** Note: the Mac version of Calibre doesn't install the command line tools by default. If you go to the 'Preferences' page and click on the miscellaneous button, you'll see the option to install the command line tools.
-
-

Calibre_Plugins/K4MobiDeDRM_plugin/__init__.py

@@ -1,258 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import with_statement
-
-from calibre.customize import FileTypePlugin
-from calibre.gui2 import is_ok_to_use_qt
-from calibre.utils.config import config_dir
-from calibre.constants import iswindows, isosx
-# from calibre.ptempfile import PersistentTemporaryDirectory
-
-
-import sys
-import os
-import re
-from zipfile import ZipFile
-
-class K4DeDRM(FileTypePlugin):
-    name                = 'Kindle and Mobipocket DeDRM' # Name of the plugin
-    description         = 'Removes DRM from eInk Kindle, Kindle 4 Mac and Kindle 4 PC ebooks, and from Mobipocket ebooks. Provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, mdlnx, ApprenticeAlf, etc.'
-    supported_platforms = ['osx', 'windows', 'linux'] # Platforms this plugin will run on
-    author              = 'DiapDealer, SomeUpdates, mdlnx, Apprentice Alf' # The author of this plugin
-    version             = (0, 4, 5)   # The version number of this plugin
-    file_types          = set(['prc','mobi','azw','azw1','azw3','azw4','tpz']) # The file types that this plugin will be applied to
-    on_import           = True # Run this plugin during the import
-    priority            = 520  # run this plugin before earlier versions
-    minimum_calibre_version = (0, 7, 55)
-
-    def initialize(self):
-        """
-        Dynamic modules can't be imported/loaded from a zipfile... so this routine
-        runs whenever the plugin gets initialized. This will extract the appropriate
-        library for the target OS and copy it to the 'alfcrypto' subdirectory of
-        calibre's configuration directory. That 'alfcrypto' directory is then
-        inserted into the syspath (as the very first entry) in the run function
-        so the CDLL stuff will work in the alfcrypto.py script.
-        """
-        if iswindows:
-            names = ['alfcrypto.dll','alfcrypto64.dll']
-        elif isosx:
-            names = ['libalfcrypto.dylib']
-        else:
-            names = ['libalfcrypto32.so','libalfcrypto64.so','alfcrypto.py','alfcrypto.dll','alfcrypto64.dll','getk4pcpids.py','mobidedrm.py','kgenpids.py','k4pcutils.py','topazextract.py']
-        lib_dict = self.load_resources(names)
-        self.alfdir = os.path.join(config_dir, 'alfcrypto')
-        if not os.path.exists(self.alfdir):
-            os.mkdir(self.alfdir)
-        for entry, data in lib_dict.items():
-            file_path = os.path.join(self.alfdir, entry)
-            with open(file_path,'wb') as f:
-                f.write(data)
-
-    def run(self, path_to_ebook):
-        # add the alfcrypto directory to sys.path so alfcrypto.py 
-        # will be able to locate the custom lib(s) for CDLL import.
-        sys.path.insert(0, self.alfdir)
-        # Had to move these imports here so the custom libs can be
-        # extracted to the appropriate places beforehand these routines
-        # look for them.
-        from calibre_plugins.k4mobidedrm import kgenpids
-        from calibre_plugins.k4mobidedrm import topazextract
-        from calibre_plugins.k4mobidedrm import mobidedrm
-
-        plug_ver = '.'.join(str(self.version).strip('()').replace(' ', '').split(','))
-        k4 = True
-        pids = []
-        serials = []
-        kInfoFiles = []
-        self.config()
-        
-        # Get supplied list of PIDs to try from plugin customization.
-        pidstringlistt = self.pids_string.split(',')
-        for pid in pidstringlistt:
-            pid = str(pid).strip()
-            if len(pid) == 10 or len(pid) == 8:
-                pids.append(pid)
-            else:
-                if len(pid) > 0:
-                    print "'%s' is not a valid Mobipocket PID." % pid
-                        
-        # For linux, get PIDs by calling the right routines under WINE
-        if sys.platform.startswith('linux'):
-            k4 = False
-            pids.extend(self.WINEgetPIDs(path_to_ebook))
-            
-        # Get supplied list of Kindle serial numbers to try from plugin customization.
-        serialstringlistt = self.serials_string.split(',')
-        for serial in serialstringlistt:
-            serial = str(serial).strip()
-            if len(serial) == 16 and serial[0] == 'B':
-                serials.append(serial)
-            else:
-                if len(serial) > 0:
-                    print "'%s' is not a valid Kindle serial number." % serial
-                    
-        # Load any kindle info files (*.info) included Calibre's config directory.
-        try:
-            print 'K4MobiDeDRM v%s: Calibre configuration directory = %s' % (plug_ver, config_dir)
-            files = os.listdir(config_dir)
-            filefilter = re.compile("\.info$|\.kinf$", re.IGNORECASE)
-            files = filter(filefilter.search, files)
-            if files:
-                for filename in files:
-                    fpath = os.path.join(config_dir, filename)
-                    kInfoFiles.append(fpath)
-                print 'K4MobiDeDRM v%s: Kindle info/kinf file %s found in config folder.' % (plug_ver, filename)
-        except IOError:
-            print 'K4MobiDeDRM v%s: Error reading kindle info/kinf files from config directory.' % plug_ver
-            pass
-
-        mobi = True
-        magic3 = file(path_to_ebook,'rb').read(3)
-        if magic3 == 'TPZ':
-            mobi = False
-
-        bookname = os.path.splitext(os.path.basename(path_to_ebook))[0]
-
-        if mobi:
-            mb = mobidedrm.MobiBook(path_to_ebook)
-        else:
-            mb = topazextract.TopazBook(path_to_ebook)
-
-        title = mb.getBookTitle()
-        md1, md2 = mb.getPIDMetaInfo()
-        pidlst = kgenpids.getPidList(md1, md2, k4, pids, serials, kInfoFiles)
-
-        try:
-            mb.processBook(pidlst)
-
-        except mobidedrm.DrmException, e:
-            #if you reached here then no luck raise and exception
-            if is_ok_to_use_qt():
-                from PyQt4.Qt import QMessageBox
-                d = QMessageBox(QMessageBox.Warning, "K4MobiDeDRM v%s Plugin" % plug_ver, "Error: " + str(e) + "... %s\n" %  path_to_ebook)
-                d.show()
-                d.raise_()
-                d.exec_()
-            raise Exception("K4MobiDeDRM plugin v%s Error: %s" % (plug_ver, str(e)))
-        except topazextract.TpzDRMError, e:
-            #if you reached here then no luck raise and exception
-            if is_ok_to_use_qt():
-                from PyQt4.Qt import QMessageBox
-                d = QMessageBox(QMessageBox.Warning, "K4MobiDeDRM v%s Plugin" % plug_ver, "Error: " + str(e) + "... %s\n" % path_to_ebook)
-                d.show()
-                d.raise_()
-                d.exec_()
-            raise Exception("K4MobiDeDRM plugin v%s Error: %s" % (plug_ver, str(e)))
-
-        print "Success!"
-        if mobi:
-            if mb.getPrintReplica():
-                of = self.temporary_file(bookname+'.azw4')
-                print 'K4MobiDeDRM v%s: Print Replica format detected.' % plug_ver
-            elif mb.getMobiVersion() >= 8:
-                print 'K4MobiDeDRM v%s: Stand-alone KF8 format detected.' % plug_ver
-                of = self.temporary_file(bookname+'.azw3')
-            else:
-                of = self.temporary_file(bookname+'.mobi')
-            mb.getMobiFile(of.name)
-        else:
-            of = self.temporary_file(bookname+'.htmlz')
-            mb.getHTMLZip(of.name)
-            mb.cleanup()
-        return of.name
-
-    def WINEgetPIDs(self, infile):
-
-        import subprocess
-        from subprocess import Popen, PIPE, STDOUT
-
-        import subasyncio
-        from subasyncio import Process
-
-        print "   Getting PIDs from WINE"
-
-        outfile = os.path.join(self.alfdir + 'winepids.txt')
-        # Remove any previous winepids.txt file.
-        if os.path.exists(outfile):
-            os.remove(outfile)
-
-        cmdline = 'wine python.exe ' \
-                  + '"'+self.alfdir + '/getk4pcpids.py"' \
-                  + ' "' + infile + '"' \
-                  + ' "' + outfile + '"'
-
-        env = os.environ
-        
-        print "My wine_prefix from tweaks is ", self.wine_prefix
-
-        if ("WINEPREFIX" in env):
-            print "Using WINEPREFIX from the environment: ", env["WINEPREFIX"]
-        elif (self.wine_prefix is not None):
-            env['WINEPREFIX'] = self.wine_prefix
-            print "Using WINEPREFIX from tweaks: ", self.wine_prefix
-        else:
-            print "No wine prefix used"
-
-        print 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 "WINE subprocess error ", str(e)
-            return []
-        print "WINE subprocess returned ", result
-        
-        WINEpids = []
-        if os.path.exists(outfile):
-            try:
-                customvalues = file(outfile, 'r').readline().split(',')
-                for customvalue in customvalues:
-                    customvalue = str(customvalue)
-                    customvalue = customvalue.strip()
-                    if len(customvalue) == 10 or len(customvalue) == 8:
-                        WINEpids.append(customvalue)
-                    else:
-                        print "'%s' is not a valid PID." % customvalue
-            except Exception, e:
-                print "Error parsing winepids.txt: ", str(e)
-                return []
-        else:
-            print "No PIDs generated by Wine Python subprocess."
-        return WINEpids
-
-    def is_customizable(self):
-        # return true to allow customization via the Plugin->Preferences.
-        return True
-
-    def config_widget(self):
-        # It is important to put this import statement here rather than at the
-        # top of the module as importing the config class will also cause the
-        # GUI libraries to be loaded, which we do not want when using calibre
-        # from the command line
-        from calibre_plugins.k4mobidedrm.config import ConfigWidget
-        return config.ConfigWidget()
-    
-    def config(self):
-        from calibre_plugins.k4mobidedrm.config import prefs
-        
-        self.pids_string = prefs['pids']
-        self.serials_string = prefs['serials']
-        self.wine_prefix = prefs['WINEPREFIX']
-        
-    def save_settings(self, config_widget):
-        '''
-        Save the settings specified by the user with config_widget.
-        '''
-        config_widget.save_settings()
-        self.config()
-
-    def load_resources(self, names):
-        ans = {}
-        with ZipFile(self.plugin_path, 'r') as zf:
-            for candidate in zf.namelist():
-                if candidate in names:
-                    ans[candidate] = zf.read(candidate)
-        return ans

Calibre_Plugins/K4MobiDeDRM_plugin/cmbtc_v2.2.py

@@ -1,899 +0,0 @@
-#! /usr/bin/python
-
-"""
-
-Comprehensive Mazama Book DRM with Topaz Cryptography V2.2
-
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdBHJ4CNc6DNFCw4MRCw4SWAK6
-M8hYfnNEI0yQmn5Ti+W8biT7EatpauE/5jgQMPBmdNrDr1hbHyHBSP7xeC2qlRWC
-B62UCxeu/fpfnvNHDN/wPWWH4jynZ2M6cdcnE5LQ+FfeKqZn7gnG2No1U9h7oOHx
-y2/pHuYme7U1TsgSjwIDAQAB
------END PUBLIC KEY-----
-
-"""
-
-from __future__ import with_statement
-
-import csv
-import sys
-import os
-import getopt
-import zlib
-from struct import pack
-from struct import unpack
-from ctypes import windll, c_char_p, c_wchar_p, c_uint, POINTER, byref, \
-    create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \
-    string_at, Structure, c_void_p, cast
-import _winreg as winreg
-import Tkinter
-import Tkconstants
-import tkMessageBox
-import traceback
-import hashlib
-
-MAX_PATH = 255
-
-kernel32 = windll.kernel32
-advapi32 = windll.advapi32
-crypt32 = windll.crypt32
-
-global kindleDatabase
-global bookFile
-global bookPayloadOffset
-global bookHeaderRecords
-global bookMetadata
-global bookKey
-global command
-
-#
-# Various character maps used to decrypt books. Probably supposed to act as obfuscation
-#
-
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-charMap2 = "AaZzB0bYyCc1XxDdW2wEeVv3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_"
-charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
-
-#
-# Exceptions for all the problems that might happen during the script
-#
-
-class CMBDTCError(Exception):
-    pass
-
-class CMBDTCFatal(Exception):
-    pass
-
-#
-# Stolen stuff
-#
-
-class DataBlob(Structure):
-    _fields_ = [('cbData', c_uint),
-                ('pbData', c_void_p)]
-DataBlob_p = POINTER(DataBlob)
-
-def GetSystemDirectory():
-    GetSystemDirectoryW = kernel32.GetSystemDirectoryW
-    GetSystemDirectoryW.argtypes = [c_wchar_p, c_uint]
-    GetSystemDirectoryW.restype = c_uint
-    def GetSystemDirectory():
-        buffer = create_unicode_buffer(MAX_PATH + 1)
-        GetSystemDirectoryW(buffer, len(buffer))
-        return buffer.value
-    return GetSystemDirectory
-GetSystemDirectory = GetSystemDirectory()
-
-
-def GetVolumeSerialNumber():
-    GetVolumeInformationW = kernel32.GetVolumeInformationW
-    GetVolumeInformationW.argtypes = [c_wchar_p, c_wchar_p, c_uint,
-                                      POINTER(c_uint), POINTER(c_uint),
-                                      POINTER(c_uint), c_wchar_p, c_uint]
-    GetVolumeInformationW.restype = c_uint
-    def GetVolumeSerialNumber(path):
-        vsn = c_uint(0)
-        GetVolumeInformationW(path, None, 0, byref(vsn), None, None, None, 0)
-        return vsn.value
-    return GetVolumeSerialNumber
-GetVolumeSerialNumber = GetVolumeSerialNumber()
-
-
-def GetUserName():
-    GetUserNameW = advapi32.GetUserNameW
-    GetUserNameW.argtypes = [c_wchar_p, POINTER(c_uint)]
-    GetUserNameW.restype = c_uint
-    def GetUserName():
-        buffer = create_unicode_buffer(32)
-        size = c_uint(len(buffer))
-        while not GetUserNameW(buffer, byref(size)):
-            buffer = create_unicode_buffer(len(buffer) * 2)
-            size.value = len(buffer)
-        return buffer.value.encode('utf-16-le')[::2]
-    return GetUserName
-GetUserName = GetUserName()
-
-
-def CryptUnprotectData():
-    _CryptUnprotectData = crypt32.CryptUnprotectData
-    _CryptUnprotectData.argtypes = [DataBlob_p, c_wchar_p, DataBlob_p,
-                                   c_void_p, c_void_p, c_uint, DataBlob_p]
-    _CryptUnprotectData.restype = c_uint
-    def CryptUnprotectData(indata, entropy):
-        indatab = create_string_buffer(indata)
-        indata = DataBlob(len(indata), cast(indatab, c_void_p))
-        entropyb = create_string_buffer(entropy)
-        entropy = DataBlob(len(entropy), cast(entropyb, c_void_p))
-        outdata = DataBlob()
-        if not _CryptUnprotectData(byref(indata), None, byref(entropy),
-                                   None, None, 0, byref(outdata)):
-            raise CMBDTCFatal("Failed to Unprotect Data")
-        return string_at(outdata.pbData, outdata.cbData)
-    return CryptUnprotectData
-CryptUnprotectData = CryptUnprotectData()
-
-#
-# Returns the MD5 digest of "message"
-#
-
-def MD5(message):
-    ctx = hashlib.md5()
-    ctx.update(message)
-    return ctx.digest()
-
-#
-# Returns the MD5 digest of "message"
-#
-
-def SHA1(message):
-    ctx = hashlib.sha1()
-    ctx.update(message)
-    return ctx.digest()
-
-#
-# Open the book file at path
-#
-
-def openBook(path):
-    try:
-        return open(path,'rb')
-    except:
-        raise CMBDTCFatal("Could not open book file: " + path)
-#
-# Encode the bytes in data with the characters in map
-#
-
-def encode(data, map):
-    result = ""
-    for char in data:
-        value = ord(char)
-        Q = (value ^ 0x80) // len(map)
-        R = value % len(map)
-        result += map[Q]
-        result += map[R]
-    return result
-
-#
-# Hash the bytes in data and then encode the digest with the characters in map
-#
-
-def encodeHash(data,map):
-    return encode(MD5(data),map)
-
-#
-# Decode the string in data with the characters in map. Returns the decoded bytes
-#
-
-def decode(data,map):
-    result = ""
-    for i in range (0,len(data),2):
-        high = map.find(data[i])
-        low = map.find(data[i+1])
-        value = (((high * 0x40) ^ 0x80) & 0xFF) + low
-        result += pack("B",value)
-    return result
-
-#
-# Locate and open the Kindle.info file (Hopefully in the way it is done in the Kindle application)
-#
-
-def openKindleInfo():
-    regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
-    path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
-    return open(path+'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info','r')
-
-#
-# Parse the Kindle.info file and return the records as a list of key-values
-#
-
-def parseKindleInfo():
-    DB = {}
-    infoReader = openKindleInfo()
-    infoReader.read(1)
-    data = infoReader.read()
-    items = data.split('{')
-
-    for item in items:
-        splito = item.split(':')
-        DB[splito[0]] =splito[1]
-    return DB
-
-#
-# Find if the original string for a hashed/encoded string is known. If so return the original string othwise return an empty string. (Totally not optimal)
-#
-
-def findNameForHash(hash):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
-    result = ""
-    for name in names:
-        if hash == encodeHash(name, charMap2):
-            result = name
-            break
-    return name
-
-#
-# Print all the records from the kindle.info file (option -i)
-#
-
-def printKindleInfo():
-    for record in kindleDatabase:
-        name = findNameForHash(record)
-        if name != "" :
-            print (name)
-            print ("--------------------------\n")
-        else :
-            print ("Unknown Record")
-        print getKindleInfoValueForHash(record)
-        print "\n"
-#
-# Get a record from the Kindle.info file for the key "hashedKey" (already hashed and encoded). Return the decoded and decrypted record
-#
-
-def getKindleInfoValueForHash(hashedKey):
-    global kindleDatabase
-    encryptedValue = decode(kindleDatabase[hashedKey],charMap2)
-    return CryptUnprotectData(encryptedValue,"")
-
-#
-#  Get a record from the Kindle.info file for the string in "key" (plaintext). Return the decoded and decrypted record
-#
-
-def getKindleInfoValueForKey(key):
-    return getKindleInfoValueForHash(encodeHash(key,charMap2))
-
-#
-# Get a 7 bit encoded number from the book file
-#
-
-def bookReadEncodedNumber():
-    flag = False
-    data = ord(bookFile.read(1))
-
-    if data == 0xFF:
-        flag = True
-        data = ord(bookFile.read(1))
-
-    if data >= 0x80:
-        datax = (data & 0x7F)
-        while data >= 0x80 :
-            data = ord(bookFile.read(1))
-            datax = (datax <<7) + (data & 0x7F)
-        data = datax
-
-    if flag:
-        data = -data
-    return data
-
-#
-# Encode a number in 7 bit format
-#
-
-def encodeNumber(number):
-    result = ""
-    negative = False
-    flag = 0
-
-    if number < 0 :
-        number = -number + 1
-        negative = True
-
-    while True:
-        byte = number & 0x7F
-        number = number >> 7
-        byte += flag
-        result += chr(byte)
-        flag = 0x80
-        if number == 0 :
-            if (byte == 0xFF and negative == False) :
-                result += chr(0x80)
-            break
-
-    if negative:
-        result += chr(0xFF)
-
-    return result[::-1]
-
-#
-# Get a length prefixed string from the file
-#
-
-def bookReadString():
-    stringLength = bookReadEncodedNumber()
-    return unpack(str(stringLength)+"s",bookFile.read(stringLength))[0]
-
-#
-# Returns a length prefixed string
-#
-
-def lengthPrefixString(data):
-    return encodeNumber(len(data))+data
-
-
-#
-# Read and return the data of one header record at the current book file position [[offset,compressedLength,decompressedLength],...]
-#
-
-def bookReadHeaderRecordData():
-    nbValues = bookReadEncodedNumber()
-    values = []
-    for i in range (0,nbValues):
-        values.append([bookReadEncodedNumber(),bookReadEncodedNumber(),bookReadEncodedNumber()])
-    return values
-
-#
-# Read and parse one header record at the current book file position and return the associated data [[offset,compressedLength,decompressedLength],...]
-#
-
-def parseTopazHeaderRecord():
-    if ord(bookFile.read(1)) != 0x63:
-        raise CMBDTCFatal("Parse Error : Invalid Header")
-
-    tag = bookReadString()
-    record = bookReadHeaderRecordData()
-    return [tag,record]
-
-#
-# Parse the header of a Topaz file, get all the header records and the offset for the payload
-#
-
-def parseTopazHeader():
-    global bookHeaderRecords
-    global bookPayloadOffset
-    magic = unpack("4s",bookFile.read(4))[0]
-
-    if magic != 'TPZ0':
-        raise CMBDTCFatal("Parse Error : Invalid Header, not a Topaz file")
-
-    nbRecords = bookReadEncodedNumber()
-    bookHeaderRecords = {}
-
-    for i in range (0,nbRecords):
-        result = parseTopazHeaderRecord()
-        bookHeaderRecords[result[0]] = result[1]
-
-    if ord(bookFile.read(1))  != 0x64 :
-        raise CMBDTCFatal("Parse Error : Invalid Header")
-
-    bookPayloadOffset = bookFile.tell()
-
-#
-# Get a record in the book payload, given its name and index. If necessary the record is decrypted. The record is not decompressed
-#
-
-def getBookPayloadRecord(name, index):
-    encrypted = False
-
-    try:
-        recordOffset = bookHeaderRecords[name][index][0]
-    except:
-        raise CMBDTCFatal("Parse Error : Invalid Record, record not found")
-
-    bookFile.seek(bookPayloadOffset + recordOffset)
-
-    tag = bookReadString()
-    if tag != name :
-        raise CMBDTCFatal("Parse Error : Invalid Record, record name doesn't match")
-
-    recordIndex = bookReadEncodedNumber()
-
-    if recordIndex < 0 :
-        encrypted = True
-        recordIndex = -recordIndex -1
-
-    if recordIndex != index :
-        raise CMBDTCFatal("Parse Error : Invalid Record, index doesn't match")
-
-    if bookHeaderRecords[name][index][2] != 0 :
-        record = bookFile.read(bookHeaderRecords[name][index][2])
-    else:
-        record = bookFile.read(bookHeaderRecords[name][index][1])
-
-    if encrypted:
-        ctx = topazCryptoInit(bookKey)
-        record = topazCryptoDecrypt(record,ctx)
-
-    return record
-
-#
-# Extract, decrypt and decompress a book record indicated by name and index and print it or save it in "filename"
-#
-
-def extractBookPayloadRecord(name, index, filename):
-    compressed = False
-
-    try:
-        compressed = bookHeaderRecords[name][index][2] != 0
-        record = getBookPayloadRecord(name,index)
-    except:
-        print("Could not find record")
-
-    if compressed:
-        try:
-            record = zlib.decompress(record)
-        except:
-            raise CMBDTCFatal("Could not decompress record")
-
-    if filename != "":
-        try:
-            file = open(filename,"wb")
-            file.write(record)
-            file.close()
-        except:
-            raise CMBDTCFatal("Could not write to destination file")
-    else:
-        print(record)
-
-#
-# return next record [key,value] from the book metadata from the current book position
-#
-
-def readMetadataRecord():
-    return [bookReadString(),bookReadString()]
-
-#
-# Parse the metadata record from the book payload and return a list of [key,values]
-#
-
-def parseMetadata():
-    global bookHeaderRecords
-    global bookPayloadAddress
-    global bookMetadata
-    bookMetadata = {}
-    bookFile.seek(bookPayloadOffset + bookHeaderRecords["metadata"][0][0])
-    tag = bookReadString()
-    if tag != "metadata" :
-        raise CMBDTCFatal("Parse Error : Record Names Don't Match")
-
-    flags = ord(bookFile.read(1))
-    nbRecords = ord(bookFile.read(1))
-
-    for i in range (0,nbRecords) :
-        record =readMetadataRecord()
-        bookMetadata[record[0]] = record[1]
-
-#
-# Returns two bit at offset from a bit field
-#
-
-def getTwoBitsFromBitField(bitField,offset):
-    byteNumber = offset // 4
-    bitPosition = 6 - 2*(offset % 4)
-
-    return ord(bitField[byteNumber]) >> bitPosition & 3
-
-#
-# Returns the six bits at offset from a bit field
-#
-
-def getSixBitsFromBitField(bitField,offset):
-    offset *= 3
-    value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
-    return value
-
-#
-# 8 bits to six bits encoding from hash to generate PID string
-#
-
-def encodePID(hash):
-    global charMap3
-    PID = ""
-    for position in range (0,8):
-        PID += charMap3[getSixBitsFromBitField(hash,position)]
-    return PID
-
-#
-# Context initialisation for the Topaz Crypto
-#
-
-def topazCryptoInit(key):
-    ctx1 = 0x0CAFFE19E
-
-    for keyChar in key:
-        keyByte = ord(keyChar)
-        ctx2 = ctx1
-        ctx1 = ((((ctx1 >>2) * (ctx1 >>7))&0xFFFFFFFF) ^ (keyByte * keyByte * 0x0F902007)& 0xFFFFFFFF )
-    return [ctx1,ctx2]
-
-#
-# decrypt data with the context prepared by topazCryptoInit()
-#
-
-def topazCryptoDecrypt(data, ctx):
-    ctx1 = ctx[0]
-    ctx2 = ctx[1]
-
-    plainText = ""
-
-    for dataChar in data:
-        dataByte = ord(dataChar)
-        m = (dataByte ^ ((ctx1 >> 3) &0xFF) ^ ((ctx2<<3) & 0xFF)) &0xFF
-        ctx2 = ctx1
-        ctx1 = (((ctx1 >> 2) * (ctx1 >> 7)) &0xFFFFFFFF) ^((m * m * 0x0F902007) &0xFFFFFFFF)
-        plainText += chr(m)
-
-    return plainText
-
-#
-# Decrypt a payload record with the PID
-#
-
-def decryptRecord(data,PID):
-    ctx = topazCryptoInit(PID)
-    return topazCryptoDecrypt(data, ctx)
-
-#
-# Try to decrypt a dkey record (contains the book PID)
-#
-
-def decryptDkeyRecord(data,PID):
-    record = decryptRecord(data,PID)
-    fields = unpack("3sB8sB8s3s",record)
-
-    if fields[0] != "PID" or fields[5] != "pid" :
-        raise CMBDTCError("Didn't find PID magic numbers in record")
-    elif fields[1] != 8 or fields[3] != 8 :
-        raise CMBDTCError("Record didn't contain correct length fields")
-    elif fields[2] != PID :
-        raise CMBDTCError("Record didn't contain PID")
-
-    return fields[4]
-
-#
-# Decrypt all the book's dkey records (contain the book PID)
-#
-
-def decryptDkeyRecords(data,PID):
-    nbKeyRecords = ord(data[0])
-    records = []
-    data = data[1:]
-    for i in range (0,nbKeyRecords):
-        length = ord(data[0])
-        try:
-            key = decryptDkeyRecord(data[1:length+1],PID)
-            records.append(key)
-        except CMBDTCError:
-            pass
-        data = data[1+length:]
-
-    return records
-
-#
-# Encryption table used to generate the device PID
-#
-
-def generatePidEncryptionTable() :
-    table = []
-    for counter1 in range (0,0x100):
-        value = counter1
-        for counter2 in range (0,8):
-            if (value & 1 == 0) :
-                value = value >> 1
-            else :
-                value = value >> 1
-                value = value ^ 0xEDB88320
-        table.append(value)
-    return table
-
-#
-# Seed value used to generate the device PID
-#
-
-def generatePidSeed(table,dsn) :
-    value = 0
-    for counter in range (0,4) :
-        index = (ord(dsn[counter]) ^ value) &0xFF
-        value = (value >> 8) ^ table[index]
-    return value
-
-#
-# Generate the device PID
-#
-
-def generateDevicePID(table,dsn,nbRoll):
-    seed = generatePidSeed(table,dsn)
-    pidAscii = ""
-    pid = [(seed >>24) &0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF,(seed>>24) & 0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF]
-    index = 0
-
-    for counter in range (0,nbRoll):
-        pid[index] = pid[index] ^ ord(dsn[counter])
-        index = (index+1) %8
-
-    for counter in range (0,8):
-        index = ((((pid[counter] >>5) & 3) ^ pid[counter]) & 0x1f) + (pid[counter] >> 7)
-        pidAscii += charMap4[index]
-    return pidAscii
-
-#
-# Create decrypted book payload
-#
-
-def createDecryptedPayload(payload):
-
-    # store data to be able to create the header later
-    headerData= []
-    currentOffset = 0
-
-    # Add social DRM to decrypted files
-
-    try:
-        data = getKindleInfoValueForKey("kindle.name.info")+":"+ getKindleInfoValueForKey("login")
-        if payload!= None:
-            payload.write(lengthPrefixString("sdrm"))
-            payload.write(encodeNumber(0))
-            payload.write(data)
-        else:
-            currentOffset += len(lengthPrefixString("sdrm"))
-            currentOffset += len(encodeNumber(0))
-            currentOffset += len(data)
-    except:
-        pass
-
-    for headerRecord in bookHeaderRecords:
-        name = headerRecord
-        newRecord = []
-
-        if name != "dkey" :
-
-            for index in range (0,len(bookHeaderRecords[name])) :
-                offset = currentOffset
-
-                if payload != None:
-                    # write tag
-                    payload.write(lengthPrefixString(name))
-                    # write data
-                    payload.write(encodeNumber(index))
-                    payload.write(getBookPayloadRecord(name, index))
-
-                else :
-                    currentOffset += len(lengthPrefixString(name))
-                    currentOffset += len(encodeNumber(index))
-                    currentOffset += len(getBookPayloadRecord(name, index))
-                    newRecord.append([offset,bookHeaderRecords[name][index][1],bookHeaderRecords[name][index][2]])
-
-        headerData.append([name,newRecord])
-
-
-
-    return headerData
-
-#
-# Create decrypted book
-#
-
-def createDecryptedBook(outputFile):
-    outputFile = open(outputFile,"wb")
-    # Write the payload in a temporary file
-    headerData = createDecryptedPayload(None)
-    outputFile.write("TPZ0")
-    outputFile.write(encodeNumber(len(headerData)))
-
-    for header in headerData :
-        outputFile.write(chr(0x63))
-        outputFile.write(lengthPrefixString(header[0]))
-        outputFile.write(encodeNumber(len(header[1])))
-        for numbers in header[1] :
-            outputFile.write(encodeNumber(numbers[0]))
-            outputFile.write(encodeNumber(numbers[1]))
-            outputFile.write(encodeNumber(numbers[2]))
-
-    outputFile.write(chr(0x64))
-    createDecryptedPayload(outputFile)
-    outputFile.close()
-
-#
-# Set the command to execute by the programm according to cmdLine parameters
-#
-
-def setCommand(name) :
-    global command
-    if command != "" :
-        raise CMBDTCFatal("Invalid command line parameters")
-    else :
-        command = name
-
-#
-# Program usage
-#
-
-def usage():
-    print("\nUsage:")
-    print("\nCMBDTC.py [options] bookFileName\n")
-    print("-p Adds a PID to the list of PIDs that are tried to decrypt the book key (can be used several times)")
-    print("-d Saves a decrypted copy of the book")
-    print("-r Prints or writes to disk a record indicated in the form name:index (e.g \"img:0\")")
-    print("-o Output file name to write records and decrypted books")
-    print("-v Verbose (can be used several times)")
-    print("-i Prints kindle.info database")
-
-#
-# Main
-#
-
-def main(argv=sys.argv):
-    global kindleDatabase
-    global bookMetadata
-    global bookKey
-    global bookFile
-    global command
-
-    progname = os.path.basename(argv[0])
-
-    verbose = 0
-    recordName = ""
-    recordIndex = 0
-    outputFile = ""
-    PIDs = []
-    kindleDatabase = None
-    command = ""
-
-
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], "vdir:o:p:")
-    except getopt.GetoptError, err:
-        # print help information and exit:
-        print str(err) # will print something like "option -a not recognized"
-        usage()
-        sys.exit(2)
-
-    if len(opts) == 0 and len(args) == 0 :
-        usage()
-        sys.exit(2)
-
-    for o, a in opts:
-        if o == "-v":
-            verbose+=1
-        if o == "-i":
-            setCommand("printInfo")
-        if o =="-o":
-            if a == None :
-                raise CMBDTCFatal("Invalid parameter for -o")
-            outputFile = a
-        if o =="-r":
-            setCommand("printRecord")
-            try:
-                recordName,recordIndex = a.split(':')
-            except:
-                raise CMBDTCFatal("Invalid parameter for -r")
-        if o =="-p":
-            PIDs.append(a)
-        if o =="-d":
-            setCommand("doit")
-
-    if command == "" :
-        raise CMBDTCFatal("No action supplied on command line")
-
-    #
-    # Read the encrypted database
-    #
-
-    try:
-        kindleDatabase = parseKindleInfo()
-    except Exception, message:
-        if verbose>0:
-            print(message)
-
-    if kindleDatabase != None :
-        if command == "printInfo" :
-            printKindleInfo()
-
-    #
-    # Compute the DSN
-    #
-
-    # Get the Mazama Random number
-        MazamaRandomNumber = getKindleInfoValueForKey("MazamaRandomNumber")
-
-    # Get the HDD serial
-        encodedSystemVolumeSerialNumber = encodeHash(str(GetVolumeSerialNumber(GetSystemDirectory().split('\\')[0] + '\\')),charMap1)
-
-    # Get the current user name
-        encodedUsername = encodeHash(GetUserName(),charMap1)
-
-    # concat, hash and encode
-        DSN = encode(SHA1(MazamaRandomNumber+encodedSystemVolumeSerialNumber+encodedUsername),charMap1)
-
-        if verbose >1:
-            print("DSN: " + DSN)
-
-    #
-    # Compute the device PID
-    #
-
-        table =  generatePidEncryptionTable()
-        devicePID = generateDevicePID(table,DSN,4)
-        PIDs.append(devicePID)
-
-        if verbose > 0:
-            print("Device PID: " + devicePID)
-
-    #
-    # Open book and parse metadata
-    #
-
-    if len(args) == 1:
-
-        bookFile = openBook(args[0])
-        parseTopazHeader()
-        parseMetadata()
-
-    #
-    # Compute book PID
-    #
-
-    # Get the account token
-
-        if kindleDatabase != None:
-            kindleAccountToken = getKindleInfoValueForKey("kindle.account.tokens")
-
-            if verbose >1:
-                print("Account Token: " + kindleAccountToken)
-
-            keysRecord = bookMetadata["keys"]
-            keysRecordRecord = bookMetadata[keysRecord]
-
-            pidHash = SHA1(DSN+kindleAccountToken+keysRecord+keysRecordRecord)
-
-            bookPID = encodePID(pidHash)
-            PIDs.append(bookPID)
-
-            if verbose > 0:
-                print ("Book PID: " + bookPID )
-
-    #
-    #  Decrypt book key
-    #
-
-        dkey = getBookPayloadRecord('dkey', 0)
-
-        bookKeys = []
-        for PID in PIDs :
-            bookKeys+=decryptDkeyRecords(dkey,PID)
-
-        if len(bookKeys) == 0 :
-            if verbose > 0 :
-                print ("Book key could not be found. Maybe this book is not registered with this device.")
-        else :
-            bookKey = bookKeys[0]
-            if verbose > 0:
-                print("Book key: " + bookKey.encode('hex'))
-
-
-
-            if command == "printRecord" :
-                extractBookPayloadRecord(recordName,int(recordIndex),outputFile)
-                if outputFile != "" and verbose>0 :
-                    print("Wrote record to file: "+outputFile)
-            elif command == "doit" :
-                if outputFile!="" :
-                    createDecryptedBook(outputFile)
-                    if verbose >0 :
-                        print ("Decrypted book saved. Don't pirate!")
-                elif verbose > 0:
-                    print("Output file name was not supplied.")
-
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main())

Calibre_Plugins/K4MobiDeDRM_plugin/config.py

@@ -1,59 +0,0 @@
-from PyQt4.Qt import QWidget, QVBoxLayout, QLabel, QLineEdit
-
-from calibre.utils.config import JSONConfig
-
-# This is where all preferences for this plugin will be stored
-# You should always prefix your config file name with plugins/,
-# so as to ensure you dont accidentally clobber a calibre config file
-prefs = JSONConfig('plugins/K4MobiDeDRM')
-
-# Set defaults
-prefs.defaults['pids'] = ""
-prefs.defaults['serials'] = ""
-prefs.defaults['WINEPREFIX'] = None
-
-
-class ConfigWidget(QWidget):
-
-    def __init__(self):
-        QWidget.__init__(self)
-        self.l = QVBoxLayout()
-        self.setLayout(self.l)
-
-        self.serialLabel = QLabel('Kindle Serial numbers (separate with commas, no spaces)')
-        self.l.addWidget(self.serialLabel)
-
-        self.serials = QLineEdit(self)
-        self.serials.setText(prefs['serials'])
-        self.l.addWidget(self.serials)
-        self.serialLabel.setBuddy(self.serials)
-
-        self.pidLabel = QLabel('Mobipocket PIDs (separate with commas, no spaces)')
-        self.l.addWidget(self.pidLabel)
-
-        self.pids = QLineEdit(self)
-        self.pids.setText(prefs['pids'])
-        self.l.addWidget(self.pids)
-        self.pidLabel.setBuddy(self.serials)
-
-        self.wpLabel = QLabel('For Linux only: WINEPREFIX (enter absolute path)')
-        self.l.addWidget(self.wpLabel)
-
-        self.wineprefix = QLineEdit(self)
-        wineprefix = prefs['WINEPREFIX']
-        if wineprefix is not None:
-            self.wineprefix.setText(wineprefix)
-        else:
-            self.wineprefix.setText('')
-
-        self.l.addWidget(self.wineprefix)
-        self.wpLabel.setBuddy(self.wineprefix)
-
-    def save_settings(self):
-        prefs['pids'] = str(self.pids.text())
-        prefs['serials'] = str(self.serials.text())
-        winepref=str(self.wineprefix.text())
-        if winepref.strip() != '':
-            prefs['WINEPREFIX'] = winepref
-        else:
-            prefs['WINEPREFIX'] = None

Calibre_Plugins/K4MobiDeDRM_plugin/flatxml2html.py

@@ -1,793 +0,0 @@
-#! /usr/bin/python
-# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
-# For use with Topaz Scripts Version 2.6
-
-import sys
-import csv
-import os
-import math
-import getopt
-from struct import pack
-from struct import unpack
-
-
-class DocParser(object):
-    def __init__(self, flatxml, classlst, fileid, bookDir, gdict, fixedimage):
-        self.id = os.path.basename(fileid).replace('.dat','')
-        self.svgcount = 0
-        self.docList = flatxml.split('\n')
-        self.docSize = len(self.docList)
-        self.classList = {}
-        self.bookDir = bookDir
-        self.gdict = gdict
-        tmpList = classlst.split('\n')
-        for pclass in tmpList:
-            if pclass != '':
-                # remove the leading period from the css name
-                cname = pclass[1:]
-            self.classList[cname] = True
-        self.fixedimage = fixedimage
-        self.ocrtext = []
-        self.link_id = []
-        self.link_title = []
-        self.link_page = []
-        self.link_href = []
-        self.link_type = []
-        self.dehyphen_rootid = []
-        self.paracont_stemid = []
-        self.parastems_stemid = []
-
-
-    def getGlyph(self, gid):
-        result = ''
-        id='id="gl%d"' % gid
-        return self.gdict.lookup(id)
-
-    def glyphs_to_image(self, glyphList):
-
-        def extract(path, key):
-            b = path.find(key) + len(key)
-            e = path.find(' ',b)
-            return int(path[b:e])
-
-        svgDir = os.path.join(self.bookDir,'svg')
-
-        imgDir = os.path.join(self.bookDir,'img')
-        imgname = self.id + '_%04d.svg' % self.svgcount
-        imgfile = os.path.join(imgDir,imgname)
-
-        # get glyph information
-        gxList = self.getData('info.glyph.x',0,-1)
-        gyList = self.getData('info.glyph.y',0,-1)
-        gidList = self.getData('info.glyph.glyphID',0,-1)
-
-        gids = []
-        maxws = []
-        maxhs = []
-        xs = []
-        ys = []
-        gdefs = []
-
-        # get path defintions, positions, dimensions for each glyph
-        # that makes up the image, and find min x and min y to reposition origin
-        minx = -1
-        miny = -1
-        for j in glyphList:
-            gid = gidList[j]
-            gids.append(gid)
-
-            xs.append(gxList[j])
-            if minx == -1: minx = gxList[j]
-            else : minx = min(minx, gxList[j])
-
-            ys.append(gyList[j])
-            if miny == -1: miny = gyList[j]
-            else : miny = min(miny, gyList[j])
-
-            path = self.getGlyph(gid)
-            gdefs.append(path)
-
-            maxws.append(extract(path,'width='))
-            maxhs.append(extract(path,'height='))
-
-
-        # change the origin to minx, miny and calc max height and width
-        maxw = maxws[0] + xs[0] - minx
-        maxh = maxhs[0] + ys[0] - miny
-        for j in xrange(0, len(xs)):
-            xs[j] = xs[j] - minx
-            ys[j] = ys[j] - miny
-            maxw = max( maxw, (maxws[j] + xs[j]) )
-            maxh = max( maxh, (maxhs[j] + ys[j]) )
-
-        # open the image file for output
-        ifile = open(imgfile,'w')
-        ifile.write('<?xml version="1.0" standalone="no"?>\n')
-        ifile.write('<!DOCTYPE svg PUBLIC "-//W3C/DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n')
-        ifile.write('<svg width="%dpx" height="%dpx" viewBox="0 0 %d %d" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">\n' % (math.floor(maxw/10), math.floor(maxh/10), maxw, maxh))
-        ifile.write('<defs>\n')
-        for j in xrange(0,len(gdefs)):
-            ifile.write(gdefs[j])
-        ifile.write('</defs>\n')
-        for j in xrange(0,len(gids)):
-            ifile.write('<use xlink:href="#gl%d" x="%d" y="%d" />\n' % (gids[j], xs[j], ys[j]))
-        ifile.write('</svg>')
-        ifile.close()
-
-        return 0
-
-
-
-    # return tag at line pos in document
-    def lineinDoc(self, pos) :
-        if (pos >= 0) and (pos < self.docSize) :
-            item = self.docList[pos]
-            if item.find('=') >= 0:
-                (name, argres) = item.split('=',1)
-            else :
-                name = item
-                argres = ''
-        return name, argres
-
-
-    # find tag in doc if within pos to end inclusive
-    def findinDoc(self, tagpath, pos, end) :
-        result = None
-        if end == -1 :
-            end = self.docSize
-        else:
-            end = min(self.docSize, end)
-        foundat = -1
-        for j in xrange(pos, end):
-            item = self.docList[j]
-            if item.find('=') >= 0:
-                (name, argres) = item.split('=',1)
-            else :
-                name = item
-                argres = ''
-            if name.endswith(tagpath) :
-                result = argres
-                foundat = j
-                break
-        return foundat, result
-
-
-    # return list of start positions for the tagpath
-    def posinDoc(self, tagpath):
-        startpos = []
-        pos = 0
-        res = ""
-        while res != None :
-            (foundpos, res) = self.findinDoc(tagpath, pos, -1)
-            if res != None :
-                startpos.append(foundpos)
-            pos = foundpos + 1
-        return startpos
-
-
-    # returns a vector of integers for the tagpath
-    def getData(self, tagpath, pos, end):
-        argres=[]
-        (foundat, argt) = self.findinDoc(tagpath, pos, end)
-        if (argt != None) and (len(argt) > 0) :
-            argList = argt.split('|')
-            argres = [ int(strval) for strval in argList]
-        return argres
-
-
-    # get the class
-    def getClass(self, pclass):
-        nclass = pclass
-
-        # class names are an issue given topaz may start them with numerals (not allowed),
-        # use a mix of cases (which cause some browsers problems), and actually
-        # attach numbers after "_reclustered*" to the end to deal classeses that inherit
-        # from a base class (but then not actually provide all of these _reclustereed
-        # classes in the stylesheet!
-
-        # so we clean this up by lowercasing, prepend 'cl-', and getting any baseclass
-        # that exists in the stylesheet first, and then adding this specific class
-        # after
-
-        # also some class names have spaces in them so need to convert to dashes
-        if nclass != None :
-            nclass = nclass.replace(' ','-')
-            classres = ''
-            nclass = nclass.lower()
-            nclass = 'cl-' + nclass
-            baseclass = ''
-            # graphic is the base class for captions
-            if nclass.find('cl-cap-') >=0 :
-                classres = 'graphic' + ' '
-            else :
-                # strip to find baseclass
-                p = nclass.find('_')
-                if p > 0 :
-                    baseclass = nclass[0:p]
-                    if baseclass in self.classList:
-                        classres += baseclass + ' '
-            classres += nclass
-            nclass = classres
-        return nclass
-
-
-    # develop a sorted description of the starting positions of
-    # groups and regions on the page, as well as the page type
-    def PageDescription(self):
-
-        def compare(x, y):
-            (xtype, xval) = x
-            (ytype, yval) = y
-            if xval > yval:
-                return 1
-            if xval == yval:
-                return 0
-            return -1
-
-        result = []
-        (pos, pagetype) = self.findinDoc('page.type',0,-1)
-
-        groupList = self.posinDoc('page.group')
-        groupregionList = self.posinDoc('page.group.region')
-        pageregionList = self.posinDoc('page.region')
-        # integrate into one list
-        for j in groupList:
-            result.append(('grpbeg',j))
-        for j in groupregionList:
-            result.append(('gregion',j))
-        for j in pageregionList:
-            result.append(('pregion',j))
-        result.sort(compare)
-
-        # insert group end and page end indicators
-        inGroup = False
-        j = 0
-        while True:
-            if j == len(result): break
-            rtype = result[j][0]
-            rval = result[j][1]
-            if not inGroup and (rtype == 'grpbeg') :
-                inGroup = True
-                j = j + 1
-            elif inGroup and (rtype in ('grpbeg', 'pregion')):
-                result.insert(j,('grpend',rval))
-                inGroup = False
-            else:
-                j = j + 1
-        if inGroup:
-            result.append(('grpend',-1))
-        result.append(('pageend', -1))
-        return pagetype, result
-
-
-
-    # build a description of the paragraph
-    def getParaDescription(self, start, end, regtype):
-
-        result = []
-
-        # paragraph
-        (pos, pclass) = self.findinDoc('paragraph.class',start,end)
-
-        pclass = self.getClass(pclass)
-
-        # if paragraph uses extratokens (extra glyphs) then make it fixed
-        (pos, extraglyphs) = self.findinDoc('paragraph.extratokens',start,end)
-
-        # build up a description of the paragraph in result and return it
-        # first check for the  basic - all words paragraph
-        (pos, sfirst) = self.findinDoc('paragraph.firstWord',start,end)
-        (pos, slast) = self.findinDoc('paragraph.lastWord',start,end)
-        if (sfirst != None) and (slast != None) :
-            first = int(sfirst)
-            last = int(slast)
-
-            makeImage = (regtype == 'vertical') or (regtype == 'table')
-            makeImage = makeImage or (extraglyphs != None)
-            if self.fixedimage:
-                makeImage = makeImage or (regtype == 'fixed')
-
-            if (pclass != None):
-                makeImage = makeImage or (pclass.find('.inverted') >= 0)
-                if self.fixedimage :
-                    makeImage = makeImage or (pclass.find('cl-f-') >= 0)
-
-            # before creating an image make sure glyph info exists
-            gidList = self.getData('info.glyph.glyphID',0,-1)
-
-            makeImage = makeImage & (len(gidList) > 0)
-
-            if not makeImage :
-                # standard all word paragraph
-                for wordnum in xrange(first, last):
-                    result.append(('ocr', wordnum))
-                return pclass, result
-
-            # convert paragraph to svg image
-            # translate first and last word into first and last glyphs
-            # and generate inline image and include it
-            glyphList = []
-            firstglyphList = self.getData('word.firstGlyph',0,-1)
-            gidList = self.getData('info.glyph.glyphID',0,-1)
-            firstGlyph = firstglyphList[first]
-            if last < len(firstglyphList):
-                lastGlyph = firstglyphList[last]
-            else :
-                lastGlyph = len(gidList)
-
-            # handle case of white sapce paragraphs with no actual glyphs in them
-            # by reverting to text based paragraph
-            if firstGlyph >= lastGlyph:
-                # revert to standard text based paragraph
-                for wordnum in xrange(first, last):
-                    result.append(('ocr', wordnum))
-                return pclass, result
-
-            for glyphnum in xrange(firstGlyph, lastGlyph):
-                glyphList.append(glyphnum)
-            # include any extratokens if they exist
-            (pos, sfg) = self.findinDoc('extratokens.firstGlyph',start,end)
-            (pos, slg) = self.findinDoc('extratokens.lastGlyph',start,end)
-            if (sfg != None) and (slg != None):
-                for glyphnum in xrange(int(sfg), int(slg)):
-                    glyphList.append(glyphnum)
-            num = self.svgcount
-            self.glyphs_to_image(glyphList)
-            self.svgcount += 1
-            result.append(('svg', num))
-            return pclass, result
-
-        # this type of paragraph may be made up of multiple spans, inline
-        # word monograms (images), and words with semantic meaning,
-        # plus glyphs used to form starting letter of first word
-
-        # need to parse this type line by line
-        line = start + 1
-        word_class = ''
-
-        # if end is -1 then we must search to end of document
-        if end == -1 :
-            end = self.docSize
-
-        # seems some xml has last* coming before first* so we have to
-        # handle any order
-        sp_first = -1
-        sp_last = -1
-
-        gl_first = -1
-        gl_last = -1
-
-        ws_first = -1
-        ws_last = -1
-
-        word_class = ''
-
-        word_semantic_type = ''
-
-        while (line < end) :
-
-            (name, argres) = self.lineinDoc(line)
-
-            if name.endswith('span.firstWord') :
-                sp_first = int(argres)
-
-            elif name.endswith('span.lastWord') :
-                sp_last = int(argres)
-
-            elif name.endswith('word.firstGlyph') :
-                gl_first = int(argres)
-
-            elif name.endswith('word.lastGlyph') :
-                gl_last = int(argres)
-
-            elif name.endswith('word_semantic.firstWord'):
-                ws_first = int(argres)
-
-            elif name.endswith('word_semantic.lastWord'):
-                ws_last = int(argres)
-
-            elif name.endswith('word.class'):
-                (cname, space) = argres.split('-',1)
-                if space == '' : space = '0'
-                if (cname == 'spaceafter') and (int(space) > 0) :
-                    word_class = 'sa'
-
-            elif name.endswith('word.img.src'):
-                result.append(('img' + word_class, int(argres)))
-                word_class = ''
-
-            elif name.endswith('region.img.src'):
-                result.append(('img' + word_class, int(argres)))
-
-            if (sp_first != -1) and (sp_last != -1):
-                for wordnum in xrange(sp_first, sp_last):
-                    result.append(('ocr', wordnum))
-                sp_first = -1
-                sp_last = -1
-
-            if (gl_first != -1) and (gl_last != -1):
-                glyphList = []
-                for glyphnum in xrange(gl_first, gl_last):
-                    glyphList.append(glyphnum)
-                num = self.svgcount
-                self.glyphs_to_image(glyphList)
-                self.svgcount += 1
-                result.append(('svg', num))
-                gl_first = -1
-                gl_last = -1
-
-            if (ws_first != -1) and (ws_last != -1):
-                for wordnum in xrange(ws_first, ws_last):
-                    result.append(('ocr', wordnum))
-                ws_first = -1
-                ws_last = -1
-
-            line += 1
-
-        return pclass, result
-
-
-    def buildParagraph(self, pclass, pdesc, type, regtype) :
-        parares = ''
-        sep =''
-
-        classres = ''
-        if pclass :
-            classres = ' class="' + pclass + '"'
-
-        br_lb = (regtype == 'fixed') or (regtype == 'chapterheading') or (regtype == 'vertical')
-
-        handle_links = len(self.link_id) > 0
-
-        if (type == 'full') or (type == 'begin') :
-            parares += '<p' + classres + '>'
-
-        if (type == 'end'):
-            parares += ' '
-
-        lstart = len(parares)
-
-        cnt = len(pdesc)
-
-        for j in xrange( 0, cnt) :
-
-            (wtype, num) = pdesc[j]
-
-            if wtype == 'ocr' :
-                word = self.ocrtext[num]
-                sep = ' '
-
-                if handle_links:
-                    link = self.link_id[num]
-                    if (link > 0):
-                        linktype = self.link_type[link-1]
-                        title = self.link_title[link-1]
-                        if (title == "") or (parares.rfind(title) < 0):
-                            title=parares[lstart:]
-                        if linktype == 'external' :
-                            linkhref = self.link_href[link-1]
-                            linkhtml = '<a href="%s">' % linkhref
-                        else :
-                            if len(self.link_page) >= link :
-                                ptarget = self.link_page[link-1] - 1
-                                linkhtml = '<a href="#page%04d">' % ptarget
-                            else :
-                                # just link to the current page
-                                linkhtml = '<a href="#' + self.id + '">'
-                        linkhtml += title + '</a>'
-                        pos = parares.rfind(title)
-                        if pos >= 0:
-                            parares = parares[0:pos] + linkhtml + parares[pos+len(title):]
-                        else :
-                            parares += linkhtml
-                        lstart = len(parares)
-                        if word == '_link_' : word = ''
-                    elif (link < 0) :
-                        if word == '_link_' : word = ''
-
-                if word == '_lb_':
-                    if ((num-1) in self.dehyphen_rootid ) or handle_links:
-                        word = ''
-                        sep = ''
-                    elif br_lb :
-                        word = '<br />\n'
-                        sep = ''
-                    else :
-                        word = '\n'
-                        sep = ''
-
-                if num in self.dehyphen_rootid :
-                    word = word[0:-1]
-                    sep = ''
-
-                parares += word + sep
-
-            elif wtype == 'img' :
-                sep = ''
-                parares += '<img src="img/img%04d.jpg" alt="" />' % num
-                parares += sep
-
-            elif wtype == 'imgsa' :
-                sep = ' '
-                parares += '<img src="img/img%04d.jpg" alt="" />' % num
-                parares += sep
-
-            elif wtype == 'svg' :
-                sep = ''
-                parares += '<img src="img/' + self.id + '_%04d.svg" alt="" />' % num
-                parares += sep
-
-        if len(sep) > 0 : parares = parares[0:-1]
-        if (type == 'full') or (type == 'end') :
-            parares += '</p>'
-        return parares
-
-
-    def buildTOCEntry(self, pdesc) :
-        parares = ''
-        sep =''
-        tocentry = ''
-        handle_links = len(self.link_id) > 0
-
-        lstart = 0
-
-        cnt = len(pdesc)
-        for j in xrange( 0, cnt) :
-
-            (wtype, num) = pdesc[j]
-
-            if wtype == 'ocr' :
-                word = self.ocrtext[num]
-                sep = ' '
-
-                if handle_links:
-                    link = self.link_id[num]
-                    if (link > 0):
-                        linktype = self.link_type[link-1]
-                        title = self.link_title[link-1]
-                        title = title.rstrip('. ')
-                        alt_title = parares[lstart:]
-                        alt_title = alt_title.strip()
-                        # now strip off the actual printed page number
-                        alt_title = alt_title.rstrip('01234567890ivxldIVXLD-.')
-                        alt_title = alt_title.rstrip('. ')
-                        # skip over any external links - can't have them in a books toc
-                        if linktype == 'external' :
-                            title = ''
-                            alt_title = ''
-                            linkpage = ''
-                        else :
-                            if len(self.link_page) >= link :
-                                ptarget = self.link_page[link-1] - 1
-                                linkpage = '%04d' % ptarget
-                            else :
-                                # just link to the current page
-                                linkpage = self.id[4:]
-                        if len(alt_title) >= len(title):
-                            title = alt_title
-                        if title != '' and linkpage != '':
-                            tocentry += title + '|' + linkpage + '\n'
-                        lstart = len(parares)
-                        if word == '_link_' : word = ''
-                    elif (link < 0) :
-                        if word == '_link_' : word = ''
-
-                if word == '_lb_':
-                    word = ''
-                    sep = ''
-
-                if num in self.dehyphen_rootid :
-                    word = word[0:-1]
-                    sep = ''
-
-                parares += word + sep
-
-            else :
-                continue
-
-        return tocentry
-
-
-
-
-    # walk the document tree collecting the information needed
-    # to build an html page using the ocrText
-
-    def process(self):
-
-        tocinfo = ''
-        hlst = []
-
-        # get the ocr text
-        (pos, argres) = self.findinDoc('info.word.ocrText',0,-1)
-        if argres :  self.ocrtext = argres.split('|')
-
-        # get information to dehyphenate the text
-        self.dehyphen_rootid = self.getData('info.dehyphen.rootID',0,-1)
-
-        # determine if first paragraph is continued from previous page
-        (pos, self.parastems_stemid) = self.findinDoc('info.paraStems.stemID',0,-1)
-        first_para_continued = (self.parastems_stemid  != None)
-
-        # determine if last paragraph is continued onto the next page
-        (pos, self.paracont_stemid) = self.findinDoc('info.paraCont.stemID',0,-1)
-        last_para_continued = (self.paracont_stemid != None)
-
-        # collect link ids
-        self.link_id = self.getData('info.word.link_id',0,-1)
-
-        # collect link destination page numbers
-        self.link_page = self.getData('info.links.page',0,-1)
-
-        # collect link types (container versus external)
-        (pos, argres) = self.findinDoc('info.links.type',0,-1)
-        if argres :  self.link_type = argres.split('|')
-
-        # collect link destinations
-        (pos, argres) = self.findinDoc('info.links.href',0,-1)
-        if argres :  self.link_href = argres.split('|')
-
-        # collect link titles
-        (pos, argres) = self.findinDoc('info.links.title',0,-1)
-        if argres :
-            self.link_title = argres.split('|')
-        else:
-            self.link_title.append('')
-
-        # get a descriptions of the starting points of the regions
-        # and groups on the page
-        (pagetype, pageDesc) = self.PageDescription()
-        regcnt = len(pageDesc) - 1
-
-        anchorSet = False
-        breakSet = False
-        inGroup = False
-
-        # process each region on the page and convert what you can to html
-
-        for j in xrange(regcnt):
-
-            (etype, start) = pageDesc[j]
-            (ntype, end) = pageDesc[j+1]
-
-
-            # set anchor for link target on this page
-            if not anchorSet and not first_para_continued:
-                hlst.append('<div style="visibility: hidden; height: 0; width: 0;" id="')
-                hlst.append(self.id + '" title="pagetype_' + pagetype + '"></div>\n')
-                anchorSet = True
-
-            # handle groups of graphics with text captions
-            if (etype == 'grpbeg'):
-                (pos, grptype) = self.findinDoc('group.type', start, end)
-                if grptype != None:
-                    if grptype == 'graphic':
-                        gcstr = ' class="' + grptype + '"'
-                        hlst.append('<div' + gcstr + '>')
-                        inGroup = True
-
-            elif (etype == 'grpend'):
-                if inGroup:
-                    hlst.append('</div>\n')
-                    inGroup = False
-
-            else:
-                (pos, regtype) = self.findinDoc('region.type',start,end)
-
-                if regtype == 'graphic' :
-                    (pos, simgsrc) = self.findinDoc('img.src',start,end)
-                    if simgsrc:
-                        if inGroup:
-                            hlst.append('<img src="img/img%04d.jpg" alt="" />' % int(simgsrc))
-                        else:
-                            hlst.append('<div class="graphic"><img src="img/img%04d.jpg" alt="" /></div>' % int(simgsrc))
-
-                elif regtype == 'chapterheading' :
-                    (pclass, pdesc) = self.getParaDescription(start,end, regtype)
-                    if not breakSet:
-                        hlst.append('<div style="page-break-after: always;">&nbsp;</div>\n')
-                        breakSet = True
-                    tag = 'h1'
-                    if pclass and (len(pclass) >= 7):
-                        if pclass[3:7] == 'ch1-' : tag = 'h1'
-                        if pclass[3:7] == 'ch2-' : tag = 'h2'
-                        if pclass[3:7] == 'ch3-' : tag = 'h3'
-                        hlst.append('<' + tag + ' class="' + pclass + '">')
-                    else:
-                        hlst.append('<' + tag + '>')
-                    hlst.append(self.buildParagraph(pclass, pdesc, 'middle', regtype))
-                    hlst.append('</' + tag + '>')
-
-                elif (regtype == 'text') or (regtype == 'fixed') or (regtype == 'insert') or (regtype == 'listitem'):
-                    ptype = 'full'
-                    # check to see if this is a continution from the previous page
-                    if first_para_continued :
-                        ptype = 'end'
-                        first_para_continued = False
-                    (pclass, pdesc) = self.getParaDescription(start,end, regtype)
-                    if pclass and (len(pclass) >= 6) and (ptype == 'full'):
-                        tag = 'p'
-                        if pclass[3:6] == 'h1-' : tag = 'h4'
-                        if pclass[3:6] == 'h2-' : tag = 'h5'
-                        if pclass[3:6] == 'h3-' : tag = 'h6'
-                        hlst.append('<' + tag + ' class="' + pclass + '">')
-                        hlst.append(self.buildParagraph(pclass, pdesc, 'middle', regtype))
-                        hlst.append('</' + tag + '>')
-                    else :
-                        hlst.append(self.buildParagraph(pclass, pdesc, ptype, regtype))
-
-                elif (regtype == 'tocentry') :
-                    ptype = 'full'
-                    if first_para_continued :
-                        ptype = 'end'
-                        first_para_continued = False
-                    (pclass, pdesc) = self.getParaDescription(start,end, regtype)
-                    tocinfo += self.buildTOCEntry(pdesc)
-                    hlst.append(self.buildParagraph(pclass, pdesc, ptype, regtype))
-
-                elif (regtype == 'vertical') or (regtype == 'table') :
-                    ptype = 'full'
-                    if inGroup:
-                        ptype = 'middle'
-                    if first_para_continued :
-                        ptype = 'end'
-                        first_para_continued = False
-                    (pclass, pdesc) = self.getParaDescription(start, end, regtype)
-                    hlst.append(self.buildParagraph(pclass, pdesc, ptype, regtype))
-
-
-                elif (regtype == 'synth_fcvr.center'):
-                    (pos, simgsrc) = self.findinDoc('img.src',start,end)
-                    if simgsrc:
-                        hlst.append('<div class="graphic"><img src="img/img%04d.jpg" alt="" /></div>' % int(simgsrc))
-
-                else :
-                    print '          Making region type', regtype,
-                    (pos, temp) = self.findinDoc('paragraph',start,end)
-                    (pos2, temp) = self.findinDoc('span',start,end)
-                    if pos != -1 or pos2 != -1:
-                        print ' a "text" region'
-                        orig_regtype = regtype
-                        regtype = 'fixed'
-                        ptype = 'full'
-                        # check to see if this is a continution from the previous page
-                        if first_para_continued :
-                            ptype = 'end'
-                            first_para_continued = False
-                        (pclass, pdesc) = self.getParaDescription(start,end, regtype)
-                        if not pclass:
-                            if orig_regtype.endswith('.right')     : pclass = 'cl-right'
-                            elif orig_regtype.endswith('.center')  : pclass = 'cl-center'
-                            elif orig_regtype.endswith('.left')    : pclass = 'cl-left'
-                            elif orig_regtype.endswith('.justify') : pclass = 'cl-justify'
-                        if pclass and (ptype == 'full') and (len(pclass) >= 6):
-                            tag = 'p'
-                            if pclass[3:6] == 'h1-' : tag = 'h4'
-                            if pclass[3:6] == 'h2-' : tag = 'h5'
-                            if pclass[3:6] == 'h3-' : tag = 'h6'
-                            hlst.append('<' + tag + ' class="' + pclass + '">')
-                            hlst.append(self.buildParagraph(pclass, pdesc, 'middle', regtype))
-                            hlst.append('</' + tag + '>')
-                        else :
-                            hlst.append(self.buildParagraph(pclass, pdesc, ptype, regtype))
-                    else :
-                        print ' a "graphic" region'
-                        (pos, simgsrc) = self.findinDoc('img.src',start,end)
-                        if simgsrc:
-                            hlst.append('<div class="graphic"><img src="img/img%04d.jpg" alt="" /></div>' % int(simgsrc))
-
-
-        htmlpage = "".join(hlst)
-        if last_para_continued :
-            if htmlpage[-4:] == '</p>':
-                htmlpage = htmlpage[0:-4]
-            last_para_continued = False
-
-        return htmlpage, tocinfo
-
-
-def convert2HTML(flatxml, classlst, fileid, bookDir, gdict, fixedimage):
-    # create a document parser
-    dp = DocParser(flatxml, classlst, fileid, bookDir, gdict, fixedimage)
-    htmlpage, tocinfo = dp.process()
-    return htmlpage, tocinfo

Calibre_Plugins/K4MobiDeDRM_plugin/genbook.py

@@ -1,721 +0,0 @@
-#! /usr/bin/python
-# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
-
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-
-import sys
-sys.stdout=Unbuffered(sys.stdout)
-
-import csv
-import os
-import getopt
-from struct import pack
-from struct import unpack
-
-class TpzDRMError(Exception):
-    pass
-
-# local support routines
-if 'calibre' in sys.modules:
-    inCalibre = True
-else:
-    inCalibre = False
-
-if inCalibre :
-    from calibre_plugins.k4mobidedrm import convert2xml
-    from calibre_plugins.k4mobidedrm import flatxml2html
-    from calibre_plugins.k4mobidedrm import flatxml2svg
-    from calibre_plugins.k4mobidedrm import stylexml2css
-else :
-    import convert2xml
-    import flatxml2html
-    import flatxml2svg
-    import stylexml2css
-
-# global switch
-buildXML = False
-
-# Get a 7 bit encoded number from a file
-def readEncodedNumber(file):
-    flag = False
-    c = file.read(1)
-    if (len(c) == 0):
-        return None
-    data = ord(c)
-    if data == 0xFF:
-        flag = True
-        c = file.read(1)
-        if (len(c) == 0):
-            return None
-        data = ord(c)
-    if data >= 0x80:
-        datax = (data & 0x7F)
-        while data >= 0x80 :
-            c = file.read(1)
-            if (len(c) == 0):
-                return None
-            data = ord(c)
-            datax = (datax <<7) + (data & 0x7F)
-        data = datax
-    if flag:
-        data = -data
-    return data
-
-# Get a length prefixed string from the file
-def lengthPrefixString(data):
-    return encodeNumber(len(data))+data
-
-def readString(file):
-    stringLength = readEncodedNumber(file)
-    if (stringLength == None):
-        return None
-    sv = file.read(stringLength)
-    if (len(sv)  != stringLength):
-        return ""
-    return unpack(str(stringLength)+"s",sv)[0]
-
-def getMetaArray(metaFile):
-    # parse the meta file
-    result = {}
-    fo = file(metaFile,'rb')
-    size = readEncodedNumber(fo)
-    for i in xrange(size):
-        tag = readString(fo)
-        value = readString(fo)
-        result[tag] = value
-        # print tag, value
-    fo.close()
-    return result
-
-
-# dictionary of all text strings by index value
-class Dictionary(object):
-    def __init__(self, dictFile):
-        self.filename = dictFile
-        self.size = 0
-        self.fo = file(dictFile,'rb')
-        self.stable = []
-        self.size = readEncodedNumber(self.fo)
-        for i in xrange(self.size):
-            self.stable.append(self.escapestr(readString(self.fo)))
-        self.pos = 0
-    def escapestr(self, str):
-        str = str.replace('&','&amp;')
-        str = str.replace('<','&lt;')
-        str = str.replace('>','&gt;')
-        str = str.replace('=','&#61;')
-        return str
-    def lookup(self,val):
-        if ((val >= 0) and (val < self.size)) :
-            self.pos = val
-            return self.stable[self.pos]
-        else:
-            print "Error - %d outside of string table limits" % val
-            raise TpzDRMError('outside or string table limits')
-            # sys.exit(-1)
-    def getSize(self):
-        return self.size
-    def getPos(self):
-        return self.pos
-
-
-class PageDimParser(object):
-    def __init__(self, flatxml):
-        self.flatdoc = flatxml.split('\n')
-    # find tag if within pos to end inclusive
-    def findinDoc(self, tagpath, pos, end) :
-        result = None
-        docList = self.flatdoc
-        cnt = len(docList)
-        if end == -1 :
-            end = cnt
-        else:
-            end = min(cnt,end)
-        foundat = -1
-        for j in xrange(pos, end):
-            item = docList[j]
-            if item.find('=') >= 0:
-                (name, argres) = item.split('=')
-            else :
-                name = item
-                argres = ''
-            if name.endswith(tagpath) :
-                result = argres
-                foundat = j
-                break
-        return foundat, result
-    def process(self):
-        (pos, sph) = self.findinDoc('page.h',0,-1)
-        (pos, spw) = self.findinDoc('page.w',0,-1)
-        if (sph == None): sph = '-1'
-        if (spw == None): spw = '-1'
-        return sph, spw
-
-def getPageDim(flatxml):
-    # create a document parser
-    dp = PageDimParser(flatxml)
-    (ph, pw) = dp.process()
-    return ph, pw
-
-class GParser(object):
-    def __init__(self, flatxml):
-        self.flatdoc = flatxml.split('\n')
-        self.dpi = 1440
-        self.gh = self.getData('info.glyph.h')
-        self.gw = self.getData('info.glyph.w')
-        self.guse = self.getData('info.glyph.use')
-        if self.guse :
-            self.count = len(self.guse)
-        else :
-            self.count = 0
-        self.gvtx = self.getData('info.glyph.vtx')
-        self.glen = self.getData('info.glyph.len')
-        self.gdpi = self.getData('info.glyph.dpi')
-        self.vx = self.getData('info.vtx.x')
-        self.vy = self.getData('info.vtx.y')
-        self.vlen = self.getData('info.len.n')
-        if self.vlen :
-            self.glen.append(len(self.vlen))
-        elif self.glen:
-            self.glen.append(0)
-        if self.vx :
-            self.gvtx.append(len(self.vx))
-        elif self.gvtx :
-            self.gvtx.append(0)
-    def getData(self, path):
-        result = None
-        cnt = len(self.flatdoc)
-        for j in xrange(cnt):
-            item = self.flatdoc[j]
-            if item.find('=') >= 0:
-                (name, argt) = item.split('=')
-                argres = argt.split('|')
-            else:
-                name = item
-                argres = []
-            if (name == path):
-                result = argres
-                break
-        if (len(argres) > 0) :
-            for j in xrange(0,len(argres)):
-                argres[j] = int(argres[j])
-        return result
-    def getGlyphDim(self, gly):
-        if self.gdpi[gly] == 0:
-            return 0, 0
-        maxh = (self.gh[gly] * self.dpi) / self.gdpi[gly]
-        maxw = (self.gw[gly] * self.dpi) / self.gdpi[gly]
-        return maxh, maxw
-    def getPath(self, gly):
-        path = ''
-        if (gly < 0) or (gly >= self.count):
-            return path
-        tx = self.vx[self.gvtx[gly]:self.gvtx[gly+1]]
-        ty = self.vy[self.gvtx[gly]:self.gvtx[gly+1]]
-        p = 0
-        for k in xrange(self.glen[gly], self.glen[gly+1]):
-            if (p == 0):
-                zx = tx[0:self.vlen[k]+1]
-                zy = ty[0:self.vlen[k]+1]
-            else:
-                zx = tx[self.vlen[k-1]+1:self.vlen[k]+1]
-                zy = ty[self.vlen[k-1]+1:self.vlen[k]+1]
-            p += 1
-            j = 0
-            while ( j  < len(zx) ):
-                if (j == 0):
-                    # Start Position.
-                    path += 'M %d %d ' % (zx[j] * self.dpi / self.gdpi[gly], zy[j] * self.dpi / self.gdpi[gly])
-                elif (j <= len(zx)-3):
-                    # Cubic Bezier Curve
-                    path += 'C %d %d %d %d %d %d ' % (zx[j] * self.dpi / self.gdpi[gly], zy[j] * self.dpi / self.gdpi[gly], zx[j+1] * self.dpi / self.gdpi[gly], zy[j+1] * self.dpi / self.gdpi[gly], zx[j+2] * self.dpi / self.gdpi[gly], zy[j+2] * self.dpi / self.gdpi[gly])
-                    j += 2
-                elif (j == len(zx)-2):
-                    # Cubic Bezier Curve to Start Position
-                    path += 'C %d %d %d %d %d %d ' % (zx[j] * self.dpi / self.gdpi[gly], zy[j] * self.dpi / self.gdpi[gly], zx[j+1] * self.dpi / self.gdpi[gly], zy[j+1] * self.dpi / self.gdpi[gly], zx[0] * self.dpi / self.gdpi[gly], zy[0] * self.dpi / self.gdpi[gly])
-                    j += 1
-                elif (j == len(zx)-1):
-                    # Quadratic Bezier Curve to Start Position
-                    path += 'Q %d %d %d %d ' % (zx[j] * self.dpi / self.gdpi[gly], zy[j] * self.dpi / self.gdpi[gly], zx[0] * self.dpi / self.gdpi[gly], zy[0] * self.dpi / self.gdpi[gly])
-
-                j += 1
-        path += 'z'
-        return path
-
-
-
-# dictionary of all text strings by index value
-class GlyphDict(object):
-    def __init__(self):
-        self.gdict = {}
-    def lookup(self, id):
-        # id='id="gl%d"' % val
-        if id in self.gdict:
-            return self.gdict[id]
-        return None
-    def addGlyph(self, val, path):
-        id='id="gl%d"' % val
-        self.gdict[id] = path
-
-
-def generateBook(bookDir, raw, fixedimage):
-    # sanity check Topaz file extraction
-    if not os.path.exists(bookDir) :
-        print "Can not find directory with unencrypted book"
-        return 1
-
-    dictFile = os.path.join(bookDir,'dict0000.dat')
-    if not os.path.exists(dictFile) :
-        print "Can not find dict0000.dat file"
-        return 1
-
-    pageDir = os.path.join(bookDir,'page')
-    if not os.path.exists(pageDir) :
-        print "Can not find page directory in unencrypted book"
-        return 1
-
-    imgDir = os.path.join(bookDir,'img')
-    if not os.path.exists(imgDir) :
-        print "Can not find image directory in unencrypted book"
-        return 1
-
-    glyphsDir = os.path.join(bookDir,'glyphs')
-    if not os.path.exists(glyphsDir) :
-        print "Can not find glyphs directory in unencrypted book"
-        return 1
-
-    metaFile = os.path.join(bookDir,'metadata0000.dat')
-    if not os.path.exists(metaFile) :
-        print "Can not find metadata0000.dat in unencrypted book"
-        return 1
-
-    svgDir = os.path.join(bookDir,'svg')
-    if not os.path.exists(svgDir) :
-        os.makedirs(svgDir)
-
-    if buildXML:
-        xmlDir = os.path.join(bookDir,'xml')
-        if not os.path.exists(xmlDir) :
-            os.makedirs(xmlDir)
-
-    otherFile = os.path.join(bookDir,'other0000.dat')
-    if not os.path.exists(otherFile) :
-        print "Can not find other0000.dat in unencrypted book"
-        return 1
-
-    print "Updating to color images if available"
-    spath = os.path.join(bookDir,'color_img')
-    dpath = os.path.join(bookDir,'img')
-    filenames = os.listdir(spath)
-    filenames = sorted(filenames)
-    for filename in filenames:
-        imgname = filename.replace('color','img')
-        sfile = os.path.join(spath,filename)
-        dfile = os.path.join(dpath,imgname)
-        imgdata = file(sfile,'rb').read()
-        file(dfile,'wb').write(imgdata)
-
-    print "Creating cover.jpg"
-    isCover = False
-    cpath = os.path.join(bookDir,'img')
-    cpath = os.path.join(cpath,'img0000.jpg')
-    if os.path.isfile(cpath):
-        cover = file(cpath, 'rb').read()
-        cpath = os.path.join(bookDir,'cover.jpg')
-        file(cpath, 'wb').write(cover)
-        isCover = True
-
-
-    print 'Processing Dictionary'
-    dict = Dictionary(dictFile)
-
-    print 'Processing Meta Data and creating OPF'
-    meta_array = getMetaArray(metaFile)
-
-    # replace special chars in title and authors like & < >
-    title = meta_array.get('Title','No Title Provided')
-    title = title.replace('&','&amp;')
-    title = title.replace('<','&lt;')
-    title = title.replace('>','&gt;')
-    meta_array['Title'] = title
-    authors = meta_array.get('Authors','No Authors Provided')
-    authors = authors.replace('&','&amp;')
-    authors = authors.replace('<','&lt;')
-    authors = authors.replace('>','&gt;')
-    meta_array['Authors'] = authors
-
-    if buildXML:
-        xname = os.path.join(xmlDir, 'metadata.xml')
-        mlst = []
-        for key in meta_array:
-            mlst.append('<meta name="' + key + '" content="' + meta_array[key] + '" />\n')
-        metastr = "".join(mlst)
-        mlst = None
-        file(xname, 'wb').write(metastr)
-
-    print 'Processing StyleSheet'
-
-    # get some scaling info from metadata to use while processing styles
-    # and first page info
-
-    fontsize = '135'
-    if 'fontSize' in meta_array:
-        fontsize = meta_array['fontSize']
-
-    # also get the size of a normal text page
-    # get the total number of pages unpacked as a safety check
-    filenames = os.listdir(pageDir)
-    numfiles = len(filenames)
-
-    spage = '1'
-    if 'firstTextPage' in meta_array:
-        spage = meta_array['firstTextPage']
-    pnum = int(spage)
-    if pnum >= numfiles or pnum < 0:
-        # metadata is wrong so just select a page near the front
-        # 10% of the book to get a normal text page
-        pnum = int(0.10 * numfiles)
-    # 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)
-    fname = os.path.join(pageDir,pname)
-    flat_xml = convert2xml.fromData(dict, fname)
-
-    (ph, pw) = getPageDim(flat_xml)
-    if (ph == '-1') or (ph == '0') : ph = '11000'
-    if (pw == '-1') or (pw == '0') : pw = '8500'
-    meta_array['pageHeight'] = ph
-    meta_array['pageWidth'] = pw
-    if 'fontSize' not in meta_array.keys():
-        meta_array['fontSize'] = fontsize
-
-    # process other.dat for css info and for map of page files to svg images
-    # this map is needed because some pages actually are made up of multiple
-    # pageXXXX.xml files
-    xname = os.path.join(bookDir, 'style.css')
-    flat_xml = convert2xml.fromData(dict, otherFile)
-
-    # extract info.original.pid to get original page information
-    pageIDMap = {}
-    pageidnums = stylexml2css.getpageIDMap(flat_xml)
-    if len(pageidnums) == 0:
-        filenames = os.listdir(pageDir)
-        numfiles = len(filenames)
-        for k in range(numfiles):
-            pageidnums.append(k)
-    # create a map from page ids to list of page file nums to process for that page
-    for i in range(len(pageidnums)):
-        id = pageidnums[i]
-        if id in pageIDMap.keys():
-            pageIDMap[id].append(i)
-        else:
-            pageIDMap[id] = [i]
-
-    # now get the css info
-    cssstr , classlst = stylexml2css.convert2CSS(flat_xml, fontsize, ph, pw)
-    file(xname, 'wb').write(cssstr)
-    if buildXML:
-        xname = os.path.join(xmlDir, 'other0000.xml')
-        file(xname, 'wb').write(convert2xml.getXML(dict, otherFile))
-
-    print 'Processing Glyphs'
-    gd = GlyphDict()
-    filenames = os.listdir(glyphsDir)
-    filenames = sorted(filenames)
-    glyfname = os.path.join(svgDir,'glyphs.svg')
-    glyfile = open(glyfname, 'w')
-    glyfile.write('<?xml version="1.0" standalone="no"?>\n')
-    glyfile.write('<!DOCTYPE svg PUBLIC "-//W3C/DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n')
-    glyfile.write('<svg width="512" height="512" viewBox="0 0 511 511" xmlns="http://www.w3.org/2000/svg" version="1.1">\n')
-    glyfile.write('<title>Glyphs for %s</title>\n' % meta_array['Title'])
-    glyfile.write('<defs>\n')
-    counter = 0
-    for filename in filenames:
-        # print '     ', filename
-        print '.',
-        fname = os.path.join(glyphsDir,filename)
-        flat_xml = convert2xml.fromData(dict, fname)
-
-        if buildXML:
-            xname = os.path.join(xmlDir, filename.replace('.dat','.xml'))
-            file(xname, 'wb').write(convert2xml.getXML(dict, fname))
-
-        gp = GParser(flat_xml)
-        for i in xrange(0, gp.count):
-            path = gp.getPath(i)
-            maxh, maxw = gp.getGlyphDim(i)
-            fullpath = '<path id="gl%d" d="%s" fill="black" /><!-- width=%d height=%d -->\n' % (counter * 256 + i, path, maxw, maxh)
-            glyfile.write(fullpath)
-            gd.addGlyph(counter * 256 + i, fullpath)
-        counter += 1
-    glyfile.write('</defs>\n')
-    glyfile.write('</svg>\n')
-    glyfile.close()
-    print " "
-
-
-    # start up the html
-    # also build up tocentries while processing html
-    htmlFileName = "book.html"
-    hlst = []
-    hlst.append('<?xml version="1.0" encoding="utf-8"?>\n')
-    hlst.append('<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.1 Strict//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11-strict.dtd">\n')
-    hlst.append('<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\n')
-    hlst.append('<head>\n')
-    hlst.append('<meta http-equiv="content-type" content="text/html; charset=utf-8"/>\n')
-    hlst.append('<title>' + meta_array['Title'] + ' by ' + meta_array['Authors'] + '</title>\n')
-    hlst.append('<meta name="Author" content="' + meta_array['Authors'] + '" />\n')
-    hlst.append('<meta name="Title" content="' + meta_array['Title'] + '" />\n')
-    if 'ASIN' in meta_array:
-        hlst.append('<meta name="ASIN" content="' + meta_array['ASIN'] + '" />\n')
-    if 'GUID' in meta_array:
-        hlst.append('<meta name="GUID" content="' + meta_array['GUID'] + '" />\n')
-    hlst.append('<link href="style.css" rel="stylesheet" type="text/css" />\n')
-    hlst.append('</head>\n<body>\n')
-
-    print 'Processing Pages'
-    # Books are at 1440 DPI.  This is rendering at twice that size for
-    # readability when rendering to the screen.
-    scaledpi = 1440.0
-
-    filenames = os.listdir(pageDir)
-    filenames = sorted(filenames)
-    numfiles = len(filenames)
-
-    xmllst = []
-    elst = []
-
-    for filename in filenames:
-        # print '     ', filename
-        print ".",
-        fname = os.path.join(pageDir,filename)
-        flat_xml = convert2xml.fromData(dict, fname)
-
-        # keep flat_xml for later svg processing
-        xmllst.append(flat_xml)
-
-        if buildXML:
-            xname = os.path.join(xmlDir, filename.replace('.dat','.xml'))
-            file(xname, 'wb').write(convert2xml.getXML(dict, fname))
-
-        # first get the html
-        pagehtml, tocinfo = flatxml2html.convert2HTML(flat_xml, classlst, fname, bookDir, gd, fixedimage)
-        elst.append(tocinfo)
-        hlst.append(pagehtml)
-
-    # finish up the html string and output it
-    hlst.append('</body>\n</html>\n')
-    htmlstr = "".join(hlst)
-    hlst = None
-    file(os.path.join(bookDir, htmlFileName), 'wb').write(htmlstr)
-
-    print " "
-    print 'Extracting Table of Contents from Amazon OCR'
-
-    # first create a table of contents file for the svg images
-    tlst = []
-    tlst.append('<?xml version="1.0" encoding="utf-8"?>\n')
-    tlst.append('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n')
-    tlst.append('<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >')
-    tlst.append('<head>\n')
-    tlst.append('<title>' + meta_array['Title'] + '</title>\n')
-    tlst.append('<meta name="Author" content="' + meta_array['Authors'] + '" />\n')
-    tlst.append('<meta name="Title" content="' + meta_array['Title'] + '" />\n')
-    if 'ASIN' in meta_array:
-        tlst.append('<meta name="ASIN" content="' + meta_array['ASIN'] + '" />\n')
-    if 'GUID' in meta_array:
-        tlst.append('<meta name="GUID" content="' + meta_array['GUID'] + '" />\n')
-    tlst.append('</head>\n')
-    tlst.append('<body>\n')
-
-    tlst.append('<h2>Table of Contents</h2>\n')
-    start = pageidnums[0]
-    if (raw):
-        startname = 'page%04d.svg' % start
-    else:
-        startname = 'page%04d.xhtml' % start
-
-    tlst.append('<h3><a href="' + startname + '">Start of Book</a></h3>\n')
-    # build up a table of contents for the svg xhtml output
-    tocentries = "".join(elst)
-    elst = None
-    toclst = tocentries.split('\n')
-    toclst.pop()
-    for entry in toclst:
-        print entry
-        title, pagenum = entry.split('|')
-        id = pageidnums[int(pagenum)]
-        if (raw):
-            fname = 'page%04d.svg' % id
-        else:
-            fname = 'page%04d.xhtml' % id
-        tlst.append('<h3><a href="'+ fname + '">' + title + '</a></h3>\n')
-    tlst.append('</body>\n')
-    tlst.append('</html>\n')
-    tochtml = "".join(tlst)
-    file(os.path.join(svgDir, 'toc.xhtml'), 'wb').write(tochtml)
-
-
-    # now create index_svg.xhtml that points to all required files
-    slst = []
-    slst.append('<?xml version="1.0" encoding="utf-8"?>\n')
-    slst.append('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n')
-    slst.append('<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >')
-    slst.append('<head>\n')
-    slst.append('<title>' + meta_array['Title'] + '</title>\n')
-    slst.append('<meta name="Author" content="' + meta_array['Authors'] + '" />\n')
-    slst.append('<meta name="Title" content="' + meta_array['Title'] + '" />\n')
-    if 'ASIN' in meta_array:
-        slst.append('<meta name="ASIN" content="' + meta_array['ASIN'] + '" />\n')
-    if 'GUID' in meta_array:
-        slst.append('<meta name="GUID" content="' + meta_array['GUID'] + '" />\n')
-    slst.append('</head>\n')
-    slst.append('<body>\n')
-
-    print "Building svg images of each book page"
-    slst.append('<h2>List of Pages</h2>\n')
-    slst.append('<div>\n')
-    idlst = sorted(pageIDMap.keys())
-    numids = len(idlst)
-    cnt = len(idlst)
-    previd = None
-    for j in range(cnt):
-        pageid = idlst[j]
-        if j < cnt - 1:
-            nextid = idlst[j+1]
-        else:
-            nextid = None
-        print '.',
-        pagelst = pageIDMap[pageid]
-        flst = []
-        for page in pagelst:
-            flst.append(xmllst[page])
-        flat_svg = "".join(flst)
-        flst=None
-        svgxml = flatxml2svg.convert2SVG(gd, flat_svg, pageid, previd, nextid, svgDir, raw, meta_array, scaledpi)
-        if (raw) :
-            pfile = open(os.path.join(svgDir,'page%04d.svg' % pageid),'w')
-            slst.append('<a href="svg/page%04d.svg">Page %d</a>\n' % (pageid, pageid))
-        else :
-            pfile = open(os.path.join(svgDir,'page%04d.xhtml' % pageid), 'w')
-            slst.append('<a href="svg/page%04d.xhtml">Page %d</a>\n' % (pageid, pageid))
-        previd = pageid
-        pfile.write(svgxml)
-        pfile.close()
-        counter += 1
-    slst.append('</div>\n')
-    slst.append('<h2><a href="svg/toc.xhtml">Table of Contents</a></h2>\n')
-    slst.append('</body>\n</html>\n')
-    svgindex = "".join(slst)
-    slst = None
-    file(os.path.join(bookDir, 'index_svg.xhtml'), 'wb').write(svgindex)
-
-    print " "
-
-    # build the opf file
-    opfname = os.path.join(bookDir, 'book.opf')
-    olst = []
-    olst.append('<?xml version="1.0" encoding="utf-8"?>\n')
-    olst.append('<package xmlns="http://www.idpf.org/2007/opf" unique-identifier="guid_id">\n')
-    # adding metadata
-    olst.append('   <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">\n')
-    if 'GUID' in meta_array:
-        olst.append('      <dc:identifier opf:scheme="GUID" id="guid_id">' + meta_array['GUID'] + '</dc:identifier>\n')
-    if 'ASIN' in meta_array:
-        olst.append('      <dc:identifier opf:scheme="ASIN">' + meta_array['ASIN'] + '</dc:identifier>\n')
-    if 'oASIN' in meta_array:
-        olst.append('      <dc:identifier opf:scheme="oASIN">' + meta_array['oASIN'] + '</dc:identifier>\n')
-    olst.append('      <dc:title>' + meta_array['Title'] + '</dc:title>\n')
-    olst.append('      <dc:creator opf:role="aut">' + meta_array['Authors'] + '</dc:creator>\n')
-    olst.append('      <dc:language>en</dc:language>\n')
-    olst.append('      <dc:date>' + meta_array['UpdateTime'] + '</dc:date>\n')
-    if isCover:
-        olst.append('      <meta name="cover" content="bookcover"/>\n')
-    olst.append('   </metadata>\n')
-    olst.append('<manifest>\n')
-    olst.append('   <item id="book" href="book.html" media-type="application/xhtml+xml"/>\n')
-    olst.append('   <item id="stylesheet" href="style.css" media-type="text/css"/>\n')
-    # adding image files to manifest
-    filenames = os.listdir(imgDir)
-    filenames = sorted(filenames)
-    for filename in filenames:
-        imgname, imgext = os.path.splitext(filename)
-        if imgext == '.jpg':
-            imgext = 'jpeg'
-        if imgext == '.svg':
-            imgext = 'svg+xml'
-        olst.append('   <item id="' + imgname + '" href="img/' + filename + '" media-type="image/' + imgext + '"/>\n')
-    if isCover:
-        olst.append('   <item id="bookcover" href="cover.jpg" media-type="image/jpeg" />\n')
-    olst.append('</manifest>\n')
-    # adding spine
-    olst.append('<spine>\n   <itemref idref="book" />\n</spine>\n')
-    if isCover:
-        olst.append('   <guide>\n')
-        olst.append('      <reference href="cover.jpg" type="cover" title="Cover"/>\n')
-        olst.append('   </guide>\n')
-    olst.append('</package>\n')
-    opfstr = "".join(olst)
-    olst = None
-    file(opfname, 'wb').write(opfstr)
-
-    print 'Processing Complete'
-
-    return 0
-
-def usage():
-    print "genbook.py generates a book from the extract Topaz Files"
-    print "Usage:"
-    print "    genbook.py [-r] [-h [--fixed-image] <bookDir>  "
-    print "  "
-    print "Options:"
-    print "  -h            :  help - print this usage message"
-    print "  -r            :  generate raw svg files (not wrapped in xhtml)"
-    print "  --fixed-image :  genearate any Fixed Area as an svg image in the html"
-    print "  "
-
-
-def main(argv):
-    bookDir = ''
-    if len(argv) == 0:
-        argv = sys.argv
-
-    try:
-        opts, args = getopt.getopt(argv[1:], "rh:",["fixed-image"])
-
-    except getopt.GetoptError, err:
-        print str(err)
-        usage()
-        return 1
-
-    if len(opts) == 0 and len(args) == 0 :
-        usage()
-        return 1
-
-    raw = 0
-    fixedimage = True
-    for o, a in opts:
-        if o =="-h":
-            usage()
-            return 0
-        if o =="-r":
-            raw = 1
-        if o =="--fixed-image":
-            fixedimage = True
-
-    bookDir = args[0]
-
-    rv = generateBook(bookDir, raw, fixedimage)
-    return rv
-
-
-if __name__ == '__main__':
-    sys.exit(main(''))

Calibre_Plugins/K4MobiDeDRM_plugin/getk4pcpids.py

@@ -1,77 +0,0 @@
-#!/usr/bin/python
-#
-# This is a python script. You need a Python interpreter to run it.
-# For example, ActiveState Python, which exists for windows.
-#
-# Changelog
-#  1.00 - Initial version
-
-__version__ = '1.00'
-
-import sys
-
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-sys.stdout=Unbuffered(sys.stdout)
-
-import os
-import struct
-import binascii
-import kgenpids
-import topazextract
-import mobidedrm
-from alfcrypto import Pukall_Cipher
-
-class DrmException(Exception):
-    pass
-
-def getK4PCpids(path_to_ebook):
-    # Return Kindle4PC PIDs. Assumes that the caller checked that we are not on Linux, which will raise an exception
-
-    mobi = True
-    magic3 = file(path_to_ebook,'rb').read(3)
-    if magic3 == 'TPZ':
-        mobi = False
-
-    if mobi:
-        mb = mobidedrm.MobiBook(path_to_ebook,False)
-    else:
-        mb = topazextract.TopazBook(path_to_ebook)
-    
-    md1, md2 = mb.getPIDMetaInfo()
-
-    return kgenpids.getPidList(md1, md2, True, [], [], []) 
-
-
-def main(argv=sys.argv):
-    print ('getk4pcpids.py v%(__version__)s. '
-        'Copyright 2012 Apprentic Alf' % globals())
-
-    if len(argv)<2 or len(argv)>3:
-        print "Gets the possible book-specific PIDs from K4PC for a particular book"
-        print "Usage:"
-        print "    %s <bookfile> [<outfile>]" % sys.argv[0]
-        return 1
-    else:
-        infile = argv[1]
-        try:
-            pidlist = getK4PCpids(infile)
-        except DrmException, e:
-            print "Error: %s" % e
-            return 1
-        pidstring = ','.join(pidlist)
-        print "Possible PIDs are: ", pidstring
-        if len(argv) is 3:
-            outfile = argv[2]
-            file(outfile, 'w').write(pidstring)
-        
-    return 0
-
-if __name__ == "__main__":
-    sys.exit(main())

Calibre_Plugins/K4MobiDeDRM_plugin/k4mobidedrm_orig.py

@@ -1,223 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import with_statement
-
-# engine to remove drm from Kindle for Mac and Kindle for PC books
-# for personal use for archiving and converting your ebooks
-
-# PLEASE DO NOT PIRATE EBOOKS!
-
-# We want all authors and publishers, and eBook stores to live
-# long and prosperous lives but at the same time  we just want to
-# be able to read OUR books on whatever device we want and to keep
-# readable for a long, long time
-
-#  This borrows very heavily from works by CMBDTC, IHeartCabbages, skindle,
-#    unswindle, DarkReverser, ApprenticeAlf, DiapDealer, some_updates
-#    and many many others
-
-
-__version__ = '4.3'
-
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-
-import sys
-import os, csv, getopt
-import string
-import re
-import traceback
-
-buildXML = False
-
-class DrmException(Exception):
-    pass
-
-if 'calibre' in sys.modules:
-    inCalibre = True
-else:
-    inCalibre = False
-
-if inCalibre:
-    from calibre_plugins.k4mobidedrm import mobidedrm
-    from calibre_plugins.k4mobidedrm import topazextract
-    from calibre_plugins.k4mobidedrm import kgenpids
-else:
-    import mobidedrm
-    import topazextract
-    import kgenpids
-
-
-# cleanup bytestring filenames
-# borrowed from calibre from calibre/src/calibre/__init__.py
-# added in removal of non-printing chars
-# and removal of . at start
-# convert underscores to spaces (we're OK with spaces in file names)
-def cleanup_name(name):
-    _filename_sanitize = re.compile(r'[\xae\0\\|\?\*<":>\+/]')
-    substitute='_'
-    one = ''.join(char for char in name if char in string.printable)
-    one = _filename_sanitize.sub(substitute, one)
-    one = re.sub(r'\s', ' ', one).strip()
-    one = re.sub(r'^\.+$', '_', one)
-    one = one.replace('..', substitute)
-    # Windows doesn't like path components that end with a period
-    if one.endswith('.'):
-        one = one[:-1]+substitute
-    # Mac and Unix don't like file names that begin with a full stop
-    if len(one) > 0 and one[0] == '.':
-        one = substitute+one[1:]
-    one = one.replace('_',' ')
-    return one
-
-def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
-    global buildXML
-
-    # handle the obvious cases at the beginning
-    if not os.path.isfile(infile):
-        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: Input file does not exist"
-        return 1
-
-    mobi = True
-    magic3 = file(infile,'rb').read(3)
-    if magic3 == 'TPZ':
-        mobi = False
-
-    bookname = os.path.splitext(os.path.basename(infile))[0]
-
-    if mobi:
-        mb = mobidedrm.MobiBook(infile)
-    else:
-        mb = topazextract.TopazBook(infile)
-
-    title = mb.getBookTitle()
-    print "Processing Book: ", title
-    filenametitle = cleanup_name(title)
-    outfilename = cleanup_name(bookname)
-    
-    # generate 'sensible' filename, that will sort with the original name,
-    # but is close to the name from the file.
-    outlength = len(outfilename)
-    comparelength = min(8,min(outlength,len(filenametitle)))
-    copylength = min(max(outfilename.find(' '),8),len(outfilename))
-    if outlength==0:
-        outfilename = filenametitle
-    elif comparelength > 0:
-    	if outfilename[:comparelength] == filenametitle[:comparelength]:
-        	outfilename = filenametitle
-        else:
-        	outfilename = outfilename[:copylength] + " " + filenametitle
-
-    # avoid excessively long file names
-    if len(outfilename)>150:
-        outfilename = outfilename[:150]
-
-    # build pid list
-    md1, md2 = mb.getPIDMetaInfo()
-    pidlst = kgenpids.getPidList(md1, md2, k4, pids, serials, kInfoFiles)
-
-    try:
-        mb.processBook(pidlst)
-
-    except mobidedrm.DrmException, e:
-        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
-        return 1
-    except topazextract.TpzDRMError, e:
-        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
-        return 1
-    except Exception, e:
-        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
-        return 1
-
-    if mobi:
-        if mb.getPrintReplica():
-            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.azw4')
-        elif mb.getMobiVersion() >= 8:
-            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.azw3')
-        else:
-            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
-        mb.getMobiFile(outfile)
-        return 0
-
-    # topaz:
-    print "   Creating NoDRM HTMLZ Archive"
-    zipname = os.path.join(outdir, outfilename + '_nodrm' + '.htmlz')
-    mb.getHTMLZip(zipname)
-
-    print "   Creating SVG ZIP Archive"
-    zipname = os.path.join(outdir, outfilename + '_SVG' + '.zip')
-    mb.getSVGZip(zipname)
-
-    if buildXML:
-        print "   Creating XML ZIP Archive"
-        zipname = os.path.join(outdir, outfilename + '_XML' + '.zip')
-        mb.getXMLZip(zipname)
-
-    # remove internal temporary directory of Topaz pieces
-    mb.cleanup()
-
-    return 0
-
-
-def usage(progname):
-    print "Removes DRM protection from K4PC/M, Kindle, Mobi and Topaz ebooks"
-    print "Usage:"
-    print "    %s [-k <kindle.info>] [-p <pidnums>] [-s <kindleSerialNumbers>] <infile> <outdir>  " % progname
-
-#
-# Main
-#
-def main(argv=sys.argv):
-    progname = os.path.basename(argv[0])
-
-    k4 = False
-    kInfoFiles = []
-    serials = []
-    pids = []
-
-    print ('K4MobiDeDrm v%(__version__)s '
-           'provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, ApprenticeAlf, etc .' % globals())
-
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
-    except getopt.GetoptError, err:
-        print str(err)
-        usage(progname)
-        sys.exit(2)
-    if len(args)<2:
-        usage(progname)
-        sys.exit(2)
-
-    for o, a in opts:
-        if o == "-k":
-            if a == None :
-                raise DrmException("Invalid parameter for -k")
-            kInfoFiles.append(a)
-        if o == "-p":
-            if a == None :
-                raise DrmException("Invalid parameter for -p")
-            pids = a.split(',')
-        if o == "-s":
-            if a == None :
-                raise DrmException("Invalid parameter for -s")
-            serials = a.split(',')
-
-    # try with built in Kindle Info files
-    k4 = True
-    if sys.platform.startswith('linux'):
-        k4 = False
-        kInfoFiles = None
-    infile = args[0]
-    outdir = args[1]
-    return decryptBook(infile, outdir, k4, kInfoFiles, serials, pids)
-
-
-if __name__ == '__main__':
-    sys.stdout=Unbuffered(sys.stdout)
-    sys.exit(main())

Calibre_Plugins/K4MobiDeDRM_plugin/kgenpids.py

@@ -1,276 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import with_statement
-import sys
-import os, csv
-import binascii
-import zlib
-import re
-from struct import pack, unpack, unpack_from
-
-class DrmException(Exception):
-    pass
-
-global charMap1
-global charMap3
-global charMap4
-
-if 'calibre' in sys.modules:
-    inCalibre = True
-else:
-    inCalibre = False
-
-if inCalibre:
-    if sys.platform.startswith('win'):
-        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
-
-    if sys.platform.startswith('darwin'):
-        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
-else:
-    if sys.platform.startswith('win'):
-        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
-
-    if sys.platform.startswith('darwin'):
-        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
-
-
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
-
-# crypto digestroutines
-import hashlib
-
-def MD5(message):
-    ctx = hashlib.md5()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA1(message):
-    ctx = hashlib.sha1()
-    ctx.update(message)
-    return ctx.digest()
-
-
-# Encode the bytes in data with the characters in map
-def encode(data, map):
-    result = ""
-    for char in data:
-        value = ord(char)
-        Q = (value ^ 0x80) // len(map)
-        R = value % len(map)
-        result += map[Q]
-        result += map[R]
-    return result
-
-# Hash the bytes in data and then encode the digest with the characters in map
-def encodeHash(data,map):
-    return encode(MD5(data),map)
-
-# Decode the string in data with the characters in map. Returns the decoded bytes
-def decode(data,map):
-    result = ""
-    for i in range (0,len(data)-1,2):
-        high = map.find(data[i])
-        low = map.find(data[i+1])
-        if (high == -1) or (low == -1) :
-            break
-        value = (((high * len(map)) ^ 0x80) & 0xFF) + low
-        result += pack("B",value)
-    return result
-
-#
-# PID generation routines
-#
-
-# Returns two bit at offset from a bit field
-def getTwoBitsFromBitField(bitField,offset):
-    byteNumber = offset // 4
-    bitPosition = 6 - 2*(offset % 4)
-    return ord(bitField[byteNumber]) >> bitPosition & 3
-
-# Returns the six bits at offset from a bit field
-def getSixBitsFromBitField(bitField,offset):
-    offset *= 3
-    value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
-    return value
-
-# 8 bits to six bits encoding from hash to generate PID string
-def encodePID(hash):
-    global charMap3
-    PID = ""
-    for position in range (0,8):
-        PID += charMap3[getSixBitsFromBitField(hash,position)]
-    return PID
-
-# Encryption table used to generate the device PID
-def generatePidEncryptionTable() :
-    table = []
-    for counter1 in range (0,0x100):
-        value = counter1
-        for counter2 in range (0,8):
-            if (value & 1 == 0) :
-                value = value >> 1
-            else :
-                value = value >> 1
-                value = value ^ 0xEDB88320
-        table.append(value)
-    return table
-
-# Seed value used to generate the device PID
-def generatePidSeed(table,dsn) :
-    value = 0
-    for counter in range (0,4) :
-        index = (ord(dsn[counter]) ^ value) &0xFF
-        value = (value >> 8) ^ table[index]
-    return value
-
-# Generate the device PID
-def generateDevicePID(table,dsn,nbRoll):
-    global charMap4
-    seed = generatePidSeed(table,dsn)
-    pidAscii = ""
-    pid = [(seed >>24) &0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF,(seed>>24) & 0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF]
-    index = 0
-    for counter in range (0,nbRoll):
-        pid[index] = pid[index] ^ ord(dsn[counter])
-        index = (index+1) %8
-    for counter in range (0,8):
-        index = ((((pid[counter] >>5) & 3) ^ pid[counter]) & 0x1f) + (pid[counter] >> 7)
-        pidAscii += charMap4[index]
-    return pidAscii
-
-def crc32(s):
-    return (~binascii.crc32(s,-1))&0xFFFFFFFF
-
-# convert from 8 digit PID to 10 digit PID with checksum
-def checksumPid(s):
-    global charMap4
-    crc = crc32(s)
-    crc = crc ^ (crc >> 16)
-    res = s
-    l = len(charMap4)
-    for i in (0,1):
-        b = crc & 0xff
-        pos = (b // l) ^ (b % l)
-        res += charMap4[pos%l]
-        crc >>= 8
-    return res
-
-
-# old kindle serial number to fixed pid
-def pidFromSerial(s, l):
-    global charMap4
-    crc = crc32(s)
-    arr1 = [0]*l
-    for i in xrange(len(s)):
-        arr1[i%l] ^= ord(s[i])
-    crc_bytes = [crc >> 24 & 0xff, crc >> 16 & 0xff, crc >> 8 & 0xff, crc & 0xff]
-    for i in xrange(l):
-        arr1[i] ^= crc_bytes[i&3]
-    pid = ""
-    for i in xrange(l):
-        b = arr1[i] & 0xff
-        pid+=charMap4[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]
-    return pid
-
-
-# Parse the EXTH header records and use the Kindle serial number to calculate the book pid.
-def getKindlePid(pidlst, rec209, token, serialnum):
-    # Compute book PID
-    pidHash = SHA1(serialnum+rec209+token)
-    bookPID = encodePID(pidHash)
-    bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
-
-    # compute fixed pid for old pre 2.5 firmware update pid as well
-    bookPID = pidFromSerial(serialnum, 7) + "*"
-    bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
-
-    return pidlst
-
-
-# parse the Kindleinfo file to calculate the book pid.
-
-keynames = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
-
-def getK4Pids(pidlst, rec209, token, kInfoFile):
-    global charMap1
-    kindleDatabase = None
-    try:
-        kindleDatabase = getDBfromFile(kInfoFile)
-    except Exception, message:
-        print(message)
-        kindleDatabase = None
-        pass
-
-    if kindleDatabase == None :
-        return pidlst
-
-    try:
-        # Get the Mazama Random number
-        MazamaRandomNumber = kindleDatabase["MazamaRandomNumber"]
-
-        # Get the kindle account token
-        kindleAccountToken = kindleDatabase["kindle.account.tokens"]
-    except KeyError:
-        print "Keys not found in " + kInfoFile
-        return pidlst
-
-    # Get the ID string used
-    encodedIDString = encodeHash(GetIDString(),charMap1)
-
-    # Get the current user name
-    encodedUsername = encodeHash(GetUserName(),charMap1)
-
-    # concat, hash and encode to calculate the DSN
-    DSN = encode(SHA1(MazamaRandomNumber+encodedIDString+encodedUsername),charMap1)
-
-    # Compute the device PID (for which I can tell, is used for nothing).
-    table =  generatePidEncryptionTable()
-    devicePID = generateDevicePID(table,DSN,4)
-    devicePID = checksumPid(devicePID)
-    pidlst.append(devicePID)
-
-    # Compute book PIDs
-
-    # book pid
-    pidHash = SHA1(DSN+kindleAccountToken+rec209+token)
-    bookPID = encodePID(pidHash)
-    bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
-
-    # variant 1
-    pidHash = SHA1(kindleAccountToken+rec209+token)
-    bookPID = encodePID(pidHash)
-    bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
-
-    # variant 2
-    pidHash = SHA1(DSN+rec209+token)
-    bookPID = encodePID(pidHash)
-    bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
-
-    return pidlst
-
-def getPidList(md1, md2, k4, pids, serials, kInfoFiles):
-    pidlst = []
-    if kInfoFiles is None:
-        kInfoFiles = []
-    if k4:
-        kInfoFiles = getKindleInfoFiles(kInfoFiles)
-    for infoFile in kInfoFiles:
-        try:
-            pidlst = getK4Pids(pidlst, md1, md2, infoFile)
-        except Exception, message:
-            print("Error getting PIDs from " + infoFile + ": " + message)
-    for serialnum in serials:
-        try:
-            pidlst = getKindlePid(pidlst, md1, md2, serialnum)
-        except Exception, message:
-            print("Error getting PIDs from " + serialnum + ": " + message)
-    for pid in pids:
-        pidlst.append(pid)
-    return pidlst

Calibre_Plugins/K4MobiDeDRM_plugin/pbkdf2.py

@@ -1,68 +0,0 @@
-# A simple implementation of pbkdf2 using stock python modules. See RFC2898
-# for details. Basically, it derives a key from a password and salt.
-
-# Copyright 2004 Matt Johnston <matt @ ucc asn au>
-# Copyright 2009 Daniel Holth <dholth@fastmail.fm>
-# This code may be freely used and modified for any purpose.
-
-# Revision history
-# v0.1  October 2004    - Initial release
-# v0.2  8 March 2007    - Make usable with hashlib in Python 2.5 and use
-# v0.3  ""                 the correct digest_size rather than always 20
-# v0.4  Oct 2009        - Rescue from chandler svn, test and optimize.
-
-import sys
-import hmac
-from struct import pack
-try:
-    # only in python 2.5
-    import hashlib
-    sha = hashlib.sha1
-    md5 = hashlib.md5
-    sha256 = hashlib.sha256
-except ImportError: # pragma: NO COVERAGE
-    # fallback
-    import sha
-    import md5
-
-# this is what you want to call.
-def pbkdf2( password, salt, itercount, keylen, hashfn = sha ):
-    try:
-        # depending whether the hashfn is from hashlib or sha/md5
-        digest_size = hashfn().digest_size
-    except TypeError: # pragma: NO COVERAGE
-        digest_size = hashfn.digest_size
-    # l - number of output blocks to produce
-    l = keylen / digest_size
-    if keylen % digest_size != 0:
-        l += 1
-
-    h = hmac.new( password, None, hashfn )
-
-    T = ""
-    for i in range(1, l+1):
-        T += pbkdf2_F( h, salt, itercount, i )
-
-    return T[0: keylen]
-
-def xorstr( a, b ):
-    if len(a) != len(b):
-        raise ValueError("xorstr(): lengths differ")
-    return ''.join((chr(ord(x)^ord(y)) for x, y in zip(a, b)))
-
-def prf( h, data ):
-    hm = h.copy()
-    hm.update( data )
-    return hm.digest()
-
-# Helper as per the spec. h is a hmac which has been created seeded with the
-# password, it will be copy()ed and not modified.
-def pbkdf2_F( h, salt, itercount, blocknum ):
-    U = prf( h, salt + pack('>i',blocknum ) )
-    T = U
-
-    for i in range(2, itercount+1):
-        U = prf( h, U )
-        T = xorstr( T, U )
-
-    return T

Calibre_Plugins/eReaderPDB2PML ReadMe.txt

@@ -1,31 +0,0 @@
-eReader PDB2PML - eReaderPDB2PML_v06_plugin.zip
-
-All credit given to The Dark Reverser for the original standalone script. I had the much easier job of converting it to a Calibre plugin.
-
-This plugin is meant to convert secure Ereader files (PDB) to unsecured PMLZ files. Calibre can then convert it to whatever format you desire. It is meant to function without having to install any  dependencies... other than having Calibre installed, of course. I've included the psyco libraries (compiled for each platform) for speed. If your system can use them, great! Otherwise, they won't be used and things will just work slower.
-
-
-Installation:
-
-Go to Calibre's Preferences page. Do **NOT** select "Get Plugins to enhance calibre" as this is reserved for "official" calibre plugins, instead select "Change calibre behavior". Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file  (eReaderPDB2PML_vXX_plugin.zip) and click the 'Add' button. You're done.
-
-
-Please note:  Calibre does not provide any immediate feedback to indicate that adding the plugin was a success. You can always click on the File-Type plugins to see if the plugin was added.
-
-
-Configuration:
-
-Highlight the plugin (eReader PDB 2 PML under the "File type plugins" category) and click the "Customize Plugin" button on Calibre's Preferences->Plugins page. Enter your name and last 8 digits of the credit card number separated by a comma: Your Name,12341234
-
-If you've purchased books with more than one credit card, separate the info with a colon: Your Name,12341234:Other Name,23452345 (NOTE: Do NOT put quotes around your name like you do with the original script!!)
-
-
-Troubleshooting:
-
-If you find that it's not working for you (imported pdb's are not converted to pmlz format), you can save a lot of time and trouble by trying to add the pdb to Calibre with the command line tools. This will print out a lot of helpful debugging info that can be copied into any online help requests. I'm going to ask you to do it first, anyway, so you might as well get used to it. ;)
-
-Open a command prompt (terminal) and change to the directory where the ebook you're trying to import resides. Then type the command "calibredb add your_ebook.pdb". Don't type the quotes and obviously change the 'your_ebook.pdb' to whatever the filename of your book is. Copy the resulting output and paste it into any online help request you make.
-
-** Note: the Mac version of Calibre doesn't install the command line tools by default. If you go to the 'Preferences' page and click on the miscellaneous button, you'll see the option to install the command line tools.
-
-

Calibre_Plugins/eReaderPDB2PML_plugin/__init__.py

@@ -1,140 +0,0 @@
-#!/usr/bin/env python
-
-# eReaderPDB2PML_plugin.py
-# Released under the terms of the GNU General Public Licence, version 3 or
-# later.  <http://www.gnu.org/licenses/>
-#
-# All credit given to The Dark Reverser for the original standalone script.
-# I had the much easier job of converting it to Calibre a plugin.
-#
-# This plugin is meant to convert secure Ereader files (PDB) to unsecured PMLZ files.
-# Calibre can then convert it to whatever format you desire.
-# It is meant to function without having to install any dependencies...
-# other than having Calibre installed, of course. 
-#
-# Installation:
-# Go to Calibre's Preferences page... click on the Plugins button. Use the file
-# dialog button to select the plugin's zip file (eReaderPDB2PML_vXX_plugin.zip) and
-# click the 'Add' button. You're done.
-#
-# Configuration:
-# Highlight the plugin (eReader PDB 2 PML) and click the
-# "Customize Plugin" button on Calibre's Preferences->Plugins page.
-# Enter your name and the last 8 digits of the credit card number separated by
-# a comma: Your Name,12341234
-#
-# If you've purchased books with more than one credit card, separate the info with
-# a colon: Your Name,12341234:Other Name,23452345
-# NOTE: Do NOT put quotes around your name like you do with the original script!!
-#
-# Revision history:
-#   0.0.1 - Initial release
-#   0.0.2 - updated to distinguish it from earlier non-openssl version
-#   0.0.3 - removed added psyco code as it is not supported under Calibre's Python 2.7
-#   0.0.4 - minor typos fixed
-#   0.0.5 - updated to the new calibre plugin interface
-
-import sys, os
-
-from calibre.customize import FileTypePlugin
-from calibre.ptempfile import PersistentTemporaryDirectory
-from calibre.constants import iswindows, isosx
-from calibre_plugins.erdrpdb2pml import erdr2pml
-
-class eRdrDeDRM(FileTypePlugin):
-    name                = 'eReader PDB 2 PML' # Name of the plugin
-    description         = 'Removes DRM from secure pdb files. \
-                            Credit given to The Dark Reverser for the original standalone script.'
-    supported_platforms = ['linux', 'osx', 'windows'] # Platforms this plugin will run on
-    author              = 'DiapDealer' # The author of this plugin
-    version             = (0, 0, 6)   # The version number of this plugin
-    file_types          = set(['pdb']) # The file types that this plugin will be applied to
-    on_import           = True # Run this plugin during the import
-    minimum_calibre_version = (0, 7, 55)
-
-    def run(self, path_to_ebook):
-        
-        global bookname, erdr2pml
-        
-        infile = path_to_ebook
-        bookname = os.path.splitext(os.path.basename(infile))[0]
-        outdir = PersistentTemporaryDirectory()
-        pmlzfile = self.temporary_file(bookname + '.pmlz')
-        
-        if self.site_customization:
-            keydata = self.site_customization
-            ar = keydata.split(':')
-            for i in ar:
-                try:
-                    name, cc = i.split(',')
-                except ValueError:
-                    print '   Error parsing user supplied data.'
-                    return path_to_ebook
-
-                try:
-                    print "Processing..."
-                    import time
-                    start_time = time.time()
-                    pmlfilepath = self.convertEreaderToPml(infile, name, cc, outdir)
-                    
-                    if pmlfilepath and pmlfilepath != 1:
-                        import zipfile
-                        print "   Creating PMLZ file"
-                        myZipFile = zipfile.ZipFile(pmlzfile.name,'w',zipfile.ZIP_STORED, False)
-                        list = os.listdir(outdir)
-                        for file in list:
-                            localname = file
-                            filePath = os.path.join(outdir,file)
-                            if os.path.isfile(filePath):
-                                myZipFile.write(filePath, localname)
-                            elif os.path.isdir(filePath):
-                                imageList = os.listdir(filePath)
-                                localimgdir = os.path.basename(filePath)
-                                for image in imageList:
-                                    localname = os.path.join(localimgdir,image)
-                                    imagePath = os.path.join(filePath,image)
-                                    if os.path.isfile(imagePath):
-                                        myZipFile.write(imagePath, localname)
-                        myZipFile.close()
-                        end_time = time.time()
-                        search_time = end_time - start_time
-                        print 'elapsed time: %.2f seconds' % (search_time, ) 
-                        print "done"
-                        return pmlzfile.name
-                    else:
-                        raise ValueError('Error Creating PML file.')
-                except ValueError, e:
-                        print "Error: %s" % e
-                        pass
-            raise Exception('Couldn\'t decrypt pdb file.')
-        else:
-            raise Exception('No name and CC# provided.')
-        
-    def convertEreaderToPml(self, infile, name, cc, outdir):
-
-        print "   Decoding File"
-        sect = erdr2pml.Sectionizer(infile, 'PNRdPPrs')
-        er = erdr2pml.EreaderProcessor(sect, name, cc)
-
-        if er.getNumImages() > 0:
-            print "   Extracting images"
-            #imagedir = bookname + '_img/'
-            imagedir = 'images/'
-            imagedirpath = os.path.join(outdir,imagedir)
-            if not os.path.exists(imagedirpath):
-                os.makedirs(imagedirpath)
-            for i in xrange(er.getNumImages()):
-                name, contents = er.getImage(i)
-                file(os.path.join(imagedirpath, name), 'wb').write(contents)
-
-        print "   Extracting pml"
-        pml_string = er.getText()
-        pmlfilename = bookname + ".pml"
-        try:
-            file(os.path.join(outdir, pmlfilename),'wb').write(erdr2pml.cleanPML(pml_string))
-            return os.path.join(outdir, pmlfilename)
-        except:
-            return 1
- 
-    def customization_help(self, gui=False):
-        return 'Enter Account Name & Last 8 digits of Credit Card number (separate with a comma)'

Calibre_Plugins/eReaderPDB2PML_plugin/erdr2pml.py

@@ -1,527 +0,0 @@
-#!/usr/bin/env python
-# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
-#
-# erdr2pml.py
-#
-# This is a python script. You need a Python interpreter to run it.
-# For example, ActiveState Python, which exists for windows.
-# Changelog
-#
-#  Based on ereader2html version 0.08 plus some later small fixes
-#
-#  0.01 - Initial version
-#  0.02 - Support more eReader files. Support bold text and links. Fix PML decoder parsing bug.
-#  0.03 - Fix incorrect variable usage at one place.
-#  0.03b - enhancement by DeBockle (version 259 support)
-# Custom version 0.03 - no change to eReader support, only usability changes
-#   - start of pep-8 indentation (spaces not tab), fix trailing blanks
-#   - version variable, only one place to change
-#   - added main routine, now callable as a library/module, 
-#     means tools can add optional support for ereader2html
-#   - outdir is no longer a mandatory parameter (defaults based on input name if missing)
-#   - time taken output to stdout
-#   - Psyco support - reduces runtime by a factor of (over) 3!
-#     E.g. (~600Kb file) 90 secs down to 24 secs
-#       - newstyle classes
-#       - changed map call to list comprehension
-#         may not work with python 2.3
-#         without Psyco this reduces runtime to 90%
-#         E.g. 90 secs down to 77 secs
-#         Psyco with map calls takes longer, do not run with map in Psyco JIT!
-#       - izip calls used instead of zip (if available), further reduction
-#         in run time (factor of 4.5).
-#         E.g. (~600Kb file) 90 secs down to 20 secs
-#   - Python 2.6+ support, avoid DeprecationWarning with sha/sha1
-#  0.04 - Footnote support, PML output, correct charset in html, support more PML tags
-#   - Feature change, dump out PML file
-#   - Added supprt for footnote tags. NOTE footnote ids appear to be bad (not usable)
-#       in some pdb files :-( due to the same id being used multiple times
-#   - Added correct charset encoding (pml is based on cp1252)
-#   - Added logging support.
-#  0.05 - Improved type 272 support for sidebars, links, chapters, metainfo, etc
-#  0.06 - Merge of 0.04 and 0.05. Improved HTML output
-#         Placed images in subfolder, so that it's possible to just
-#         drop the book.pml file onto DropBook to make an unencrypted
-#         copy of the eReader file.
-#         Using that with Calibre works a lot better than the HTML
-#         conversion in this code.
-#  0.07 - Further Improved type 272 support for sidebars with all earlier fixes
-#  0.08 - fixed typos, removed extraneous things
-#  0.09 - fixed typos in first_pages to first_page to again support older formats
-#  0.10 - minor cleanups
-#  0.11 - fixups for using correct xml for footnotes and sidebars for use with Dropbook
-#  0.12 - Fix added to prevent lowercasing of image names when the pml code itself uses a different case in the link name.
-#  0.13 - change to unbuffered stdout for use with gui front ends
-#  0.14 - contributed enhancement to support --make-pmlz switch
-#  0.15 - enabled high-ascii to pml character encoding. DropBook now works on Mac.
-#  0.16 - convert to use openssl DES (very very fast) or pure python DES if openssl's libcrypto is not available
-#  0.17 - added support for pycrypto's DES as well
-#  0.18 - on Windows try PyCrypto first and OpenSSL next
-#  0.19 - Modify the interface to allow use of import
-#  0.20 - modify to allow use inside new interface for calibre plugins
-#  0.21 - Support eReader (drm) version 11. 
-#       - Don't reject dictionary format. 
-#       - Ignore sidebars for dictionaries (different format?)
-
-__version__='0.21'
-
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-
-import sys
-import struct, binascii, getopt, zlib, os, os.path, urllib, tempfile
-
-if 'calibre' in sys.modules:
-    inCalibre = True
-else:
-    inCalibre = False
-
-Des = None
-if sys.platform.startswith('win'):
-    # first try with pycrypto
-    if inCalibre:
-        from calibre_plugins.erdrpdb2pml import pycrypto_des
-    else:
-        import pycrypto_des
-    Des = pycrypto_des.load_pycrypto()
-    if Des == None:
-        # they try with openssl
-        if inCalibre:
-            from calibre_plugins.erdrpdb2pml import openssl_des
-        else:
-            import openssl_des
-        Des = openssl_des.load_libcrypto()
-else:
-    # first try with openssl
-    if inCalibre:
-        from calibre_plugins.erdrpdb2pml import openssl_des
-    else:
-        import openssl_des
-    Des = openssl_des.load_libcrypto()
-    if Des == None:
-        # then try with pycrypto
-        if inCalibre:
-            from calibre_plugins.erdrpdb2pml import pycrypto_des
-        else:
-            import pycrypto_des
-        Des = pycrypto_des.load_pycrypto()
-
-# if that did not work then use pure python implementation
-# of DES and try to speed it up with Psycho
-if Des == None:
-    if inCalibre:
-        from calibre_plugins.erdrpdb2pml import python_des
-    else:
-        import python_des
-    Des = python_des.Des
-    # Import Psyco if available
-    try:
-        # http://psyco.sourceforge.net
-        import psyco
-        psyco.full()
-    except ImportError:
-        pass
-
-try:
-    from hashlib import sha1
-except ImportError:
-    # older Python release
-    import sha
-    sha1 = lambda s: sha.new(s)
-
-import cgi
-import logging
-
-logging.basicConfig()
-#logging.basicConfig(level=logging.DEBUG)
-
-
-class Sectionizer(object):
-    bkType = "Book"
-
-    def __init__(self, filename, ident):
-        self.contents = file(filename, 'rb').read()
-        self.header = self.contents[0:72]
-        self.num_sections, = struct.unpack('>H', self.contents[76:78])
-        # Dictionary or normal content (TODO: Not hard-coded)
-        if self.header[0x3C:0x3C+8] != ident:
-            if self.header[0x3C:0x3C+8] == "PDctPPrs":
-                self.bkType = "Dict"
-            else:
-                raise ValueError('Invalid file format')
-        self.sections = []
-        for i in xrange(self.num_sections):
-            offset, a1,a2,a3,a4 = struct.unpack('>LBBBB', self.contents[78+i*8:78+i*8+8])
-            flags, val = a1, a2<<16|a3<<8|a4
-            self.sections.append( (offset, flags, val) )
-    def loadSection(self, section):
-        if section + 1 == self.num_sections:
-            end_off = len(self.contents)
-        else:
-            end_off = self.sections[section + 1][0]
-        off = self.sections[section][0]
-        return self.contents[off:end_off]
-
-def sanitizeFileName(s):
-    r = ''
-    for c in s:
-        if c in "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.-":
-            r += c
-    return r
-
-def fixKey(key):
-    def fixByte(b):
-        return b ^ ((b ^ (b<<1) ^ (b<<2) ^ (b<<3) ^ (b<<4) ^ (b<<5) ^ (b<<6) ^ (b<<7) ^ 0x80) & 0x80)
-    return 	"".join([chr(fixByte(ord(a))) for a in key])
-
-def deXOR(text, sp, table):
-    r=''
-    j = sp
-    for i in xrange(len(text)):
-        r += chr(ord(table[j]) ^ ord(text[i]))
-        j = j + 1
-        if j == len(table):
-            j = 0
-    return r
-
-class EreaderProcessor(object):
-    def __init__(self, sect, username, creditcard):
-        self.section_reader = sect.loadSection
-        data = self.section_reader(0)
-        version,  = struct.unpack('>H', data[0:2])
-        self.version = version
-        logging.info('eReader file format version %s', version)
-        if version != 272 and version != 260 and version != 259:
-            raise ValueError('incorrect eReader version %d (error 1)' % version)
-        data = self.section_reader(1)
-        self.data = data
-        des = Des(fixKey(data[0:8]))
-        cookie_shuf, cookie_size = struct.unpack('>LL', des.decrypt(data[-8:]))
-        if cookie_shuf < 3 or cookie_shuf > 0x14 or cookie_size < 0xf0 or cookie_size > 0x200:
-            raise ValueError('incorrect eReader version (error 2)')
-        input = des.decrypt(data[-cookie_size:])
-        def unshuff(data, shuf):
-            r = [''] * len(data)
-            j = 0
-            for i in xrange(len(data)):
-                j = (j + shuf) % len(data)
-                r[j] = data[i]
-            assert	len("".join(r)) == len(data)
-            return "".join(r)
-        r = unshuff(input[0:-8], cookie_shuf)
-
-        def fixUsername(s):
-            r = ''
-            for c in s.lower():
-                if (c >= 'a' and c <= 'z' or c >= '0' and c <= '9'):
-                    r += c
-            return r
-
-        user_key = struct.pack('>LL', binascii.crc32(fixUsername(username)) & 0xffffffff, binascii.crc32(creditcard[-8:])& 0xffffffff)
-        drm_sub_version = struct.unpack('>H', r[0:2])[0]
-        self.num_text_pages = struct.unpack('>H', r[2:4])[0] - 1
-        self.num_image_pages = struct.unpack('>H', r[26:26+2])[0]
-        self.first_image_page = struct.unpack('>H', r[24:24+2])[0]
-        # Default values
-        self.num_footnote_pages = 0
-        self.num_sidebar_pages = 0
-        self.first_footnote_page = -1
-        self.first_sidebar_page = -1
-        if self.version == 272:
-            self.num_footnote_pages = struct.unpack('>H', r[46:46+2])[0]
-            self.first_footnote_page = struct.unpack('>H', r[44:44+2])[0]
-            if (sect.bkType == "Book"):
-                self.num_sidebar_pages = struct.unpack('>H', r[38:38+2])[0]
-                self.first_sidebar_page = struct.unpack('>H', r[36:36+2])[0]
-            # self.num_bookinfo_pages = struct.unpack('>H', r[34:34+2])[0]
-            # self.first_bookinfo_page = struct.unpack('>H', r[32:32+2])[0]
-            # self.num_chapter_pages = struct.unpack('>H', r[22:22+2])[0]
-            # self.first_chapter_page = struct.unpack('>H', r[20:20+2])[0]
-            # self.num_link_pages = struct.unpack('>H', r[30:30+2])[0]
-            # self.first_link_page = struct.unpack('>H', r[28:28+2])[0]
-            # self.num_xtextsize_pages = struct.unpack('>H', r[54:54+2])[0]
-            # self.first_xtextsize_page = struct.unpack('>H', r[52:52+2])[0]
-
-            # **before** data record 1 was decrypted and unshuffled, it contained data
-            # to create an XOR table and which is used to fix footnote record 0, link records, chapter records, etc
-            self.xortable_offset  = struct.unpack('>H', r[40:40+2])[0]
-            self.xortable_size = struct.unpack('>H', r[42:42+2])[0]
-            self.xortable = self.data[self.xortable_offset:self.xortable_offset + self.xortable_size]
-        else:
-            # Nothing needs to be done
-            pass
-            # self.num_bookinfo_pages = 0
-            # self.num_chapter_pages = 0
-            # self.num_link_pages = 0
-            # self.num_xtextsize_pages = 0
-            # self.first_bookinfo_page = -1
-            # self.first_chapter_page = -1
-            # self.first_link_page = -1
-            # self.first_xtextsize_page = -1
-
-        logging.debug('self.num_text_pages %d', self.num_text_pages)
-        logging.debug('self.num_footnote_pages %d, self.first_footnote_page %d', self.num_footnote_pages , self.first_footnote_page)
-        logging.debug('self.num_sidebar_pages %d, self.first_sidebar_page %d', self.num_sidebar_pages , self.first_sidebar_page)
-        self.flags = struct.unpack('>L', r[4:8])[0]
-        reqd_flags = (1<<9) | (1<<7) | (1<<10)
-        if (self.flags & reqd_flags) != reqd_flags:
-            print "Flags: 0x%X" % self.flags
-            raise ValueError('incompatible eReader file')
-        des = Des(fixKey(user_key))
-        if version == 259:
-            if drm_sub_version != 7:
-                raise ValueError('incorrect eReader version %d (error 3)' % drm_sub_version)
-            encrypted_key_sha = r[44:44+20]
-            encrypted_key = r[64:64+8]
-        elif version == 260:
-            if drm_sub_version != 13 and drm_sub_version != 11:
-                raise ValueError('incorrect eReader version %d (error 3)' % drm_sub_version)
-            if drm_sub_version == 13:
-                encrypted_key = r[44:44+8]
-                encrypted_key_sha = r[52:52+20]
-            else:
-                encrypted_key = r[64:64+8]
-                encrypted_key_sha = r[44:44+20]
-        elif version == 272:
-            encrypted_key = r[172:172+8]
-            encrypted_key_sha = r[56:56+20]
-        self.content_key = des.decrypt(encrypted_key)
-        if sha1(self.content_key).digest() != encrypted_key_sha:
-            raise ValueError('Incorrect Name and/or Credit Card')
-
-    def getNumImages(self):
-        return self.num_image_pages
-
-    def getImage(self, i):
-        sect = self.section_reader(self.first_image_page + i)
-        name = sect[4:4+32].strip('\0')
-        data = sect[62:]
-        return sanitizeFileName(name), data
-
-
-    # def getChapterNamePMLOffsetData(self):
-    #     cv = ''
-    #     if self.num_chapter_pages > 0:
-    #         for i in xrange(self.num_chapter_pages):
-    #             chaps = self.section_reader(self.first_chapter_page + i)
-    #             j = i % self.xortable_size
-    #             offname = deXOR(chaps, j, self.xortable)
-    #             offset = struct.unpack('>L', offname[0:4])[0]
-    #             name = offname[4:].strip('\0')
-    #             cv += '%d|%s\n' % (offset, name) 
-    #     return cv
-
-    # def getLinkNamePMLOffsetData(self):
-    #     lv = ''
-    #     if self.num_link_pages > 0:
-    #         for i in xrange(self.num_link_pages):
-    #             links = self.section_reader(self.first_link_page + i)
-    #             j = i % self.xortable_size
-    #             offname = deXOR(links, j, self.xortable)
-    #             offset = struct.unpack('>L', offname[0:4])[0]
-    #             name = offname[4:].strip('\0')
-    #             lv += '%d|%s\n' % (offset, name) 
-    #     return lv
-
-    # def getExpandedTextSizesData(self):
-    #      ts = ''
-    #      if self.num_xtextsize_pages > 0:
-    #          tsize = deXOR(self.section_reader(self.first_xtextsize_page), 0, self.xortable)
-    #          for i in xrange(self.num_text_pages):
-    #              xsize = struct.unpack('>H', tsize[0:2])[0]
-    #              ts += "%d\n" % xsize
-    #              tsize = tsize[2:]
-    #      return ts
-
-    # def getBookInfo(self):
-    #     bkinfo = ''
-    #     if self.num_bookinfo_pages > 0:
-    #         info = self.section_reader(self.first_bookinfo_page)
-    #         bkinfo = deXOR(info, 0, self.xortable)
-    #         bkinfo = bkinfo.replace('\0','|')
-    #         bkinfo += '\n'
-    #     return bkinfo
-
-    def getText(self):
-        des = Des(fixKey(self.content_key))
-        r = ''
-        for i in xrange(self.num_text_pages):
-            logging.debug('get page %d', i)
-            r += zlib.decompress(des.decrypt(self.section_reader(1 + i)))
-             
-        # now handle footnotes pages
-        if self.num_footnote_pages > 0:
-            r += '\n'
-            # the record 0 of the footnote section must pass through the Xor Table to make it useful
-            sect = self.section_reader(self.first_footnote_page)
-            fnote_ids = deXOR(sect, 0, self.xortable)
-            # the remaining records of the footnote sections need to be decoded with the content_key and zlib inflated
-            des = Des(fixKey(self.content_key))
-            for i in xrange(1,self.num_footnote_pages):
-                logging.debug('get footnotepage %d', i)
-                id_len = ord(fnote_ids[2])
-                id = fnote_ids[3:3+id_len]
-                fmarker = '<footnote id="%s">\n' % id
-                fmarker += zlib.decompress(des.decrypt(self.section_reader(self.first_footnote_page + i)))
-                fmarker += '\n</footnote>\n'
-                r += fmarker
-                fnote_ids = fnote_ids[id_len+4:]
-
-        # TODO: Handle dictionary index (?) pages - which are also marked as
-        # sidebar_pages (?). For now dictionary sidebars are ignored
-        # For dictionaries - record 0 is null terminated strings, followed by
-        # blocks of around 62000 bytes and a final block. Not sure of the
-        # encoding
-
-        # now handle sidebar pages
-        if self.num_sidebar_pages > 0:
-            r += '\n'
-            # the record 0 of the sidebar section must pass through the Xor Table to make it useful
-            sect = self.section_reader(self.first_sidebar_page)
-            sbar_ids = deXOR(sect, 0, self.xortable)
-            # the remaining records of the sidebar sections need to be decoded with the content_key and zlib inflated
-            des = Des(fixKey(self.content_key))
-            for i in xrange(1,self.num_sidebar_pages):
-                id_len = ord(sbar_ids[2])
-                id = sbar_ids[3:3+id_len]
-                smarker = '<sidebar id="%s">\n' % id
-                smarker += zlib.decompress(des.decrypt(self.section_reader(self.first_sidebar_page + i)))
-                smarker += '\n</sidebar>\n'
-                r += smarker
-                sbar_ids = sbar_ids[id_len+4:]
-
-        return r
-
-def cleanPML(pml):
-	# Convert special characters to proper PML code.  High ASCII start at (\x80, \a128) and go up to (\xff, \a255)
-	pml2 = pml
-	for k in xrange(128,256):
-		badChar = chr(k)
-		pml2 = pml2.replace(badChar, '\\a%03d' % k)
-	return pml2
-
-def convertEreaderToPml(infile, name, cc, outdir):
-    if not os.path.exists(outdir):
-        os.makedirs(outdir)
-    bookname = os.path.splitext(os.path.basename(infile))[0]
-    print "   Decoding File"
-    sect = Sectionizer(infile, 'PNRdPPrs')
-    er = EreaderProcessor(sect, name, cc)
-
-    if er.getNumImages() > 0:
-        print "   Extracting images"
-        imagedir = bookname + '_img/'
-        imagedirpath = os.path.join(outdir,imagedir)
-        if not os.path.exists(imagedirpath):
-            os.makedirs(imagedirpath)
-        for i in xrange(er.getNumImages()):
-            name, contents = er.getImage(i)
-            file(os.path.join(imagedirpath, name), 'wb').write(contents)
-
-    print "   Extracting pml"
-    pml_string = er.getText()
-    pmlfilename = bookname + ".pml"
-    file(os.path.join(outdir, pmlfilename),'wb').write(cleanPML(pml_string))
-
-    # bkinfo = er.getBookInfo()
-    # if bkinfo != '':
-    #     print "   Extracting book meta information"
-    #     file(os.path.join(outdir, 'bookinfo.txt'),'wb').write(bkinfo)
-
-
-                
-def decryptBook(infile, outdir, name, cc, make_pmlz):
-    if make_pmlz :
-        # ignore specified outdir, use tempdir instead
-        outdir = tempfile.mkdtemp()
-    try:
-        print "Processing..."
-        convertEreaderToPml(infile, name, cc, outdir)
-        if make_pmlz :
-            import zipfile
-            import shutil
-            print "   Creating PMLZ file"
-            zipname = infile[:-4] + '.pmlz'
-            myZipFile = zipfile.ZipFile(zipname,'w',zipfile.ZIP_STORED, False)
-            list = os.listdir(outdir)
-            for file in list:
-                localname = file
-                filePath = os.path.join(outdir,file)
-                if os.path.isfile(filePath):
-                    myZipFile.write(filePath, localname)
-                elif os.path.isdir(filePath):
-                    imageList = os.listdir(filePath)
-                    localimgdir = os.path.basename(filePath)
-                    for image in imageList:
-                        localname = os.path.join(localimgdir,image)
-                        imagePath = os.path.join(filePath,image)
-                        if os.path.isfile(imagePath):
-                            myZipFile.write(imagePath, localname)
-            myZipFile.close()
-            # remove temporary directory
-            shutil.rmtree(outdir, True)
-            print 'output is %s' % zipname
-        else :
-            print 'output in %s' % outdir 
-        print "done"
-    except ValueError, e:
-        print "Error: %s" % e
-        return 1
-    return 0
-
-
-def usage():
-    print "Converts DRMed eReader books to PML Source"
-    print "Usage:"
-    print "  erdr2pml [options] infile.pdb [outdir] \"your name\" credit_card_number "
-    print " "
-    print "Options: "
-    print "  -h                prints this message"
-    print "  --make-pmlz       create PMLZ instead of using output directory"
-    print " "
-    print "Note:"
-    print "  if ommitted, outdir defaults based on 'infile.pdb'"
-    print "  It's enough to enter the last 8 digits of the credit card number"
-    return
-
-
-def main(argv=None):
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], "h", ["make-pmlz"])
-    except getopt.GetoptError, err:
-        print str(err)
-        usage()
-        return 1
-    make_pmlz = False
-    for o, a in opts:
-        if o == "-h":
-            usage()
-            return 0
-        elif o == "--make-pmlz":
-            make_pmlz = True
-    
-    print "eRdr2Pml v%s. Copyright (c) 2009 The Dark Reverser" % __version__
-
-    if len(args)!=3 and len(args)!=4:
-        usage()
-        return 1
-
-    if len(args)==3:
-        infile, name, cc = args[0], args[1], args[2]
-        outdir = infile[:-4] + '_Source'
-    elif len(args)==4:
-        infile, outdir, name, cc = args[0], args[1], args[2], args[3]
-
-    return decryptBook(infile, outdir, name, cc, make_pmlz)
-
-
-if __name__ == "__main__":
-    sys.stdout=Unbuffered(sys.stdout)
-    sys.exit(main())
-

Calibre_Plugins/eReaderPDB2PML_plugin/openssl_des.py

@@ -1,90 +0,0 @@
-#!/usr/bin/env python
-# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
-
-# implement just enough of des from openssl to make erdr2pml.py happy
-
-def load_libcrypto():
-    from ctypes import CDLL, POINTER, c_void_p, c_char_p, c_char, c_int, c_long, \
-        Structure, c_ulong, create_string_buffer, cast
-    from ctypes.util import find_library
-    import sys
-
-    if sys.platform.startswith('win'):
-        libcrypto = find_library('libeay32')
-    else:
-        libcrypto = find_library('crypto')
-
-    if libcrypto is None:
-        return None
-
-    libcrypto = CDLL(libcrypto)
-    
-    # typedef struct DES_ks
-    #     {
-    #     union
-    #         {
-    #         DES_cblock cblock;
-    #         /* make sure things are correct size on machines with
-    #          * 8 byte longs */
-    #         DES_LONG deslong[2];
-    #         } ks[16];
-    #     } DES_key_schedule;
-
-    # just create a big enough place to hold everything 
-    # it will have alignment of structure so we should be okay (16 byte aligned?)
-    class DES_KEY_SCHEDULE(Structure):
-        _fields_ = [('DES_cblock1', c_char * 16),
-                    ('DES_cblock2', c_char * 16),
-                    ('DES_cblock3', c_char * 16),
-                    ('DES_cblock4', c_char * 16),
-                    ('DES_cblock5', c_char * 16),
-                    ('DES_cblock6', c_char * 16),
-                    ('DES_cblock7', c_char * 16),
-                    ('DES_cblock8', c_char * 16),
-                    ('DES_cblock9', c_char * 16),
-                    ('DES_cblock10', c_char * 16),
-                    ('DES_cblock11', c_char * 16),
-                    ('DES_cblock12', c_char * 16),
-                    ('DES_cblock13', c_char * 16),
-                    ('DES_cblock14', c_char * 16),
-                    ('DES_cblock15', c_char * 16),
-                    ('DES_cblock16', c_char * 16)]
-
-    DES_KEY_SCHEDULE_p = POINTER(DES_KEY_SCHEDULE)
-
-    def F(restype, name, argtypes):
-        func = getattr(libcrypto, name)
-        func.restype = restype
-        func.argtypes = argtypes
-        return func
-
-    DES_set_key = F(None, 'DES_set_key',[c_char_p, DES_KEY_SCHEDULE_p])
-    DES_ecb_encrypt = F(None, 'DES_ecb_encrypt',[c_char_p, c_char_p, DES_KEY_SCHEDULE_p, c_int])
-
-    
-    class DES(object):
-        def __init__(self, key):
-            if len(key) != 8 :
-                raise Error('DES improper key used')
-                return
-            self.key = key
-            self.keyschedule = DES_KEY_SCHEDULE()
-            DES_set_key(self.key, self.keyschedule)
-        def desdecrypt(self, data):
-            ob = create_string_buffer(len(data))
-            DES_ecb_encrypt(data, ob, self.keyschedule, 0)
-            return ob.raw
-        def decrypt(self, data):
-            if not data:
-                return ''
-            i = 0
-            result = []
-            while i < len(data):
-                block = data[i:i+8]
-                processed_block = self.desdecrypt(block)
-                result.append(processed_block)
-                i += 8
-            return ''.join(result)
-
-    return DES
-

Calibre_Plugins/ignobleepub_plugin/ignobleepub_plugin.py

@@ -1,382 +0,0 @@
-#!/usr/bin/env python
-
-# ignobleepub_plugin.py
-# Released under the terms of the GNU General Public Licence, version 3 or
-# later.  <http://www.gnu.org/licenses/>
-#
-# Requires Calibre version 0.7.55 or higher.
-#
-# All credit given to I <3 Cabbages for the original standalone scripts.
-# I had the much easier job of converting them to Calibre a plugin.
-#
-# This plugin is meant to decrypt Barnes & Noble Epubs that are protected
-# with Adobe's Adept encryption. It is meant to function without having to install
-# any dependencies... other than having Calibre installed, of course. It will still
-# work if you have Python and PyCrypto already installed, but they aren't necessary.
-#
-# Configuration:
-# 1) The easiest way to configure the plugin is to enter your name (Barnes & Noble account
-# name) and credit card number (the one used to purchase the books) into the plugin's
-# customization window. Highlight the plugin (Ignoble Epub DeDRM) and click the
-# "Customize Plugin" button on Calibre's Preferences->Plugins page.
-# Enter the name and credit card number separated by a comma: Your Name,1234123412341234
-#
-# If you've purchased books with more than one credit card, separate the info with
-# a colon: Your Name,1234123412341234:Other Name,2345234523452345
-#
-# ** Method 1 is your only option if you don't have/can't run the original
-# I <3 Cabbages scripts on your particular machine. **
-#
-# 2) If you already have keyfiles generated with I <3 Cabbages' ignoblekeygen.pyw
-# script, you can put those keyfiles in Calibre's configuration directory. The easiest
-# way to find the correct directory is to go to Calibre's Preferences page... click
-# on the 'Miscellaneous' button (looks like a gear),  and then click the 'Open Calibre
-# configuration directory' button. Paste your keyfiles in there. Just make sure that
-# they have different names and are saved with the '.b64' extension (like the ignoblekeygen
-# script produces). This directory isn't touched when upgrading Calibre, so it's quite safe
-# to leave then there.
-#
-# All keyfiles from option 2 and all data entered from option 1 will be used to attempt
-# to decrypt a book. You can use option 1 or option 2, or a combination of both.
-#
-#
-# Revision history:
-#   0.1.0 - Initial release
-#   0.1.1 - Allow Windows users to make use of openssl if they have it installed.
-#          - Incorporated SomeUpdates zipfix routine.
-#   0.1.2 - bug fix for non-ascii file names in encryption.xml
-#   0.1.3 - Try PyCrypto on Windows first
-#   0.1.4 - update zipfix to deal with mimetype not in correct place
-#   0.1.5 - update zipfix to deal with completely missing mimetype files
-#   0.1.6 - update ot the new calibre plugin interface 
-
-"""
-Decrypt Barnes & Noble ADEPT encrypted EPUB books.
-"""
-
-from __future__ import with_statement
-
-__license__ = 'GPL v3'
-
-import sys
-import os
-import hashlib
-import zlib
-import zipfile
-import re
-from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
-import xml.etree.ElementTree as etree
-from contextlib import closing
-
-global AES
-global AES2
-
-META_NAMES = ('mimetype', 'META-INF/rights.xml', 'META-INF/encryption.xml')
-NSMAP = {'adept': 'http://ns.adobe.com/adept',
-         'enc': 'http://www.w3.org/2001/04/xmlenc#'}
-
-class IGNOBLEError(Exception):
-    pass
-
-def _load_crypto_libcrypto():
-    from ctypes import CDLL, POINTER, c_void_p, c_char_p, c_int, c_long, \
-        Structure, c_ulong, create_string_buffer, cast
-    from ctypes.util import find_library
-
-    if sys.platform.startswith('win'):
-        libcrypto = find_library('libeay32')
-    else:
-        libcrypto = find_library('crypto')
-    if libcrypto is None:
-        raise IGNOBLEError('libcrypto not found')
-    libcrypto = CDLL(libcrypto)
-
-    AES_MAXNR = 14
-    
-    c_char_pp = POINTER(c_char_p)
-    c_int_p = POINTER(c_int)
-
-    class AES_KEY(Structure):
-        _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))),
-                    ('rounds', c_int)]
-    AES_KEY_p = POINTER(AES_KEY)
-    
-    def F(restype, name, argtypes):
-        func = getattr(libcrypto, name)
-        func.restype = restype
-        func.argtypes = argtypes
-        return func
-    
-    AES_set_encrypt_key = F(c_int, 'AES_set_encrypt_key',
-                            [c_char_p, c_int, AES_KEY_p])
-    AES_set_decrypt_key = F(c_int, 'AES_set_decrypt_key',
-                            [c_char_p, c_int, AES_KEY_p])
-    AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',
-                        [c_char_p, c_char_p, c_ulong, AES_KEY_p, c_char_p,
-                         c_int])
-    
-    class AES(object):
-        def __init__(self, userkey):
-            self._blocksize = len(userkey)
-            if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
-                raise IGNOBLEError('AES improper key used')
-                return
-            key = self._key = AES_KEY()
-            rv = AES_set_decrypt_key(userkey, len(userkey) * 8, key)
-            if rv < 0:
-                raise IGNOBLEError('Failed to initialize AES key')
-    
-        def decrypt(self, data):
-            out = create_string_buffer(len(data))
-            iv = ("\x00" * self._blocksize)
-            rv = AES_cbc_encrypt(data, out, len(data), self._key, iv, 0)
-            if rv == 0:
-                raise IGNOBLEError('AES decryption failed')
-            return out.raw
-        
-    class AES2(object):
-         def __init__(self, userkey, iv):
-            self._blocksize = len(userkey)
-            self._iv = iv
-            key = self._key = AES_KEY()
-            rv = AES_set_encrypt_key(userkey, len(userkey) * 8, key)
-            if rv < 0:
-                raise IGNOBLEError('Failed to initialize AES Encrypt key')
-    
-         def encrypt(self, data):
-            out = create_string_buffer(len(data))
-            rv = AES_cbc_encrypt(data, out, len(data), self._key, self._iv, 1)
-            if rv == 0:
-                raise IGNOBLEError('AES encryption failed')
-            return out.raw
-    print 'IgnobleEpub: Using libcrypto.'
-    return (AES, AES2)
-
-def _load_crypto_pycrypto():
-    from Crypto.Cipher import AES as _AES
-
-    class AES(object):
-        def __init__(self, key):
-            self._aes = _AES.new(key, _AES.MODE_CBC)
-
-        def decrypt(self, data):
-            return self._aes.decrypt(data)
-            
-    class AES2(object):
-        def __init__(self, key, iv):
-            self._aes = _AES.new(key, _AES.MODE_CBC, iv)
-
-        def encrypt(self, data):
-            return self._aes.encrypt(data)
-    print 'IgnobleEpub: Using PyCrypto.'
-    return (AES, AES2)
-    
-def _load_crypto():
-    _aes = _aes2 = None
-    cryptolist = (_load_crypto_libcrypto, _load_crypto_pycrypto)
-    if sys.platform.startswith('win'):
-        cryptolist = (_load_crypto_pycrypto, _load_crypto_libcrypto)
-    for loader in cryptolist:
-        try:
-            _aes, _aes2 = loader()
-            break
-        except (ImportError, IGNOBLEError):
-            pass
-    return (_aes, _aes2)
-
-def normalize_name(name): # Strip spaces and convert to lowercase.
-    return ''.join(x for x in name.lower() if x != ' ')
-
-def generate_keyfile(name, ccn):
-    name = normalize_name(name) + '\x00'
-    ccn = ccn + '\x00'
-    name_sha = hashlib.sha1(name).digest()[:16]
-    ccn_sha = hashlib.sha1(ccn).digest()[:16]
-    both_sha = hashlib.sha1(name + ccn).digest()
-    aes = AES2(ccn_sha, name_sha)
-    crypt = aes.encrypt(both_sha + ('\x0c' * 0x0c))
-    userkey = hashlib.sha1(crypt).digest()
-
-    return userkey.encode('base64')
-
-class ZipInfo(zipfile.ZipInfo):
-    def __init__(self, *args, **kwargs):
-        if 'compress_type' in kwargs:
-            compress_type = kwargs.pop('compress_type')
-        super(ZipInfo, self).__init__(*args, **kwargs)
-        self.compress_type = compress_type
-
-class Decryptor(object):
-    def __init__(self, bookkey, encryption):
-        enc = lambda tag: '{%s}%s' % (NSMAP['enc'], tag)
-        self._aes = AES(bookkey)
-        encryption = etree.fromstring(encryption)
-        self._encrypted = encrypted = set()
-        expr = './%s/%s/%s' % (enc('EncryptedData'), enc('CipherData'),
-                               enc('CipherReference'))
-        for elem in encryption.findall(expr):
-            path = elem.get('URI', None)
-            path = path.encode('utf-8')
-            if path is not None:
-                encrypted.add(path)
-
-    def decompress(self, bytes):
-        dc = zlib.decompressobj(-15)
-        bytes = dc.decompress(bytes)
-        ex = dc.decompress('Z') + dc.flush()
-        if ex:
-            bytes = bytes + ex
-        return bytes
-
-    def decrypt(self, path, data):
-        if path in self._encrypted:
-            data = self._aes.decrypt(data)[16:]
-            data = data[:-ord(data[-1])]
-            data = self.decompress(data)
-        return data
-
-def plugin_main(userkey, inpath, outpath):
-    key = userkey.decode('base64')[:16]
-    aes = AES(key)
-    
-    with closing(ZipFile(open(inpath, 'rb'))) as inf:
-        namelist = set(inf.namelist())
-        if 'META-INF/rights.xml' not in namelist or \
-           'META-INF/encryption.xml' not in namelist:
-            return 1
-        for name in META_NAMES:
-            namelist.remove(name)
-        try: # If the generated keyfile doesn't match the bookkey, this is where it's likely to blow up.
-            rights = etree.fromstring(inf.read('META-INF/rights.xml'))
-            adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
-            expr = './/%s' % (adept('encryptedKey'),)
-            bookkey = ''.join(rights.findtext(expr))
-            bookkey = aes.decrypt(bookkey.decode('base64'))
-            bookkey = bookkey[:-ord(bookkey[-1])]
-            encryption = inf.read('META-INF/encryption.xml')
-            decryptor = Decryptor(bookkey[-16:], encryption)
-            kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
-            with closing(ZipFile(open(outpath, 'wb'), 'w', **kwds)) as outf:
-                zi = ZipInfo('mimetype', compress_type=ZIP_STORED)
-                outf.writestr(zi, inf.read('mimetype'))
-                for path in namelist:
-                    data = inf.read(path)
-                    outf.writestr(path, decryptor.decrypt(path, data))
-        except:
-            return 2
-    return 0
-
-from calibre.customize import FileTypePlugin
-from calibre.constants import iswindows, isosx
-
-class IgnobleDeDRM(FileTypePlugin):
-    name                    = 'Ignoble Epub DeDRM'
-    description             = 'Removes DRM from secure Barnes & Noble epub files. \
-                                Credit given to I <3 Cabbages for the original stand-alone scripts.'
-    supported_platforms     = ['linux', 'osx', 'windows']
-    author                  = 'DiapDealer'
-    version                 = (0, 1, 6)
-    minimum_calibre_version = (0, 7, 55)  # Compiled python libraries cannot be imported in earlier versions.
-    file_types              = set(['epub'])
-    on_import               = True
-
-    def run(self, path_to_ebook):
-        global AES
-        global AES2
-        
-        AES, AES2 = _load_crypto()
-        
-        if AES == None or AES2 == None:
-            # Failed to load libcrypto or PyCrypto... Adobe Epubs can't be decrypted.'
-            raise IGNOBLEError('IgnobleEpub - Failed to load crypto libs.')
-            return
-
-        # Load any keyfiles (*.b64) included Calibre's config directory.
-        userkeys = []
-        try:
-            # Find Calibre's configuration directory.
-            confpath = os.path.split(os.path.split(self.plugin_path)[0])[0]
-            print 'IgnobleEpub: Calibre configuration directory = %s' % confpath
-            files = os.listdir(confpath)
-            filefilter = re.compile("\.b64$", re.IGNORECASE)
-            files = filter(filefilter.search, files)
-
-            if files:
-                for filename in files:
-                    fpath = os.path.join(confpath, filename)
-                    with open(fpath, 'rb') as f:
-                        userkeys.append(f.read())
-                    print 'IgnobleEpub: Keyfile %s found in config folder.' % filename
-            else:
-                print 'IgnobleEpub: No keyfiles found. Checking plugin customization string.'
-        except IOError:
-            print 'IgnobleEpub: Error reading keyfiles from config directory.'
-            pass
-        
-        # Get name and credit card number from Plugin Customization
-        if not userkeys and not self.site_customization:
-            # Plugin hasn't been configured... do nothing.
-            raise IGNOBLEError('IgnobleEpub - No keys found. Plugin not configured.')
-            return
-        
-        if self.site_customization:
-            keystuff = self.site_customization
-            ar = keystuff.split(':')
-            keycount = 0
-            for i in ar:
-                try:
-                    name, ccn = i.split(',')
-                    keycount += 1
-                except ValueError:
-                    raise IGNOBLEError('IgnobleEpub - Error parsing user supplied data.')
-                    return
-        
-                # Generate Barnes & Noble EPUB user key from name and credit card number.
-                userkeys.append( generate_keyfile(name, ccn) )
-            print 'IgnobleEpub: %d userkey(s) generated from customization data.' % keycount
-        
-        # Attempt to decrypt epub with each encryption key (generated or provided).
-        for userkey in userkeys:
-            # Create a TemporaryPersistent file to work with.
-            # Check original epub archive for zip errors.
-            from calibre_plugins.ignobleepub import zipfix
-            inf = self.temporary_file('.epub')
-            try:
-                fr = zipfix.fixZip(path_to_ebook, inf.name)
-                fr.fix()
-            except Exception, e:
-                raise Exception(e)
-                return
-            of = self.temporary_file('.epub')
-        
-            # Give the user key, ebook and TemporaryPersistent file to the Stripper function.
-            result = plugin_main(userkey, inf.name, of.name)
-        
-            # Ebook is not a B&N Adept epub... do nothing and pass it on.
-            # This allows a non-encrypted epub to be imported without error messages.
-            if  result == 1:
-                print 'IgnobleEpub: Not a B&N Adept Epub... punting.'
-                of.close()
-                return path_to_ebook
-                break
-        
-            # Decryption was successful return the modified PersistentTemporary
-            # file to Calibre's import process.
-            if  result == 0:
-                print 'IgnobleEpub: Encryption successfully removed.'
-                of.close()
-                return of.name
-                break
-            
-            print 'IgnobleEpub: Encryption key invalid... trying others.'
-            of.close()
-        
-        # Something went wrong with decryption.
-        # Import the original unmolested epub.
-        of.close
-        raise IGNOBLEError('IgnobleEpub - Ultimately failed to decrypt.')
-        return
-        
-        
-    def customization_help(self, gui=False):
-        return 'Enter B&N Account name and CC# (separate name and CC# with a comma)'

Calibre_Plugins/ignobleepub_plugin/zipfix.py

@@ -1,156 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import zlib
-import zipfile
-import os
-import os.path
-import getopt
-from struct import unpack
-
-
-_FILENAME_LEN_OFFSET = 26
-_EXTRA_LEN_OFFSET = 28
-_FILENAME_OFFSET = 30
-_MAX_SIZE = 64 * 1024
-_MIMETYPE = 'application/epub+zip'
-
-class ZipInfo(zipfile.ZipInfo):
-    def __init__(self, *args, **kwargs):
-        if 'compress_type' in kwargs:
-            compress_type = kwargs.pop('compress_type')
-        super(ZipInfo, self).__init__(*args, **kwargs)
-        self.compress_type = compress_type
-
-class fixZip:
-    def __init__(self, zinput, zoutput):
-        self.ztype = 'zip'
-        if zinput.lower().find('.epub') >= 0 :
-            self.ztype = 'epub'
-        self.inzip = zipfile.ZipFile(zinput,'r')
-        self.outzip = zipfile.ZipFile(zoutput,'w')
-        # open the input zip for reading only as a raw file
-	self.bzf = file(zinput,'rb')
-        
-    def getlocalname(self, zi):
-        local_header_offset = zi.header_offset
-        self.bzf.seek(local_header_offset + _FILENAME_LEN_OFFSET)
-        leninfo = self.bzf.read(2)
-        local_name_length, = unpack('<H', leninfo)
-        self.bzf.seek(local_header_offset + _FILENAME_OFFSET)
-        local_name = self.bzf.read(local_name_length)
-        return local_name
-
-    def uncompress(self, cmpdata):
-        dc = zlib.decompressobj(-15)
-        data = ''
-        while len(cmpdata) > 0:
-            if len(cmpdata) > _MAX_SIZE :
-                newdata = cmpdata[0:_MAX_SIZE]
-                cmpdata = cmpdata[_MAX_SIZE:]
-            else:
-                newdata = cmpdata
-                cmpdata = ''
-            newdata = dc.decompress(newdata)
-            unprocessed = dc.unconsumed_tail
-            if len(unprocessed) == 0:
-                newdata += dc.flush()
-            data += newdata
-            cmpdata += unprocessed
-            unprocessed = ''
-        return data
-
-    def getfiledata(self, zi):
-        # get file name length and exta data length to find start of file data
-        local_header_offset = zi.header_offset
-
-        self.bzf.seek(local_header_offset + _FILENAME_LEN_OFFSET)
-        leninfo = self.bzf.read(2)
-        local_name_length, = unpack('<H', leninfo)
-
-        self.bzf.seek(local_header_offset + _EXTRA_LEN_OFFSET)
-        exinfo = self.bzf.read(2)
-        extra_field_length, = unpack('<H', exinfo)
-
-        self.bzf.seek(local_header_offset + _FILENAME_OFFSET + local_name_length + extra_field_length)
-        data = None
-
-        # if not compressed we are good to go
-        if zi.compress_type == zipfile.ZIP_STORED:
-            data = self.bzf.read(zi.file_size)
-
-        # if compressed we must decompress it using zlib
-        if zi.compress_type == zipfile.ZIP_DEFLATED:
-            cmpdata = self.bzf.read(zi.compress_size)
-            data = self.uncompress(cmpdata)
-
-        return data
-
-        
-
-    def fix(self):
-        # get the zipinfo for each member of the input archive
-        # and copy member over to output archive
-        # if problems exist with local vs central filename, fix them
-
-        # if epub write mimetype file first, with no compression
-        if self.ztype == 'epub':
-            nzinfo = ZipInfo('mimetype', compress_type=zipfile.ZIP_STORED)
-            self.outzip.writestr(nzinfo, _MIMETYPE)
-
-        # write the rest of the files
-        for zinfo in self.inzip.infolist():
-            if zinfo.filename != "mimetype" or self.ztype == '.zip':
-                data = None
-                nzinfo = zinfo
-                try: 
-                    data = self.inzip.read(zinfo.filename)
-                except zipfile.BadZipfile or zipfile.error:
-                    local_name = self.getlocalname(zinfo)
-                    data = self.getfiledata(zinfo)
-                    nzinfo.filename = local_name
-
-                nzinfo.date_time = zinfo.date_time
-                nzinfo.compress_type = zinfo.compress_type
-                nzinfo.flag_bits = 0
-                nzinfo.internal_attr = 0
-                self.outzip.writestr(nzinfo,data)
-
-        self.bzf.close()
-        self.inzip.close()
-        self.outzip.close()
-
-
-def usage():
-    print """usage: zipfix.py inputzip outputzip
-     inputzip is the source zipfile to fix
-     outputzip is the fixed zip archive
-    """
-    
-
-def repairBook(infile, outfile):
-    if not os.path.exists(infile):
-        print "Error: Input Zip File does not exist"
-        return 1
-    try:
-        fr = fixZip(infile, outfile)
-        fr.fix()
-        return 0
-    except Exception, e:
-        print "Error Occurred ", e
-        return 2
-
-
-def main(argv=sys.argv):
-    if len(argv)!=3:
-        usage()
-        return 1
-    infile = argv[1]
-    outfile = argv[2]
-    return repairBook(infile, outfile)
-
-
-if __name__ == '__main__' :
-    sys.exit(main())
-
-

Calibre_Plugins/ineptepub_plugin/__init__.py

@@ -1,477 +0,0 @@
-#! /usr/bin/python
-
-# ineptepub_plugin.py
-# Released under the terms of the GNU General Public Licence, version 3 or
-# later.  <http://www.gnu.org/licenses/>
-#
-# Requires Calibre version 0.7.55 or higher.
-#
-# All credit given to I <3 Cabbages for the original standalone scripts.
-# I had the much easier job of converting them to a Calibre plugin.
-#
-# This plugin is meant to decrypt Adobe Digital Edition Epubs that are protected
-# with Adobe's Adept encryption. It is meant to function without having to install
-# any dependencies... other than having Calibre installed, of course. It will still
-# work if you have Python and PyCrypto already installed, but they aren't necessary.
-#
-# Configuration:
-# When first run, the plugin will attempt to find your Adobe Digital Editions installation
-# (on Windows and Mac OS's). If successful, it will create an 'adeptkey.der' file and
-# save it in Calibre's configuration directory. It will use that file on subsequent runs.
-# If there are already '*.der' files in the directory, the plugin won't attempt to
-# find the ADE installation. So if you have ADE installed on the same machine as Calibre...
-# you are ready to go.
-#
-# If you already have keyfiles generated with I <3 Cabbages' ineptkey.pyw script,
-# you can put those keyfiles in Calibre's configuration directory. The easiest
-# way to find the correct directory is to go to Calibre's Preferences page... click
-# on the 'Miscellaneous' button (looks like a gear),  and then click the 'Open Calibre
-# configuration directory' button. Paste your keyfiles in there. Just make sure that
-# they have different names and are saved with the '.der' extension (like the ineptkey
-# script produces). This directory isn't touched when upgrading Calibre, so it's quite
-# safe to leave them there.
-#
-# Since there is no Linux version of Adobe Digital Editions, Linux users will have to
-# obtain a keyfile through other methods and put the file in Calibre's configuration directory.
-#
-# All keyfiles with a '.der' extension found in Calibre's configuration directory will
-# be used to attempt to decrypt a book.
-#
-# ** NOTE ** There is no plugin customization data for the Inept Epub DeDRM plugin.
-#
-# Revision history:
-#   0.1 - Initial release
-#   0.1.1 - Allow Windows users to make use of openssl if they have it installed.
-#         - Incorporated SomeUpdates zipfix routine.
-#   0.1.2 - Removed Carbon dependency for Mac users. Fixes an issue that was a
-#           result of Calibre changing to python 2.7.
-#   0.1.3 - bug fix for epubs with non-ascii chars in file names
-#   0.1.4 - default to try PyCrypto first on Windows
-#   0.1.5 - update zipfix to handle out of position mimetypes
-#   0.1.6 - update zipfix to handle completely missing mimetype files
-#   0.1.7 - update to new calibre plugin interface
-
-"""
-Decrypt Adobe ADEPT-encrypted EPUB books.
-"""
-
-from __future__ import with_statement
-
-__license__ = 'GPL v3'
-
-import sys
-import os
-import zlib
-import zipfile
-import re
-from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
-from contextlib import closing
-import xml.etree.ElementTree as etree
-
-global AES
-global RSA
-
-META_NAMES = ('mimetype', 'META-INF/rights.xml', 'META-INF/encryption.xml')
-NSMAP = {'adept': 'http://ns.adobe.com/adept',
-         'enc': 'http://www.w3.org/2001/04/xmlenc#'}
-
-
-class ADEPTError(Exception):
-    pass
-
-def _load_crypto_libcrypto():
-    from ctypes import CDLL, POINTER, c_void_p, c_char_p, c_int, c_long, \
-        Structure, c_ulong, create_string_buffer, cast
-    from ctypes.util import find_library
-
-    if sys.platform.startswith('win'):
-        libcrypto = find_library('libeay32')
-    else:
-        libcrypto = find_library('crypto')
-    if libcrypto is None:
-        raise ADEPTError('libcrypto not found')
-    libcrypto = CDLL(libcrypto)
-
-    RSA_NO_PADDING = 3
-    AES_MAXNR = 14
-    
-    c_char_pp = POINTER(c_char_p)
-    c_int_p = POINTER(c_int)
-
-    class RSA(Structure):
-        pass
-    RSA_p = POINTER(RSA)
-    
-    class AES_KEY(Structure):
-        _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))),
-                    ('rounds', c_int)]
-    AES_KEY_p = POINTER(AES_KEY)
-    
-    def F(restype, name, argtypes):
-        func = getattr(libcrypto, name)
-        func.restype = restype
-        func.argtypes = argtypes
-        return func
-    
-    d2i_RSAPrivateKey = F(RSA_p, 'd2i_RSAPrivateKey',
-                          [RSA_p, c_char_pp, c_long])
-    RSA_size = F(c_int, 'RSA_size', [RSA_p])
-    RSA_private_decrypt = F(c_int, 'RSA_private_decrypt',
-                            [c_int, c_char_p, c_char_p, RSA_p, c_int])
-    RSA_free = F(None, 'RSA_free', [RSA_p])
-    AES_set_decrypt_key = F(c_int, 'AES_set_decrypt_key',
-                            [c_char_p, c_int, AES_KEY_p])
-    AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',
-                        [c_char_p, c_char_p, c_ulong, AES_KEY_p, c_char_p,
-                         c_int])
-    
-    class RSA(object):
-        def __init__(self, der):
-            buf = create_string_buffer(der)
-            pp = c_char_pp(cast(buf, c_char_p))
-            rsa = self._rsa = d2i_RSAPrivateKey(None, pp, len(der))
-            if rsa is None:
-                raise ADEPTError('Error parsing ADEPT user key DER')
-        
-        def decrypt(self, from_):
-            rsa = self._rsa
-            to = create_string_buffer(RSA_size(rsa))
-            dlen = RSA_private_decrypt(len(from_), from_, to, rsa,
-                                       RSA_NO_PADDING)
-            if dlen < 0:
-                raise ADEPTError('RSA decryption failed')
-            return to[:dlen]
-    
-        def __del__(self):
-            if self._rsa is not None:
-                RSA_free(self._rsa)
-                self._rsa = None
-
-    class AES(object):
-        def __init__(self, userkey):
-            self._blocksize = len(userkey)
-            if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
-                raise ADEPTError('AES improper key used')
-                return
-            key = self._key = AES_KEY()
-            rv = AES_set_decrypt_key(userkey, len(userkey) * 8, key)
-            if rv < 0:
-                raise ADEPTError('Failed to initialize AES key')
-    
-        def decrypt(self, data):
-            out = create_string_buffer(len(data))
-            iv = ("\x00" * self._blocksize)
-            rv = AES_cbc_encrypt(data, out, len(data), self._key, iv, 0)
-            if rv == 0:
-                raise ADEPTError('AES decryption failed')
-            return out.raw
-    print 'IneptEpub: Using libcrypto.'
-    return (AES, RSA)
-
-def _load_crypto_pycrypto():
-    from Crypto.Cipher import AES as _AES
-    from Crypto.PublicKey import RSA as _RSA
-
-    # ASN.1 parsing code from tlslite
-    class ASN1Error(Exception):
-        pass
-    
-    class ASN1Parser(object):
-        class Parser(object):
-            def __init__(self, bytes):
-                self.bytes = bytes
-                self.index = 0
-    
-            def get(self, length):
-                if self.index + length > len(self.bytes):
-                    raise ASN1Error("Error decoding ASN.1")
-                x = 0
-                for count in range(length):
-                    x <<= 8
-                    x |= self.bytes[self.index]
-                    self.index += 1
-                return x
-    
-            def getFixBytes(self, lengthBytes):
-                bytes = self.bytes[self.index : self.index+lengthBytes]
-                self.index += lengthBytes
-                return bytes
-    
-            def getVarBytes(self, lengthLength):
-                lengthBytes = self.get(lengthLength)
-                return self.getFixBytes(lengthBytes)
-    
-            def getFixList(self, length, lengthList):
-                l = [0] * lengthList
-                for x in range(lengthList):
-                    l[x] = self.get(length)
-                return l
-    
-            def getVarList(self, length, lengthLength):
-                lengthList = self.get(lengthLength)
-                if lengthList % length != 0:
-                    raise ASN1Error("Error decoding ASN.1")
-                lengthList = int(lengthList/length)
-                l = [0] * lengthList
-                for x in range(lengthList):
-                    l[x] = self.get(length)
-                return l
-    
-            def startLengthCheck(self, lengthLength):
-                self.lengthCheck = self.get(lengthLength)
-                self.indexCheck = self.index
-    
-            def setLengthCheck(self, length):
-                self.lengthCheck = length
-                self.indexCheck = self.index
-    
-            def stopLengthCheck(self):
-                if (self.index - self.indexCheck) != self.lengthCheck:
-                    raise ASN1Error("Error decoding ASN.1")
-    
-            def atLengthCheck(self):
-                if (self.index - self.indexCheck) < self.lengthCheck:
-                    return False
-                elif (self.index - self.indexCheck) == self.lengthCheck:
-                    return True
-                else:
-                    raise ASN1Error("Error decoding ASN.1")
-    
-        def __init__(self, bytes):
-            p = self.Parser(bytes)
-            p.get(1)
-            self.length = self._getASN1Length(p)
-            self.value = p.getFixBytes(self.length)
-    
-        def getChild(self, which):
-            p = self.Parser(self.value)
-            for x in range(which+1):
-                markIndex = p.index
-                p.get(1)
-                length = self._getASN1Length(p)
-                p.getFixBytes(length)
-            return ASN1Parser(p.bytes[markIndex:p.index])
-    
-        def _getASN1Length(self, p):
-            firstLength = p.get(1)
-            if firstLength<=127:
-                return firstLength
-            else:
-                lengthLength = firstLength & 0x7F
-                return p.get(lengthLength)
-
-    class AES(object):
-        def __init__(self, key):
-            self._aes = _AES.new(key, _AES.MODE_CBC)
-
-        def decrypt(self, data):
-            return self._aes.decrypt(data)
-
-    class RSA(object):
-        def __init__(self, der):
-            key = ASN1Parser([ord(x) for x in der])
-            key = [key.getChild(x).value for x in xrange(1, 4)]
-            key = [self.bytesToNumber(v) for v in key]
-            self._rsa = _RSA.construct(key)
-
-        def bytesToNumber(self, bytes):
-            total = 0L
-            for byte in bytes:
-                total = (total << 8) + byte
-            return total
-    
-        def decrypt(self, data):
-            return self._rsa.decrypt(data)
-    print 'IneptEpub: Using pycrypto.'
-    return (AES, RSA)
-
-def _load_crypto():
-    _aes = _rsa = None
-    cryptolist = (_load_crypto_libcrypto, _load_crypto_pycrypto)
-    if sys.platform.startswith('win'):
-        cryptolist = (_load_crypto_pycrypto, _load_crypto_libcrypto)
-    for loader in cryptolist:
-        try:
-            _aes, _rsa = loader()
-            break
-        except (ImportError, ADEPTError):
-            pass
-    return (_aes, _rsa)
-    
-class ZipInfo(zipfile.ZipInfo):
-    def __init__(self, *args, **kwargs):
-        if 'compress_type' in kwargs:
-            compress_type = kwargs.pop('compress_type')
-        super(ZipInfo, self).__init__(*args, **kwargs)
-        self.compress_type = compress_type
-
-class Decryptor(object):
-    def __init__(self, bookkey, encryption):
-        enc = lambda tag: '{%s}%s' % (NSMAP['enc'], tag)
-        self._aes = AES(bookkey)
-        encryption = etree.fromstring(encryption)
-        self._encrypted = encrypted = set()
-        expr = './%s/%s/%s' % (enc('EncryptedData'), enc('CipherData'),
-                               enc('CipherReference'))
-        for elem in encryption.findall(expr):
-            path = elem.get('URI', None)
-            path = path.encode('utf-8')
-            if path is not None:
-                encrypted.add(path)
-
-    def decompress(self, bytes):
-        dc = zlib.decompressobj(-15)
-        bytes = dc.decompress(bytes)
-        ex = dc.decompress('Z') + dc.flush()
-        if ex:
-            bytes = bytes + ex
-        return bytes
-
-    def decrypt(self, path, data):
-        if path in self._encrypted:
-            data = self._aes.decrypt(data)[16:]
-            data = data[:-ord(data[-1])]
-            data = self.decompress(data)
-        return data
-
-def plugin_main(userkey, inpath, outpath):
-    rsa = RSA(userkey)
-    with closing(ZipFile(open(inpath, 'rb'))) as inf:
-        namelist = set(inf.namelist())
-        if 'META-INF/rights.xml' not in namelist or \
-           'META-INF/encryption.xml' not in namelist:
-            return 1
-        for name in META_NAMES:
-            namelist.remove(name)
-        try:
-            rights = etree.fromstring(inf.read('META-INF/rights.xml'))
-            adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
-            expr = './/%s' % (adept('encryptedKey'),)
-            bookkey = ''.join(rights.findtext(expr))
-            bookkey = rsa.decrypt(bookkey.decode('base64'))
-            # Padded as per RSAES-PKCS1-v1_5
-            if bookkey[-17] != '\x00':
-                raise ADEPTError('problem decrypting session key')
-            encryption = inf.read('META-INF/encryption.xml')
-            decryptor = Decryptor(bookkey[-16:], encryption)
-            kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
-            with closing(ZipFile(open(outpath, 'wb'), 'w', **kwds)) as outf:
-                zi = ZipInfo('mimetype', compress_type=ZIP_STORED)
-                outf.writestr(zi, inf.read('mimetype'))
-                for path in namelist:
-                    data = inf.read(path)
-                    outf.writestr(path, decryptor.decrypt(path, data))
-        except:
-            return 2
-    return 0
-
-from calibre.customize import FileTypePlugin
-from calibre.constants import iswindows, isosx
-
-class IneptDeDRM(FileTypePlugin):
-    name                    = 'Inept Epub DeDRM'
-    description             = 'Removes DRM from secure Adobe epub files. \
-                                Credit given to I <3 Cabbages for the original stand-alone scripts.'
-    supported_platforms     = ['linux', 'osx', 'windows']
-    author                  = 'DiapDealer'
-    version                 = (0, 1, 7)
-    minimum_calibre_version = (0, 7, 55)  # Compiled python libraries cannot be imported in earlier versions.
-    file_types              = set(['epub'])
-    on_import               = True
-    priority                = 100
-    
-    def run(self, path_to_ebook):
-        global AES
-        global RSA
-        
-        AES, RSA = _load_crypto()
-        
-        if AES == None or RSA == None:
-            # Failed to load libcrypto or PyCrypto... Adobe Epubs can\'t be decrypted.'
-            raise ADEPTError('IneptEpub: Failed to load crypto libs... Adobe Epubs can\'t be decrypted.')
-            return
-        
-        # Load any keyfiles (*.der) included Calibre's config directory.
-        userkeys = []
-
-        # Find Calibre's configuration directory.
-        confpath = os.path.split(os.path.split(self.plugin_path)[0])[0]
-        print 'IneptEpub: Calibre configuration directory = %s' % confpath
-        files = os.listdir(confpath)
-        filefilter = re.compile("\.der$", re.IGNORECASE)
-        files = filter(filefilter.search, files)
-
-        if files:
-            try:
-                for filename in files:
-                    fpath = os.path.join(confpath, filename)
-                    with open(fpath, 'rb') as f:
-                        userkeys.append(f.read())
-                    print 'IneptEpub: Keyfile %s found in config folder.' % filename
-            except IOError:
-                print 'IneptEpub: Error reading keyfiles from config directory.'
-                pass
-        else:
-            # Try to find key from ADE install and save the key in
-            # Calibre's configuration directory for future use.
-            if iswindows or isosx:
-                # ADE key retrieval script included in respective OS folder.
-                from calibre_plugins.ineptepub.ade_key import retrieve_key
-                try:
-                    keydata = retrieve_key()
-                    userkeys.append(keydata)
-                    keypath = os.path.join(confpath, 'calibre-adeptkey.der')
-                    with open(keypath, 'wb') as f:
-                        f.write(keydata)
-                    print 'IneptEpub: Created keyfile from ADE install.'    
-                except:
-                    print 'IneptEpub: Couldn\'t Retrieve key from ADE install.'
-                    pass
-
-        if not userkeys:
-            # No user keys found... bail out.
-            raise ADEPTError('IneptEpub - No keys found. Check keyfile(s)/ADE install')
-            return
-        
-        # Attempt to decrypt epub with each encryption key found.
-        for userkey in userkeys:
-            # Create a TemporaryPersistent file to work with.
-            # Check original epub archive for zip errors.
-            from calibre_plugins.ineptepub import zipfix
-            inf = self.temporary_file('.epub')
-            try:
-                fr = zipfix.fixZip(path_to_ebook, inf.name)
-                fr.fix()
-            except Exception, e:
-                raise Exception(e)
-                return
-            of = self.temporary_file('.epub')
-        
-            # Give the user key, ebook and TemporaryPersistent file to the plugin_main function.
-            result = plugin_main(userkey, inf.name, of.name)
-        
-            # Ebook is not an Adobe Adept epub... do nothing and pass it on.
-            # This allows a non-encrypted epub to be imported without error messages.
-            if  result == 1:
-                print 'IneptEpub: Not an Adobe Adept Epub... punting.'
-                of.close()
-                return path_to_ebook
-                break
-        
-            # Decryption was successful return the modified PersistentTemporary
-            # file to Calibre's import process.
-            if  result == 0:
-                print 'IneptEpub: Encryption successfully removed.'
-                of.close
-                return of.name
-                break
-            
-            print 'IneptEpub: Encryption key invalid... trying others.'
-            of.close()
-        
-        # Something went wrong with decryption.
-        # Import the original unmolested epub.
-        of.close
-        raise ADEPTError('IneptEpub - Ultimately failed to decrypt')
-        return
-

Calibre_Plugins/ineptepub_plugin/ade_key.py

@@ -1,346 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Retrieve Adobe ADEPT user key.
-"""
-
-from __future__ import with_statement
-
-__license__ = 'GPL v3'
-
-import sys
-import os
-import struct
-from calibre.constants import iswindows, isosx
-
-class ADEPTError(Exception):
-    pass
-
-if iswindows:
-    from ctypes import windll, c_char_p, c_wchar_p, c_uint, POINTER, byref, \
-        create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \
-        string_at, Structure, c_void_p, cast, c_size_t, memmove, CDLL, c_int, \
-        c_long, c_ulong
-
-    from ctypes.wintypes import LPVOID, DWORD, BOOL
-    import _winreg as winreg
-
-    def _load_crypto_libcrypto():
-        from ctypes.util import find_library
-        libcrypto = find_library('libeay32')
-        if libcrypto is None:
-            raise ADEPTError('libcrypto not found')
-        libcrypto = CDLL(libcrypto)
-        AES_MAXNR = 14
-        c_char_pp = POINTER(c_char_p)
-        c_int_p = POINTER(c_int)
-        class AES_KEY(Structure):
-            _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))),
-                        ('rounds', c_int)]
-        AES_KEY_p = POINTER(AES_KEY)
-    
-        def F(restype, name, argtypes):
-            func = getattr(libcrypto, name)
-            func.restype = restype
-            func.argtypes = argtypes
-            return func
-    
-        AES_set_decrypt_key = F(c_int, 'AES_set_decrypt_key',
-                                [c_char_p, c_int, AES_KEY_p])
-        AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',
-                            [c_char_p, c_char_p, c_ulong, AES_KEY_p, c_char_p,
-                             c_int])
-        class AES(object):
-            def __init__(self, userkey):
-                self._blocksize = len(userkey)
-                if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
-                    raise ADEPTError('AES improper key used')
-                key = self._key = AES_KEY()
-                rv = AES_set_decrypt_key(userkey, len(userkey) * 8, key)
-                if rv < 0:
-                    raise ADEPTError('Failed to initialize AES key')
-            def decrypt(self, data):
-                out = create_string_buffer(len(data))
-                iv = ("\x00" * self._blocksize)
-                rv = AES_cbc_encrypt(data, out, len(data), self._key, iv, 0)
-                if rv == 0:
-                    raise ADEPTError('AES decryption failed')
-                return out.raw
-        return AES
-
-    def _load_crypto_pycrypto():
-        from Crypto.Cipher import AES as _AES
-        class AES(object):
-            def __init__(self, key):
-                self._aes = _AES.new(key, _AES.MODE_CBC)
-            def decrypt(self, data):
-                return self._aes.decrypt(data)
-        return AES
-
-    def _load_crypto():
-        AES = None
-        for loader in (_load_crypto_pycrypto, _load_crypto_libcrypto):
-            try:
-                AES = loader()
-                break
-            except (ImportError, ADEPTError):
-                pass
-        return AES
-
-    AES = _load_crypto()
-
-
-    DEVICE_KEY_PATH = r'Software\Adobe\Adept\Device'
-    PRIVATE_LICENCE_KEY_PATH = r'Software\Adobe\Adept\Activation'
-
-    MAX_PATH = 255
-
-    kernel32 = windll.kernel32
-    advapi32 = windll.advapi32
-    crypt32 = windll.crypt32
-
-    def GetSystemDirectory():
-        GetSystemDirectoryW = kernel32.GetSystemDirectoryW
-        GetSystemDirectoryW.argtypes = [c_wchar_p, c_uint]
-        GetSystemDirectoryW.restype = c_uint
-        def GetSystemDirectory():
-            buffer = create_unicode_buffer(MAX_PATH + 1)
-            GetSystemDirectoryW(buffer, len(buffer))
-            return buffer.value
-        return GetSystemDirectory
-    GetSystemDirectory = GetSystemDirectory()
-
-    def GetVolumeSerialNumber():
-        GetVolumeInformationW = kernel32.GetVolumeInformationW
-        GetVolumeInformationW.argtypes = [c_wchar_p, c_wchar_p, c_uint,
-                                          POINTER(c_uint), POINTER(c_uint),
-                                          POINTER(c_uint), c_wchar_p, c_uint]
-        GetVolumeInformationW.restype = c_uint
-        def GetVolumeSerialNumber(path):
-            vsn = c_uint(0)
-            GetVolumeInformationW(
-                path, None, 0, byref(vsn), None, None, None, 0)
-            return vsn.value
-        return GetVolumeSerialNumber
-    GetVolumeSerialNumber = GetVolumeSerialNumber()
-
-    def GetUserName():
-        GetUserNameW = advapi32.GetUserNameW
-        GetUserNameW.argtypes = [c_wchar_p, POINTER(c_uint)]
-        GetUserNameW.restype = c_uint
-        def GetUserName():
-            buffer = create_unicode_buffer(32)
-            size = c_uint(len(buffer))
-            while not GetUserNameW(buffer, byref(size)):
-                buffer = create_unicode_buffer(len(buffer) * 2)
-                size.value = len(buffer)
-            return buffer.value.encode('utf-16-le')[::2]
-        return GetUserName
-    GetUserName = GetUserName()
-
-    PAGE_EXECUTE_READWRITE = 0x40
-    MEM_COMMIT  = 0x1000
-    MEM_RESERVE = 0x2000
-
-    def VirtualAlloc():
-        _VirtualAlloc = kernel32.VirtualAlloc
-        _VirtualAlloc.argtypes = [LPVOID, c_size_t, DWORD, DWORD]
-        _VirtualAlloc.restype = LPVOID
-        def VirtualAlloc(addr, size, alloctype=(MEM_COMMIT | MEM_RESERVE),
-                         protect=PAGE_EXECUTE_READWRITE):
-            return _VirtualAlloc(addr, size, alloctype, protect)
-        return VirtualAlloc
-    VirtualAlloc = VirtualAlloc()
-
-    MEM_RELEASE = 0x8000
-
-    def VirtualFree():
-        _VirtualFree = kernel32.VirtualFree
-        _VirtualFree.argtypes = [LPVOID, c_size_t, DWORD]
-        _VirtualFree.restype = BOOL
-        def VirtualFree(addr, size=0, freetype=MEM_RELEASE):
-            return _VirtualFree(addr, size, freetype)
-        return VirtualFree
-    VirtualFree = VirtualFree()
-
-    class NativeFunction(object):
-        def __init__(self, restype, argtypes, insns):
-            self._buf = buf = VirtualAlloc(None, len(insns))
-            memmove(buf, insns, len(insns))
-            ftype = CFUNCTYPE(restype, *argtypes)
-            self._native = ftype(buf)
-
-        def __call__(self, *args):
-            return self._native(*args)
-
-        def __del__(self):
-            if self._buf is not None:
-                VirtualFree(self._buf)
-                self._buf = None
-
-    if struct.calcsize("P") == 4:
-        CPUID0_INSNS = (
-            "\x53"             # push   %ebx
-            "\x31\xc0"         # xor    %eax,%eax
-            "\x0f\xa2"         # cpuid
-            "\x8b\x44\x24\x08" # mov    0x8(%esp),%eax
-            "\x89\x18"         # mov    %ebx,0x0(%eax)
-            "\x89\x50\x04"     # mov    %edx,0x4(%eax)
-            "\x89\x48\x08"     # mov    %ecx,0x8(%eax)
-            "\x5b"             # pop    %ebx
-            "\xc3"             # ret
-        )
-        CPUID1_INSNS = (
-            "\x53"             # push   %ebx
-            "\x31\xc0"         # xor    %eax,%eax
-            "\x40"             # inc    %eax
-            "\x0f\xa2"         # cpuid
-            "\x5b"             # pop    %ebx
-            "\xc3"             # ret
-        )
-    else:
-        CPUID0_INSNS = (
-            "\x49\x89\xd8"     # mov    %rbx,%r8
-            "\x49\x89\xc9"     # mov    %rcx,%r9
-            "\x48\x31\xc0"     # xor    %rax,%rax
-            "\x0f\xa2"         # cpuid
-            "\x4c\x89\xc8"     # mov    %r9,%rax
-            "\x89\x18"         # mov    %ebx,0x0(%rax)
-            "\x89\x50\x04"     # mov    %edx,0x4(%rax)
-            "\x89\x48\x08"     # mov    %ecx,0x8(%rax)
-            "\x4c\x89\xc3"     # mov    %r8,%rbx
-            "\xc3"             # retq
-        )
-        CPUID1_INSNS = (
-            "\x53"             # push   %rbx
-            "\x48\x31\xc0"     # xor    %rax,%rax
-            "\x48\xff\xc0"     # inc    %rax
-            "\x0f\xa2"         # cpuid
-            "\x5b"             # pop    %rbx
-            "\xc3"             # retq
-        )
-
-    def cpuid0():
-        _cpuid0 = NativeFunction(None, [c_char_p], CPUID0_INSNS)
-        buf = create_string_buffer(12)
-        def cpuid0():
-            _cpuid0(buf)
-            return buf.raw
-        return cpuid0
-    cpuid0 = cpuid0()
-
-    cpuid1 = NativeFunction(c_uint, [], CPUID1_INSNS)
-
-    class DataBlob(Structure):
-        _fields_ = [('cbData', c_uint),
-                    ('pbData', c_void_p)]
-    DataBlob_p = POINTER(DataBlob)
-
-    def CryptUnprotectData():
-        _CryptUnprotectData = crypt32.CryptUnprotectData
-        _CryptUnprotectData.argtypes = [DataBlob_p, c_wchar_p, DataBlob_p,
-                                       c_void_p, c_void_p, c_uint, DataBlob_p]
-        _CryptUnprotectData.restype = c_uint
-        def CryptUnprotectData(indata, entropy):
-            indatab = create_string_buffer(indata)
-            indata = DataBlob(len(indata), cast(indatab, c_void_p))
-            entropyb = create_string_buffer(entropy)
-            entropy = DataBlob(len(entropy), cast(entropyb, c_void_p))
-            outdata = DataBlob()
-            if not _CryptUnprotectData(byref(indata), None, byref(entropy),
-                                       None, None, 0, byref(outdata)):
-                raise ADEPTError("Failed to decrypt user key key (sic)")
-            return string_at(outdata.pbData, outdata.cbData)
-        return CryptUnprotectData
-    CryptUnprotectData = CryptUnprotectData()
-
-    def retrieve_key():
-        if AES is None:
-            tkMessageBox.showerror(
-                "ADEPT Key",
-                "This script requires PyCrypto or OpenSSL which must be installed "
-                "separately.  Read the top-of-script comment for details.")
-            return False
-        root = GetSystemDirectory().split('\\')[0] + '\\'
-        serial = GetVolumeSerialNumber(root)
-        vendor = cpuid0()
-        signature = struct.pack('>I', cpuid1())[1:]
-        user = GetUserName()
-        entropy = struct.pack('>I12s3s13s', serial, vendor, signature, user)
-        cuser = winreg.HKEY_CURRENT_USER
-        try:
-            regkey = winreg.OpenKey(cuser, DEVICE_KEY_PATH)
-        except WindowsError:
-            raise ADEPTError("Adobe Digital Editions not activated")
-        device = winreg.QueryValueEx(regkey, 'key')[0]
-        keykey = CryptUnprotectData(device, entropy)
-        userkey = None
-        try:
-            plkroot = winreg.OpenKey(cuser, PRIVATE_LICENCE_KEY_PATH)
-        except WindowsError:
-            raise ADEPTError("Could not locate ADE activation")
-        for i in xrange(0, 16):
-            try:
-                plkparent = winreg.OpenKey(plkroot, "%04d" % (i,))
-            except WindowsError:
-                break
-            ktype = winreg.QueryValueEx(plkparent, None)[0]
-            if ktype != 'credentials':
-                continue
-            for j in xrange(0, 16):
-                try:
-                    plkkey = winreg.OpenKey(plkparent, "%04d" % (j,))
-                except WindowsError:
-                    break
-                ktype = winreg.QueryValueEx(plkkey, None)[0]
-                if ktype != 'privateLicenseKey':
-                    continue
-                userkey = winreg.QueryValueEx(plkkey, 'value')[0]
-                break
-            if userkey is not None:
-                break
-        if userkey is None:
-            raise ADEPTError('Could not locate privateLicenseKey')
-        userkey = userkey.decode('base64')
-        aes = AES(keykey)
-        userkey = aes.decrypt(userkey)
-        userkey = userkey[26:-ord(userkey[-1])]
-        return userkey
-
-else:
-
-    import xml.etree.ElementTree as etree
-    import subprocess
-
-    NSMAP = {'adept': 'http://ns.adobe.com/adept',
-             'enc': 'http://www.w3.org/2001/04/xmlenc#'}
-
-    def findActivationDat():
-        home = os.getenv('HOME')
-        cmdline = 'find "' + home + '/Library/Application Support/Adobe/Digital Editions" -name "activation.dat"'
-        cmdline = cmdline.encode(sys.getfilesystemencoding())
-        p2 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-        out1, out2 = p2.communicate()
-        reslst = out1.split('\n')
-        cnt = len(reslst)
-        for j in xrange(cnt):
-            resline = reslst[j]
-            pp = resline.find('activation.dat')
-            if pp >= 0:
-                ActDatPath = resline
-                break
-        if os.path.exists(ActDatPath):
-            return ActDatPath
-        return None
-    
-    def retrieve_key():
-        actpath = findActivationDat()
-        if actpath is None:
-            raise ADEPTError("Could not locate ADE activation")
-        tree = etree.parse(actpath)
-        adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
-        expr = '//%s/%s' % (adept('credentials'), adept('privateLicenseKey'))
-        userkey = tree.findtext(expr)
-        userkey = userkey.decode('base64')
-        userkey = userkey[26:]
-        return userkey

Calibre_Plugins/ineptepub_plugin/zipfix.py

@@ -1,156 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import zlib
-import zipfile
-import os
-import os.path
-import getopt
-from struct import unpack
-
-
-_FILENAME_LEN_OFFSET = 26
-_EXTRA_LEN_OFFSET = 28
-_FILENAME_OFFSET = 30
-_MAX_SIZE = 64 * 1024
-_MIMETYPE = 'application/epub+zip'
-
-class ZipInfo(zipfile.ZipInfo):
-    def __init__(self, *args, **kwargs):
-        if 'compress_type' in kwargs:
-            compress_type = kwargs.pop('compress_type')
-        super(ZipInfo, self).__init__(*args, **kwargs)
-        self.compress_type = compress_type
-
-class fixZip:
-    def __init__(self, zinput, zoutput):
-        self.ztype = 'zip'
-        if zinput.lower().find('.epub') >= 0 :
-            self.ztype = 'epub'
-        self.inzip = zipfile.ZipFile(zinput,'r')
-        self.outzip = zipfile.ZipFile(zoutput,'w')
-        # open the input zip for reading only as a raw file
-	self.bzf = file(zinput,'rb')
-        
-    def getlocalname(self, zi):
-        local_header_offset = zi.header_offset
-        self.bzf.seek(local_header_offset + _FILENAME_LEN_OFFSET)
-        leninfo = self.bzf.read(2)
-        local_name_length, = unpack('<H', leninfo)
-        self.bzf.seek(local_header_offset + _FILENAME_OFFSET)
-        local_name = self.bzf.read(local_name_length)
-        return local_name
-
-    def uncompress(self, cmpdata):
-        dc = zlib.decompressobj(-15)
-        data = ''
-        while len(cmpdata) > 0:
-            if len(cmpdata) > _MAX_SIZE :
-                newdata = cmpdata[0:_MAX_SIZE]
-                cmpdata = cmpdata[_MAX_SIZE:]
-            else:
-                newdata = cmpdata
-                cmpdata = ''
-            newdata = dc.decompress(newdata)
-            unprocessed = dc.unconsumed_tail
-            if len(unprocessed) == 0:
-                newdata += dc.flush()
-            data += newdata
-            cmpdata += unprocessed
-            unprocessed = ''
-        return data
-
-    def getfiledata(self, zi):
-        # get file name length and exta data length to find start of file data
-        local_header_offset = zi.header_offset
-
-        self.bzf.seek(local_header_offset + _FILENAME_LEN_OFFSET)
-        leninfo = self.bzf.read(2)
-        local_name_length, = unpack('<H', leninfo)
-
-        self.bzf.seek(local_header_offset + _EXTRA_LEN_OFFSET)
-        exinfo = self.bzf.read(2)
-        extra_field_length, = unpack('<H', exinfo)
-
-        self.bzf.seek(local_header_offset + _FILENAME_OFFSET + local_name_length + extra_field_length)
-        data = None
-
-        # if not compressed we are good to go
-        if zi.compress_type == zipfile.ZIP_STORED:
-            data = self.bzf.read(zi.file_size)
-
-        # if compressed we must decompress it using zlib
-        if zi.compress_type == zipfile.ZIP_DEFLATED:
-            cmpdata = self.bzf.read(zi.compress_size)
-            data = self.uncompress(cmpdata)
-
-        return data
-
-        
-
-    def fix(self):
-        # get the zipinfo for each member of the input archive
-        # and copy member over to output archive
-        # if problems exist with local vs central filename, fix them
-
-        # if epub write mimetype file first, with no compression
-        if self.ztype == 'epub':
-            nzinfo = ZipInfo('mimetype', compress_type=zipfile.ZIP_STORED)
-            self.outzip.writestr(nzinfo, _MIMETYPE)
-
-        # write the rest of the files
-        for zinfo in self.inzip.infolist():
-            if zinfo.filename != "mimetype" or self.ztype == '.zip':
-                data = None
-                nzinfo = zinfo
-                try: 
-                    data = self.inzip.read(zinfo.filename)
-                except zipfile.BadZipfile or zipfile.error:
-                    local_name = self.getlocalname(zinfo)
-                    data = self.getfiledata(zinfo)
-                    nzinfo.filename = local_name
-
-                nzinfo.date_time = zinfo.date_time
-                nzinfo.compress_type = zinfo.compress_type
-                nzinfo.flag_bits = 0
-                nzinfo.internal_attr = 0
-                self.outzip.writestr(nzinfo,data)
-
-        self.bzf.close()
-        self.inzip.close()
-        self.outzip.close()
-
-
-def usage():
-    print """usage: zipfix.py inputzip outputzip
-     inputzip is the source zipfile to fix
-     outputzip is the fixed zip archive
-    """
-    
-
-def repairBook(infile, outfile):
-    if not os.path.exists(infile):
-        print "Error: Input Zip File does not exist"
-        return 1
-    try:
-        fr = fixZip(infile, outfile)
-        fr.fix()
-        return 0
-    except Exception, e:
-        print "Error Occurred ", e
-        return 2
-
-
-def main(argv=sys.argv):
-    if len(argv)!=3:
-        usage()
-        return 1
-    infile = argv[1]
-    outfile = argv[2]
-    return repairBook(infile, outfile)
-
-
-if __name__ == '__main__' :
-    sys.exit(main())
-
-

Calibre_Plugins/ineptpdf_plugin/ade_key.py

@@ -1,346 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Retrieve Adobe ADEPT user key.
-"""
-
-from __future__ import with_statement
-
-__license__ = 'GPL v3'
-
-import sys
-import os
-import struct
-from calibre.constants import iswindows, isosx
-
-class ADEPTError(Exception):
-    pass
-
-if iswindows:
-    from ctypes import windll, c_char_p, c_wchar_p, c_uint, POINTER, byref, \
-        create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \
-        string_at, Structure, c_void_p, cast, c_size_t, memmove, CDLL, c_int, \
-        c_long, c_ulong
-
-    from ctypes.wintypes import LPVOID, DWORD, BOOL
-    import _winreg as winreg
-
-    def _load_crypto_libcrypto():
-        from ctypes.util import find_library
-        libcrypto = find_library('libeay32')
-        if libcrypto is None:
-            raise ADEPTError('libcrypto not found')
-        libcrypto = CDLL(libcrypto)
-        AES_MAXNR = 14
-        c_char_pp = POINTER(c_char_p)
-        c_int_p = POINTER(c_int)
-        class AES_KEY(Structure):
-            _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))),
-                        ('rounds', c_int)]
-        AES_KEY_p = POINTER(AES_KEY)
-    
-        def F(restype, name, argtypes):
-            func = getattr(libcrypto, name)
-            func.restype = restype
-            func.argtypes = argtypes
-            return func
-    
-        AES_set_decrypt_key = F(c_int, 'AES_set_decrypt_key',
-                                [c_char_p, c_int, AES_KEY_p])
-        AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',
-                            [c_char_p, c_char_p, c_ulong, AES_KEY_p, c_char_p,
-                             c_int])
-        class AES(object):
-            def __init__(self, userkey):
-                self._blocksize = len(userkey)
-                if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
-                    raise ADEPTError('AES improper key used')
-                key = self._key = AES_KEY()
-                rv = AES_set_decrypt_key(userkey, len(userkey) * 8, key)
-                if rv < 0:
-                    raise ADEPTError('Failed to initialize AES key')
-            def decrypt(self, data):
-                out = create_string_buffer(len(data))
-                iv = ("\x00" * self._blocksize)
-                rv = AES_cbc_encrypt(data, out, len(data), self._key, iv, 0)
-                if rv == 0:
-                    raise ADEPTError('AES decryption failed')
-                return out.raw
-        return AES
-
-    def _load_crypto_pycrypto():
-        from Crypto.Cipher import AES as _AES
-        class AES(object):
-            def __init__(self, key):
-                self._aes = _AES.new(key, _AES.MODE_CBC)
-            def decrypt(self, data):
-                return self._aes.decrypt(data)
-        return AES
-
-    def _load_crypto():
-        AES = None
-        for loader in (_load_crypto_pycrypto, _load_crypto_libcrypto):
-            try:
-                AES = loader()
-                break
-            except (ImportError, ADEPTError):
-                pass
-        return AES
-
-    AES = _load_crypto()
-
-
-    DEVICE_KEY_PATH = r'Software\Adobe\Adept\Device'
-    PRIVATE_LICENCE_KEY_PATH = r'Software\Adobe\Adept\Activation'
-
-    MAX_PATH = 255
-
-    kernel32 = windll.kernel32
-    advapi32 = windll.advapi32
-    crypt32 = windll.crypt32
-
-    def GetSystemDirectory():
-        GetSystemDirectoryW = kernel32.GetSystemDirectoryW
-        GetSystemDirectoryW.argtypes = [c_wchar_p, c_uint]
-        GetSystemDirectoryW.restype = c_uint
-        def GetSystemDirectory():
-            buffer = create_unicode_buffer(MAX_PATH + 1)
-            GetSystemDirectoryW(buffer, len(buffer))
-            return buffer.value
-        return GetSystemDirectory
-    GetSystemDirectory = GetSystemDirectory()
-
-    def GetVolumeSerialNumber():
-        GetVolumeInformationW = kernel32.GetVolumeInformationW
-        GetVolumeInformationW.argtypes = [c_wchar_p, c_wchar_p, c_uint,
-                                          POINTER(c_uint), POINTER(c_uint),
-                                          POINTER(c_uint), c_wchar_p, c_uint]
-        GetVolumeInformationW.restype = c_uint
-        def GetVolumeSerialNumber(path):
-            vsn = c_uint(0)
-            GetVolumeInformationW(
-                path, None, 0, byref(vsn), None, None, None, 0)
-            return vsn.value
-        return GetVolumeSerialNumber
-    GetVolumeSerialNumber = GetVolumeSerialNumber()
-
-    def GetUserName():
-        GetUserNameW = advapi32.GetUserNameW
-        GetUserNameW.argtypes = [c_wchar_p, POINTER(c_uint)]
-        GetUserNameW.restype = c_uint
-        def GetUserName():
-            buffer = create_unicode_buffer(32)
-            size = c_uint(len(buffer))
-            while not GetUserNameW(buffer, byref(size)):
-                buffer = create_unicode_buffer(len(buffer) * 2)
-                size.value = len(buffer)
-            return buffer.value.encode('utf-16-le')[::2]
-        return GetUserName
-    GetUserName = GetUserName()
-
-    PAGE_EXECUTE_READWRITE = 0x40
-    MEM_COMMIT  = 0x1000
-    MEM_RESERVE = 0x2000
-
-    def VirtualAlloc():
-        _VirtualAlloc = kernel32.VirtualAlloc
-        _VirtualAlloc.argtypes = [LPVOID, c_size_t, DWORD, DWORD]
-        _VirtualAlloc.restype = LPVOID
-        def VirtualAlloc(addr, size, alloctype=(MEM_COMMIT | MEM_RESERVE),
-                         protect=PAGE_EXECUTE_READWRITE):
-            return _VirtualAlloc(addr, size, alloctype, protect)
-        return VirtualAlloc
-    VirtualAlloc = VirtualAlloc()
-
-    MEM_RELEASE = 0x8000
-
-    def VirtualFree():
-        _VirtualFree = kernel32.VirtualFree
-        _VirtualFree.argtypes = [LPVOID, c_size_t, DWORD]
-        _VirtualFree.restype = BOOL
-        def VirtualFree(addr, size=0, freetype=MEM_RELEASE):
-            return _VirtualFree(addr, size, freetype)
-        return VirtualFree
-    VirtualFree = VirtualFree()
-
-    class NativeFunction(object):
-        def __init__(self, restype, argtypes, insns):
-            self._buf = buf = VirtualAlloc(None, len(insns))
-            memmove(buf, insns, len(insns))
-            ftype = CFUNCTYPE(restype, *argtypes)
-            self._native = ftype(buf)
-
-        def __call__(self, *args):
-            return self._native(*args)
-
-        def __del__(self):
-            if self._buf is not None:
-                VirtualFree(self._buf)
-                self._buf = None
-
-    if struct.calcsize("P") == 4:
-        CPUID0_INSNS = (
-            "\x53"             # push   %ebx
-            "\x31\xc0"         # xor    %eax,%eax
-            "\x0f\xa2"         # cpuid
-            "\x8b\x44\x24\x08" # mov    0x8(%esp),%eax
-            "\x89\x18"         # mov    %ebx,0x0(%eax)
-            "\x89\x50\x04"     # mov    %edx,0x4(%eax)
-            "\x89\x48\x08"     # mov    %ecx,0x8(%eax)
-            "\x5b"             # pop    %ebx
-            "\xc3"             # ret
-        )
-        CPUID1_INSNS = (
-            "\x53"             # push   %ebx
-            "\x31\xc0"         # xor    %eax,%eax
-            "\x40"             # inc    %eax
-            "\x0f\xa2"         # cpuid
-            "\x5b"             # pop    %ebx
-            "\xc3"             # ret
-        )
-    else:
-        CPUID0_INSNS = (
-            "\x49\x89\xd8"     # mov    %rbx,%r8
-            "\x49\x89\xc9"     # mov    %rcx,%r9
-            "\x48\x31\xc0"     # xor    %rax,%rax
-            "\x0f\xa2"         # cpuid
-            "\x4c\x89\xc8"     # mov    %r9,%rax
-            "\x89\x18"         # mov    %ebx,0x0(%rax)
-            "\x89\x50\x04"     # mov    %edx,0x4(%rax)
-            "\x89\x48\x08"     # mov    %ecx,0x8(%rax)
-            "\x4c\x89\xc3"     # mov    %r8,%rbx
-            "\xc3"             # retq
-        )
-        CPUID1_INSNS = (
-            "\x53"             # push   %rbx
-            "\x48\x31\xc0"     # xor    %rax,%rax
-            "\x48\xff\xc0"     # inc    %rax
-            "\x0f\xa2"         # cpuid
-            "\x5b"             # pop    %rbx
-            "\xc3"             # retq
-        )
-
-    def cpuid0():
-        _cpuid0 = NativeFunction(None, [c_char_p], CPUID0_INSNS)
-        buf = create_string_buffer(12)
-        def cpuid0():
-            _cpuid0(buf)
-            return buf.raw
-        return cpuid0
-    cpuid0 = cpuid0()
-
-    cpuid1 = NativeFunction(c_uint, [], CPUID1_INSNS)
-
-    class DataBlob(Structure):
-        _fields_ = [('cbData', c_uint),
-                    ('pbData', c_void_p)]
-    DataBlob_p = POINTER(DataBlob)
-
-    def CryptUnprotectData():
-        _CryptUnprotectData = crypt32.CryptUnprotectData
-        _CryptUnprotectData.argtypes = [DataBlob_p, c_wchar_p, DataBlob_p,
-                                       c_void_p, c_void_p, c_uint, DataBlob_p]
-        _CryptUnprotectData.restype = c_uint
-        def CryptUnprotectData(indata, entropy):
-            indatab = create_string_buffer(indata)
-            indata = DataBlob(len(indata), cast(indatab, c_void_p))
-            entropyb = create_string_buffer(entropy)
-            entropy = DataBlob(len(entropy), cast(entropyb, c_void_p))
-            outdata = DataBlob()
-            if not _CryptUnprotectData(byref(indata), None, byref(entropy),
-                                       None, None, 0, byref(outdata)):
-                raise ADEPTError("Failed to decrypt user key key (sic)")
-            return string_at(outdata.pbData, outdata.cbData)
-        return CryptUnprotectData
-    CryptUnprotectData = CryptUnprotectData()
-
-    def retrieve_key():
-        if AES is None:
-            tkMessageBox.showerror(
-                "ADEPT Key",
-                "This script requires PyCrypto or OpenSSL which must be installed "
-                "separately.  Read the top-of-script comment for details.")
-            return False
-        root = GetSystemDirectory().split('\\')[0] + '\\'
-        serial = GetVolumeSerialNumber(root)
-        vendor = cpuid0()
-        signature = struct.pack('>I', cpuid1())[1:]
-        user = GetUserName()
-        entropy = struct.pack('>I12s3s13s', serial, vendor, signature, user)
-        cuser = winreg.HKEY_CURRENT_USER
-        try:
-            regkey = winreg.OpenKey(cuser, DEVICE_KEY_PATH)
-        except WindowsError:
-            raise ADEPTError("Adobe Digital Editions not activated")
-        device = winreg.QueryValueEx(regkey, 'key')[0]
-        keykey = CryptUnprotectData(device, entropy)
-        userkey = None
-        try:
-            plkroot = winreg.OpenKey(cuser, PRIVATE_LICENCE_KEY_PATH)
-        except WindowsError:
-            raise ADEPTError("Could not locate ADE activation")
-        for i in xrange(0, 16):
-            try:
-                plkparent = winreg.OpenKey(plkroot, "%04d" % (i,))
-            except WindowsError:
-                break
-            ktype = winreg.QueryValueEx(plkparent, None)[0]
-            if ktype != 'credentials':
-                continue
-            for j in xrange(0, 16):
-                try:
-                    plkkey = winreg.OpenKey(plkparent, "%04d" % (j,))
-                except WindowsError:
-                    break
-                ktype = winreg.QueryValueEx(plkkey, None)[0]
-                if ktype != 'privateLicenseKey':
-                    continue
-                userkey = winreg.QueryValueEx(plkkey, 'value')[0]
-                break
-            if userkey is not None:
-                break
-        if userkey is None:
-            raise ADEPTError('Could not locate privateLicenseKey')
-        userkey = userkey.decode('base64')
-        aes = AES(keykey)
-        userkey = aes.decrypt(userkey)
-        userkey = userkey[26:-ord(userkey[-1])]
-        return userkey
-
-else:
-
-    import xml.etree.ElementTree as etree
-    import subprocess
-
-    NSMAP = {'adept': 'http://ns.adobe.com/adept',
-             'enc': 'http://www.w3.org/2001/04/xmlenc#'}
-
-    def findActivationDat():
-        home = os.getenv('HOME')
-        cmdline = 'find "' + home + '/Library/Application Support/Adobe/Digital Editions" -name "activation.dat"'
-        cmdline = cmdline.encode(sys.getfilesystemencoding())
-        p2 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-        out1, out2 = p2.communicate()
-        reslst = out1.split('\n')
-        cnt = len(reslst)
-        for j in xrange(cnt):
-            resline = reslst[j]
-            pp = resline.find('activation.dat')
-            if pp >= 0:
-                ActDatPath = resline
-                break
-        if os.path.exists(ActDatPath):
-            return ActDatPath
-        return None
-    
-    def retrieve_key():
-        actpath = findActivationDat()
-        if actpath is None:
-            raise ADEPTError("Could not locate ADE activation")
-        tree = etree.parse(actpath)
-        adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
-        expr = '//%s/%s' % (adept('credentials'), adept('privateLicenseKey'))
-        userkey = tree.findtext(expr)
-        userkey = userkey.decode('base64')
-        userkey = userkey[26:]
-        return userkey

Calibre_Plugins/k4mobidedrm_plugin/k4mutils.py

@@ -1,749 +0,0 @@
-# standlone set of Mac OSX specific routines needed for KindleBooks
-
-from __future__ import with_statement
-
-import sys
-import os
-import os.path
-import re
-import copy
-import subprocess
-from struct import pack, unpack, unpack_from
-
-class DrmException(Exception):
-    pass
-
-
-# interface to needed routines in openssl's libcrypto
-def _load_crypto_libcrypto():
-    from ctypes import CDLL, byref, POINTER, c_void_p, c_char_p, c_int, c_long, \
-        Structure, c_ulong, create_string_buffer, addressof, string_at, cast
-    from ctypes.util import find_library
-
-    libcrypto = find_library('crypto')
-    if libcrypto is None:
-        raise DrmException('libcrypto not found')
-    libcrypto = CDLL(libcrypto)
-
-    # From OpenSSL's crypto aes header
-    #
-    # AES_ENCRYPT     1
-    # AES_DECRYPT     0
-    # AES_MAXNR 14 (in bytes)
-    # AES_BLOCK_SIZE 16 (in bytes)
-    # 
-    # struct aes_key_st {
-    #    unsigned long rd_key[4 *(AES_MAXNR + 1)];
-    #    int rounds;
-    # };
-    # typedef struct aes_key_st AES_KEY;
-    #
-    # int AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key);
-    #
-    # note:  the ivec string, and output buffer are both mutable
-    # void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-    #     const unsigned long length, const AES_KEY *key, unsigned char *ivec, const int enc);
-
-    AES_MAXNR = 14
-    c_char_pp = POINTER(c_char_p)
-    c_int_p = POINTER(c_int)
-
-    class AES_KEY(Structure):
-        _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))), ('rounds', c_int)]
-    AES_KEY_p = POINTER(AES_KEY)
-
-    def F(restype, name, argtypes):
-        func = getattr(libcrypto, name)
-        func.restype = restype
-        func.argtypes = argtypes
-        return func
-
-    AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',[c_char_p, c_char_p, c_ulong, AES_KEY_p, c_char_p,c_int])
-
-    AES_set_decrypt_key = F(c_int, 'AES_set_decrypt_key',[c_char_p, c_int, AES_KEY_p])
-
-    # From OpenSSL's Crypto evp/p5_crpt2.c
-    #
-    # int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-    #                        const unsigned char *salt, int saltlen, int iter,
-    #                        int keylen, unsigned char *out);
-
-    PKCS5_PBKDF2_HMAC_SHA1 = F(c_int, 'PKCS5_PBKDF2_HMAC_SHA1',
-                                [c_char_p, c_ulong, c_char_p, c_ulong, c_ulong, c_ulong, c_char_p])
-
-    class LibCrypto(object):
-        def __init__(self):
-            self._blocksize = 0
-            self._keyctx = None
-            self._iv = 0
-
-        def set_decrypt_key(self, userkey, iv):
-            self._blocksize = len(userkey)
-            if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
-                raise DrmException('AES improper key used')
-                return
-            keyctx = self._keyctx = AES_KEY()
-            self._iv = iv
-            self._userkey = userkey
-            rv = AES_set_decrypt_key(userkey, len(userkey) * 8, keyctx)
-            if rv < 0:
-                raise DrmException('Failed to initialize AES key')
-
-        def decrypt(self, data):
-            out = create_string_buffer(len(data))
-            mutable_iv = create_string_buffer(self._iv, len(self._iv))
-            keyctx = self._keyctx
-            rv = AES_cbc_encrypt(data, out, len(data), keyctx, mutable_iv, 0)
-            if rv == 0:
-                raise DrmException('AES decryption failed')
-            return out.raw
-
-        def keyivgen(self, passwd, salt, iter, keylen):
-            saltlen = len(salt)
-            passlen = len(passwd)
-            out = create_string_buffer(keylen)
-            rv = PKCS5_PBKDF2_HMAC_SHA1(passwd, passlen, salt, saltlen, iter, keylen, out)
-            return out.raw
-    return LibCrypto
-
-def _load_crypto():
-    LibCrypto = None
-    try:
-        LibCrypto = _load_crypto_libcrypto()
-    except (ImportError, DrmException):
-        pass
-    return LibCrypto
-
-LibCrypto = _load_crypto()
-
-#
-# Utility Routines
-#
-
-# crypto digestroutines
-import hashlib
-
-def MD5(message):
-    ctx = hashlib.md5()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA1(message):
-    ctx = hashlib.sha1()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA256(message):
-    ctx = hashlib.sha256()
-    ctx.update(message)
-    return ctx.digest()
-
-# Various character maps used to decrypt books. Probably supposed to act as obfuscation
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM"
-
-# For kinf approach of K4Mac 1.6.X or later
-# On K4PC charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
-# For Mac they seem to re-use charMap2 here
-charMap5 = charMap2
-
-# new in K4M 1.9.X
-testMap8 = "YvaZ3FfUm9Nn_c1XuG4yCAzB0beVg-TtHh5SsIiR6rJjQdW2wEq7KkPpL8lOoMxD"
-
-
-def encode(data, map):
-    result = ""
-    for char in data:
-        value = ord(char)
-        Q = (value ^ 0x80) // len(map)
-        R = value % len(map)
-        result += map[Q]
-        result += map[R]
-    return result
-
-# Hash the bytes in data and then encode the digest with the characters in map
-def encodeHash(data,map):
-    return encode(MD5(data),map)
-
-# Decode the string in data with the characters in map. Returns the decoded bytes
-def decode(data,map):
-    result = ""
-    for i in range (0,len(data)-1,2):
-        high = map.find(data[i])
-        low = map.find(data[i+1])
-        if (high == -1) or (low == -1) :
-            break
-        value = (((high * len(map)) ^ 0x80) & 0xFF) + low
-        result += pack("B",value)
-    return result
-
-# For K4M 1.6.X and later
-# generate table of prime number less than or equal to int n
-def primes(n):
-    if n==2: return [2]
-    elif n<2: return []
-    s=range(3,n+1,2)
-    mroot = n ** 0.5
-    half=(n+1)/2-1
-    i=0
-    m=3
-    while m <= mroot:
-        if s[i]:
-            j=(m*m-3)/2
-            s[j]=0
-            while j<half:
-                s[j]=0
-                j+=m
-        i=i+1
-        m=2*i+3
-    return [2]+[x for x in s if x]
-
-
-# uses a sub process to get the Hard Drive Serial Number using ioreg
-# returns with the serial number of drive whose BSD Name is "disk0"
-def GetVolumeSerialNumber():
-    sernum = os.getenv('MYSERIALNUMBER')
-    if sernum != None:
-        return sernum
-    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
-    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)
-    bsdname = None
-    sernum = None
-    foundIt = False
-    for j in xrange(cnt):
-        resline = reslst[j]
-        pp = resline.find('"Serial Number" = "')
-        if pp >= 0:
-            sernum = resline[pp+19:-1]
-            sernum = sernum.strip()
-        bb = resline.find('"BSD Name" = "')
-        if bb >= 0:
-            bsdname = resline[bb+14:-1]
-            bsdname = bsdname.strip()
-            if (bsdname == 'disk0') and (sernum != None):
-                foundIt = True
-                break
-    if not foundIt:
-        sernum = ''
-    return sernum
-
-def GetUserHomeAppSupKindleDirParitionName():
-    home = os.getenv('HOME')
-    dpath =  home + '/Library'
-    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
-
-# uses a sub process to get the UUID of the specified disk partition using ioreg
-def GetDiskPartitionUUID(diskpart):
-    uuidnum = os.getenv('MYUUIDNUMBER')
-    if uuidnum != None:
-        return uuidnum
-    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
-    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)
-    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 not foundIt:
-        uuidnum = ''
-    return uuidnum
-
-def GetMACAddressMunged():
-    macnum = os.getenv('MYMACNUM')
-    if macnum != None:
-        return macnum
-    cmdline = '/sbin/ifconfig 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 ')
-        if pp >= 0:
-            macnum = resline[pp+6:-1]
-            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
-            for i in range(6):
-                maclst[i] = int('0x' + maclst[i], 0)
-            mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
-            mlst[5] = maclst[5] ^ 0xa5
-            mlst[4] = maclst[3] ^ 0xa5
-            mlst[3] = maclst[4] ^ 0xa5
-            mlst[2] = maclst[2] ^ 0xa5
-            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 not foundIt:
-        macnum = ''
-    return macnum
-
-
-# uses unix env to get username instead of using sysctlbyname
-def GetUserName():
-    username = os.getenv('USER')
-    return username
-
-def isNewInstall():
-    home = os.getenv('HOME')
-    # soccer game fan anyone
-    dpath = home + '/Library/Application Support/Kindle/storage/.pes2011'
-    # print dpath, os.path.exists(dpath)
-    if os.path.exists(dpath):
-        return True
-    dpath = home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support/Kindle/storage/.pes2011'
-    # print dpath, os.path.exists(dpath)
-    if os.path.exists(dpath):
-        return True
-    return False
-
-
-def GetIDString():
-    # K4Mac now has an extensive set of ids strings it uses
-    # in encoding pids and in creating unique passwords
-    # for use in its own version of CryptUnprotectDataV2
-
-    # BUT Amazon has now become nasty enough to detect when its app
-    # is being run under a debugger and actually changes code paths
-    # including which one of these strings is chosen, all to try
-    # to prevent reverse engineering
-
-    # Sad really ... they will only hurt their own sales ...
-    # true book lovers really want to keep their books forever
-    # and move them to their devices and DRM prevents that so they
-    # will just buy from someplace else that they can remove
-    # the DRM from
-
-    # Amazon should know by now that true book lover's are not like
-    # penniless kids that pirate music, we do not pirate books
-
-    if isNewInstall():
-        mungedmac = GetMACAddressMunged()
-        if len(mungedmac) > 7:
-            print('Using Munged MAC Address for ID: '+mungedmac)
-            return mungedmac
-    sernum = GetVolumeSerialNumber()
-    if len(sernum) > 7:
-        print('Using Volume Serial Number for ID: '+sernum)
-        return sernum
-    diskpart = GetUserHomeAppSupKindleDirParitionName()
-    uuidnum = GetDiskPartitionUUID(diskpart)
-    if len(uuidnum) > 7:
-        print('Using Disk Partition UUID for ID: '+uuidnum)
-        return uuidnum
-    mungedmac = GetMACAddressMunged()
-    if len(mungedmac) > 7:
-        print('Using Munged MAC Address for ID: '+mungedmac)
-        return mungedmac
-    print('Using Fixed constant 9999999999 for ID.')
-    return '9999999999'
-
-
-# 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):
-        sernum = GetVolumeSerialNumber()
-        if sernum == '':
-            sernum = '9999999999'
-        sp = sernum + '!@#' + 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):
-        sp = GetUserName() + ':&%:' + GetIDString()
-        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):
-    passwdData = 'header_key_data'
-    salt = 'HEADER.2011'
-    iter = 0x80
-    keylen = 0x100
-    crp = LibCrypto()
-    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
-    key = key_iv[0:32]
-    iv = key_iv[32:48]
-    crp.set_decrypt_key(key,iv)
-    cleartext = crp.decrypt(encryptedData)
-    return cleartext
-
-
-# implements an Pseudo Mac Version of Windows built-in Crypto routine
-# used for Kindle for Mac Versions >= 1.9.0
-class CryptUnprotectDataV3(object):
-    def __init__(self, entropy):
-        sp = GetUserName() + '+@#$%+' + GetIDString()
-        passwdData = encode(SHA256(sp),charMap2)
-        salt = entropy
-        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, charMap2)
-        return cleartext
-
-
-# Locate the .kindle-info files
-def getKindleInfoFiles(kInfoFiles):
-    home = os.getenv('HOME')
-    # search for any .kinf2011 files in new location (Sep 2012)
-    cmdline = 'find "' + home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support" -name ".kinf2011"'
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    out1, out2 = p1.communicate()
-    reslst = out1.split('\n')
-    for resline in reslst:
-        if os.path.isfile(resline):
-            kInfoFiles.append(resline)
-            print('Found k4Mac kinf2011 file: ' + resline)
-            found = True
-   # search for any .kinf2011 files
-    cmdline = 'find "' + home + '/Library/Application Support" -name ".kinf2011"'
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    out1, out2 = p1.communicate()
-    reslst = out1.split('\n')
-    for resline in reslst:
-        if os.path.isfile(resline):
-            kInfoFiles.append(resline)
-            print('Found k4Mac kinf2011 file: ' + resline)
-            found = True
-    # search for any .kindle-info files
-    cmdline = 'find "' + home + '/Library/Application Support" -name ".kindle-info"'
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    out1, out2 = p1.communicate()
-    reslst = out1.split('\n')
-    kinfopath = 'NONE'
-    found = False
-    for resline in reslst:
-        if os.path.isfile(resline):
-            kInfoFiles.append(resline)
-            print('Found K4Mac kindle-info file: ' + resline)
-            found = True
-    # search for any .rainier*-kinf files
-    cmdline = 'find "' + home + '/Library/Application Support" -name ".rainier*-kinf"'
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    out1, out2 = p1.communicate()
-    reslst = out1.split('\n')
-    for resline in reslst:
-        if os.path.isfile(resline):
-            kInfoFiles.append(resline)
-            print('Found k4Mac kinf file: ' + resline)
-            found = True
-    if not found:
-        print('No k4Mac kindle-info/kinf/kinf2011 files have been found.')
-    return kInfoFiles
-
-# 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"]
-    DB = {}
-    cnt = 0
-    infoReader = open(kInfoFile, 'r')
-    hdr = infoReader.read(1)
-    data = infoReader.read()
-
-    if data.find('[') != -1 :
-
-        # older style kindle-info file
-        cud = CryptUnprotectData()
-        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)
-                DB[keyname] = cleartext
-                cnt = cnt + 1
-        if cnt == 0:
-            DB = None
-        return DB
-
-    if 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()
-
-        # 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"
-
-            # 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 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,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 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)
-            DB[keyname] = cleartext
-            cnt = cnt + 1
-
-        if cnt == 0:
-            DB = None
-        return DB
-
-    # 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)
-
-    # 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
-        DB[keyname] = cleartext
-        cnt = cnt + 1
-
-    if cnt == 0:
-        DB = None
-    return DB

Calibre_Plugins/k4mobidedrm_plugin/k4pcutils.py

@@ -1,437 +0,0 @@
-#!/usr/bin/env python
-# K4PC Windows specific routines
-
-from __future__ import with_statement
-
-import sys, os, re
-from struct import pack, unpack, unpack_from
-
-from ctypes import windll, c_char_p, c_wchar_p, c_uint, POINTER, byref, \
-    create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \
-    string_at, Structure, c_void_p, cast
-
-import _winreg as winreg
-MAX_PATH = 255
-kernel32 = windll.kernel32
-advapi32 = windll.advapi32
-crypt32 = windll.crypt32
-
-import traceback
-
-# crypto digestroutines
-import hashlib
-
-def MD5(message):
-    ctx = hashlib.md5()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA1(message):
-    ctx = hashlib.sha1()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA256(message):
-    ctx = hashlib.sha256()
-    ctx.update(message)
-    return ctx.digest()
-
-# For K4PC 1.9.X
-# use routines in alfcrypto:
-#    AES_cbc_encrypt
-#    AES_set_decrypt_key
-#    PKCS5_PBKDF2_HMAC_SHA1
-
-from alfcrypto import AES_CBC, KeyIVGen
-
-def UnprotectHeaderData(encryptedData):
-    passwdData = 'header_key_data'
-    salt = 'HEADER.2011'
-    iter = 0x80
-    keylen = 0x100
-    key_iv = KeyIVGen().pbkdf2(passwdData, salt, iter, keylen)
-    key = key_iv[0:32]
-    iv = key_iv[32:48]
-    aes=AES_CBC()
-    aes.set_decrypt_key(key, iv)
-    cleartext = aes.decrypt(encryptedData)
-    return cleartext
-
-
-# simple primes table (<= n) calculator
-def primes(n):
-    if n==2: return [2]
-    elif n<2: return []
-    s=range(3,n+1,2)
-    mroot = n ** 0.5
-    half=(n+1)/2-1
-    i=0
-    m=3
-    while m <= mroot:
-        if s[i]:
-            j=(m*m-3)/2
-            s[j]=0
-            while j<half:
-                s[j]=0
-                j+=m
-        i=i+1
-        m=2*i+3
-    return [2]+[x for x in s if x]
-
-
-# Various character maps used to decrypt kindle info values.
-# Probably supposed to act as obfuscation
-charMap2 = "AaZzB0bYyCc1XxDdW2wEeVv3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_"
-charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
-# New maps in K4PC 1.9.0
-testMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-testMap6 = "9YzAb0Cd1Ef2n5Pr6St7Uvh3Jk4M8WxG"
-testMap8 = "YvaZ3FfUm9Nn_c1XuG4yCAzB0beVg-TtHh5SsIiR6rJjQdW2wEq7KkPpL8lOoMxD"
-
-class DrmException(Exception):
-    pass
-
-# Encode the bytes in data with the characters in map
-def encode(data, map):
-    result = ""
-    for char in data:
-        value = ord(char)
-        Q = (value ^ 0x80) // len(map)
-        R = value % len(map)
-        result += map[Q]
-        result += map[R]
-    return result
-
-# Hash the bytes in data and then encode the digest with the characters in map
-def encodeHash(data,map):
-    return encode(MD5(data),map)
-
-# Decode the string in data with the characters in map. Returns the decoded bytes
-def decode(data,map):
-    result = ""
-    for i in range (0,len(data)-1,2):
-        high = map.find(data[i])
-        low = map.find(data[i+1])
-        if (high == -1) or (low == -1) :
-            break
-        value = (((high * len(map)) ^ 0x80) & 0xFF) + low
-        result += pack("B",value)
-    return result
-
-
-# interface with Windows OS Routines
-class DataBlob(Structure):
-    _fields_ = [('cbData', c_uint),
-                ('pbData', c_void_p)]
-DataBlob_p = POINTER(DataBlob)
-
-
-def GetSystemDirectory():
-    GetSystemDirectoryW = kernel32.GetSystemDirectoryW
-    GetSystemDirectoryW.argtypes = [c_wchar_p, c_uint]
-    GetSystemDirectoryW.restype = c_uint
-    def GetSystemDirectory():
-        buffer = create_unicode_buffer(MAX_PATH + 1)
-        GetSystemDirectoryW(buffer, len(buffer))
-        return buffer.value
-    return GetSystemDirectory
-GetSystemDirectory = GetSystemDirectory()
-
-def GetVolumeSerialNumber():
-    GetVolumeInformationW = kernel32.GetVolumeInformationW
-    GetVolumeInformationW.argtypes = [c_wchar_p, c_wchar_p, c_uint,
-                                      POINTER(c_uint), POINTER(c_uint),
-                                      POINTER(c_uint), c_wchar_p, c_uint]
-    GetVolumeInformationW.restype = c_uint
-    def GetVolumeSerialNumber(path = GetSystemDirectory().split('\\')[0] + '\\'):
-        vsn = c_uint(0)
-        GetVolumeInformationW(path, None, 0, byref(vsn), None, None, None, 0)
-        return str(vsn.value)
-    return GetVolumeSerialNumber
-GetVolumeSerialNumber = GetVolumeSerialNumber()
-
-def GetIDString():
-    vsn = GetVolumeSerialNumber()
-    print('Using Volume Serial Number for ID: '+vsn)
-    return vsn
-
-def getLastError():
-    GetLastError = kernel32.GetLastError
-    GetLastError.argtypes = None
-    GetLastError.restype = c_uint
-    def getLastError():
-        return GetLastError()
-    return getLastError
-getLastError = getLastError()
-
-def GetUserName():
-    GetUserNameW = advapi32.GetUserNameW
-    GetUserNameW.argtypes = [c_wchar_p, POINTER(c_uint)]
-    GetUserNameW.restype = c_uint
-    def GetUserName():
-        buffer = create_unicode_buffer(2)
-        size = c_uint(len(buffer))
-        while not GetUserNameW(buffer, byref(size)):
-            errcd = getLastError()
-            if errcd == 234:
-                # bad wine implementation up through wine 1.3.21
-                return "AlternateUserName"
-            buffer = create_unicode_buffer(len(buffer) * 2)
-            size.value = len(buffer)
-        return buffer.value.encode('utf-16-le')[::2]
-    return GetUserName
-GetUserName = GetUserName()
-
-def CryptUnprotectData():
-    _CryptUnprotectData = crypt32.CryptUnprotectData
-    _CryptUnprotectData.argtypes = [DataBlob_p, c_wchar_p, DataBlob_p,
-                                   c_void_p, c_void_p, c_uint, DataBlob_p]
-    _CryptUnprotectData.restype = c_uint
-    def CryptUnprotectData(indata, entropy, flags):
-        indatab = create_string_buffer(indata)
-        indata = DataBlob(len(indata), cast(indatab, c_void_p))
-        entropyb = create_string_buffer(entropy)
-        entropy = DataBlob(len(entropy), cast(entropyb, c_void_p))
-        outdata = DataBlob()
-        if not _CryptUnprotectData(byref(indata), None, byref(entropy),
-                                   None, None, flags, byref(outdata)):
-            # raise DrmException("Failed to Unprotect Data")
-            return 'failed'
-        return string_at(outdata.pbData, outdata.cbData)
-    return CryptUnprotectData
-CryptUnprotectData = CryptUnprotectData()
-
-
-# Locate all of the kindle-info style files and return as list
-def getKindleInfoFiles(kInfoFiles):
-    regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
-    path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
-
-    # some 64 bit machines do not have the proper registry key for some reason
-    # or the pythonn interface to the 32 vs 64 bit registry is broken
-    if 'LOCALAPPDATA' in os.environ.keys():
-        path = os.environ['LOCALAPPDATA']
-
-    print('searching for kinfoFiles in ' + path)
-    found = False
-
-    # first look for older kindle-info files
-    kinfopath = path +'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info'
-    if os.path.isfile(kinfopath):
-        found = True
-        print('Found K4PC kindle.info file: ' + kinfopath)
-        kInfoFiles.append(kinfopath)
-
-    # now look for newer (K4PC 1.5.0 and later rainier.2.1.1.kinf file
-
-    kinfopath = path +'\\Amazon\\Kindle For PC\\storage\\rainier.2.1.1.kinf'
-    if os.path.isfile(kinfopath):
-        found = True
-        print('Found K4PC 1.5.X kinf file: ' + kinfopath)
-        kInfoFiles.append(kinfopath)
-
-    # now look for even newer (K4PC 1.6.0 and later) rainier.2.1.1.kinf file
-    kinfopath = path +'\\Amazon\\Kindle\\storage\\rainier.2.1.1.kinf'
-    if os.path.isfile(kinfopath):
-        found = True
-        print('Found K4PC 1.6.X kinf file: ' + kinfopath)
-        kInfoFiles.append(kinfopath)
-
-    # now look for even newer (K4PC 1.9.0 and later) .kinf2011 file
-    kinfopath = path +'\\Amazon\\Kindle\\storage\\.kinf2011'
-    if os.path.isfile(kinfopath):
-        found = True
-        print('Found K4PC kinf2011 file: ' + kinfopath)
-        kInfoFiles.append(kinfopath)
-
-    if not found:
-        print('No K4PC kindle.info/kinf/kinf2011 files have been found.')
-    return kInfoFiles
-
-
-# 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"]
-    DB = {}
-    cnt = 0
-    infoReader = open(kInfoFile, 'r')
-    hdr = infoReader.read(1)
-    data = infoReader.read()
-
-    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)
-                cnt = cnt + 1
-        if cnt == 0:
-            DB = None
-        return DB
-
-    if 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('/')
-
-        # 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 raw keyhash string is used to create entropy for the actual
-            # CryptProtectData Blob that represents that keys contents
-            entropy = SHA1(keyhash)
-
-            # 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,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)
-            cnt = cnt + 1
-
-        if cnt == 0:
-            DB = None
-        return DB
-
-    # 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)
-
-
-    # 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)
-        DB[keyname] = cleartext
-        cnt = cnt + 1
-
-    if cnt == 0:
-        DB = None
-    return DB

DeDRM_Macintosh_Application/DeDRM ReadMe.rtf

@@ -1,40 +1,70 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset134 STHeitiSC-Light;}
 {\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww12360\viewh16560\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
+\paperw11900\paperh16840\vieww12000\viewh15840\viewkind0
+\deftab720
+\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\ql\qnatural\pardirnatural
+\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\qj\pardirnatural
-\cf0 DeDRM is an application that packs all of the python drm-removal software into one easy to use program that remembers preferences and settings.\
-It works without manual configuration with Kindle for Mac ebooks and Adobe Adept ePub and PDF ebooks.\
 \
-To remove the DRM of Kindle ebooks from eInk Kindles, eReader pdb ebooks, Barnes and Noble ePubs, or Mobipocket ebooks, you must first run DeDRM application (by double-clicking it) and set some additional Preferences including:\
+\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 \
 \
-Kindle (not Kindle Fire): 16 digit Serial Number\
-Barnes & Noble ePub:  Name and CC number or key file  (bnepubkey.b64)\
-eReader Social DRM: Name and last 8 digits of CC number\
-Mobipocket: 10 digit PID\
+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, 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:\
+\
+
+\b eInk Kindle (not Kindle Fire)
+\b0 :
+\b \
+	
+\b0 16 digit Serial Number, found in your Amazon account web pages.\
+
+\b Barnes & Noble (not from NOOK Study)
+\b0 : \
+	Your account email and password, so the key can be retrieved from the Barnes & Noble servers.\
+	An active internet connection is required for this.\
+
+\b eReader
+\b0 :\
+	Name and last 8 digits of CC number\
+
+\b Mobipocket
+\b0 :\
+	10 digit PID\
 \
 A final preference is the destination folder for the DRM-free copies of your ebooks that the application produces. This can be either the same folder as the original ebook, or a folder of your choice.\
 \
 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.5 or above. \
+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 X 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\ql\qnatural\pardirnatural
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
 
 \b \cf0 Installation
 \b0 \
-Drag the DeDRM application from from tools_v5.3\\DeDRM_Applications\\Macintosh (the location of this ReadMe) to your Applications folder, or anywhere else you find convenient.\
+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 Use
+\b \
+Use
 \b0 \
 1. To set the preferences, double-click the application and follow the instructions in the dialogs.\
 2. Drag & Drop DRMed ebooks or folders of DRMed ebooks onto the application icon when it is not running.\
@@ -42,6 +72,28 @@ Drag the DeDRM application from from tools_v5.3\\DeDRM_Applications\\Macintosh (
 \
 
 \b Troubleshooting\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0
 
-\b0 \cf0 A log is created on your desktop containing detailed information from all the scripts. If you have any problems decrypting your ebooks, quote the contents of this log in a comment at Apprentice Alf's blog.}
+\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\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 \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 
+\f0 cabbages\
+The original mobidedrm and erdr2pml scripts were by The Dark Reverser\
+The original topaz DRM removal script was by CMBDTC\
+The original topaz format conversion scripts were by some_updates, clarknova and Bart Simpson\
+\
+The alfcrypto library is by some_updates\
+The ePub encryption detection script is by Apprentice Alf, adapted from a script by Paul Durrant\
+The ignoblekey script is by Apprentice Harper\
+The DeDRM AppleScript is by Apprentice Alf and Apprentice Harper, adapted from a script by Paul Durrant\
+\
+Many fixes, updates and enhancements to the scripts and applications have been made by many other people. For more details, see the comments in the individual scripts.\
+}

DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist

@@ -24,33 +24,43 @@
 	<key>CFBundleExecutable</key>
 	<string>droplet</string>
 	<key>CFBundleGetInfoString</key>
-	<string>DeDRM 5.3.1, Written 2010–2012 by Apprentice Alf and others.</string>
+	<string>DeDRM AppleScript 6.5.1 Written 2010–2016 by Apprentice Alf et al.</string>
 	<key>CFBundleIconFile</key>
 	<string>DeDRM</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.ScriptEditor.id.707CCCD5-0C6C-4BEB-B67C-B6E866ADE85A</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>DeDRM 5.3.1</string>
+	<string>DeDRM</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.3.1</string>
+	<string>6.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>dplt</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.5.0</string>
 	<key>LSRequiresCarbon</key>
 	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2010–2016 Apprentice Alf and Apprentice Harper</string>
 	<key>WindowState</key>
 	<dict>
+		<key>bundleDividerCollapsed</key>
+		<false/>
+		<key>bundlePositionOfDivider</key>
+		<real>1162</real>
+		<key>dividerCollapsed</key>
+		<false/>
+		<key>eventLogLevel</key>
+		<integer>0</integer>
 		<key>name</key>
 		<string>ScriptWindowState</string>
 		<key>positionOfDivider</key>
-		<real>554</real>
+		<real>651</real>
 		<key>savedFrame</key>
-		<string>1691 92 922 818 1440 0 1920 1080 </string>
-		<key>selectedTabView</key>
-		<string>event log</string>
+		<string>0 37 1680 990 0 0 1680 1027 </string>
+		<key>selectedTab</key>
+		<string>log</string>
 	</dict>
 </dict>
 </plist>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Info.plist

@@ -27,15 +27,15 @@
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>DTCompiler</key>
-	<string></string>
+	<string>4.0</string>
 	<key>DTPlatformBuild</key>
 	<string>10M2518</string>
 	<key>DTPlatformVersion</key>
 	<string>PG</string>
 	<key>DTSDKBuild</key>
-	<string>9L31a</string>
+	<string>8S2167</string>
 	<key>DTSDKName</key>
-	<string>macosx10.5</string>
+	<string>macosx10.4</string>
 	<key>DTXcode</key>
 	<string>0400</string>
 	<key>DTXcodeBuild</key>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Adobe Digital Editions Key_Help.htm

@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing Adobe Digital Editions Keys</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing Adobe Digital Editions Keys</h1>
+
+
+<p>If you have upgraded from an earlier version of the plugin, any existing Adobe Digital Editions keys will have been automatically imported, so you might not need to do any more configuration. In addition, on Windows and Mac, the default Adobe Digital Editions key is added the first time the plugin is run. Continue reading for key generation and management instructions.</p>
+
+<h3>Creating New Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog prompting you to enter a key name for the default Adobe Digital Editions key. </p>
+<ul>
+<li><span class="bold">Unique Key Name:</span> this is a unique name you choose to help you identify the key. This name will show in the list of configured keys.</li>
+</ul>
+
+<p>Click the OK button to create and store the Adobe Digital Editions key for the current installation of Adobe Digital Editions. Or Cancel if you don’t want to create the key.</p>
+<p>New keys are checked against the current list of keys before being added, and duplicates are discarded.</p>
+
+<h3>Deleting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted key in the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<h3>Renaming Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a sheet of paper. Clicking this button will promt you to enter a new name for the highlighted key in the list. Enter the new name for the encryption key and click the OK button to use the new name, or Cancel to revert to the old name..</p>
+
+<h3>Exporting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a computer’s hard-drive. Use this button to export the highlighted key to a file (with a ‘.der’ file name extension). Used for backup purposes or to migrate key data to other computers/calibre installations. The dialog will prompt you for a place to save the file.</p>
+
+<h3>Linux Users: WINEPREFIX</h3>
+
+<p>Under the list of keys, Linux users will see a text field labeled "WINEPREFIX". If you are use Adobe Digital Editions under Wine, and your wine installation containing Adobe Digital Editions isn't the default Wine installation, you may enter the full path to the correct Wine installation here. Leave blank if you are unsure.</p>
+
+<h3>Importing Existing Keyfiles:</h3>
+
+<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.der’ key files. Key files might come from being exported from this or older plugins, or may have been generated using the adobekey.pyw script running under Wine on Linux systems.</p>
+
+<p>Once done creating/deleting/renaming/importing decryption keys, click Close to exit the customization dialogue. Your changes will only be saved permanently when you click OK in the main configuration dialog.</p>
+
+
+</body>
+
+</html>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Barnes and Noble Key_Help.htm

@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing Barnes and Noble Keys</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing Barnes and Noble Keys</h1>
+
+
+<p>If you have upgraded from an earlier version of the plugin, any existing Barnes and Noble keys will have been automatically imported, so you might not need to do any more configuration. Continue reading for key generation and management instructions.</p>
+
+<h3>Changes at Barnes & Noble</h3>
+
+<p>In mid-2014, Barnes & Noble changed the way they generated encryption keys. Instead of deriving the key from the user's name and credit card number, they started generating a random key themselves, sending that key through to devices when they connected to the Barnes & Noble servers. This means that most users will now find that no combination of their name and CC# will work in decrypting their recently downloaded ebooks.</p>
+
+<p>Someone commenting at Apprentice Alf's blog detailed a way to retrieve a new account key using the account's email address and password. This method has now been incorporated into the plugin.
+
+<h3>Creating New Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering the necessary data to generate a new key.</p>
+<ul>
+<li><span class="bold">Unique Key Name:</span> this is a unique name you choose to help you identify the key. This name will show in the list of configured keys. Choose something that will help you remember the data (account email address) it was created with.</li>
+<li><span class="bold">B&N/nook account email address:</span> This is the default email address for your Barnes and Noble/nook account. This email will not be stored anywhere on your computer or in calibre. It will only be used to fetch the account key that from the B&N server, and it is that key that will be stored in the preferences.</li>
+<li><span class="bold">B&N/nook account password:</span> this is the password for your Barnes and Noble/nook account. As with the email address, this will not be stored anywhere on your computer or in calibre. It will only be used to fetch the key from the B&N server.</li>
+</ul>
+
+<p>Click the OK button to create and store the generated key. Or Cancel if you don’t want to create a key.</p>
+<p>New keys are checked against the current list of keys before being added, and duplicates are discarded.</p>
+
+<h3>Deleting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted key in the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<h3>Renaming Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a sheet of paper. Clicking this button will promt you to enter a new name for the highlighted key in the list. Enter the new name for the encryption key and click the OK button to use the new name, or Cancel to revert to the old name..</p>
+
+<h3>Exporting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a computer’s hard-drive. Use this button to export the highlighted key to a file (with a ‘.b64’ file name extension). Used for backup purposes or to migrate key data to other computers/calibre installations. The dialog will prompt you for a place to save the file.</p>
+
+<h3>Importing Existing Keyfiles:</h3>
+
+<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.b64’ key files. Key files might come from being exported from this or older plugins, or may have been generated using the original i♥cabbages script, or you may have made it by following the instructions above.</p>
+
+<p>Once done creating/deleting/renaming/importing decryption keys, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
+
+<h3>NOOK Study</h3>
+<p>Books downloaded through NOOK Study may or may not use the key found using the above method. If a book is not decrypted successfully with any of the keys, the plugin will attempt to recover keys from the NOOK Study log file and use them.</p>
+
+
+
+</body>
+
+</html>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_EInk Kindle Serial Number_Help.htm

@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing eInk Kindle serial numbers</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing eInk Kindle serial numbers</h1>
+
+<p>If you have upgraded from an earlier version of the plugin, any existing eInk Kindle serial numbers will have been automatically imported, so you might not need to do any more configuration.</p>
+
+<p>Please note that Kindle serial numbers are only valid keys for eInk Kindles like the Kindle Touch and PaperWhite. The Kindle Fire and Fire HD do not use their serial number for DRM and it is useless to enter those serial numbers.</p>
+
+<h3>Creating New Kindle serial numbers:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering a new Kindle serial number.</p>
+<ul>
+<li><span class="bold">Eink Kindle Serial Number:</span> this is the unique serial number of your device. It usually starts with a ‘B’ or a ‘9’ and is sixteen characters long. For a reference of where to find serial numbers and their ranges, please refer to this <a href="http://wiki.mobileread.com/wiki/Kindle_serial_numbers">mobileread wiki page.</a></li>
+</ul>
+
+<p>Click the OK button to save the serial number. Or Cancel if you didn’t want to enter a serial number.</p>
+
+<h3>Deleting Kindle serial numbers:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted Kindle serial number from the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<p>Once done creating/deleting serial numbers, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
+
+</body>
+
+</html>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Help.htm

@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>DeDRM Plugin Configuration</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+
+</style>
+</head>
+
+<body>
+
+<h1>DeDRM Plugin <span class="version">(v6.3.0)</span></h1>
+
+<p>This plugin removes DRM from ebooks when they are imported into calibre. If you already have DRMed ebooks in your calibre library, you will need to remove them and import them again.</p>
+
+<h3>Installation</h3>
+<p>You have obviously managed to install the plugin, as otherwise you wouldn’t be reading this help file. However, you should also delete any older DeDRM plugins, as this DeDRM plugin replaces the five older plugins: Kindle and Mobipocket DeDRM (K4MobiDeDRM), Ignoble Epub DeDRM (ignobleepub), Inept Epub DeDRM (ineptepub), Inept PDF DeDRM (ineptepub) and eReader PDB 2 PML (eReaderPDB2PML).</p>
+
+<h3>Configuration</h3>
+<p>On Windows and Mac, the keys for ebooks downloaded for Kindle for Mac/PC and Adobe Digital Editions are automatically generated. If all your DRMed ebooks can be opened and read in Kindle for Mac/PC and/or Adobe Digital Editions on the same computer on which you are running calibre, you do not need to do any configuration of this plugin. On Linux, keys for Kindle for PC and Adobe Digital Editions need to be generated separately (see the Linux section below)</p>
+
+<p>If you have other DRMed ebooks, you will need to enter extra configuration information. The buttons in this dialog will open individual configuration dialogs that will allow you to enter the needed information, depending on the type and source of your DRMed eBooks. Additional help on the information required is available in each of the the dialogs.</p>
+
+<p>If you have used previous versions of the various DeDRM plugins on this machine, you may find that some of the configuration dialogs already contain the information you entered through those previous plugins.</p>
+
+<p>When you have finished entering your configuration information, you <em>must</em> click the OK button to save it. If you click the Cancel button, all your changes in all the configuration dialogs will be lost.</p>
+
+<h3>Troubleshooting:</h3>
+
+<p >If you find that it’s not working for you , you can save a lot of time by trying to add the ebook to Calibre in debug mode. This will print out a lot of helpful info that can be copied into any online help requests.</p>
+
+<p>Open a command prompt (terminal window) and type "calibre-debug -g" (without the quotes). Calibre will launch, and you can can add the problem ebook the usual way. The debug info will be output to the original command prompt (terminal window). Copy the resulting output and paste it into the comment you make at my blog.</p>
+<p><span class="bold">Note:</span> The Mac version of Calibre doesn’t install the command line tools by default. If you go to the ‘Preferences’ page and click on the miscellaneous button, you’ll find the option to install the command line tools.</p>
+
+<h3>Credits:</h3>
+<ul>
+<li>The Dark Reverser for the Mobipocket and eReader scripts</li>
+<li>i♥cabbages for the Adobe Digital Editions scripts</li>
+<li>Skindle aka Bart Simpson for the Amazon Kindle for PC script</li>
+<li>CMBDTC for Amazon Topaz DRM removal script</li>
+<li>some_updates, clarknova and Bart Simpson for  Amazon Topaz conversion scripts</li>
+<li>DiapDealer for the first calibre plugin versions of the tools</li>
+<li>some_updates, DiapDealer, Apprentice Alf and mdlnx for Amazon Kindle/Mobipocket tools</li>
+<li>some_updates for the DeDRM all-in-one Python tool</li>
+<li>Apprentice Alf for the DeDRM all-in-one AppleScript tool</li>
+<li>Apprentice Alf for the DeDRM all-in-one calibre plugin</li>
+<li>And probably many more.</li>
+</ul>
+
+<h3> For additional help read the <a href="http://apprenticealf.wordpress.com/2011/01/17/frequently-asked-questions-about-the-drm-removal-tools/">FAQs</a> at <a href="http://apprenticealf.wordpress.com">Apprentice Alf’s Blog</a> and ask questions in the comments section of the <a href="http://apprenticealf.wordpress.com/2012/09/10/drm-removal-tools-for-ebooks/">first post</a>.</h3>
+
+<h2>Linux Systems Only</h2>
+<h3>Generating decryption keys for Adobe Digital Editions and Kindle for PC</h3>
+<p>If you install Kindle for PC and/or Adobe Digital Editions in Wine, you will be able to download DRMed ebooks to them under Wine. To be able to remove the DRM, you will need to generate key files and add them in the plugin's customisation dialogs.</p>
+
+<p>To generate the key files you will need to install Python and PyCrypto under the same Wine setup as your Kindle for PC and/or Adobe Digital Editions installations. (Kindle for PC, Python and Pycrypto installation instructions in the ReadMe.)</p>
+
+<p>Once everything's installed under Wine, you'll need to run the adobekey.pyw script (for Adobe Digital Editions) and kindlekey.pyw (For Kindle for PC) using the python installation in your Wine system. The scripts can be found in Other_Tools/Key_Retrieval_Scripts.</p>
+
+<p>Each script will create a key file in the same folder as the script. Copy the key files to your Linux system and then load the key files using the Adobe Digital Editions ebooks dialog and the Kindle for Mac/PC ebooks dialog.</p>
+
+
+</body>
+
+</html>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Kindle for Android Key_Help.htm

@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing Kindle for Android Keys</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing Kindle for Android Keys</h1>
+
+<p>Amazon's Kindle for Android application uses an internal key equivalent to an eInk Kindle's serial number. Extracting that key is a little tricky, but worth it, as it then allows the DRM to be removed from any Kindle ebooks that have been downloaded to that Android device.</p>
+
+<p>Please note that it is not currently known whether the same applies to the Kindle application on the Kindle Fire and Fire HD.</p>
+
+<h3>Getting the Kindle for Android backup file</h3>
+
+<p>Obtain and install adb (Android Debug Bridge) on your computer. Details of how to do this are beyond the scope of this help file, but there are plenty of on-line guides.</p>
+<p>Enable developer mode on your Android device. Again, look for an on-line guide for your device.</p>
+<p>Once you have adb installed and your device in developer mode, connect your device to your computer with a USB cable and then open up a command line (Terminal on Mac OS X and cmd.exe on Windows) and enter "adb backup com.amazon.kindle" (without the quotation marks!) and press return. A file "backup.ab" should be created in your home directory.
+
+<h3>Adding a Kindle for Android Key</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+).  Clicking this button will open a new dialog with two main controls.
+<ul>
+<li><span class="bold">Choose backup file:</span> click this button and you will be prompted to find the backup.ab file you created earlier. Once selected the file will be processed to extract the decryption key, and if successful the file name will be displayed to the right of the button.</li>
+<li><span class="bold">Unique Key Name:</span> this is a unique name you choose to help you identify the key. This name will show in the list of Kindle for Android keys. Enter a name that will help you remember which device this key came from.</li>
+</ul>
+
+<p>Click the OK button to store the Kindle for Android key for the current list of Kindle for Android keys. Or click Cancel if you don’t want to store the key.</p>
+<p>New keys are checked against the current list of keys before being added, and duplicates are discarded.</p>
+
+<h3>Deleting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted key in the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<h3>Renaming Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a sheet of paper. Clicking this button will prompt you to enter a new name for the highlighted key in the list. Enter the new name for the key and click the OK button to use the new name, or Cancel to revert to the old name.</p>
+
+<h3>Exporting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a computer’s hard-drive. Use this button to export the highlighted key to a file (with a ‘.k4a' file name extension). Used for backup purposes or to migrate key data to other computers/calibre installations. The dialog will prompt you for a place to save the file.</p>
+
+<h3>Importing Existing Keyfiles:</h3>
+
+<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import any ‘.k4a’ file you obtained by using the androidkindlekey.py script manually, or by exporting from another copy of calibre.</p>
+
+</body>
+
+</html>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Kindle for Mac and PC Key_Help.htm

@@ -0,0 +1,59 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing Kindle for Mac/PC Keys</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing Kindle for Mac/PC Keys</h1>
+
+
+<p>If you have upgraded from an earlier version of the plugin, any existing Kindle for Mac/PC keys will have been automatically imported, so you might not need to do any more configuration. In addition, on Windows and Mac, the default Kindle for Mac/PC key is added the first time the plugin is run. Continue reading for key generation and management instructions.</p>
+
+<h3>Creating New Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog prompting you to enter a key name for the default Kindle for Mac/PC key. </p>
+<ul>
+<li><span class="bold">Unique Key Name:</span> this is a unique name you choose to help you identify the key. This name will show in the list of configured keys.</li>
+</ul>
+
+<p>Click the OK button to create and store the Kindle for Mac/PC key for the current installation of Kindle for Mac/PC. Or Cancel if you don’t want to create the key.</p>
+<p>New keys are checked against the current list of keys before being added, and duplicates are discarded.</p>
+
+<h3>Deleting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted key in the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<h3>Renaming Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a sheet of paper. Clicking this button will promt you to enter a new name for the highlighted key in the list. Enter the new name for the encryption key and click the OK button to use the new name, or Cancel to revert to the old name..</p>
+
+<h3>Exporting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a computer’s hard-drive. Use this button to export the highlighted key to a file (with a ‘.der’ file name extension). Used for backup purposes or to migrate key data to other computers/calibre installations. The dialog will prompt you for a place to save the file.</p>
+
+<h3>Linux Users: WINEPREFIX</h3>
+
+<p>Under the list of keys, Linux users will see a text field labeled "WINEPREFIX". If you are use Kindle for PC under Wine, and your wine installation containing Kindle for PC isn't the default Wine installation, you may enter the full path to the correct Wine installation here. Leave blank if you are unsure.</p>
+
+<h3>Importing Existing Keyfiles:</h3>
+
+<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.k4i’ key files. Key files might come from being exported from this plugin, or may have been generated using the kindlekey.pyw script running under Wine on Linux systems.</p>
+
+<p>Once done creating/deleting/renaming/importing decryption keys, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
+
+</body>
+
+</html>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Mobipocket PID_Help.htm

@@ -0,0 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing Mobipocket PIDs</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing Mobipocket PIDs</h1>
+
+<p>If you have upgraded from an earlier version of the plugin, any existing Mobipocket PIDs will have been automatically imported, so you might not need to do any more configuration.</p>
+
+
+<h3>Creating New Mobipocket PIDs:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering a new Mobipocket PID.</p>
+<ul>
+<li><span class="bold">PID:</span> this is a PID used to decrypt your Mobipocket ebooks. It is eight or ten characters long. Mobipocket PIDs are usualy displayed in the About screen of your Mobipocket device.</li>
+</ul>
+
+<p>Click the OK button to save the PID. Or Cancel if you didn’t want to enter a PID.</p>
+
+<h3>Deleting Mobipocket PIDs:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted Mobipocket PID from the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<p>Once done creating/deleting PIDs, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
+
+</body>
+
+</html>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_eReader Key_Help.htm

@@ -0,0 +1,56 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing eReader Keys</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing eReader Keys</h1>
+
+<p>If you have upgraded from an earlier version of the plugin, any existing eReader (Fictionwise ‘.pdb’) keys will have been automatically imported, so you might not need to do any more configuration. Continue reading for key generation and management instructions.</p>
+
+<h3>Creating New Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering the necessary data to generate a new key.</p>
+<ul>
+<li><span class="bold">Unique Key Name:</span> this is a unique name you choose to help you identify the key. This name will show in the list of configured keys. Choose something that will help you remember the data (name, cc#) it was created with.</li>
+<li><span class="bold">Your Name:</span> This is the name used by Fictionwise to generate your encryption key. Since Fictionwise has now closed down, you might not have easy access to this. It was often the name on the Credit Card used at Fictionwise.</li>
+<li><span class="bold">Credit Card#:</span> this is the default credit card number that was on file with Fictionwise at the time of download of the ebook to be de-DRMed. Just enter the last 8 digits of the number. As with the name, this number will not be stored anywhere on your computer or in calibre. It will only be used in the creation of the one-way hash/key that’s stored in the preferences.</li>
+</ul>
+
+<p>Click the OK button to create and store the generated key. Or Cancel if you don’t want to create a key.</p>
+<p>New keys are checked against the current list of keys before being added, and duplicates are discarded.</p>
+
+<h3>Deleting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted key in the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<h3>Renaming Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a sheet of paper. Clicking this button will promt you to enter a new name for the highlighted key in the list. Enter the new name for the encryption key and click the OK button to use the new name, or Cancel to revert to the old name..</p>
+
+<h3>Exporting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a computer’s hard-drive. Use this button to export the highlighted key to a file (with a ‘.b63’ file name extension). Used for backup purposes or to migrate key data to other computers/calibre installations. The dialog will prompt you for a place to save the file.</p>
+
+<h3>Importing Existing Keyfiles:</h3>
+
+<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.b63’ key files that have previously been exported.</p>
+
+<p>Once done creating/deleting/renaming/importing decryption keys, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
+
+</body>
+
+</html>

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

@@ -0,0 +1,634 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+__license__   = 'GPL v3'
+__docformat__ = 'restructuredtext en'
+
+
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
+#
+# 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.
+#
+# This plugin is meant to decrypt eReader PDBs, Adobe Adept ePubs, Barnes & Noble ePubs,
+# Adobe Adept PDFs, Amazon Kindle and Mobipocket files without having to
+# install any dependencies... other than having calibre installed, of course.
+#
+# Configuration:
+# Check out the plugin's configuration settings by clicking the "Customize plugin"
+# button when you have the "DeDRM" plugin highlighted (under Preferences->
+# Plugins->File type plugins). Once you have the configuration dialog open, you'll
+# see a Help link on the top right-hand side.
+#
+# Revision history:
+#   6.0.0 - Initial release
+#   6.0.1 - Bug Fixes for Windows App, Kindle for Mac and Windows Adobe Digital Editions
+#   6.0.2 - Restored call to Wine to get Kindle for PC keys, added for ADE
+#   6.0.3 - Fixes for Kindle for Mac and Windows non-ascii user names
+#   6.0.4 - Fixes for stand-alone scripts and applications
+#           and pdb files in plugin and initial conversion of prefs.
+#   6.0.5 - Fix a key issue
+#   6.0.6 - Fix up an incorrect function call
+#   6.0.7 - Error handling for incomplete PDF metadata
+#   6.0.8 - Fixes a Wine key issue and topaz support
+#   6.0.9 - Ported to work with newer versions of Calibre (moved to Qt5). Still supports older Qt4 versions.
+#   6.1.0 - Fixed multiple books import problem and PDF import with no key problem
+#   6.2.0 - Support for getting B&N key from nook Study log. Fix for UTF-8 filenames in Adobe ePubs.
+#           Fix for not copying needed files. Fix for getting default Adobe key for PDFs
+#   6.2.1 - Fix for non-ascii Windows user names
+#   6.2.2 - Added URL method for B&N/nook books
+#   6.3.0 - Added in Kindle for Android serial number solution
+#   6.3.1 - Version number bump for clarity
+#   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
+#   6.5.0 - Big update to Macintosh app
+#           Fix for some more 'new' tags in Topaz ebooks.
+#           Fix an error in wineutils.py
+
+
+"""
+Decrypt DRMed ebooks.
+"""
+
+PLUGIN_NAME = u"DeDRM"
+PLUGIN_VERSION_TUPLE = (6, 5, 0)
+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'
+
+import sys, os, re
+import time
+import zipfile
+import traceback
+from zipfile import ZipFile
+
+class DeDRMError(Exception):
+    pass
+
+from calibre.customize import FileTypePlugin
+from calibre.constants import iswindows, isosx
+from calibre.gui2 import is_ok_to_use_qt
+from calibre.utils.config import config_dir
+
+
+# Wrap a stream so that output gets flushed immediately
+# and also make sure that any unicode strings get safely
+# 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")
+        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)
+
+class DeDRM(FileTypePlugin):
+    name                    = PLUGIN_NAME
+    description             = u"Removes DRM from Amazon Kindle, Adobe Adept (including Kobo), Barnes & Noble, Mobipocket and eReader ebooks. Credit given to i♥cabbages and The Dark Reverser for the original stand-alone scripts."
+    supported_platforms     = ['linux', 'osx', 'windows']
+    author                  = u"Apprentice Alf, Aprentice Harper, The Dark Reverser and i♥cabbages"
+    version                 = PLUGIN_VERSION_TUPLE
+    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
+
+
+    def initialize(self):
+        """
+        Dynamic modules can't be imported/loaded from a zipfile.
+        So this routine will extract the appropriate
+        library for the target OS and copy it to the 'alfcrypto' subdirectory of
+        calibre's configuration directory. That 'alfcrypto' directory is then
+        inserted into the syspath (as the very first entry) in the run function
+        so the CDLL stuff will work in the alfcrypto.py script.
+
+        The extraction only happens once per version of the plugin
+        Also perform upgrade of preferences once per version
+        """
+        try:
+            self.pluginsdir = os.path.join(config_dir,u"plugins")
+            if not os.path.exists(self.pluginsdir):
+                os.mkdir(self.pluginsdir)
+            self.maindir = os.path.join(self.pluginsdir,u"DeDRM")
+            if not os.path.exists(self.maindir):
+                os.mkdir(self.maindir)
+            self.helpdir = os.path.join(self.maindir,u"help")
+            if not os.path.exists(self.helpdir):
+                os.mkdir(self.helpdir)
+            self.alfdir = os.path.join(self.maindir,u"libraryfiles")
+            if not os.path.exists(self.alfdir):
+                os.mkdir(self.alfdir)
+            # only continue if we've never run this version of the plugin before
+            self.verdir = os.path.join(self.maindir,PLUGIN_VERSION)
+            if not os.path.exists(self.verdir):
+                if iswindows:
+                    names = [u"alfcrypto.dll",u"alfcrypto64.dll"]
+                elif isosx:
+                    names = [u"libalfcrypto.dylib"]
+                else:
+                    names = [u"libalfcrypto32.so",u"libalfcrypto64.so",u"kindlekey.py",u"adobekey.py",u"subasyncio.py"]
+                lib_dict = self.load_resources(names)
+                print u"{0} v{1}: Copying needed library files from plugin's zip".format(PLUGIN_NAME, PLUGIN_VERSION)
+
+                for entry, data in lib_dict.items():
+                    file_path = os.path.join(self.alfdir, entry)
+                    try:
+                        os.remove(file_path)
+                    except:
+                        pass
+
+                    try:
+                        open(file_path,'wb').write(data)
+                    except:
+                        print u"{0} v{1}: Exception when copying needed library files".format(PLUGIN_NAME, PLUGIN_VERSION)
+                        traceback.print_exc()
+                        pass
+
+                # convert old preferences, if necessary.
+                from calibre_plugins.dedrm.prefs import convertprefs
+                convertprefs()
+
+                # mark that this version has been initialized
+                os.mkdir(self.verdir)
+        except Exception, e:
+            traceback.print_exc()
+            raise
+
+    def ePubDecrypt(self,path_to_ebook):
+        # Create a TemporaryPersistent file to work with.
+        # Check original epub archive for zip errors.
+        import calibre_plugins.dedrm.zipfix
+
+        inf = self.temporary_file(u".epub")
+        try:
+            print u"{0} v{1}: Verifying zip archive integrity".format(PLUGIN_NAME, PLUGIN_VERSION)
+            fr = zipfix.fixZip(path_to_ebook, inf.name)
+            fr.fix()
+        except Exception, e:
+            print u"{0} v{1}: Error \'{2}\' when checking zip archive".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0])
+            raise Exception(e)
+
+        # import the decryption keys
+        import calibre_plugins.dedrm.prefs as prefs
+        dedrmprefs = prefs.DeDRM_Prefs()
+
+        # import the Barnes & Noble ePub handler
+        import calibre_plugins.dedrm.ignobleepub as ignobleepub
+
+
+        #check the book
+        if  ignobleepub.ignobleBook(inf.name):
+            print u"{0} v{1}: “{2}” is a secure Barnes & Noble ePub".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
+
+            # Attempt to decrypt epub with each encryption key (generated or provided).
+            for keyname, userkey in dedrmprefs['bandnkeys'].items():
+                keyname_masked = u"".join((u'X' if (x.isdigit()) else x) for x in keyname)
+                print u"{0} v{1}: Trying Encryption key {2:s}".format(PLUGIN_NAME, PLUGIN_VERSION, keyname_masked)
+                of = self.temporary_file(u".epub")
+
+                # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                try:
+                    result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                except:
+                    print u"{0} v{1}: Exception when trying to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                    traceback.print_exc()
+                    result = 1
+
+                of.close()
+
+                if  result == 0:
+                    # Decryption was successful.
+                    # Return the modified PersistentTemporary file to calibre.
+                    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_masked,time.time()-self.starttime)
+
+            # perhaps we should see if we can get a key from a log file
+            print u"{0} v{1}: Looking for new NOOK Study Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+
+            # get the default NOOK Study keys
+            defaultkeys = []
+
+            try:
+                if iswindows or isosx:
+                    from calibre_plugins.dedrm.ignoblekey import nookkeys
+
+                    defaultkeys = nookkeys()
+                else: # linux
+                    from wineutils import WineGetKeys
+
+                    scriptpath = os.path.join(self.alfdir,u"ignoblekey.py")
+                    defaultkeys = WineGetKeys(scriptpath, u".b64",dedrmprefs['adobewineprefix'])
+
+            except:
+                print u"{0} v{1}: Exception when getting default NOOK Study Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
+
+            newkeys = []
+            for keyvalue in defaultkeys:
+                if keyvalue not in dedrmprefs['bandnkeys'].values():
+                    newkeys.append(keyvalue)
+
+            if len(newkeys) > 0:
+                try:
+                    for i,userkey in enumerate(newkeys):
+                        print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+
+                        of = self.temporary_file(u".epub")
+
+                        # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                        try:
+                            result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                        except:
+                           print u"{0} v{1}: Exception when trying to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                           traceback.print_exc()
+                           result = 1
+
+                        of.close()
+
+                        if result == 0:
+                            # Decryption was a success
+                            # Store the new successful key in the defaults
+                            print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                            try:
+                                dedrmprefs.addnamedvaluetoprefs('bandnkeys','nook_Study_key',keyvalue)
+                                dedrmprefs.writeprefs()
+                                print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                            except:
+                                print u"{0} v{1}: Exception saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                                traceback.print_exc()
+                            # Return the modified PersistentTemporary file to calibre.
+                            return of.name
+
+                        print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                except Exception, e:
+                    pass
+
+            print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
+
+        # import the Adobe Adept ePub handler
+        import calibre_plugins.dedrm.ineptepub as ineptepub
+
+        if ineptepub.adeptBook(inf.name):
+            print u"{0} v{1}: {2} is a secure Adobe Adept ePub".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
+
+            # Attempt to decrypt epub with each encryption key (generated or provided).
+            for keyname, userkeyhex in dedrmprefs['adeptkeys'].items():
+                userkey = userkeyhex.decode('hex')
+                print u"{0} v{1}: Trying Encryption key {2:s}".format(PLUGIN_NAME, PLUGIN_VERSION, keyname)
+                of = self.temporary_file(u".epub")
+
+                # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                try:
+                    result = ineptepub.decryptBook(userkey, inf.name, of.name)
+                except:
+                    print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                    traceback.print_exc()
+                    result = 1
+
+                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)
+
+            # perhaps we need to get a new default ADE key
+            print u"{0} v{1}: Looking for new default Adobe Digital Editions Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+
+            # get the default Adobe keys
+            defaultkeys = []
+
+            try:
+                if iswindows or isosx:
+                    from calibre_plugins.dedrm.adobekey import adeptkeys
+
+                    defaultkeys = adeptkeys()
+                else: # linux
+                    from wineutils import WineGetKeys
+
+                    scriptpath = os.path.join(self.alfdir,u"adobekey.py")
+                    defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
+
+                self.default_key = defaultkeys[0]
+            except:
+                print u"{0} v{1}: Exception when getting default Adobe Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
+                self.default_key = u""
+
+            newkeys = []
+            for keyvalue in defaultkeys:
+                if keyvalue.encode('hex') not in dedrmprefs['adeptkeys'].values():
+                    newkeys.append(keyvalue)
+
+            if len(newkeys) > 0:
+                try:
+                    for i,userkey in enumerate(newkeys):
+                        print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                        of = self.temporary_file(u".epub")
+
+                        # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                        try:
+                            result = ineptepub.decryptBook(userkey, inf.name, of.name)
+                        except:
+                            print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                            traceback.print_exc()
+                            result = 1
+
+                        of.close()
+
+                        if  result == 0:
+                            # Decryption was a success
+                            # Store the new successful key in the defaults
+                            print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                            try:
+                                dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
+                                dedrmprefs.writeprefs()
+                                print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                            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
+
+                        print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                except Exception, e:
+                    pass
+
+            # Something went wrong with decryption.
+            print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
+
+        # Not a Barnes & Noble nor an Adobe Adept
+        # Import the fixed epub.
+        print u"{0} v{1}: “{2}” is neither an Adobe Adept nor a Barnes & Noble encrypted ePub".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
+        raise DeDRMError(u"{0} v{1}: Couldn't decrypt after {2:.1f} seconds. DRM free perhaps?".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
+
+    def PDFDecrypt(self,path_to_ebook):
+        import calibre_plugins.dedrm.prefs as prefs
+        import calibre_plugins.dedrm.ineptpdf
+
+        dedrmprefs = prefs.DeDRM_Prefs()
+        # Attempt to decrypt epub with each encryption key (generated or provided).
+        print u"{0} v{1}: {2} is a PDF ebook".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
+        for keyname, userkeyhex in dedrmprefs['adeptkeys'].items():
+            userkey = userkeyhex.decode('hex')
+            print u"{0} v{1}: Trying Encryption key {2:s}".format(PLUGIN_NAME, PLUGIN_VERSION, keyname)
+            of = self.temporary_file(u".pdf")
+
+            # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+            try:
+                result = ineptpdf.decryptBook(userkey, path_to_ebook, of.name)
+            except:
+                print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
+                result = 1
+
+            of.close()
+
+            if  result == 0:
+                # Decryption was successful.
+                # Return the modified PersistentTemporary file to calibre.
+                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)
+
+        # perhaps we need to get a new default ADE key
+        print u"{0} v{1}: Looking for new default Adobe Digital Editions Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+
+        # get the default Adobe keys
+        defaultkeys = []
+
+        try:
+            if iswindows or isosx:
+                from calibre_plugins.dedrm.adobekey import adeptkeys
+
+                defaultkeys = adeptkeys()
+            else: # linux
+                from wineutils import WineGetKeys
+
+                scriptpath = os.path.join(self.alfdir,u"adobekey.py")
+                defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
+
+            self.default_key = defaultkeys[0]
+        except:
+            print u"{0} v{1}: Exception when getting default Adobe Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+            traceback.print_exc()
+            self.default_key = u""
+
+        newkeys = []
+        for keyvalue in defaultkeys:
+            if keyvalue.encode('hex') not in dedrmprefs['adeptkeys'].values():
+                newkeys.append(keyvalue)
+
+        if len(newkeys) > 0:
+            try:
+                for i,userkey in enumerate(newkeys):
+                    print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                    of = self.temporary_file(u".pdf")
+
+                    # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                    try:
+                        result = ineptpdf.decryptBook(userkey, path_to_ebook, of.name)
+                    except:
+                        print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                        traceback.print_exc()
+                        result = 1
+
+                    of.close()
+
+                    if  result == 0:
+                        # Decryption was a success
+                        # Store the new successful key in the defaults
+                        print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                        try:
+                            dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
+                            dedrmprefs.writeprefs()
+                            print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                        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()
+                        # Return the modified PersistentTemporary file to calibre.
+                        return of.name
+
+                    print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+            except Exception, e:
+                pass
+
+        # Something went wrong with decryption.
+        print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
+
+
+    def KindleMobiDecrypt(self,path_to_ebook):
+
+        # add the alfcrypto directory to sys.path so alfcrypto.py
+        # will be able to locate the custom lib(s) for CDLL import.
+        sys.path.insert(0, self.alfdir)
+        # Had to move this import here so the custom libs can be
+        # extracted to the appropriate places beforehand these routines
+        # look for them.
+        import calibre_plugins.dedrm.prefs as prefs
+        import calibre_plugins.dedrm.k4mobidedrm
+
+        dedrmprefs = prefs.DeDRM_Prefs()
+        pids = dedrmprefs['pids']
+        serials = dedrmprefs['serials']
+        for android_serials_list in dedrmprefs['androidkeys'].values():
+            #print android_serials_list
+            serials.extend(android_serials_list)
+        #print serials
+        androidFiles = []
+        kindleDatabases = dedrmprefs['kindlekeys'].items()
+
+        try:
+            book = k4mobidedrm.GetDecryptedBook(path_to_ebook,kindleDatabases,androidFiles,serials,pids,self.starttime)
+        except Exception, e:
+            decoded = False
+            # perhaps we need to get a new default Kindle for Mac/PC key
+            defaultkeys = []
+            print u"{0} v{1}: Failed to decrypt with error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION,e.args[0])
+            print u"{0} v{1}: Looking for new default Kindle Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+
+            try:
+                if iswindows or isosx:
+                    from calibre_plugins.dedrm.kindlekey import kindlekeys
+
+                    defaultkeys = kindlekeys()
+                else: # linux
+                    from wineutils import WineGetKeys
+
+                    scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
+                    defaultkeys = WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
+            except:
+                print u"{0} v{1}: Exception when getting default Kindle Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
+                pass
+
+            newkeys = {}
+            for i,keyvalue in enumerate(defaultkeys):
+                keyname = u"default_key_{0:d}".format(i+1)
+                if keyvalue not in dedrmprefs['kindlekeys'].values():
+                    newkeys[keyname] = keyvalue
+            if len(newkeys) > 0:
+                print u"{0} v{1}: Found {2} new {3}".format(PLUGIN_NAME, PLUGIN_VERSION, len(newkeys), u"key" if len(newkeys)==1 else u"keys")
+                try:
+                    book = k4mobidedrm.GetDecryptedBook(path_to_ebook,newkeys.items(),[],[],[],self.starttime)
+                    decoded = True
+                    # store the new successful keys in the defaults
+                    print u"{0} v{1}: Saving {2} new {3}".format(PLUGIN_NAME, PLUGIN_VERSION, len(newkeys), u"key" if len(newkeys)==1 else u"keys")
+                    for keyvalue in newkeys.values():
+                        dedrmprefs.addnamedvaluetoprefs('kindlekeys','default_key',keyvalue)
+                    dedrmprefs.writeprefs()
+                except Exception, e:
+                    pass
+            if not decoded:
+                #if you reached here then no luck raise and exception
+                print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
+
+        of = self.temporary_file(book.getBookExtension())
+        book.getFile(of.name)
+        of.close()
+        book.cleanup()
+        return of.name
+
+
+    def eReaderDecrypt(self,path_to_ebook):
+
+        import calibre_plugins.dedrm.prefs as prefs
+        import calibre_plugins.dedrm.erdr2pml
+
+        dedrmprefs = prefs.DeDRM_Prefs()
+        # Attempt to decrypt epub with each encryption key (generated or provided).
+        for keyname, userkey in dedrmprefs['ereaderkeys'].items():
+            keyname_masked = u"".join((u'X' if (x.isdigit()) else x) for x in keyname)
+            print u"{0} v{1}: Trying Encryption key {2:s}".format(PLUGIN_NAME, PLUGIN_VERSION, keyname_masked)
+            of = self.temporary_file(u".pmlz")
+
+            # Give the userkey, ebook and TemporaryPersistent file to the decryption function.
+            result = erdr2pml.decryptBook(path_to_ebook, of.name, True, userkey.decode('hex'))
+
+            of.close()
+
+            # Decryption was successful return the modified PersistentTemporary
+            # file to Calibre's import process.
+            if  result == 0:
+                print u"{0} v{1}: Successfully decrypted with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname_masked,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_masked,time.time()-self.starttime)
+
+        print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
+
+
+    def run(self, path_to_ebook):
+
+        # make sure any unicode output gets converted safely with 'replace'
+        sys.stdout=SafeUnbuffered(sys.stdout)
+        sys.stderr=SafeUnbuffered(sys.stderr)
+
+        print u"{0} v{1}: Trying to decrypt {2}".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
+        self.starttime = time.time()
+
+        booktype = os.path.splitext(path_to_ebook)[1].lower()[1:]
+        if booktype in ['prc','mobi','pobi','azw','azw1','azw3','azw4','tpz']:
+            # Kindle/Mobipocket
+            decrypted_ebook = self.KindleMobiDecrypt(path_to_ebook)
+        elif booktype == 'pdb':
+            # eReader
+            decrypted_ebook = self.eReaderDecrypt(path_to_ebook)
+            pass
+        elif booktype == 'pdf':
+            # Adobe Adept PDF (hopefully)
+            decrypted_ebook = self.PDFDecrypt(path_to_ebook)
+            pass
+        elif booktype == 'epub':
+            # Adobe Adept or B&N ePub
+            decrypted_ebook = self.ePubDecrypt(path_to_ebook)
+        else:
+            print u"Unknown booktype {0}. Passing back to calibre unchanged".format(booktype)
+            return path_to_ebook
+        print u"{0} v{1}: Finished after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+        return decrypted_ebook
+
+    def is_customizable(self):
+        # return true to allow customization via the Plugin->Preferences.
+        return True
+
+    def config_widget(self):
+        import calibre_plugins.dedrm.config as config
+        return config.ConfigWidget(self.plugin_path, self.alfdir)
+
+    def save_settings(self, config_widget):
+        config_widget.save_settings()

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

@@ -1,25 +1,31 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from __future__ import with_statement
 
-# ineptkey.pyw, version 5.4
+# adobekey.pyw, version 5.7
 # Copyright © 2009-2010 i♥cabbages
 
-# Released under the terms of the GNU General Public Licence, version 3 or
-# later.  <http://www.gnu.org/licenses/>
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
 
-# Windows users: Before running this program, you must first install Python 2.6
-#   from <http://www.python.org/download/> and PyCrypto from
-#   <http://www.voidspace.org.uk/python/modules.shtml#pycrypto> (make certain
-#   to install the version for Python 2.6).  Then save this script file as
-#   ineptkey.pyw and double-click on it to run it.  It will create a file named
-#   adeptkey.der in the same directory.  This is your ADEPT user key.
+# Modified 2010–2013 by some_updates, DiapDealer and Apprentice Alf
+
+# Windows users: Before running this program, you must first install Python.
+#   We recommend ActiveState Python 2.7.X for Windows (x86) from
+#   http://www.activestate.com/activepython/downloads.
+#   You must also install PyCrypto from
+#   http://www.voidspace.org.uk/python/modules.shtml#pycrypto
+#   (make certain to install the version for Python 2.7).
+#   Then save this script file as adobekey.pyw and double-click on it to run it.
+#   It will create a file named adobekey_1.der in in the same directory as the script.
+#   This is your Adobe Digital Editions user key.
 #
-# Mac OS X users: Save this script file as ineptkey.pyw.  You can run this
-#   program from the command line (pythonw ineptkey.pyw) or by double-clicking
+# Mac OS X users: Save this script file as adobekey.pyw.  You can run this
+#   program from the command line (python adobekey.pyw) or by double-clicking
 #   it when it has been associated with PythonLauncher.  It will create a file
-#   named adeptkey.der in the same directory.  This is your ADEPT user key.
+#   named adobekey_1.der in the same directory as the script.
+#   This is your Adobe Digital Editions user key.
 
 # Revision history:
 #   1 - Initial release, for Adobe Digital Editions 1.7
@@ -30,31 +36,93 @@ from __future__ import with_statement
 #   4.2 - added old 1.7.1 processing
 #   4.3 - better key search
 #   4.4 - Make it working on 64-bit Python
-#   5 - Clean up and improve 4.x changes;
-#       Clean up and merge OS X support by unknown
+#   5  -  Clean up and improve 4.x changes;
+#         Clean up and merge OS X support by unknown
 #   5.1 - add support for using OpenSSL on Windows in place of PyCrypto
 #   5.2 - added support for output of key to a particular file
 #   5.3 - On Windows try PyCrypto first, OpenSSL next
 #   5.4 - Modify interface to allow use of import
+#   5.5 - Fix for potential problem with PyCrypto
+#   5.6 - Revised to allow use in Plugins to eliminate need for duplicate code
+#   5.7 - Unicode support added, renamed adobekey from ineptkey
+#   5.8 - Added getkey interface for Windows DeDRM application
+#   5.9 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#   6.0 - Work if TkInter is missing
 
 """
 Retrieve Adobe ADEPT user key.
 """
 
 __license__ = 'GPL v3'
+__version__ = '6.0'
 
-import sys
-import os
-import struct
-import Tkinter
-import Tkconstants
-import tkMessageBox
-import traceback
+import sys, os, struct, getopt
+
+# 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)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"adobekey.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
 
 class ADEPTError(Exception):
     pass
 
-if sys.platform.startswith('win'):
+if iswindows:
     from ctypes import windll, c_char_p, c_wchar_p, c_uint, POINTER, byref, \
         create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \
         string_at, Structure, c_void_p, cast, c_size_t, memmove, CDLL, c_int, \
@@ -110,7 +178,7 @@ if sys.platform.startswith('win'):
         from Crypto.Cipher import AES as _AES
         class AES(object):
             def __init__(self, key):
-                self._aes = _AES.new(key, _AES.MODE_CBC)
+                self._aes = _AES.new(key, _AES.MODE_CBC, '\x00'*16)
             def decrypt(self, data):
                 return self._aes.decrypt(data)
         return AES
@@ -292,13 +360,9 @@ if sys.platform.startswith('win'):
         return CryptUnprotectData
     CryptUnprotectData = CryptUnprotectData()
 
-    def retrieve_key(keypath):
+    def adeptkeys():
         if AES is None:
-            tkMessageBox.showerror(
-                "ADEPT Key",
-                "This script requires PyCrypto or OpenSSL which must be installed "
-                "separately.  Read the top-of-script comment for details.")
-            return False
+            raise ADEPTError("PyCrypto or OpenSSL must be installed")
         root = GetSystemDirectory().split('\\')[0] + '\\'
         serial = GetVolumeSerialNumber(root)
         vendor = cpuid0()
@@ -308,11 +372,12 @@ if sys.platform.startswith('win'):
         cuser = winreg.HKEY_CURRENT_USER
         try:
             regkey = winreg.OpenKey(cuser, DEVICE_KEY_PATH)
+            device = winreg.QueryValueEx(regkey, 'key')[0]
         except WindowsError:
             raise ADEPTError("Adobe Digital Editions not activated")
-        device = winreg.QueryValueEx(regkey, 'key')[0]
         keykey = CryptUnprotectData(device, entropy)
         userkey = None
+        keys = []
         try:
             plkroot = winreg.OpenKey(cuser, PRIVATE_LICENCE_KEY_PATH)
         except WindowsError:
@@ -334,134 +399,205 @@ if sys.platform.startswith('win'):
                 if ktype != 'privateLicenseKey':
                     continue
                 userkey = winreg.QueryValueEx(plkkey, 'value')[0]
-                break
-            if userkey is not None:
-                break
-        if userkey is None:
+                userkey = userkey.decode('base64')
+                aes = AES(keykey)
+                userkey = aes.decrypt(userkey)
+                userkey = userkey[26:-ord(userkey[-1])]
+                #print "found key:",userkey.encode('hex')
+                keys.append(userkey)
+        if len(keys) == 0:
             raise ADEPTError('Could not locate privateLicenseKey')
-        userkey = userkey.decode('base64')
-        aes = AES(keykey)
-        userkey = aes.decrypt(userkey)
-        userkey = userkey[26:-ord(userkey[-1])]
-        with open(keypath, 'wb') as f:
-            f.write(userkey)
-        return True
+        print u"Found {0:d} keys".format(len(keys))
+        return keys
 
-elif sys.platform.startswith('darwin'):
+
+elif isosx:
     import xml.etree.ElementTree as etree
-    import Carbon.File
-    import Carbon.Folder
-    import Carbon.Folders
-    import MacOS
+    import subprocess
 
-    ACTIVATION_PATH = 'Adobe/Digital Editions/activation.dat'
     NSMAP = {'adept': 'http://ns.adobe.com/adept',
              'enc': 'http://www.w3.org/2001/04/xmlenc#'}
 
-    def find_folder(domain, dtype):
-        try:
-            fsref = Carbon.Folder.FSFindFolder(domain, dtype, False)
-            return Carbon.File.pathname(fsref)
-        except MacOS.Error:
-            return None
+    def findActivationDat():
+        import warnings
+        warnings.filterwarnings('ignore', category=FutureWarning)
 
-    def find_app_support_file(subpath):
-        dtype = Carbon.Folders.kApplicationSupportFolderType
-        for domain in Carbon.Folders.kUserDomain, Carbon.Folders.kLocalDomain:
-            path = find_folder(domain, dtype)
-            if path is None:
-                continue
-            path = os.path.join(path, subpath)
-            if os.path.isfile(path):
-                return path
+        home = os.getenv('HOME')
+        cmdline = 'find "' + home + '/Library/Application Support/Adobe/Digital Editions" -name "activation.dat"'
+        cmdline = cmdline.encode(sys.getfilesystemencoding())
+        p2 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+        out1, out2 = p2.communicate()
+        reslst = out1.split('\n')
+        cnt = len(reslst)
+        ActDatPath = "activation.dat"
+        for j in xrange(cnt):
+            resline = reslst[j]
+            pp = resline.find('activation.dat')
+            if pp >= 0:
+                ActDatPath = resline
+                break
+        if os.path.exists(ActDatPath):
+            return ActDatPath
         return None
 
-    def retrieve_key(keypath):
-        actpath = find_app_support_file(ACTIVATION_PATH)
+    def adeptkeys():
+        actpath = findActivationDat()
         if actpath is None:
-            raise ADEPTError("Could not locate ADE activation")
+            raise ADEPTError("Could not find ADE activation.dat file.")
         tree = etree.parse(actpath)
         adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
         expr = '//%s/%s' % (adept('credentials'), adept('privateLicenseKey'))
         userkey = tree.findtext(expr)
         userkey = userkey.decode('base64')
         userkey = userkey[26:]
-        with open(keypath, 'wb') as f:
-            f.write(userkey)
-        return True
-
-elif sys.platform.startswith('cygwin'):
-    def retrieve_key(keypath):
-        tkMessageBox.showerror(
-            "ADEPT Key",
-            "This script requires a Windows-native Python, and cannot be run "
-            "under Cygwin.  Please install a Windows-native Python and/or "
-            "check your file associations.")
-        return False
+        return [userkey]
 
 else:
-    def retrieve_key(keypath):
-        tkMessageBox.showerror(
-            "ADEPT Key",
-            "This script only supports Windows and Mac OS X.  For Linux "
-            "you should be able to run ADE and this script under Wine (with "
-            "an appropriate version of Windows Python installed).")
-        return False
+    def adeptkeys():
+        raise ADEPTError("This script only supports Windows and Mac OS X.")
+        return []
 
-class ExceptionDialog(Tkinter.Frame):
-    def __init__(self, root, text):
-        Tkinter.Frame.__init__(self, root, border=5)
-        label = Tkinter.Label(self, text="Unexpected error:",
-                              anchor=Tkconstants.W, justify=Tkconstants.LEFT)
-        label.pack(fill=Tkconstants.X, expand=0)
-        self.text = Tkinter.Text(self)
-        self.text.pack(fill=Tkconstants.BOTH, expand=1)
+# interface for Python DeDRM
+def getkey(outpath):
+    keys = adeptkeys()
+    if len(keys) > 0:
+        if not os.path.isdir(outpath):
+            outfile = outpath
+            with file(outfile, 'wb') as keyfileout:
+                keyfileout.write(keys[0])
+            print u"Saved a key to {0}".format(outfile)
+        else:
+            keycount = 0
+            for key in keys:
+                while True:
+                    keycount += 1
+                    outfile = os.path.join(outpath,u"adobekey_{0:d}.der".format(keycount))
+                    if not os.path.exists(outfile):
+                        break
+                with file(outfile, 'wb') as keyfileout:
+                    keyfileout.write(key)
+                print u"Saved a key to {0}".format(outfile)
+        return True
+    return False
 
-        self.text.insert(Tkconstants.END, text)
+def usage(progname):
+    print u"Finds, decrypts and saves the default Adobe Adept encryption key(s)."
+    print u"Keys are saved to the current directory, or a specified output directory."
+    print u"If a file name is passed instead of a directory, only the first key is saved, in that file."
+    print u"Usage:"
+    print u"    {0:s} [-h] [<outpath>]".format(progname)
 
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
+    progname = os.path.basename(argv[0])
+    print u"{0} v{1}\nCopyright © 2009-2013 i♥cabbages and Apprentice Alf".format(progname,__version__)
 
-def extractKeyfile(keypath):
     try:
-        success = retrieve_key(keypath)
-    except ADEPTError, e:
-        print "Key generation Error: " + str(e)
-        return 1
-    except Exception, e:
-        print "General Error: " + str(e)
-        return 1
-    if not success:
-        return 1
+        opts, args = getopt.getopt(argv[1:], "h")
+    except getopt.GetoptError, err:
+        print u"Error in options or arguments: {0}".format(err.args[0])
+        usage(progname)
+        sys.exit(2)
+
+    for o, a in opts:
+        if o == "-h":
+            usage(progname)
+            sys.exit(0)
+
+    if len(args) > 1:
+        usage(progname)
+        sys.exit(2)
+
+    if len(args) == 1:
+        # save to the specified file or directory
+        outpath = args[0]
+        if not os.path.isabs(outpath):
+           outpath = os.path.abspath(outpath)
+    else:
+        # save to the same directory as the script
+        outpath = os.path.dirname(argv[0])
+
+    # make sure the outpath is the
+    outpath = os.path.realpath(os.path.normpath(outpath))
+
+    keys = adeptkeys()
+    if len(keys) > 0:
+        if not os.path.isdir(outpath):
+            outfile = outpath
+            with file(outfile, 'wb') as keyfileout:
+                keyfileout.write(keys[0])
+            print u"Saved a key to {0}".format(outfile)
+        else:
+            keycount = 0
+            for key in keys:
+                while True:
+                    keycount += 1
+                    outfile = os.path.join(outpath,u"adobekey_{0:d}.der".format(keycount))
+                    if not os.path.exists(outfile):
+                        break
+                with file(outfile, 'wb') as keyfileout:
+                    keyfileout.write(key)
+                print u"Saved a key to {0}".format(outfile)
+    else:
+        print u"Could not retrieve Adobe Adept key."
     return 0
 
 
-def cli_main(argv=sys.argv):
-    keypath = argv[1]
-    return extractKeyfile(keypath)
+def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class ExceptionDialog(Tkinter.Frame):
+        def __init__(self, root, text):
+            Tkinter.Frame.__init__(self, root, border=5)
+            label = Tkinter.Label(self, text=u"Unexpected error:",
+                                  anchor=Tkconstants.W, justify=Tkconstants.LEFT)
+            label.pack(fill=Tkconstants.X, expand=0)
+            self.text = Tkinter.Text(self)
+            self.text.pack(fill=Tkconstants.BOTH, expand=1)
+
+            self.text.insert(Tkconstants.END, text)
 
 
-def main(argv=sys.argv):
+    argv=unicode_argv()
     root = Tkinter.Tk()
     root.withdraw()
-    progname = os.path.basename(argv[0])
-    keypath = 'adeptkey.der'
+    progpath, progname = os.path.split(argv[0])
     success = False
     try:
-        success = retrieve_key(keypath)
+        keys = adeptkeys()
+        keycount = 0
+        for key in keys:
+            while True:
+                keycount += 1
+                outfile = os.path.join(progpath,u"adobekey_{0:d}.der".format(keycount))
+                if not os.path.exists(outfile):
+                    break
+
+            with file(outfile, 'wb') as keyfileout:
+                keyfileout.write(key)
+            success = True
+            tkMessageBox.showinfo(progname, u"Key successfully retrieved to {0}".format(outfile))
     except ADEPTError, e:
-        tkMessageBox.showerror("ADEPT Key", "Error: " + str(e))
+        tkMessageBox.showerror(progname, u"Error: {0}".format(str(e)))
     except Exception:
         root.wm_state('normal')
-        root.title('ADEPT Key')
+        root.title(progname)
         text = traceback.format_exc()
         ExceptionDialog(root, text).pack(fill=Tkconstants.BOTH, expand=1)
         root.mainloop()
     if not success:
         return 1
-    tkMessageBox.showinfo(
-        "ADEPT Key", "Key successfully retrieved to %s" % (keypath))
     return 0
 
 if __name__ == '__main__':
     if len(sys.argv) > 1:
         sys.exit(cli_main())
-    sys.exit(main())
+    sys.exit(gui_main())

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

@@ -1,11 +1,18 @@
-#! /usr/bin/env python
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# crypto library mainly by some_updates
+
+# pbkdf2.py pbkdf2 code taken from pbkdf2.py
+# pbkdf2.py Copyright © 2004 Matt Johnston <matt @ ucc asn au>
+# pbkdf2.py Copyright © 2009 Daniel Holth <dholth@fastmail.fm>
+# pbkdf2.py This code may be freely used and modified for any purpose.
 
 import sys, os
 import hmac
 from struct import pack
 import hashlib
 
-
 # interface to needed routines libalfcrypto
 def _load_libalfcrypto():
     import ctypes
@@ -26,11 +33,15 @@ def _load_libalfcrypto():
             name_of_lib = 'libalfcrypto32.so'
         else:
             name_of_lib = 'libalfcrypto64.so'
-    
-    libalfcrypto = sys.path[0] + os.sep + name_of_lib
 
+    # hard code to local location for libalfcrypto
+    libalfcrypto = os.path.join(sys.path[0],name_of_lib)
     if not os.path.isfile(libalfcrypto):
-        raise Exception('libalfcrypto not found')
+        libalfcrypto = os.path.join(sys.path[0], 'lib', name_of_lib)
+    if not os.path.isfile(libalfcrypto):
+        libalfcrypto = os.path.join('.',name_of_lib)
+    if not os.path.isfile(libalfcrypto):
+        raise Exception('libalfcrypto not found at %s' % libalfcrypto)
 
     libalfcrypto = CDLL(libalfcrypto)
 
@@ -55,7 +66,7 @@ def _load_libalfcrypto():
     #
     # int AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key);
     #
-    # 
+    #
     # void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
     # const unsigned long length, const AES_KEY *key,
     # unsigned char *ivec, const int enc);
@@ -147,7 +158,7 @@ def _load_libalfcrypto():
             topazCryptoDecrypt(ctx, data, out, len(data))
             return out.raw
 
-    print "Using Library AlfCrypto DLL/DYLIB/SO"
+    print u"Using Library AlfCrypto DLL/DYLIB/SO"
     return (AES_CBC, Pukall_Cipher, Topaz_Cipher)
 
 
@@ -164,8 +175,7 @@ def _load_python_alfcrypto():
             sum2 = 0;
             keyXorVal = 0;
             if len(key)!=16:
-                print "Bad key length!"
-                return None
+                raise Exception('Pukall_Cipher: Bad key length.')
             wkey = []
             for i in xrange(8):
                 wkey.append(ord(key[i*2])<<8 | ord(key[i*2+1]))
@@ -234,6 +244,7 @@ def _load_python_alfcrypto():
             cleartext = self.aes.decrypt(iv + data)
             return cleartext
 
+    print u"Using Library AlfCrypto Python"
     return (AES_CBC, Pukall_Cipher, Topaz_Cipher)
 
 

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

@@ -0,0 +1,468 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+# androidkindlekey.py
+# Copyright © 2013-15 by Thom and Apprentice Harper
+# Some portions Copyright © 2010-15 by some_updates and Apprentice Alf
+#
+
+# Revision history:
+#  1.0   - AmazonSecureStorage.xml decryption to serial number
+#  1.1   - map_data_storage.db decryption to serial number
+#  1.2   - Changed to be callable from AppleScript by returning only serial number
+#        - and changed name to androidkindlekey.py
+#        - and added in unicode command line support
+#  1.3   - added in TkInter interface, output to a file
+#  1.4   - Fix some problems identified by Aldo Bleeker
+#  1.5   - Fix another problem identified by Aldo Bleeker
+
+"""
+Retrieve Kindle for Android Serial Number.
+"""
+
+__license__ = 'GPL v3'
+__version__ = '1.5'
+
+import os
+import sys
+import traceback
+import getopt
+import tempfile
+import zlib
+import tarfile
+from hashlib import md5
+from cStringIO import StringIO
+from binascii import a2b_hex, b2a_hex
+
+# Routines common to Mac and PC
+
+# 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)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"kindlekey.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+class DrmException(Exception):
+    pass
+
+STORAGE  = u"backup.ab"
+STORAGE1 = u"AmazonSecureStorage.xml"
+STORAGE2 = u"map_data_storage.db"
+
+class AndroidObfuscation(object):
+    '''AndroidObfuscation
+    For the key, it's written in java, and run in android dalvikvm
+    '''
+
+    key = a2b_hex('0176e04c9408b1702d90be333fd53523')
+
+    def encrypt(self, plaintext):
+        cipher = self._get_cipher()
+        padding = len(self.key) - len(plaintext) % len(self.key)
+        plaintext += chr(padding) * padding
+        return b2a_hex(cipher.encrypt(plaintext))
+
+    def decrypt(self, ciphertext):
+        cipher = self._get_cipher()
+        plaintext = cipher.decrypt(a2b_hex(ciphertext))
+        return plaintext[:-ord(plaintext[-1])]
+
+    def _get_cipher(self):
+        try:
+            from Crypto.Cipher import AES
+            return AES.new(self.key)
+        except ImportError:
+            from aescbc import AES, noPadding
+            return AES(self.key, padding=noPadding())
+
+class AndroidObfuscationV2(AndroidObfuscation):
+    '''AndroidObfuscationV2
+    '''
+
+    count = 503
+    password = 'Thomsun was here!'
+
+    def __init__(self, salt):
+        key = self.password + salt
+        for _ in range(self.count):
+            key = md5(key).digest()
+        self.key = key[:8]
+        self.iv = key[8:16]
+
+    def _get_cipher(self):
+        try :
+            from Crypto.Cipher import DES
+            return DES.new(self.key, DES.MODE_CBC, self.iv)
+        except ImportError:
+            from python_des import Des, CBC
+            return Des(self.key, CBC, self.iv)
+
+def parse_preference(path):
+    ''' parse android's shared preference xml '''
+    storage = {}
+    read = open(path)
+    for line in read:
+        line = line.strip()
+        # <string name="key">value</string>
+        if line.startswith('<string name="'):
+            index = line.find('"', 14)
+            key = line[14:index]
+            value = line[index+2:-9]
+            storage[key] = value
+    read.close()
+    return storage
+
+def get_serials1(path=STORAGE1):
+    ''' get serials from android's shared preference xml '''
+
+    if not os.path.isfile(path):
+        return []
+
+    storage = parse_preference(path)
+    salt = storage.get('AmazonSaltKey')
+    if salt and len(salt) == 16:
+        obfuscation = AndroidObfuscationV2(a2b_hex(salt))
+    else:
+        obfuscation = AndroidObfuscation()
+
+    def get_value(key):
+        encrypted_key = obfuscation.encrypt(key)
+        encrypted_value = storage.get(encrypted_key)
+        if encrypted_value:
+            return obfuscation.decrypt(encrypted_value)
+        return ''
+
+    # also see getK4Pids in kgenpids.py
+    try:
+        dsnid = get_value('DsnId')
+    except:
+        sys.stderr.write('cannot get DsnId\n')
+        return []
+
+    try:
+        tokens = set(get_value('kindle.account.tokens').split(','))
+    except:
+        return []
+
+    serials = []
+    if dsnid:
+        serials.append(dsnid)
+    for token in tokens:
+        if token:
+            serials.append('%s%s' % (dsnid, token))
+            serials.append(token)
+    return serials
+
+def get_serials2(path=STORAGE2):
+    ''' get serials from android's sql database '''
+    if not os.path.isfile(path):
+        return []
+
+    import sqlite3
+    connection = sqlite3.connect(path)
+    cursor = connection.cursor()
+    cursor.execute('''select userdata_value from userdata where userdata_key like '%/%token.device.deviceserialname%' ''')
+    userdata_keys = cursor.fetchall()
+    dsns = []
+    for userdata_row in userdata_keys:
+        try:
+            if userdata_row and userdata_row[0]:
+                userdata_utf8 = userdata_row[0].encode('utf8')
+                if len(userdata_utf8) > 0:
+                    dsns.append(userdata_utf8)
+        except:
+            print "Error getting one of the device serial name keys"
+            traceback.print_exc()
+            pass
+    dsns = list(set(dsns))
+
+    cursor.execute('''select userdata_value from userdata where userdata_key like '%/%kindle.account.tokens%' ''')
+    userdata_keys = cursor.fetchall()
+    tokens = []
+    for userdata_row in userdata_keys:
+        try:
+            if userdata_row and userdata_row[0]:
+                userdata_utf8 = userdata_row[0].encode('utf8')
+                if len(userdata_utf8) > 0:
+                    tokens.append(userdata_utf8)
+        except:
+            print "Error getting one of the account token keys"
+            traceback.print_exc()
+            pass
+    tokens = list(set(tokens))
+ 
+    serials = []
+    for x in dsns:
+        serials.append(x)
+        for y in tokens:
+            serials.append('%s%s' % (x, y))
+    for y in tokens:
+        serials.append(y)
+    return serials
+
+def get_serials(path=STORAGE):
+    '''get serials from files in from android backup.ab
+    backup.ab can be get using adb command:
+    shell> adb backup com.amazon.kindle
+    or from individual files if they're passed.
+    '''
+    if not os.path.isfile(path):
+        return []
+
+    basename = os.path.basename(path)
+    if basename == STORAGE1:
+        return get_serials1(path)
+    elif basename == STORAGE2:
+        return get_serials2(path)
+
+    output = None
+    try :
+        read = open(path, 'rb')
+        head = read.read(24)
+        if head[:14] == 'ANDROID BACKUP':
+            output = StringIO(zlib.decompress(read.read()))
+    except Exception:
+        pass
+    finally:
+        read.close()
+
+    if not output:
+        return []
+
+    serials = []
+    tar = tarfile.open(fileobj=output)
+    for member in tar.getmembers():
+        if member.name.strip().endswith(STORAGE1):
+            write = tempfile.NamedTemporaryFile(mode='wb', delete=False)
+            write.write(tar.extractfile(member).read())
+            write.close()
+            write_path = os.path.abspath(write.name)
+            serials.extend(get_serials1(write_path))
+            os.remove(write_path)
+        elif member.name.strip().endswith(STORAGE2):
+            write = tempfile.NamedTemporaryFile(mode='wb', delete=False)
+            write.write(tar.extractfile(member).read())
+            write.close()
+            write_path = os.path.abspath(write.name)
+            serials.extend(get_serials2(write_path))
+            os.remove(write_path)
+    return list(set(serials))
+
+__all__ = [ 'get_serials', 'getkey']
+
+# procedure for CLI and GUI interfaces
+# returns single or multiple keys (one per line) in the specified file
+def getkey(outfile, inpath):
+    keys = get_serials(inpath)
+    if len(keys) > 0:
+        with file(outfile, 'w') as keyfileout:
+            for key in keys:
+                keyfileout.write(key)
+                keyfileout.write("\n")
+        return True
+    return False
+
+
+def usage(progname):
+    print u"Decrypts the serial number(s) of Kindle For Android from Android backup or file"
+    print u"Get backup.ab file using adb backup com.amazon.kindle for Android 4.0+."
+    print u"Otherwise extract AmazonSecureStorage.xml from /data/data/com.amazon.kindle/shared_prefs/AmazonSecureStorage.xml"
+    print u"Or map_data_storage.db from /data/data/com.amazon.kindle/databases/map_data_storage.db"
+    print u""
+    print u"Usage:"
+    print u"    {0:s} [-h] [-b <backup.ab>] [<outfile.k4a>]".format(progname)
+
+
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
+    progname = os.path.basename(argv[0])
+    print u"{0} v{1}\nCopyright © 2010-2015 Thom, some_updates, Apprentice Alf and Apprentice Harper".format(progname,__version__)
+
+    try:
+        opts, args = getopt.getopt(argv[1:], "hb:")
+    except getopt.GetoptError, err:
+        usage(progname)
+        print u"\nError in options or arguments: {0}".format(err.args[0])
+        return 2
+
+    inpath = ""
+    for o, a in opts:
+        if o == "-h":
+            usage(progname)
+            return 0
+        if o == "-b":
+            inpath = a
+
+    if len(args) > 1:
+        usage(progname)
+        return 2
+
+    if len(args) == 1:
+        # save to the specified file or directory
+        outfile = args[0]
+        if not os.path.isabs(outfile):
+           outfile = os.path.join(os.path.dirname(argv[0]),outfile)
+           outfile = os.path.abspath(outfile)
+        if os.path.isdir(outfile):
+           outfile = os.path.join(os.path.dirname(argv[0]),"androidkindlekey.k4a")
+    else:
+        # save to the same directory as the script
+        outfile = os.path.join(os.path.dirname(argv[0]),"androidkindlekey.k4a")
+
+    # make sure the outpath is OK
+    outfile = os.path.realpath(os.path.normpath(outfile))
+
+    if not os.path.isfile(inpath):
+        usage(progname)
+        print u"\n{0:s} file not found".format(inpath)
+        return 2
+
+    if getkey(outfile, inpath):
+        print u"\nSaved Kindle for Android key to {0}".format(outfile)
+    else:
+        print u"\nCould not retrieve Kindle for Android key."
+    return 0
+
+
+def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import tkFileDialog
+    except:
+        print "Tkinter not installed"
+        return cli_main()
+
+    class DecryptionDialog(Tkinter.Frame):
+        def __init__(self, root):
+            Tkinter.Frame.__init__(self, root, border=5)
+            self.status = Tkinter.Label(self, text=u"Select backup.ab file")
+            self.status.pack(fill=Tkconstants.X, expand=1)
+            body = Tkinter.Frame(self)
+            body.pack(fill=Tkconstants.X, expand=1)
+            sticky = Tkconstants.E + Tkconstants.W
+            body.grid_columnconfigure(1, weight=2)
+            Tkinter.Label(body, text=u"Backup file").grid(row=0, column=0)
+            self.keypath = Tkinter.Entry(body, width=40)
+            self.keypath.grid(row=0, column=1, sticky=sticky)
+            self.keypath.insert(2, u"backup.ab")
+            button = Tkinter.Button(body, text=u"...", command=self.get_keypath)
+            button.grid(row=0, column=2)
+            buttons = Tkinter.Frame(self)
+            buttons.pack()
+            button2 = Tkinter.Button(
+                buttons, text=u"Extract", width=10, command=self.generate)
+            button2.pack(side=Tkconstants.LEFT)
+            Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
+            button3 = Tkinter.Button(
+                buttons, text=u"Quit", width=10, command=self.quit)
+            button3.pack(side=Tkconstants.RIGHT)
+
+        def get_keypath(self):
+            keypath = tkFileDialog.askopenfilename(
+                parent=None, title=u"Select backup.ab file",
+                defaultextension=u".ab",
+                filetypes=[('adb backup com.amazon.kindle', '.ab'),
+                           ('All Files', '.*')])
+            if keypath:
+                keypath = os.path.normpath(keypath)
+                self.keypath.delete(0, Tkconstants.END)
+                self.keypath.insert(0, keypath)
+            return
+
+        def generate(self):
+            inpath = self.keypath.get()
+            self.status['text'] = u"Getting key..."
+            try:
+                keys = get_serials(inpath)
+                keycount = 0
+                for key in keys:
+                    while True:
+                        keycount += 1
+                        outfile = os.path.join(progpath,u"kindlekey{0:d}.k4a".format(keycount))
+                        if not os.path.exists(outfile):
+                            break
+
+                    with file(outfile, 'w') as keyfileout:
+                        keyfileout.write(key)
+                    success = True
+                    tkMessageBox.showinfo(progname, u"Key successfully retrieved to {0}".format(outfile))
+            except Exception, e:
+                self.status['text'] = u"Error: {0}".format(e.args[0])
+                return
+            self.status['text'] = u"Select backup.ab file"
+
+    argv=unicode_argv()
+    progpath, progname = os.path.split(argv[0])
+    root = Tkinter.Tk()
+    root.title(u"Kindle for Android Key Extraction v.{0}".format(__version__))
+    root.resizable(True, False)
+    root.minsize(300, 0)
+    DecryptionDialog(root).pack(fill=Tkconstants.X, expand=1)
+    root.mainloop()
+    return 0
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
+    sys.exit(gui_main())

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

@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys, os
+import locale
+import codecs
+
+# get sys.argv arguments and encode them into utf-8
+def unicode_argv():
+    if sys.platform.startswith('win'):
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"DeDRM.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+
+def add_cp65001_codec():
+  try:
+    codecs.lookup('cp65001')
+  except LookupError:
+    codecs.register(
+        lambda name: name == 'cp65001' and codecs.lookup('utf-8') or None)
+  return
+
+
+def set_utf8_default_encoding():
+  if sys.getdefaultencoding() == 'utf-8':
+    return
+
+  # Regenerate setdefaultencoding.
+  reload(sys)
+  sys.setdefaultencoding('utf-8')
+
+  for attr in dir(locale):
+    if attr[0:3] != 'LC_':
+      continue
+    aref = getattr(locale, attr)
+    try:
+      locale.setlocale(aref, '')
+    except locale.Error:
+      continue
+    try:
+      lang = locale.getlocale(aref)[0]
+    except (TypeError, ValueError):
+      continue
+    if lang:
+      try:
+        locale.setlocale(aref, (lang, 'UTF-8'))
+      except locale.Error:
+        os.environ[attr] = lang + '.UTF-8'
+  try:
+    locale.setlocale(locale.LC_ALL, '')
+  except locale.Error:
+    pass
+  return
+
+

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

@@ -0,0 +1,211 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+# to work around tk_chooseDirectory not properly returning unicode paths on Windows
+# need to use a dialog that can be hacked up to actually return full unicode paths
+# originally based on AskFolder from EasyDialogs for Windows but modified to fix it
+# to actually use unicode for path
+
+# The original license for EasyDialogs is as follows
+#
+# Copyright (c) 2003-2005 Jimmy Retzlaff
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+"""
+AskFolder(...) -- Ask the user to select a folder Windows specific
+"""
+
+import os
+
+import ctypes
+from ctypes import POINTER, byref, cdll, c_int, windll
+from ctypes.wintypes import LPCWSTR, LPWSTR
+import ctypes.wintypes as wintypes
+
+
+__all__ = ['AskFolder']
+
+# Load required Windows DLLs
+ole32 = ctypes.windll.ole32
+shell32 = ctypes.windll.shell32
+user32 = ctypes.windll.user32
+
+
+# Windows Constants
+BFFM_INITIALIZED = 1
+BFFM_SETOKTEXT = 1129
+BFFM_SETSELECTIONA = 1126
+BFFM_SETSELECTIONW = 1127
+BIF_EDITBOX = 16
+BS_DEFPUSHBUTTON = 1
+CB_ADDSTRING = 323
+CB_GETCURSEL = 327
+CB_SETCURSEL = 334
+CDM_SETCONTROLTEXT = 1128
+EM_GETLINECOUNT = 186
+EM_GETMARGINS = 212
+EM_POSFROMCHAR = 214
+EM_SETSEL = 177
+GWL_STYLE = -16
+IDC_STATIC = -1
+IDCANCEL = 2
+IDNO = 7
+IDOK = 1
+IDYES = 6
+MAX_PATH = 260
+OFN_ALLOWMULTISELECT = 512
+OFN_ENABLEHOOK = 32
+OFN_ENABLESIZING = 8388608
+OFN_ENABLETEMPLATEHANDLE = 128
+OFN_EXPLORER = 524288
+OFN_OVERWRITEPROMPT = 2
+OPENFILENAME_SIZE_VERSION_400 = 76
+PBM_GETPOS = 1032
+PBM_SETMARQUEE = 1034
+PBM_SETPOS = 1026
+PBM_SETRANGE = 1025
+PBM_SETRANGE32 = 1030
+PBS_MARQUEE = 8
+PM_REMOVE = 1
+SW_HIDE = 0
+SW_SHOW = 5
+SW_SHOWNORMAL = 1
+SWP_NOACTIVATE = 16
+SWP_NOMOVE = 2
+SWP_NOSIZE = 1
+SWP_NOZORDER = 4
+VER_PLATFORM_WIN32_NT = 2
+WM_COMMAND = 273
+WM_GETTEXT = 13
+WM_GETTEXTLENGTH = 14
+WM_INITDIALOG = 272
+WM_NOTIFY = 78
+
+# Windows function prototypes
+BrowseCallbackProc = ctypes.WINFUNCTYPE(ctypes.c_int, wintypes.HWND, ctypes.c_uint, wintypes.LPARAM, wintypes.LPARAM)
+
+# Windows types
+LPCTSTR = ctypes.c_char_p
+LPTSTR = ctypes.c_char_p
+LPVOID = ctypes.c_voidp
+TCHAR = ctypes.c_char
+
+class BROWSEINFO(ctypes.Structure):
+    _fields_ = [
+                ("hwndOwner", wintypes.HWND),
+                ("pidlRoot", LPVOID),
+                ("pszDisplayName", LPTSTR),
+                ("lpszTitle", LPCTSTR),
+                ("ulFlags", ctypes.c_uint),
+                ("lpfn", BrowseCallbackProc),
+                ("lParam", wintypes.LPARAM),
+                ("iImage", ctypes.c_int)
+               ]
+
+
+# Utilities
+def CenterWindow(hwnd):
+    desktopRect = GetWindowRect(user32.GetDesktopWindow())
+    myRect = GetWindowRect(hwnd)
+    x = width(desktopRect) // 2 - width(myRect) // 2
+    y = height(desktopRect) // 2 - height(myRect) // 2
+    user32.SetWindowPos(hwnd, 0,
+                        desktopRect.left + x,
+                        desktopRect.top + y,
+                        0, 0,
+                        SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER
+                       )
+
+
+def GetWindowRect(hwnd):
+    rect = wintypes.RECT()
+    user32.GetWindowRect(hwnd, ctypes.byref(rect))
+    return rect
+
+def width(rect):
+    return rect.right-rect.left
+
+def height(rect):
+    return rect.bottom-rect.top
+
+
+def AskFolder(
+        message=None,
+        version=None,
+        defaultLocation=None,
+        location=None,
+        windowTitle=None,
+        actionButtonLabel=None,
+        cancelButtonLabel=None,
+        multiple=None):
+    """Display a dialog asking the user for select a folder.
+       modified to use unicode strings as much as possible
+       returns unicode path
+    """
+
+    def BrowseCallback(hwnd, uMsg, lParam, lpData):
+        if uMsg == BFFM_INITIALIZED:
+            if actionButtonLabel:
+                label = unicode(actionButtonLabel, errors='replace')
+                user32.SendMessageW(hwnd, BFFM_SETOKTEXT, 0, label)
+            if cancelButtonLabel:
+                label = unicode(cancelButtonLabel, errors='replace')
+                cancelButton = user32.GetDlgItem(hwnd, IDCANCEL)
+                if cancelButton:
+                    user32.SetWindowTextW(cancelButton, label)
+            if windowTitle:
+                title = unicode(windowTitle, erros='replace')
+                user32.SetWindowTextW(hwnd, title)
+            if defaultLocation:
+                user32.SendMessageW(hwnd, BFFM_SETSELECTIONW, 1, defaultLocation.replace('/', '\\'))
+            if location:
+                x, y = location
+                desktopRect = wintypes.RECT()
+                user32.GetWindowRect(0, ctypes.byref(desktopRect))
+                user32.SetWindowPos(hwnd, 0,
+                                  desktopRect.left + x,
+                                  desktopRect.top + y, 0, 0,
+                                  SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER)
+            else:
+                CenterWindow(hwnd)
+        return 0
+
+    # This next line is needed to prevent gc of the callback
+    callback = BrowseCallbackProc(BrowseCallback)
+
+    browseInfo = BROWSEINFO()
+    browseInfo.pszDisplayName = ctypes.c_char_p('\0' * (MAX_PATH+1))
+    browseInfo.lpszTitle = message
+    browseInfo.lpfn = callback
+
+    pidl = shell32.SHBrowseForFolder(ctypes.byref(browseInfo))
+    if not pidl:
+        result = None
+    else:
+        path = LPCWSTR(u" " * (MAX_PATH+1))
+        shell32.SHGetPathFromIDListW(pidl, path)
+        ole32.CoTaskMemFree(pidl)
+        result = path.value
+    return result
+
+
+
+

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/cmbtc_v2.2.py

@@ -1,899 +0,0 @@
-#! /usr/bin/python
-
-"""
-
-Comprehensive Mazama Book DRM with Topaz Cryptography V2.2
-
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdBHJ4CNc6DNFCw4MRCw4SWAK6
-M8hYfnNEI0yQmn5Ti+W8biT7EatpauE/5jgQMPBmdNrDr1hbHyHBSP7xeC2qlRWC
-B62UCxeu/fpfnvNHDN/wPWWH4jynZ2M6cdcnE5LQ+FfeKqZn7gnG2No1U9h7oOHx
-y2/pHuYme7U1TsgSjwIDAQAB
------END PUBLIC KEY-----
-
-"""
-
-from __future__ import with_statement
-
-import csv
-import sys
-import os
-import getopt
-import zlib
-from struct import pack
-from struct import unpack
-from ctypes import windll, c_char_p, c_wchar_p, c_uint, POINTER, byref, \
-    create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \
-    string_at, Structure, c_void_p, cast
-import _winreg as winreg
-import Tkinter
-import Tkconstants
-import tkMessageBox
-import traceback
-import hashlib
-
-MAX_PATH = 255
-
-kernel32 = windll.kernel32
-advapi32 = windll.advapi32
-crypt32 = windll.crypt32
-
-global kindleDatabase
-global bookFile
-global bookPayloadOffset
-global bookHeaderRecords
-global bookMetadata
-global bookKey
-global command
-
-#
-# Various character maps used to decrypt books. Probably supposed to act as obfuscation
-#
-
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-charMap2 = "AaZzB0bYyCc1XxDdW2wEeVv3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_"
-charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
-
-#
-# Exceptions for all the problems that might happen during the script
-#
-
-class CMBDTCError(Exception):
-    pass
-
-class CMBDTCFatal(Exception):
-    pass
-
-#
-# Stolen stuff
-#
-
-class DataBlob(Structure):
-    _fields_ = [('cbData', c_uint),
-                ('pbData', c_void_p)]
-DataBlob_p = POINTER(DataBlob)
-
-def GetSystemDirectory():
-    GetSystemDirectoryW = kernel32.GetSystemDirectoryW
-    GetSystemDirectoryW.argtypes = [c_wchar_p, c_uint]
-    GetSystemDirectoryW.restype = c_uint
-    def GetSystemDirectory():
-        buffer = create_unicode_buffer(MAX_PATH + 1)
-        GetSystemDirectoryW(buffer, len(buffer))
-        return buffer.value
-    return GetSystemDirectory
-GetSystemDirectory = GetSystemDirectory()
-
-
-def GetVolumeSerialNumber():
-    GetVolumeInformationW = kernel32.GetVolumeInformationW
-    GetVolumeInformationW.argtypes = [c_wchar_p, c_wchar_p, c_uint,
-                                      POINTER(c_uint), POINTER(c_uint),
-                                      POINTER(c_uint), c_wchar_p, c_uint]
-    GetVolumeInformationW.restype = c_uint
-    def GetVolumeSerialNumber(path):
-        vsn = c_uint(0)
-        GetVolumeInformationW(path, None, 0, byref(vsn), None, None, None, 0)
-        return vsn.value
-    return GetVolumeSerialNumber
-GetVolumeSerialNumber = GetVolumeSerialNumber()
-
-
-def GetUserName():
-    GetUserNameW = advapi32.GetUserNameW
-    GetUserNameW.argtypes = [c_wchar_p, POINTER(c_uint)]
-    GetUserNameW.restype = c_uint
-    def GetUserName():
-        buffer = create_unicode_buffer(32)
-        size = c_uint(len(buffer))
-        while not GetUserNameW(buffer, byref(size)):
-            buffer = create_unicode_buffer(len(buffer) * 2)
-            size.value = len(buffer)
-        return buffer.value.encode('utf-16-le')[::2]
-    return GetUserName
-GetUserName = GetUserName()
-
-
-def CryptUnprotectData():
-    _CryptUnprotectData = crypt32.CryptUnprotectData
-    _CryptUnprotectData.argtypes = [DataBlob_p, c_wchar_p, DataBlob_p,
-                                   c_void_p, c_void_p, c_uint, DataBlob_p]
-    _CryptUnprotectData.restype = c_uint
-    def CryptUnprotectData(indata, entropy):
-        indatab = create_string_buffer(indata)
-        indata = DataBlob(len(indata), cast(indatab, c_void_p))
-        entropyb = create_string_buffer(entropy)
-        entropy = DataBlob(len(entropy), cast(entropyb, c_void_p))
-        outdata = DataBlob()
-        if not _CryptUnprotectData(byref(indata), None, byref(entropy),
-                                   None, None, 0, byref(outdata)):
-            raise CMBDTCFatal("Failed to Unprotect Data")
-        return string_at(outdata.pbData, outdata.cbData)
-    return CryptUnprotectData
-CryptUnprotectData = CryptUnprotectData()
-
-#
-# Returns the MD5 digest of "message"
-#
-
-def MD5(message):
-    ctx = hashlib.md5()
-    ctx.update(message)
-    return ctx.digest()
-
-#
-# Returns the MD5 digest of "message"
-#
-
-def SHA1(message):
-    ctx = hashlib.sha1()
-    ctx.update(message)
-    return ctx.digest()
-
-#
-# Open the book file at path
-#
-
-def openBook(path):
-    try:
-        return open(path,'rb')
-    except:
-        raise CMBDTCFatal("Could not open book file: " + path)
-#
-# Encode the bytes in data with the characters in map
-#
-
-def encode(data, map):
-    result = ""
-    for char in data:
-        value = ord(char)
-        Q = (value ^ 0x80) // len(map)
-        R = value % len(map)
-        result += map[Q]
-        result += map[R]
-    return result
-
-#
-# Hash the bytes in data and then encode the digest with the characters in map
-#
-
-def encodeHash(data,map):
-    return encode(MD5(data),map)
-
-#
-# Decode the string in data with the characters in map. Returns the decoded bytes
-#
-
-def decode(data,map):
-    result = ""
-    for i in range (0,len(data),2):
-        high = map.find(data[i])
-        low = map.find(data[i+1])
-        value = (((high * 0x40) ^ 0x80) & 0xFF) + low
-        result += pack("B",value)
-    return result
-
-#
-# Locate and open the Kindle.info file (Hopefully in the way it is done in the Kindle application)
-#
-
-def openKindleInfo():
-    regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
-    path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
-    return open(path+'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info','r')
-
-#
-# Parse the Kindle.info file and return the records as a list of key-values
-#
-
-def parseKindleInfo():
-    DB = {}
-    infoReader = openKindleInfo()
-    infoReader.read(1)
-    data = infoReader.read()
-    items = data.split('{')
-
-    for item in items:
-        splito = item.split(':')
-        DB[splito[0]] =splito[1]
-    return DB
-
-#
-# Find if the original string for a hashed/encoded string is known. If so return the original string othwise return an empty string. (Totally not optimal)
-#
-
-def findNameForHash(hash):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
-    result = ""
-    for name in names:
-        if hash == encodeHash(name, charMap2):
-            result = name
-            break
-    return name
-
-#
-# Print all the records from the kindle.info file (option -i)
-#
-
-def printKindleInfo():
-    for record in kindleDatabase:
-        name = findNameForHash(record)
-        if name != "" :
-            print (name)
-            print ("--------------------------\n")
-        else :
-            print ("Unknown Record")
-        print getKindleInfoValueForHash(record)
-        print "\n"
-#
-# Get a record from the Kindle.info file for the key "hashedKey" (already hashed and encoded). Return the decoded and decrypted record
-#
-
-def getKindleInfoValueForHash(hashedKey):
-    global kindleDatabase
-    encryptedValue = decode(kindleDatabase[hashedKey],charMap2)
-    return CryptUnprotectData(encryptedValue,"")
-
-#
-#  Get a record from the Kindle.info file for the string in "key" (plaintext). Return the decoded and decrypted record
-#
-
-def getKindleInfoValueForKey(key):
-    return getKindleInfoValueForHash(encodeHash(key,charMap2))
-
-#
-# Get a 7 bit encoded number from the book file
-#
-
-def bookReadEncodedNumber():
-    flag = False
-    data = ord(bookFile.read(1))
-
-    if data == 0xFF:
-        flag = True
-        data = ord(bookFile.read(1))
-
-    if data >= 0x80:
-        datax = (data & 0x7F)
-        while data >= 0x80 :
-            data = ord(bookFile.read(1))
-            datax = (datax <<7) + (data & 0x7F)
-        data = datax
-
-    if flag:
-        data = -data
-    return data
-
-#
-# Encode a number in 7 bit format
-#
-
-def encodeNumber(number):
-    result = ""
-    negative = False
-    flag = 0
-
-    if number < 0 :
-        number = -number + 1
-        negative = True
-
-    while True:
-        byte = number & 0x7F
-        number = number >> 7
-        byte += flag
-        result += chr(byte)
-        flag = 0x80
-        if number == 0 :
-            if (byte == 0xFF and negative == False) :
-                result += chr(0x80)
-            break
-
-    if negative:
-        result += chr(0xFF)
-
-    return result[::-1]
-
-#
-# Get a length prefixed string from the file
-#
-
-def bookReadString():
-    stringLength = bookReadEncodedNumber()
-    return unpack(str(stringLength)+"s",bookFile.read(stringLength))[0]
-
-#
-# Returns a length prefixed string
-#
-
-def lengthPrefixString(data):
-    return encodeNumber(len(data))+data
-
-
-#
-# Read and return the data of one header record at the current book file position [[offset,compressedLength,decompressedLength],...]
-#
-
-def bookReadHeaderRecordData():
-    nbValues = bookReadEncodedNumber()
-    values = []
-    for i in range (0,nbValues):
-        values.append([bookReadEncodedNumber(),bookReadEncodedNumber(),bookReadEncodedNumber()])
-    return values
-
-#
-# Read and parse one header record at the current book file position and return the associated data [[offset,compressedLength,decompressedLength],...]
-#
-
-def parseTopazHeaderRecord():
-    if ord(bookFile.read(1)) != 0x63:
-        raise CMBDTCFatal("Parse Error : Invalid Header")
-
-    tag = bookReadString()
-    record = bookReadHeaderRecordData()
-    return [tag,record]
-
-#
-# Parse the header of a Topaz file, get all the header records and the offset for the payload
-#
-
-def parseTopazHeader():
-    global bookHeaderRecords
-    global bookPayloadOffset
-    magic = unpack("4s",bookFile.read(4))[0]
-
-    if magic != 'TPZ0':
-        raise CMBDTCFatal("Parse Error : Invalid Header, not a Topaz file")
-
-    nbRecords = bookReadEncodedNumber()
-    bookHeaderRecords = {}
-
-    for i in range (0,nbRecords):
-        result = parseTopazHeaderRecord()
-        bookHeaderRecords[result[0]] = result[1]
-
-    if ord(bookFile.read(1))  != 0x64 :
-        raise CMBDTCFatal("Parse Error : Invalid Header")
-
-    bookPayloadOffset = bookFile.tell()
-
-#
-# Get a record in the book payload, given its name and index. If necessary the record is decrypted. The record is not decompressed
-#
-
-def getBookPayloadRecord(name, index):
-    encrypted = False
-
-    try:
-        recordOffset = bookHeaderRecords[name][index][0]
-    except:
-        raise CMBDTCFatal("Parse Error : Invalid Record, record not found")
-
-    bookFile.seek(bookPayloadOffset + recordOffset)
-
-    tag = bookReadString()
-    if tag != name :
-        raise CMBDTCFatal("Parse Error : Invalid Record, record name doesn't match")
-
-    recordIndex = bookReadEncodedNumber()
-
-    if recordIndex < 0 :
-        encrypted = True
-        recordIndex = -recordIndex -1
-
-    if recordIndex != index :
-        raise CMBDTCFatal("Parse Error : Invalid Record, index doesn't match")
-
-    if bookHeaderRecords[name][index][2] != 0 :
-        record = bookFile.read(bookHeaderRecords[name][index][2])
-    else:
-        record = bookFile.read(bookHeaderRecords[name][index][1])
-
-    if encrypted:
-        ctx = topazCryptoInit(bookKey)
-        record = topazCryptoDecrypt(record,ctx)
-
-    return record
-
-#
-# Extract, decrypt and decompress a book record indicated by name and index and print it or save it in "filename"
-#
-
-def extractBookPayloadRecord(name, index, filename):
-    compressed = False
-
-    try:
-        compressed = bookHeaderRecords[name][index][2] != 0
-        record = getBookPayloadRecord(name,index)
-    except:
-        print("Could not find record")
-
-    if compressed:
-        try:
-            record = zlib.decompress(record)
-        except:
-            raise CMBDTCFatal("Could not decompress record")
-
-    if filename != "":
-        try:
-            file = open(filename,"wb")
-            file.write(record)
-            file.close()
-        except:
-            raise CMBDTCFatal("Could not write to destination file")
-    else:
-        print(record)
-
-#
-# return next record [key,value] from the book metadata from the current book position
-#
-
-def readMetadataRecord():
-    return [bookReadString(),bookReadString()]
-
-#
-# Parse the metadata record from the book payload and return a list of [key,values]
-#
-
-def parseMetadata():
-    global bookHeaderRecords
-    global bookPayloadAddress
-    global bookMetadata
-    bookMetadata = {}
-    bookFile.seek(bookPayloadOffset + bookHeaderRecords["metadata"][0][0])
-    tag = bookReadString()
-    if tag != "metadata" :
-        raise CMBDTCFatal("Parse Error : Record Names Don't Match")
-
-    flags = ord(bookFile.read(1))
-    nbRecords = ord(bookFile.read(1))
-
-    for i in range (0,nbRecords) :
-        record =readMetadataRecord()
-        bookMetadata[record[0]] = record[1]
-
-#
-# Returns two bit at offset from a bit field
-#
-
-def getTwoBitsFromBitField(bitField,offset):
-    byteNumber = offset // 4
-    bitPosition = 6 - 2*(offset % 4)
-
-    return ord(bitField[byteNumber]) >> bitPosition & 3
-
-#
-# Returns the six bits at offset from a bit field
-#
-
-def getSixBitsFromBitField(bitField,offset):
-    offset *= 3
-    value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
-    return value
-
-#
-# 8 bits to six bits encoding from hash to generate PID string
-#
-
-def encodePID(hash):
-    global charMap3
-    PID = ""
-    for position in range (0,8):
-        PID += charMap3[getSixBitsFromBitField(hash,position)]
-    return PID
-
-#
-# Context initialisation for the Topaz Crypto
-#
-
-def topazCryptoInit(key):
-    ctx1 = 0x0CAFFE19E
-
-    for keyChar in key:
-        keyByte = ord(keyChar)
-        ctx2 = ctx1
-        ctx1 = ((((ctx1 >>2) * (ctx1 >>7))&0xFFFFFFFF) ^ (keyByte * keyByte * 0x0F902007)& 0xFFFFFFFF )
-    return [ctx1,ctx2]
-
-#
-# decrypt data with the context prepared by topazCryptoInit()
-#
-
-def topazCryptoDecrypt(data, ctx):
-    ctx1 = ctx[0]
-    ctx2 = ctx[1]
-
-    plainText = ""
-
-    for dataChar in data:
-        dataByte = ord(dataChar)
-        m = (dataByte ^ ((ctx1 >> 3) &0xFF) ^ ((ctx2<<3) & 0xFF)) &0xFF
-        ctx2 = ctx1
-        ctx1 = (((ctx1 >> 2) * (ctx1 >> 7)) &0xFFFFFFFF) ^((m * m * 0x0F902007) &0xFFFFFFFF)
-        plainText += chr(m)
-
-    return plainText
-
-#
-# Decrypt a payload record with the PID
-#
-
-def decryptRecord(data,PID):
-    ctx = topazCryptoInit(PID)
-    return topazCryptoDecrypt(data, ctx)
-
-#
-# Try to decrypt a dkey record (contains the book PID)
-#
-
-def decryptDkeyRecord(data,PID):
-    record = decryptRecord(data,PID)
-    fields = unpack("3sB8sB8s3s",record)
-
-    if fields[0] != "PID" or fields[5] != "pid" :
-        raise CMBDTCError("Didn't find PID magic numbers in record")
-    elif fields[1] != 8 or fields[3] != 8 :
-        raise CMBDTCError("Record didn't contain correct length fields")
-    elif fields[2] != PID :
-        raise CMBDTCError("Record didn't contain PID")
-
-    return fields[4]
-
-#
-# Decrypt all the book's dkey records (contain the book PID)
-#
-
-def decryptDkeyRecords(data,PID):
-    nbKeyRecords = ord(data[0])
-    records = []
-    data = data[1:]
-    for i in range (0,nbKeyRecords):
-        length = ord(data[0])
-        try:
-            key = decryptDkeyRecord(data[1:length+1],PID)
-            records.append(key)
-        except CMBDTCError:
-            pass
-        data = data[1+length:]
-
-    return records
-
-#
-# Encryption table used to generate the device PID
-#
-
-def generatePidEncryptionTable() :
-    table = []
-    for counter1 in range (0,0x100):
-        value = counter1
-        for counter2 in range (0,8):
-            if (value & 1 == 0) :
-                value = value >> 1
-            else :
-                value = value >> 1
-                value = value ^ 0xEDB88320
-        table.append(value)
-    return table
-
-#
-# Seed value used to generate the device PID
-#
-
-def generatePidSeed(table,dsn) :
-    value = 0
-    for counter in range (0,4) :
-        index = (ord(dsn[counter]) ^ value) &0xFF
-        value = (value >> 8) ^ table[index]
-    return value
-
-#
-# Generate the device PID
-#
-
-def generateDevicePID(table,dsn,nbRoll):
-    seed = generatePidSeed(table,dsn)
-    pidAscii = ""
-    pid = [(seed >>24) &0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF,(seed>>24) & 0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF]
-    index = 0
-
-    for counter in range (0,nbRoll):
-        pid[index] = pid[index] ^ ord(dsn[counter])
-        index = (index+1) %8
-
-    for counter in range (0,8):
-        index = ((((pid[counter] >>5) & 3) ^ pid[counter]) & 0x1f) + (pid[counter] >> 7)
-        pidAscii += charMap4[index]
-    return pidAscii
-
-#
-# Create decrypted book payload
-#
-
-def createDecryptedPayload(payload):
-
-    # store data to be able to create the header later
-    headerData= []
-    currentOffset = 0
-
-    # Add social DRM to decrypted files
-
-    try:
-        data = getKindleInfoValueForKey("kindle.name.info")+":"+ getKindleInfoValueForKey("login")
-        if payload!= None:
-            payload.write(lengthPrefixString("sdrm"))
-            payload.write(encodeNumber(0))
-            payload.write(data)
-        else:
-            currentOffset += len(lengthPrefixString("sdrm"))
-            currentOffset += len(encodeNumber(0))
-            currentOffset += len(data)
-    except:
-        pass
-
-    for headerRecord in bookHeaderRecords:
-        name = headerRecord
-        newRecord = []
-
-        if name != "dkey" :
-
-            for index in range (0,len(bookHeaderRecords[name])) :
-                offset = currentOffset
-
-                if payload != None:
-                    # write tag
-                    payload.write(lengthPrefixString(name))
-                    # write data
-                    payload.write(encodeNumber(index))
-                    payload.write(getBookPayloadRecord(name, index))
-
-                else :
-                    currentOffset += len(lengthPrefixString(name))
-                    currentOffset += len(encodeNumber(index))
-                    currentOffset += len(getBookPayloadRecord(name, index))
-                    newRecord.append([offset,bookHeaderRecords[name][index][1],bookHeaderRecords[name][index][2]])
-
-        headerData.append([name,newRecord])
-
-
-
-    return headerData
-
-#
-# Create decrypted book
-#
-
-def createDecryptedBook(outputFile):
-    outputFile = open(outputFile,"wb")
-    # Write the payload in a temporary file
-    headerData = createDecryptedPayload(None)
-    outputFile.write("TPZ0")
-    outputFile.write(encodeNumber(len(headerData)))
-
-    for header in headerData :
-        outputFile.write(chr(0x63))
-        outputFile.write(lengthPrefixString(header[0]))
-        outputFile.write(encodeNumber(len(header[1])))
-        for numbers in header[1] :
-            outputFile.write(encodeNumber(numbers[0]))
-            outputFile.write(encodeNumber(numbers[1]))
-            outputFile.write(encodeNumber(numbers[2]))
-
-    outputFile.write(chr(0x64))
-    createDecryptedPayload(outputFile)
-    outputFile.close()
-
-#
-# Set the command to execute by the programm according to cmdLine parameters
-#
-
-def setCommand(name) :
-    global command
-    if command != "" :
-        raise CMBDTCFatal("Invalid command line parameters")
-    else :
-        command = name
-
-#
-# Program usage
-#
-
-def usage():
-    print("\nUsage:")
-    print("\nCMBDTC.py [options] bookFileName\n")
-    print("-p Adds a PID to the list of PIDs that are tried to decrypt the book key (can be used several times)")
-    print("-d Saves a decrypted copy of the book")
-    print("-r Prints or writes to disk a record indicated in the form name:index (e.g \"img:0\")")
-    print("-o Output file name to write records and decrypted books")
-    print("-v Verbose (can be used several times)")
-    print("-i Prints kindle.info database")
-
-#
-# Main
-#
-
-def main(argv=sys.argv):
-    global kindleDatabase
-    global bookMetadata
-    global bookKey
-    global bookFile
-    global command
-
-    progname = os.path.basename(argv[0])
-
-    verbose = 0
-    recordName = ""
-    recordIndex = 0
-    outputFile = ""
-    PIDs = []
-    kindleDatabase = None
-    command = ""
-
-
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], "vdir:o:p:")
-    except getopt.GetoptError, err:
-        # print help information and exit:
-        print str(err) # will print something like "option -a not recognized"
-        usage()
-        sys.exit(2)
-
-    if len(opts) == 0 and len(args) == 0 :
-        usage()
-        sys.exit(2)
-
-    for o, a in opts:
-        if o == "-v":
-            verbose+=1
-        if o == "-i":
-            setCommand("printInfo")
-        if o =="-o":
-            if a == None :
-                raise CMBDTCFatal("Invalid parameter for -o")
-            outputFile = a
-        if o =="-r":
-            setCommand("printRecord")
-            try:
-                recordName,recordIndex = a.split(':')
-            except:
-                raise CMBDTCFatal("Invalid parameter for -r")
-        if o =="-p":
-            PIDs.append(a)
-        if o =="-d":
-            setCommand("doit")
-
-    if command == "" :
-        raise CMBDTCFatal("No action supplied on command line")
-
-    #
-    # Read the encrypted database
-    #
-
-    try:
-        kindleDatabase = parseKindleInfo()
-    except Exception, message:
-        if verbose>0:
-            print(message)
-
-    if kindleDatabase != None :
-        if command == "printInfo" :
-            printKindleInfo()
-
-    #
-    # Compute the DSN
-    #
-
-    # Get the Mazama Random number
-        MazamaRandomNumber = getKindleInfoValueForKey("MazamaRandomNumber")
-
-    # Get the HDD serial
-        encodedSystemVolumeSerialNumber = encodeHash(str(GetVolumeSerialNumber(GetSystemDirectory().split('\\')[0] + '\\')),charMap1)
-
-    # Get the current user name
-        encodedUsername = encodeHash(GetUserName(),charMap1)
-
-    # concat, hash and encode
-        DSN = encode(SHA1(MazamaRandomNumber+encodedSystemVolumeSerialNumber+encodedUsername),charMap1)
-
-        if verbose >1:
-            print("DSN: " + DSN)
-
-    #
-    # Compute the device PID
-    #
-
-        table =  generatePidEncryptionTable()
-        devicePID = generateDevicePID(table,DSN,4)
-        PIDs.append(devicePID)
-
-        if verbose > 0:
-            print("Device PID: " + devicePID)
-
-    #
-    # Open book and parse metadata
-    #
-
-    if len(args) == 1:
-
-        bookFile = openBook(args[0])
-        parseTopazHeader()
-        parseMetadata()
-
-    #
-    # Compute book PID
-    #
-
-    # Get the account token
-
-        if kindleDatabase != None:
-            kindleAccountToken = getKindleInfoValueForKey("kindle.account.tokens")
-
-            if verbose >1:
-                print("Account Token: " + kindleAccountToken)
-
-            keysRecord = bookMetadata["keys"]
-            keysRecordRecord = bookMetadata[keysRecord]
-
-            pidHash = SHA1(DSN+kindleAccountToken+keysRecord+keysRecordRecord)
-
-            bookPID = encodePID(pidHash)
-            PIDs.append(bookPID)
-
-            if verbose > 0:
-                print ("Book PID: " + bookPID )
-
-    #
-    #  Decrypt book key
-    #
-
-        dkey = getBookPayloadRecord('dkey', 0)
-
-        bookKeys = []
-        for PID in PIDs :
-            bookKeys+=decryptDkeyRecords(dkey,PID)
-
-        if len(bookKeys) == 0 :
-            if verbose > 0 :
-                print ("Book key could not be found. Maybe this book is not registered with this device.")
-        else :
-            bookKey = bookKeys[0]
-            if verbose > 0:
-                print("Book key: " + bookKey.encode('hex'))
-
-
-
-            if command == "printRecord" :
-                extractBookPayloadRecord(recordName,int(recordIndex),outputFile)
-                if outputFile != "" and verbose>0 :
-                    print("Wrote record to file: "+outputFile)
-            elif command == "doit" :
-                if outputFile!="" :
-                    createDecryptedBook(outputFile)
-                    if verbose >0 :
-                        print ("Decrypted book saved. Don't pirate!")
-                elif verbose > 0:
-                    print("Output file name was not supplied.")
-
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main())

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 = []
@@ -230,6 +231,7 @@ class PageParser(object):
         'empty'          : (1, 'snippets', 1, 0),
 
         'page'           : (1, 'snippets', 1, 0),
+        'page.class'     : (1, 'scalar_text', 0, 0),
         'page.pageid'    : (1, 'scalar_text', 0, 0),
         'page.pagelabel' : (1, 'scalar_text', 0, 0),
         'page.type'      : (1, 'scalar_text', 0, 0),
@@ -238,11 +240,13 @@ class PageParser(object):
         'page.startID' : (1, 'scalar_number', 0, 0),
 
         'group'           : (1, 'snippets', 1, 0),
+        'group.class'     : (1, 'scalar_text', 0, 0),
         'group.type'      : (1, 'scalar_text', 0, 0),
         'group._tag'      : (1, 'scalar_text', 0, 0),
         'group.orientation': (1, 'scalar_text', 0, 0),
 
         'region'           : (1, 'snippets', 1, 0),
+        'region.class'     : (1, 'scalar_text', 0, 0),
         'region.type'      : (1, 'scalar_text', 0, 0),
         'region.x'         : (1, 'scalar_number', 0, 0),
         'region.y'         : (1, 'scalar_number', 0, 0),
@@ -252,13 +256,19 @@ class PageParser(object):
 
         'empty_text_region' : (1, 'snippets', 1, 0),
 
-        'img'           : (1, 'snippets', 1, 0),
-        'img.x'         : (1, 'scalar_number', 0, 0),
-        'img.y'         : (1, 'scalar_number', 0, 0),
-        'img.h'         : (1, 'scalar_number', 0, 0),
-        'img.w'         : (1, 'scalar_number', 0, 0),
-        'img.src'       : (1, 'scalar_number', 0, 0),
-        'img.color_src' : (1, 'scalar_number', 0, 0),
+        'img'                   : (1, 'snippets', 1, 0),
+        'img.x'                 : (1, 'scalar_number', 0, 0),
+        'img.y'                 : (1, 'scalar_number', 0, 0),
+        'img.h'                 : (1, 'scalar_number', 0, 0),
+        '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),
 
         'paragraph'           : (1, 'snippets', 1, 0),
         'paragraph.class'     : (1, 'scalar_text', 0, 0),
@@ -267,15 +277,20 @@ class PageParser(object):
         'paragraph.lastWord'  : (1, 'scalar_number', 0, 0),
         'paragraph.gridSize'  : (1, 'scalar_number', 0, 0),
         'paragraph.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
-        'paragraph.gridTopCenter' : (1, 'scalar_number', 0, 0),
-        'paragraph.gridBeginCenter' : (1, 'scalar_number', 0, 0),
-        'paragraph.gridEndCenter' : (1, 'scalar_number', 0, 0),
+        'paragraph.gridTopCenter'     : (1, 'scalar_number', 0, 0),
+        'paragraph.gridBeginCenter'   : (1, 'scalar_number', 0, 0),
+        'paragraph.gridEndCenter'     : (1, 'scalar_number', 0, 0),
 
 
         'word_semantic'           : (1, 'snippets', 1, 1),
         'word_semantic.type'      : (1, 'scalar_text', 0, 0),
+        'word_semantic.class'     : (1, 'scalar_text', 0, 0),
         'word_semantic.firstWord' : (1, 'scalar_number', 0, 0),
         'word_semantic.lastWord'  : (1, 'scalar_number', 0, 0),
+        'word_semantic.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
+        'word_semantic.gridTopCenter'     : (1, 'scalar_number', 0, 0),
+        'word_semantic.gridBeginCenter'   : (1, 'scalar_number', 0, 0),
+        'word_semantic.gridEndCenter'     : (1, 'scalar_number', 0, 0),
 
         'word'            : (1, 'snippets', 1, 0),
         'word.type'       : (1, 'scalar_text', 0, 0),
@@ -284,6 +299,7 @@ class PageParser(object):
         'word.lastGlyph'  : (1, 'scalar_number', 0, 0),
 
         '_span'           : (1, 'snippets', 1, 0),
+        '_span.class'     : (1, 'scalar_text', 0, 0),
         '_span.firstWord' : (1, 'scalar_number', 0, 0),
         '_span.lastWord'  : (1, 'scalar_number', 0, 0),
         '_span.gridSize'  : (1, 'scalar_number', 0, 0),
@@ -301,10 +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.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),
@@ -347,16 +369,18 @@ class PageParser(object):
         'version.paragraph_continuation'   : (1, 'scalar_text', 0, 0),
         'version.toc'                      : (1, 'scalar_text', 0, 0),
 
-        'stylesheet'   : (1, 'snippets', 1, 0),
-        'style'              : (1, 'snippets', 1, 0),
-        'style._tag'         : (1, 'scalar_text', 0, 0),
-        'style.type'         : (1, 'scalar_text', 0, 0),
-        'style._parent_type' : (1, 'scalar_text', 0, 0),
-        'style.class'        : (1, 'scalar_text', 0, 0),
-        'style._after_class' : (1, 'scalar_text', 0, 0),
-        'rule'               : (1, 'snippets', 1, 0),
-        'rule.attr'          : (1, 'scalar_text', 0, 0),
-        'rule.value'         : (1, 'scalar_text', 0, 0),
+        'stylesheet'                : (1, 'snippets', 1, 0),
+        'style'                     : (1, 'snippets', 1, 0),
+        'style._tag'                : (1, 'scalar_text', 0, 0),
+        'style.type'                : (1, 'scalar_text', 0, 0),
+        'style._after_type'         : (1, 'scalar_text', 0, 0),
+        'style._parent_type'        : (1, 'scalar_text', 0, 0),
+        'style._after_parent_type'  : (1, 'scalar_text', 0, 0),
+        'style.class'               : (1, 'scalar_text', 0, 0),
+        'style._after_class'        : (1, 'scalar_text', 0, 0),
+        'rule'                      : (1, 'snippets', 1, 0),
+        'rule.attr'                 : (1, 'scalar_text', 0, 0),
+        'rule.value'                : (1, 'scalar_text', 0, 0),
 
         'original'      : (0, 'number', 1, 1),
         'original.pnum' : (1, 'number', 0, 0),
@@ -367,6 +391,18 @@ class PageParser(object):
         'startID'      : (0, 'number', 1, 1),
         'startID.page' : (1, 'number', 0, 0),
         'startID.id'   : (1, 'number', 0, 0),
+    
+        'median_d'          : (1, 'number', 0, 0),
+        'median_h'          : (1, 'number', 0, 0),
+        'median_firsty'     : (1, 'number', 0, 0),
+        'median_lasty'      : (1, 'number', 0, 0),
+
+        'num_footers_maybe' : (1, 'number', 0, 0),
+        'num_footers_yes'   : (1, 'number', 0, 0),
+        'num_headers_maybe' : (1, 'number', 0, 0),
+        'num_headers_yes'   : (1, 'number', 0, 0),
+
+        'tracking'          : (1, 'number', 0, 0),
 
      }
 
@@ -491,8 +527,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/description.rtfd/TXT.rtf

@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
 {\fonttbl}
 {\colortbl;\red255\green255\blue255;}
 }

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

@@ -0,0 +1,208 @@
+#!/usr/bin/python
+#
+# This is a python script. You need a Python interpreter to run it.
+# For example, ActiveState Python, which exists for windows.
+#
+# Changelog drmcheck
+#  1.00 - Initial version, with code from various other scripts
+#  1.01 - Moved authorship announcement to usage section.
+#
+# Changelog epubtest
+#  1.00 - Cut to epubtest.py, testing ePub files only by Apprentice Alf
+#  1.01 - Added routine for use by Windows DeDRM
+#
+# Written in 2011 by Paul Durrant
+# Released with unlicense. See http://unlicense.org/
+#
+#############################################################################
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+#############################################################################
+#
+# It's still polite to give attribution if you do reuse this code.
+#
+
+from __future__ import with_statement
+
+__version__ = '1.01'
+
+import sys, struct, os
+import zlib
+import zipfile
+import xml.etree.ElementTree as etree
+
+NSMAP = {'adept': 'http://ns.adobe.com/adept',
+         'enc': 'http://www.w3.org/2001/04/xmlenc#'}
+
+# 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)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"epubtest.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+_FILENAME_LEN_OFFSET = 26
+_EXTRA_LEN_OFFSET = 28
+_FILENAME_OFFSET = 30
+_MAX_SIZE = 64 * 1024
+
+
+def uncompress(cmpdata):
+    dc = zlib.decompressobj(-15)
+    data = ''
+    while len(cmpdata) > 0:
+        if len(cmpdata) > _MAX_SIZE :
+            newdata = cmpdata[0:_MAX_SIZE]
+            cmpdata = cmpdata[_MAX_SIZE:]
+        else:
+            newdata = cmpdata
+            cmpdata = ''
+        newdata = dc.decompress(newdata)
+        unprocessed = dc.unconsumed_tail
+        if len(unprocessed) == 0:
+            newdata += dc.flush()
+        data += newdata
+        cmpdata += unprocessed
+        unprocessed = ''
+    return data
+
+def getfiledata(file, zi):
+    # get file name length and exta data length to find start of file data
+    local_header_offset = zi.header_offset
+
+    file.seek(local_header_offset + _FILENAME_LEN_OFFSET)
+    leninfo = file.read(2)
+    local_name_length, = struct.unpack('<H', leninfo)
+
+    file.seek(local_header_offset + _EXTRA_LEN_OFFSET)
+    exinfo = file.read(2)
+    extra_field_length, = struct.unpack('<H', exinfo)
+
+    file.seek(local_header_offset + _FILENAME_OFFSET + local_name_length + extra_field_length)
+    data = None
+
+    # if not compressed we are good to go
+    if zi.compress_type == zipfile.ZIP_STORED:
+        data = file.read(zi.file_size)
+
+    # if compressed we must decompress it using zlib
+    if zi.compress_type == zipfile.ZIP_DEFLATED:
+        cmpdata = file.read(zi.compress_size)
+        data = uncompress(cmpdata)
+
+    return data
+
+def encryption(infile):
+    # returns encryption: one of Unencrypted, Adobe, B&N and Unknown
+    encryption = "Unknown"
+    try:
+        with open(infile,'rb') as infileobject:
+            bookdata = infileobject.read(58)
+            # Check for Zip
+            if bookdata[0:0+2] == "PK":
+                foundrights = False
+                foundencryption = False
+                inzip = zipfile.ZipFile(infile,'r')
+                namelist = set(inzip.namelist())
+                if 'META-INF/rights.xml' not in namelist or 'META-INF/encryption.xml' not in namelist:
+                    encryption = "Unencrypted"
+                else:
+                    rights = etree.fromstring(inzip.read('META-INF/rights.xml'))
+                    adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
+                    expr = './/%s' % (adept('encryptedKey'),)
+                    bookkey = ''.join(rights.findtext(expr))
+                    if len(bookkey) == 172:
+                        encryption = "Adobe"
+                    elif len(bookkey) == 64:
+                        encryption = "B&N"
+                    else:
+                        encryption = "Unknown"
+    except:
+        traceback.print_exc()
+    return encryption
+
+def main():
+    argv=unicode_argv()
+    print encryption(argv[1])
+    return 0
+
+if __name__ == "__main__":
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    sys.exit(main())

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

@@ -1,8 +1,11 @@
 #!/usr/bin/env python
-# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
-#
+# -*- coding: utf-8 -*-
+
 # erdr2pml.py
+# Copyright © 2008 The Dark Reverser
 #
+# Modified 2008–2012 by some_updates, DiapDealer and Apprentice Alf
+
 # This is a python script. You need a Python interpreter to run it.
 # For example, ActiveState Python, which exists for windows.
 # Changelog
@@ -62,52 +65,103 @@
 #  0.21 - Support eReader (drm) version 11.
 #       - Don't reject dictionary format.
 #       - Ignore sidebars for dictionaries (different format?)
+#  0.22 - Unicode and plugin support, different image folders for PMLZ and source
+#  0.23 - moved unicode_argv call inside main for Windows DeDRM compatibility
 
-__version__='0.21'
+__version__='0.23'
 
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-
-import sys
-import struct, binascii, getopt, zlib, os, os.path, urllib, tempfile
+import sys, re
+import struct, binascii, getopt, zlib, os, os.path, urllib, tempfile, traceback
 
 if 'calibre' in sys.modules:
     inCalibre = True
 else:
     inCalibre = False
 
+# 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)
+
+iswindows = sys.platform.startswith('win')
+isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"mobidedrm.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
 Des = None
-if sys.platform.startswith('win'):
+if iswindows:
     # first try with pycrypto
     if inCalibre:
-        from calibre_plugins.erdrpdb2pml import pycrypto_des
+        from calibre_plugins.dedrm import pycrypto_des
     else:
         import pycrypto_des
     Des = pycrypto_des.load_pycrypto()
     if Des == None:
         # they try with openssl
         if inCalibre:
-            from calibre_plugins.erdrpdb2pml import openssl_des
+            from calibre_plugins.dedrm import openssl_des
         else:
             import openssl_des
         Des = openssl_des.load_libcrypto()
 else:
     # first try with openssl
     if inCalibre:
-        from calibre_plugins.erdrpdb2pml import openssl_des
+        from calibre_plugins.dedrm import openssl_des
     else:
         import openssl_des
     Des = openssl_des.load_libcrypto()
     if Des == None:
         # then try with pycrypto
         if inCalibre:
-            from calibre_plugins.erdrpdb2pml import pycrypto_des
+            from calibre_plugins.dedrm import pycrypto_des
         else:
             import pycrypto_des
         Des = pycrypto_des.load_pycrypto()
@@ -116,7 +170,7 @@ else:
 # of DES and try to speed it up with Psycho
 if Des == None:
     if inCalibre:
-        from calibre_plugins.erdrpdb2pml import python_des
+        from calibre_plugins.dedrm import python_des
     else:
         import python_des
     Des = python_des.Des
@@ -168,17 +222,30 @@ class Sectionizer(object):
         off = self.sections[section][0]
         return self.contents[off:end_off]
 
-def sanitizeFileName(s):
-    r = ''
-    for c in s:
-        if c in "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.-":
-            r += c
-    return r
+# cleanup unicode filenames
+# borrowed from calibre from calibre/src/calibre/__init__.py
+# added in removal of control (<32) chars
+# and removal of . at start and end
+# and with some (heavily edited) code from Paul Durrant's kindlenamer.py
+def sanitizeFileName(name):
+    # substitute filename unfriendly characters
+    name = name.replace(u"<",u"[").replace(u">",u"]").replace(u" : ",u" – ").replace(u": ",u" – ").replace(u":",u"—").replace(u"/",u"_").replace(u"\\",u"_").replace(u"|",u"_").replace(u"\"",u"\'")
+    # delete control characters
+    name = u"".join(char for char in name if ord(char)>=32)
+    # white space to single space, delete leading and trailing while space
+    name = re.sub(ur"\s", u" ", name).strip()
+    # remove leading dots
+    while len(name)>0 and name[0] == u".":
+        name = name[1:]
+    # remove trailing dots (Windows doesn't like them)
+    if name.endswith(u'.'):
+        name = name[:-1]
+    return name
 
 def fixKey(key):
     def fixByte(b):
         return b ^ ((b ^ (b<<1) ^ (b<<2) ^ (b<<3) ^ (b<<4) ^ (b<<5) ^ (b<<6) ^ (b<<7) ^ 0x80) & 0x80)
-    return      "".join([chr(fixByte(ord(a))) for a in key])
+    return     "".join([chr(fixByte(ord(a))) for a in key])
 
 def deXOR(text, sp, table):
     r=''
@@ -191,7 +258,7 @@ def deXOR(text, sp, table):
     return r
 
 class EreaderProcessor(object):
-    def __init__(self, sect, username, creditcard):
+    def __init__(self, sect, user_key):
         self.section_reader = sect.loadSection
         data = self.section_reader(0)
         version,  = struct.unpack('>H', data[0:2])
@@ -212,18 +279,10 @@ class EreaderProcessor(object):
             for i in xrange(len(data)):
                 j = (j + shuf) % len(data)
                 r[j] = data[i]
-            assert      len("".join(r)) == len(data)
+            assert    len("".join(r)) == len(data)
             return "".join(r)
         r = unshuff(input[0:-8], cookie_shuf)
 
-        def fixUsername(s):
-            r = ''
-            for c in s.lower():
-                if (c >= 'a' and c <= 'z' or c >= '0' and c <= '9'):
-                    r += c
-            return r
-
-        user_key = struct.pack('>LL', binascii.crc32(fixUsername(username)) & 0xffffffff, binascii.crc32(creditcard[-8:])& 0xffffffff)
         drm_sub_version = struct.unpack('>H', r[0:2])[0]
         self.num_text_pages = struct.unpack('>H', r[2:4])[0] - 1
         self.num_image_pages = struct.unpack('>H', r[26:26+2])[0]
@@ -302,7 +361,7 @@ class EreaderProcessor(object):
         sect = self.section_reader(self.first_image_page + i)
         name = sect[4:4+32].strip('\0')
         data = sect[62:]
-        return sanitizeFileName(name), data
+        return sanitizeFileName(unicode(name,'windows-1252')), data
 
 
     # def getChapterNamePMLOffsetData(self):
@@ -399,60 +458,53 @@ class EreaderProcessor(object):
         return r
 
 def cleanPML(pml):
-        # Convert special characters to proper PML code.  High ASCII start at (\x80, \a128) and go up to (\xff, \a255)
+    # Convert special characters to proper PML code.  High ASCII start at (\x80, \a128) and go up to (\xff, \a255)
     pml2 = pml
     for k in xrange(128,256):
         badChar = chr(k)
         pml2 = pml2.replace(badChar, '\\a%03d' % k)
     return pml2
 
-def convertEreaderToPml(infile, name, cc, outdir):
-    if not os.path.exists(outdir):
-        os.makedirs(outdir)
+def decryptBook(infile, outpath, make_pmlz, user_key):
     bookname = os.path.splitext(os.path.basename(infile))[0]
-    print "   Decoding File"
-    sect = Sectionizer(infile, 'PNRdPPrs')
-    er = EreaderProcessor(sect, name, cc)
-
-    if er.getNumImages() > 0:
-        print "   Extracting images"
-        imagedir = bookname + '_img/'
-        imagedirpath = os.path.join(outdir,imagedir)
-        if not os.path.exists(imagedirpath):
-            os.makedirs(imagedirpath)
-        for i in xrange(er.getNumImages()):
-            name, contents = er.getImage(i)
-            file(os.path.join(imagedirpath, name), 'wb').write(contents)
-
-    print "   Extracting pml"
-    pml_string = er.getText()
-    pmlfilename = bookname + ".pml"
-    file(os.path.join(outdir, pmlfilename),'wb').write(cleanPML(pml_string))
-
-    # bkinfo = er.getBookInfo()
-    # if bkinfo != '':
-    #     print "   Extracting book meta information"
-    #     file(os.path.join(outdir, 'bookinfo.txt'),'wb').write(bkinfo)
-
-
-
-def decryptBook(infile, outdir, name, cc, make_pmlz):
-    if make_pmlz :
-        # ignore specified outdir, use tempdir instead
+    if make_pmlz:
+        # outpath is actually pmlz name
+        pmlzname = outpath
         outdir = tempfile.mkdtemp()
+        imagedirpath = os.path.join(outdir,u"images")
+    else:
+        pmlzname = None
+        outdir = outpath
+        imagedirpath = os.path.join(outdir,bookname + u"_img")
+
     try:
-        print "Processing..."
-        convertEreaderToPml(infile, name, cc, outdir)
-        if make_pmlz :
+        if not os.path.exists(outdir):
+            os.makedirs(outdir)
+        print u"Decoding File"
+        sect = Sectionizer(infile, 'PNRdPPrs')
+        er = EreaderProcessor(sect, user_key)
+
+        if er.getNumImages() > 0:
+            print u"Extracting images"
+            if not os.path.exists(imagedirpath):
+                os.makedirs(imagedirpath)
+            for i in xrange(er.getNumImages()):
+                name, contents = er.getImage(i)
+                file(os.path.join(imagedirpath, name), 'wb').write(contents)
+
+        print u"Extracting pml"
+        pml_string = er.getText()
+        pmlfilename = bookname + ".pml"
+        file(os.path.join(outdir, pmlfilename),'wb').write(cleanPML(pml_string))
+        if pmlzname is not None:
             import zipfile
             import shutil
-            print "   Creating PMLZ file"
-            zipname = infile[:-4] + '.pmlz'
-            myZipFile = zipfile.ZipFile(zipname,'w',zipfile.ZIP_STORED, False)
+            print u"Creating PMLZ file {0}".format(os.path.basename(pmlzname))
+            myZipFile = zipfile.ZipFile(pmlzname,'w',zipfile.ZIP_STORED, False)
             list = os.listdir(outdir)
-            for file in list:
-                localname = file
-                filePath = os.path.join(outdir,file)
+            for filename in list:
+                localname = filename
+                filePath = os.path.join(outdir,filename)
                 if os.path.isfile(filePath):
                     myZipFile.write(filePath, localname)
                 elif os.path.isdir(filePath):
@@ -466,36 +518,48 @@ def decryptBook(infile, outdir, name, cc, make_pmlz):
             myZipFile.close()
             # remove temporary directory
             shutil.rmtree(outdir, True)
-            print 'output is %s' % zipname
+            print u"Output is {0}".format(pmlzname)
         else :
-            print 'output in %s' % outdir
+            print u"Output is in {0}".format(outdir)
         print "done"
     except ValueError, e:
-        print "Error: %s" % e
+        print u"Error: {0}".format(e)
+        traceback.print_exc()
         return 1
     return 0
 
 
 def usage():
-    print "Converts DRMed eReader books to PML Source"
-    print "Usage:"
-    print "  erdr2pml [options] infile.pdb [outdir] \"your name\" credit_card_number "
-    print " "
-    print "Options: "
-    print "  -h                prints this message"
-    print "  --make-pmlz       create PMLZ instead of using output directory"
-    print " "
-    print "Note:"
-    print "  if ommitted, outdir defaults based on 'infile.pdb'"
-    print "  It's enough to enter the last 8 digits of the credit card number"
+    print u"Converts DRMed eReader books to PML Source"
+    print u"Usage:"
+    print u"  erdr2pml [options] infile.pdb [outpath] \"your name\" credit_card_number"
+    print u" "
+    print u"Options: "
+    print u"  -h             prints this message"
+    print u"  -p             create PMLZ instead of source folder"
+    print u"  --make-pmlz    create PMLZ instead of source folder"
+    print u" "
+    print u"Note:"
+    print u"  if outpath is ommitted, creates source in 'infile_Source' folder"
+    print u"  if outpath is ommitted and pmlz option, creates PMLZ 'infile.pmlz'"
+    print u"  if source folder created, images are in infile_img folder"
+    print u"  if pmlz file created, images are in images folder"
+    print u"  It's enough to enter the last 8 digits of the credit card number"
     return
 
+def getuser_key(name,cc):
+    newname = "".join(c for c in name.lower() if c >= 'a' and c <= 'z' or c >= '0' and c <= '9')
+    cc = cc.replace(" ","")
+    return struct.pack('>LL', binascii.crc32(newname) & 0xffffffff,binascii.crc32(cc[-8:])& 0xffffffff)
 
-def main(argv=None):
+def cli_main():
+    print u"eRdr2Pml v{0}. Copyright © 2009–2012 The Dark Reverser et al.".format(__version__)
+
+    argv=unicode_argv()
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "h", ["make-pmlz"])
+        opts, args = getopt.getopt(argv[1:], "hp", ["make-pmlz"])
     except getopt.GetoptError, err:
-        print str(err)
+        print err.args[0]
         usage()
         return 1
     make_pmlz = False
@@ -503,24 +567,31 @@ def main(argv=None):
         if o == "-h":
             usage()
             return 0
+        elif o == "-p":
+            make_pmlz = True
         elif o == "--make-pmlz":
             make_pmlz = True
 
-    print "eRdr2Pml v%s. Copyright (c) 2009 The Dark Reverser" % __version__
-
     if len(args)!=3 and len(args)!=4:
         usage()
         return 1
 
     if len(args)==3:
-        infile, name, cc = args[0], args[1], args[2]
-        outdir = infile[:-4] + '_Source'
+        infile, name, cc = args
+        if make_pmlz:
+            outpath = os.path.splitext(infile)[0] + u".pmlz"
+        else:
+            outpath = os.path.splitext(infile)[0] + u"_Source"
     elif len(args)==4:
-        infile, outdir, name, cc = args[0], args[1], args[2], args[3]
+        infile, outpath, name, cc = args
 
-    return decryptBook(infile, outdir, name, cc, make_pmlz)
+    print getuser_key(name,cc).encode('hex')
+
+    return decryptBook(infile, outpath, make_pmlz, getuser_key(name,cc))
 
 
 if __name__ == "__main__":
-    sys.stdout=Unbuffered(sys.stdout)
-    sys.exit(main())
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    sys.exit(cli_main())
+

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

@@ -387,10 +387,14 @@ class DocParser(object):
                 ws_last = int(argres)
 
             elif name.endswith('word.class'):
-                (cname, space) = argres.split('-',1)
-                if space == '' : space = '0'
-                if (cname == 'spaceafter') and (int(space) > 0) :
-                    word_class = 'sa'
+                # we only handle spaceafter word class
+                try:
+                    (cname, space) = argres.split('-',1)
+                    if space == '' : space = '0'
+                    if (cname == 'spaceafter') and (int(space) > 0) :
+                        word_class = 'sa'
+                except:
+                    pass
 
             elif name.endswith('word.img.src'):
                 result.append(('img' + word_class, int(argres)))
@@ -454,7 +458,11 @@ class DocParser(object):
             (wtype, num) = pdesc[j]
 
             if wtype == 'ocr' :
-                word = self.ocrtext[num]
+                try:
+                    word = self.ocrtext[num]
+                except:
+                    word = ""
+
                 sep = ' '
 
                 if handle_links:

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

@@ -29,10 +29,10 @@ else:
     inCalibre = False
 
 if inCalibre :
-    from calibre_plugins.k4mobidedrm import convert2xml
-    from calibre_plugins.k4mobidedrm import flatxml2html
-    from calibre_plugins.k4mobidedrm import flatxml2svg
-    from calibre_plugins.k4mobidedrm import stylexml2css
+    from calibre_plugins.dedrm import convert2xml
+    from calibre_plugins.dedrm import flatxml2html
+    from calibre_plugins.dedrm import flatxml2svg
+    from calibre_plugins.dedrm import stylexml2css
 else :
     import convert2xml
     import flatxml2html
@@ -117,7 +117,7 @@ class Dictionary(object):
             self.pos = val
             return self.stable[self.pos]
         else:
-            print "Error - %d outside of string table limits" % val
+            print "Error: %d outside of string table limits" % val
             raise TpzDRMError('outside or string table limits')
             # sys.exit(-1)
     def getSize(self):
@@ -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/getk4pcpids.py

@@ -1,77 +0,0 @@
-#!/usr/bin/python
-#
-# This is a python script. You need a Python interpreter to run it.
-# For example, ActiveState Python, which exists for windows.
-#
-# Changelog
-#  1.00 - Initial version
-
-__version__ = '1.00'
-
-import sys
-
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-sys.stdout=Unbuffered(sys.stdout)
-
-import os
-import struct
-import binascii
-import kgenpids
-import topazextract
-import mobidedrm
-from alfcrypto import Pukall_Cipher
-
-class DrmException(Exception):
-    pass
-
-def getK4PCpids(path_to_ebook):
-    # Return Kindle4PC PIDs. Assumes that the caller checked that we are not on Linux, which will raise an exception
-
-    mobi = True
-    magic3 = file(path_to_ebook,'rb').read(3)
-    if magic3 == 'TPZ':
-        mobi = False
-
-    if mobi:
-        mb = mobidedrm.MobiBook(path_to_ebook,False)
-    else:
-        mb = topazextract.TopazBook(path_to_ebook)
-    
-    md1, md2 = mb.getPIDMetaInfo()
-
-    return kgenpids.getPidList(md1, md2, True, [], [], []) 
-
-
-def main(argv=sys.argv):
-    print ('getk4pcpids.py v%(__version__)s. '
-        'Copyright 2012 Apprentic Alf' % globals())
-
-    if len(argv)<2 or len(argv)>3:
-        print "Gets the possible book-specific PIDs from K4PC for a particular book"
-        print "Usage:"
-        print "    %s <bookfile> [<outfile>]" % sys.argv[0]
-        return 1
-    else:
-        infile = argv[1]
-        try:
-            pidlist = getK4PCpids(infile)
-        except DrmException, e:
-            print "Error: %s" % e
-            return 1
-        pidstring = ','.join(pidlist)
-        print "Possible PIDs are: ", pidstring
-        if len(argv) is 3:
-            outfile = argv[2]
-            file(outfile, 'w').write(pidstring)
-        
-    return 0
-
-if __name__ == "__main__":
-    sys.exit(main())

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

@@ -1,37 +1,116 @@
-#! /usr/bin/python
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 from __future__ import with_statement
 
-# ignobleepub.pyw, version 3.4
+# ignobleepub.pyw, version 3.8
+# Copyright © 2009-2010 by i♥cabbages
 
-# To run this program install Python 2.6 from <http://www.python.org/download/>
-# and OpenSSL or 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
-# ignobleepub.pyw and double-click on it to run it.
+# 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
+
+# Windows users: Before running this program, you must first install Python 2.6
+#   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
+#   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
+#   program from the command line (pythonw ineptepub.pyw) or by double-clicking
+#   it when it has been associated with PythonLauncher.
 
 # Revision history:
 #   1 - Initial release
 #   2 - Added OS X support by using OpenSSL when available
 #   3 - screen out improper key lengths to prevent segfaults on Linux
 #   3.1 - Allow Windows versions of libcrypto to be found
-#   3.2 - add support for encoding to 'utf-8' when building up list of files to cecrypt from encryption.xml
-#   3.3 - On Windows try PyCrypto first and OpenSSL next
-#   3.4 - Modify interace to allow use with import
+#   3.2 - add support for encoding to 'utf-8' when building up list of files to decrypt from encryption.xml
+#   3.3 - On Windows try PyCrypto first, OpenSSL next
+#   3.4 - Modify interface to allow use with import
+#   3.5 - Fix for potential problem with PyCrypto
+#   3.6 - Revised to allow use in calibre plugins to eliminate need for duplicate code
+#   3.7 - Tweaked to match ineptepub more closely
+#   3.8 - Fixed to retain zip file metadata (e.g. file modification date)
+#   3.9 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#   4.0 - Work if TkInter is missing
 
+"""
+Decrypt Barnes & Noble encrypted ePub books.
+"""
 
 __license__ = 'GPL v3'
+__version__ = "4.0"
 
 import sys
 import os
+import traceback
 import zlib
 import zipfile
-from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
+from zipfile import ZipInfo, ZipFile, ZIP_STORED, ZIP_DEFLATED
 from contextlib import closing
 import xml.etree.ElementTree as etree
-import Tkinter
-import Tkconstants
-import tkFileDialog
-import tkMessageBox
+
+# 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)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        return [u"ineptepub.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
 
 class IGNOBLEError(Exception):
     pass
@@ -41,10 +120,11 @@ def _load_crypto_libcrypto():
         Structure, c_ulong, create_string_buffer, cast
     from ctypes.util import find_library
 
-    if sys.platform.startswith('win'):
+    if iswindows:
         libcrypto = find_library('libeay32')
     else:
         libcrypto = find_library('crypto')
+
     if libcrypto is None:
         raise IGNOBLEError('libcrypto not found')
     libcrypto = CDLL(libcrypto)
@@ -65,9 +145,6 @@ def _load_crypto_libcrypto():
         func.argtypes = argtypes
         return func
 
-    AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',
-                        [c_char_p, c_char_p, c_ulong, AES_KEY_p, c_char_p,
-                         c_int])
     AES_set_decrypt_key = F(c_int, 'AES_set_decrypt_key',
                             [c_char_p, c_int, AES_KEY_p])
     AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',
@@ -100,7 +177,7 @@ def _load_crypto_pycrypto():
 
     class AES(object):
         def __init__(self, key):
-            self._aes = _AES.new(key, _AES.MODE_CBC)
+            self._aes = _AES.new(key, _AES.MODE_CBC, '\x00'*16)
 
         def decrypt(self, data):
             return self._aes.decrypt(data)
@@ -122,28 +199,13 @@ def _load_crypto():
 
 AES = _load_crypto()
 
-
-
-"""
-Decrypt Barnes & Noble ADEPT encrypted EPUB books.
-"""
-
-
 META_NAMES = ('mimetype', 'META-INF/rights.xml', 'META-INF/encryption.xml')
 NSMAP = {'adept': 'http://ns.adobe.com/adept',
          'enc': 'http://www.w3.org/2001/04/xmlenc#'}
 
-class ZipInfo(zipfile.ZipInfo):
-    def __init__(self, *args, **kwargs):
-        if 'compress_type' in kwargs:
-            compress_type = kwargs.pop('compress_type')
-        super(ZipInfo, self).__init__(*args, **kwargs)
-        self.compress_type = compress_type
-
 class Decryptor(object):
     def __init__(self, bookkey, encryption):
         enc = lambda tag: '{%s}%s' % (NSMAP['enc'], tag)
-        # self._aes = AES.new(bookkey, AES.MODE_CBC)
         self._aes = AES(bookkey)
         encryption = etree.fromstring(encryption)
         self._encrypted = encrypted = set()
@@ -151,8 +213,8 @@ class Decryptor(object):
                                enc('CipherReference'))
         for elem in encryption.findall(expr):
             path = elem.get('URI', None)
-            path = path.encode('utf-8')
             if path is not None:
+                path = path.encode('utf-8')
                 encrypted.add(path)
 
     def decompress(self, bytes):
@@ -170,166 +232,220 @@ class Decryptor(object):
             data = self.decompress(data)
         return data
 
-
-class DecryptionDialog(Tkinter.Frame):
-    def __init__(self, root):
-        Tkinter.Frame.__init__(self, root, border=5)
-        self.status = Tkinter.Label(self, text='Select files for decryption')
-        self.status.pack(fill=Tkconstants.X, expand=1)
-        body = Tkinter.Frame(self)
-        body.pack(fill=Tkconstants.X, expand=1)
-        sticky = Tkconstants.E + Tkconstants.W
-        body.grid_columnconfigure(1, weight=2)
-        Tkinter.Label(body, text='Key file').grid(row=0)
-        self.keypath = Tkinter.Entry(body, width=30)
-        self.keypath.grid(row=0, column=1, sticky=sticky)
-        if os.path.exists('bnepubkey.b64'):
-            self.keypath.insert(0, 'bnepubkey.b64')
-        button = Tkinter.Button(body, text="...", command=self.get_keypath)
-        button.grid(row=0, column=2)
-        Tkinter.Label(body, text='Input file').grid(row=1)
-        self.inpath = Tkinter.Entry(body, width=30)
-        self.inpath.grid(row=1, column=1, sticky=sticky)
-        button = Tkinter.Button(body, text="...", command=self.get_inpath)
-        button.grid(row=1, column=2)
-        Tkinter.Label(body, text='Output file').grid(row=2)
-        self.outpath = Tkinter.Entry(body, width=30)
-        self.outpath.grid(row=2, column=1, sticky=sticky)
-        button = Tkinter.Button(body, text="...", command=self.get_outpath)
-        button.grid(row=2, column=2)
-        buttons = Tkinter.Frame(self)
-        buttons.pack()
-        botton = Tkinter.Button(
-            buttons, text="Decrypt", width=10, command=self.decrypt)
-        botton.pack(side=Tkconstants.LEFT)
-        Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
-        button = Tkinter.Button(
-            buttons, text="Quit", width=10, command=self.quit)
-        button.pack(side=Tkconstants.RIGHT)
-
-    def get_keypath(self):
-        keypath = tkFileDialog.askopenfilename(
-            parent=None, title='Select B&N EPUB key file',
-            defaultextension='.b64',
-            filetypes=[('base64-encoded files', '.b64'),
-                       ('All Files', '.*')])
-        if keypath:
-            keypath = os.path.normpath(keypath)
-            self.keypath.delete(0, Tkconstants.END)
-            self.keypath.insert(0, keypath)
-        return
-
-    def get_inpath(self):
-        inpath = tkFileDialog.askopenfilename(
-            parent=None, title='Select B&N-encrypted EPUB file to decrypt',
-            defaultextension='.epub', filetypes=[('EPUB files', '.epub'),
-                                                 ('All files', '.*')])
-        if inpath:
-            inpath = os.path.normpath(inpath)
-            self.inpath.delete(0, Tkconstants.END)
-            self.inpath.insert(0, inpath)
-        return
-
-    def get_outpath(self):
-        outpath = tkFileDialog.asksaveasfilename(
-            parent=None, title='Select unencrypted EPUB file to produce',
-            defaultextension='.epub', filetypes=[('EPUB files', '.epub'),
-                                                 ('All files', '.*')])
-        if outpath:
-            outpath = os.path.normpath(outpath)
-            self.outpath.delete(0, Tkconstants.END)
-            self.outpath.insert(0, outpath)
-        return
-
-    def decrypt(self):
-        keypath = self.keypath.get()
-        inpath = self.inpath.get()
-        outpath = self.outpath.get()
-        if not keypath or not os.path.exists(keypath):
-            self.status['text'] = 'Specified key file does not exist'
-            return
-        if not inpath or not os.path.exists(inpath):
-            self.status['text'] = 'Specified input file does not exist'
-            return
-        if not outpath:
-            self.status['text'] = 'Output file not specified'
-            return
-        if inpath == outpath:
-            self.status['text'] = 'Must have different input and output files'
-            return
-        argv = [sys.argv[0], keypath, inpath, outpath]
-        self.status['text'] = 'Decrypting...'
-        try:
-            cli_main(argv)
-        except Exception, e:
-            self.status['text'] = 'Error: ' + str(e)
-            return
-        self.status['text'] = 'File successfully decrypted'
-
-
-def decryptBook(keypath, inpath, outpath):
-    with open(keypath, 'rb') as f:
-        keyb64 = f.read()
-    key = keyb64.decode('base64')[:16]
-    # aes = AES.new(key, AES.MODE_CBC)
-    aes = AES(key)
-
+# check file to make check whether it's probably an Adobe Adept encrypted ePub
+def ignobleBook(inpath):
     with closing(ZipFile(open(inpath, 'rb'))) as inf:
         namelist = set(inf.namelist())
         if 'META-INF/rights.xml' not in namelist or \
            'META-INF/encryption.xml' not in namelist:
-            raise IGNOBLEError('%s: not an B&N ADEPT EPUB' % (inpath,))
+            return False
+        try:
+            rights = etree.fromstring(inf.read('META-INF/rights.xml'))
+            adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
+            expr = './/%s' % (adept('encryptedKey'),)
+            bookkey = ''.join(rights.findtext(expr))
+            if len(bookkey) == 64:
+                return True
+        except:
+            # if we couldn't check, assume it is
+            return True
+    return False
+
+def decryptBook(keyb64, inpath, outpath):
+    if AES is None:
+        raise IGNOBLEError(u"PyCrypto or OpenSSL must be installed.")
+    key = keyb64.decode('base64')[:16]
+    aes = AES(key)
+    with closing(ZipFile(open(inpath, 'rb'))) as inf:
+        namelist = set(inf.namelist())
+        if 'META-INF/rights.xml' not in namelist or \
+           'META-INF/encryption.xml' not in namelist:
+            print u"{0:s} is DRM-free.".format(os.path.basename(inpath))
+            return 1
         for name in META_NAMES:
             namelist.remove(name)
-        rights = etree.fromstring(inf.read('META-INF/rights.xml'))
-        adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
-        expr = './/%s' % (adept('encryptedKey'),)
-        bookkey = ''.join(rights.findtext(expr))
-        bookkey = aes.decrypt(bookkey.decode('base64'))
-        bookkey = bookkey[:-ord(bookkey[-1])]
-        encryption = inf.read('META-INF/encryption.xml')
-        decryptor = Decryptor(bookkey[-16:], encryption)
-        kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
-        with closing(ZipFile(open(outpath, 'wb'), 'w', **kwds)) as outf:
-            zi = ZipInfo('mimetype', compress_type=ZIP_STORED)
-            outf.writestr(zi, inf.read('mimetype'))
-            for path in namelist:
-                data = inf.read(path)
-                outf.writestr(path, decryptor.decrypt(path, data))
+        try:
+            rights = etree.fromstring(inf.read('META-INF/rights.xml'))
+            adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
+            expr = './/%s' % (adept('encryptedKey'),)
+            bookkey = ''.join(rights.findtext(expr))
+            if len(bookkey) != 64:
+                print u"{0:s} is not a secure Barnes & Noble ePub.".format(os.path.basename(inpath))
+                return 1
+            bookkey = aes.decrypt(bookkey.decode('base64'))
+            bookkey = bookkey[:-ord(bookkey[-1])]
+            encryption = inf.read('META-INF/encryption.xml')
+            decryptor = Decryptor(bookkey[-16:], encryption)
+            kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
+            with closing(ZipFile(open(outpath, 'wb'), 'w', **kwds)) as outf:
+                zi = ZipInfo('mimetype')
+                zi.compress_type=ZIP_STORED
+                try:
+                    # if the mimetype is present, get its info, including time-stamp
+                    oldzi = inf.getinfo('mimetype')
+                    # copy across fields to be preserved
+                    zi.date_time = oldzi.date_time
+                    zi.comment = oldzi.comment
+                    zi.extra = oldzi.extra
+                    zi.internal_attr = oldzi.internal_attr
+                    # external attributes are dependent on the create system, so copy both.
+                    zi.external_attr = oldzi.external_attr
+                    zi.create_system = oldzi.create_system
+                except:
+                    pass
+                outf.writestr(zi, inf.read('mimetype'))
+                for path in namelist:
+                    data = inf.read(path)
+                    zi = ZipInfo(path)
+                    zi.compress_type=ZIP_DEFLATED
+                    try:
+                        # get the file info, including time-stamp
+                        oldzi = inf.getinfo(path)
+                        # copy across useful fields
+                        zi.date_time = oldzi.date_time
+                        zi.comment = oldzi.comment
+                        zi.extra = oldzi.extra
+                        zi.internal_attr = oldzi.internal_attr
+                        # external attributes are dependent on the create system, so copy both.
+                        zi.external_attr = oldzi.external_attr
+                        zi.create_system = oldzi.create_system
+                    except:
+                        pass
+                    outf.writestr(zi, decryptor.decrypt(path, data))
+        except:
+            print u"Could not decrypt {0:s} because of an exception:\n{1:s}".format(os.path.basename(inpath), traceback.format_exc())
+            return 2
     return 0
 
 
-def cli_main(argv=sys.argv):
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
     progname = os.path.basename(argv[0])
-    if AES is None:
-        print "%s: This script requires OpenSSL or PyCrypto, which must be installed " \
-              "separately.  Read the top-of-script comment for details." % \
-              (progname,)
-        return 1
     if len(argv) != 4:
-        print "usage: %s KEYFILE INBOOK OUTBOOK" % (progname,)
+        print u"usage: {0} <keyfile.b64> <inbook.epub> <outbook.epub>".format(progname)
         return 1
     keypath, inpath, outpath = argv[1:]
-    return decryptBook(keypath, inpath, outpath)
-
+    userkey = open(keypath,'rb').read()
+    result = decryptBook(userkey, inpath, outpath)
+    if result == 0:
+        print u"Successfully decrypted {0:s} as {1:s}".format(os.path.basename(inpath),os.path.basename(outpath))
+    return result
 
 def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class DecryptionDialog(Tkinter.Frame):
+        def __init__(self, root):
+            Tkinter.Frame.__init__(self, root, border=5)
+            self.status = Tkinter.Label(self, text=u"Select files for decryption")
+            self.status.pack(fill=Tkconstants.X, expand=1)
+            body = Tkinter.Frame(self)
+            body.pack(fill=Tkconstants.X, expand=1)
+            sticky = Tkconstants.E + Tkconstants.W
+            body.grid_columnconfigure(1, weight=2)
+            Tkinter.Label(body, text=u"Key file").grid(row=0)
+            self.keypath = Tkinter.Entry(body, width=30)
+            self.keypath.grid(row=0, column=1, sticky=sticky)
+            if os.path.exists(u"bnepubkey.b64"):
+                self.keypath.insert(0, u"bnepubkey.b64")
+            button = Tkinter.Button(body, text=u"...", command=self.get_keypath)
+            button.grid(row=0, column=2)
+            Tkinter.Label(body, text=u"Input file").grid(row=1)
+            self.inpath = Tkinter.Entry(body, width=30)
+            self.inpath.grid(row=1, column=1, sticky=sticky)
+            button = Tkinter.Button(body, text=u"...", command=self.get_inpath)
+            button.grid(row=1, column=2)
+            Tkinter.Label(body, text=u"Output file").grid(row=2)
+            self.outpath = Tkinter.Entry(body, width=30)
+            self.outpath.grid(row=2, column=1, sticky=sticky)
+            button = Tkinter.Button(body, text=u"...", command=self.get_outpath)
+            button.grid(row=2, column=2)
+            buttons = Tkinter.Frame(self)
+            buttons.pack()
+            botton = Tkinter.Button(
+                buttons, text=u"Decrypt", width=10, command=self.decrypt)
+            botton.pack(side=Tkconstants.LEFT)
+            Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
+            button = Tkinter.Button(
+                buttons, text=u"Quit", width=10, command=self.quit)
+            button.pack(side=Tkconstants.RIGHT)
+
+        def get_keypath(self):
+            keypath = tkFileDialog.askopenfilename(
+                parent=None, title=u"Select Barnes & Noble \'.b64\' key file",
+                defaultextension=u".b64",
+                filetypes=[('base64-encoded files', '.b64'),
+                           ('All Files', '.*')])
+            if keypath:
+                keypath = os.path.normpath(keypath)
+                self.keypath.delete(0, Tkconstants.END)
+                self.keypath.insert(0, keypath)
+            return
+
+        def get_inpath(self):
+            inpath = tkFileDialog.askopenfilename(
+                parent=None, title=u"Select B&N-encrypted ePub file to decrypt",
+                defaultextension=u".epub", filetypes=[('ePub files', '.epub')])
+            if inpath:
+                inpath = os.path.normpath(inpath)
+                self.inpath.delete(0, Tkconstants.END)
+                self.inpath.insert(0, inpath)
+            return
+
+        def get_outpath(self):
+            outpath = tkFileDialog.asksaveasfilename(
+                parent=None, title=u"Select unencrypted ePub file to produce",
+                defaultextension=u".epub", filetypes=[('ePub files', '.epub')])
+            if outpath:
+                outpath = os.path.normpath(outpath)
+                self.outpath.delete(0, Tkconstants.END)
+                self.outpath.insert(0, outpath)
+            return
+
+        def decrypt(self):
+            keypath = self.keypath.get()
+            inpath = self.inpath.get()
+            outpath = self.outpath.get()
+            if not keypath or not os.path.exists(keypath):
+                self.status['text'] = u"Specified key file does not exist"
+                return
+            if not inpath or not os.path.exists(inpath):
+                self.status['text'] = u"Specified input file does not exist"
+                return
+            if not outpath:
+                self.status['text'] = u"Output file not specified"
+                return
+            if inpath == outpath:
+                self.status['text'] = u"Must have different input and output files"
+                return
+            userkey = open(keypath,'rb').read()
+            self.status['text'] = u"Decrypting..."
+            try:
+                decrypt_status = decryptBook(userkey, inpath, outpath)
+            except Exception, e:
+                self.status['text'] = u"Error: {0}".format(e.args[0])
+                return
+            if decrypt_status == 0:
+                self.status['text'] = u"File successfully decrypted"
+            else:
+                self.status['text'] = u"The was an error decrypting the file."
+
     root = Tkinter.Tk()
-    if AES is None:
-        root.withdraw()
-        tkMessageBox.showerror(
-            "Ignoble EPUB Decrypter",
-            "This script requires OpenSSL or PyCrypto, which must be installed "
-            "separately.  Read the top-of-script comment for details.")
-        return 1
-    root.title('Ignoble EPUB Decrypter')
+    root.title(u"Barnes & Noble ePub Decrypter v.{0}".format(__version__))
     root.resizable(True, False)
     root.minsize(300, 0)
     DecryptionDialog(root).pack(fill=Tkconstants.X, expand=1)
     root.mainloop()
     return 0
 
-
 if __name__ == '__main__':
     if len(sys.argv) > 1:
         sys.exit(cli_main())

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

@@ -0,0 +1,336 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+# ignoblekey.py
+# Copyright © 2015 Apprentice Alf and Apprentice Harper
+
+# Based on kindlekey.py, Copyright © 2010-2013 by some_updates and Apprentice Alf
+
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
+
+# Revision history:
+#   1.0 - Initial release
+#   1.1 - remove duplicates and return last key as single key
+
+"""
+Get Barnes & Noble EPUB user key from nook Studio log file
+"""
+
+__license__ = 'GPL v3'
+__version__ = "1.1"
+
+import sys
+import os
+import hashlib
+import getopt
+import re
+
+# 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)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"ignoblekey.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+class DrmException(Exception):
+    pass
+
+# Locate all of the nookStudy/nook for PC/Mac log file and return as list
+def getNookLogFiles():
+    logFiles = []
+    found = False
+    if iswindows:
+        import _winreg as winreg
+
+        # some 64 bit machines do not have the proper registry key for some reason
+        # or the python interface to the 32 vs 64 bit registry is broken
+        paths = set()
+        if 'LOCALAPPDATA' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
+            if os.path.isdir(path):
+                paths.add(path)
+        if 'USERPROFILE' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Local"
+            if os.path.isdir(path):
+                paths.add(path)
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Roaming"
+            if os.path.isdir(path):
+                paths.add(path)
+        # User Shell Folders show take precedent over Shell Folders if present
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+
+        for path in paths:
+            # look for nookStudy log file
+            logpath = path +'\\Barnes & Noble\\NOOKstudy\\logs\\BNClientLog.txt'
+            if os.path.isfile(logpath):
+                found = True
+                print('Found nookStudy log file: ' + logpath.encode('ascii','ignore'))
+                logFiles.append(logpath)
+    else:
+        home = os.getenv('HOME')
+        # check for BNClientLog.txt in various locations
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+
+    if not found:
+        print('No nook Study log files have been found.')
+    return logFiles
+
+
+# Extract CCHash key(s) from log file
+def getKeysFromLog(kLogFile):
+    keys = []
+    regex = re.compile("ccHash: \"(.{28})\"");
+    for line in open(kLogFile):
+        for m in regex.findall(line):
+            keys.append(m)
+    return keys
+
+# interface for calibre plugin
+def nookkeys(files = []):
+    keys = []
+    if files == []:
+        files = getNookLogFiles()
+    for file in files:
+        fileKeys = getKeysFromLog(file)
+        if fileKeys:
+            print u"Found {0} keys in the Nook Study log files".format(len(fileKeys))
+            keys.extend(fileKeys)
+    return list(set(keys))
+
+# interface for Python DeDRM
+# returns single key or multiple keys, depending on path or file passed in
+def getkey(outpath, files=[]):
+    keys = nookkeys(files)
+    if len(keys) > 0:
+        if not os.path.isdir(outpath):
+            outfile = outpath
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(keys[-1])
+            print u"Saved a key to {0}".format(outfile)
+        else:
+            keycount = 0
+            for key in keys:
+                while True:
+                    keycount += 1
+                    outfile = os.path.join(outpath,u"nookkey{0:d}.b64".format(keycount))
+                    if not os.path.exists(outfile):
+                        break
+                with file(outfile, 'w') as keyfileout:
+                    keyfileout.write(key)
+                print u"Saved a key to {0}".format(outfile)
+        return True
+    return False
+
+def usage(progname):
+    print u"Finds the nook Study encryption keys."
+    print u"Keys are saved to the current directory, or a specified output directory."
+    print u"If a file name is passed instead of a directory, only the first key is saved, in that file."
+    print u"Usage:"
+    print u"    {0:s} [-h] [-k <logFile>] [<outpath>]".format(progname)
+
+
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
+    progname = os.path.basename(argv[0])
+    print u"{0} v{1}\nCopyright © 2015 Apprentice Alf".format(progname,__version__)
+
+    try:
+        opts, args = getopt.getopt(argv[1:], "hk:")
+    except getopt.GetoptError, err:
+        print u"Error in options or arguments: {0}".format(err.args[0])
+        usage(progname)
+        sys.exit(2)
+
+    files = []
+    for o, a in opts:
+        if o == "-h":
+            usage(progname)
+            sys.exit(0)
+        if o == "-k":
+            files = [a]
+
+    if len(args) > 1:
+        usage(progname)
+        sys.exit(2)
+
+    if len(args) == 1:
+        # save to the specified file or directory
+        outpath = args[0]
+        if not os.path.isabs(outpath):
+           outpath = os.path.abspath(outpath)
+    else:
+        # save to the same directory as the script
+        outpath = os.path.dirname(argv[0])
+
+    # make sure the outpath is the
+    outpath = os.path.realpath(os.path.normpath(outpath))
+
+    if not getkey(outpath, files):
+        print u"Could not retrieve nook Study key."
+    return 0
+
+
+def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class ExceptionDialog(Tkinter.Frame):
+        def __init__(self, root, text):
+            Tkinter.Frame.__init__(self, root, border=5)
+            label = Tkinter.Label(self, text=u"Unexpected error:",
+                                  anchor=Tkconstants.W, justify=Tkconstants.LEFT)
+            label.pack(fill=Tkconstants.X, expand=0)
+            self.text = Tkinter.Text(self)
+            self.text.pack(fill=Tkconstants.BOTH, expand=1)
+
+            self.text.insert(Tkconstants.END, text)
+
+
+    argv=unicode_argv()
+    root = Tkinter.Tk()
+    root.withdraw()
+    progpath, progname = os.path.split(argv[0])
+    success = False
+    try:
+        keys = nookkeys()
+        keycount = 0
+        for key in keys:
+            print key
+            while True:
+                keycount += 1
+                outfile = os.path.join(progpath,u"nookkey{0:d}.b64".format(keycount))
+                if not os.path.exists(outfile):
+                    break
+
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(key)
+            success = True
+            tkMessageBox.showinfo(progname, u"Key successfully retrieved to {0}".format(outfile))
+    except DrmException, e:
+        tkMessageBox.showerror(progname, u"Error: {0}".format(str(e)))
+    except Exception:
+        root.wm_state('normal')
+        root.title(progname)
+        text = traceback.format_exc()
+        ExceptionDialog(root, text).pack(fill=Tkconstants.BOTH, expand=1)
+        root.mainloop()
+    if not success:
+        return 1
+    return 0
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
+    sys.exit(gui_main())

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

@@ -0,0 +1,258 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+# ignoblekeyfetch.pyw, version 1.1
+# Copyright © 2015 Apprentice Harper
+
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
+
+# Based on discoveries by "Nobody You Know"
+# Code partly based on ignoblekeygen.py by several people.
+
+# Windows users: Before running this program, you must first install Python.
+#   We recommend ActiveState Python 2.7.X for Windows from
+#   http://www.activestate.com/activepython/downloads.
+#   Then save this script file as ignoblekeyfetch.pyw and double-click on it to run it.
+#
+# Mac OS X users: Save this script file as ignoblekeyfetch.pyw.  You can run this
+#   program from the command line (python ignoblekeyfetch.pyw) or by double-clicking
+#   it when it has been associated with PythonLauncher.
+
+# Revision history:
+#   1.0 - Initial  version
+#   1.1 - Try second URL if first one fails
+
+"""
+Fetch Barnes & Noble EPUB user key from B&N servers using email and password
+"""
+
+__license__ = 'GPL v3'
+__version__ = "1.1"
+
+import sys
+import os
+
+# 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)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"ignoblekeyfetch.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+
+class IGNOBLEError(Exception):
+    pass
+
+def fetch_key(email, password):
+    # change email and password to utf-8 if unicode
+    if type(email)==unicode:
+        email = email.encode('utf-8')
+    if type(password)==unicode:
+        password = password.encode('utf-8')
+
+    import random
+    random = "%030x" % random.randrange(16**30)
+
+    import urllib, urllib2, re
+
+    # try the URL from nook for PC
+    fetch_url = "https://cart4.barnesandnoble.com/services/service.aspx?Version=2&acctPassword="
+    fetch_url += urllib.quote(password,'')+"&devID=PC_BN_2.5.6.9575_"+random+"&emailAddress="
+    fetch_url += urllib.quote(email,"")+"&outFormat=5&schema=1&service=1&stage=deviceHashB"
+    #print fetch_url
+
+    found = ''
+    try:
+        req = urllib2.Request(fetch_url)
+        response = urllib2.urlopen(req)
+        the_page = response.read()
+        #print the_page
+        found = re.search('ccHash>(.+?)</ccHash', the_page).group(1)
+    except:
+        found = ''
+    if len(found)!=28:
+        # try the URL from android devices
+        fetch_url = "https://cart4.barnesandnoble.com/services/service.aspx?Version=2&acctPassword="
+        fetch_url += urllib.quote(password,'')+"&devID=hobbes_9.3.50818_"+random+"&emailAddress="
+        fetch_url += urllib.quote(email,"")+"&outFormat=5&schema=1&service=1&stage=deviceHashB"
+        #print fetch_url
+
+        found = ''
+        try:
+            req = urllib2.Request(fetch_url)
+            response = urllib2.urlopen(req)
+            the_page = response.read()
+            #print the_page
+            found = re.search('ccHash>(.+?)</ccHash', the_page).group(1)
+        except:
+            found = ''
+
+    return found
+
+
+
+
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
+    progname = os.path.basename(argv[0])
+    if len(argv) != 4:
+        print u"usage: {0} <email> <password> <keyfileout.b64>".format(progname)
+        return 1
+    email, password, keypath = argv[1:]
+    userkey = fetch_key(email, password)
+    if len(userkey) == 28:
+        open(keypath,'wb').write(userkey)
+        return 0
+    print u"Failed to fetch key."
+    return 1
+
+
+def gui_main():
+    try:
+        import Tkinter
+        import tkFileDialog
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class DecryptionDialog(Tkinter.Frame):
+        def __init__(self, root):
+            Tkinter.Frame.__init__(self, root, border=5)
+            self.status = Tkinter.Label(self, text=u"Enter parameters")
+            self.status.pack(fill=Tkconstants.X, expand=1)
+            body = Tkinter.Frame(self)
+            body.pack(fill=Tkconstants.X, expand=1)
+            sticky = Tkconstants.E + Tkconstants.W
+            body.grid_columnconfigure(1, weight=2)
+            Tkinter.Label(body, text=u"Account email address").grid(row=0)
+            self.name = Tkinter.Entry(body, width=40)
+            self.name.grid(row=0, column=1, sticky=sticky)
+            Tkinter.Label(body, text=u"Account password").grid(row=1)
+            self.ccn = Tkinter.Entry(body, width=40)
+            self.ccn.grid(row=1, column=1, sticky=sticky)
+            Tkinter.Label(body, text=u"Output file").grid(row=2)
+            self.keypath = Tkinter.Entry(body, width=40)
+            self.keypath.grid(row=2, column=1, sticky=sticky)
+            self.keypath.insert(2, u"bnepubkey.b64")
+            button = Tkinter.Button(body, text=u"...", command=self.get_keypath)
+            button.grid(row=2, column=2)
+            buttons = Tkinter.Frame(self)
+            buttons.pack()
+            botton = Tkinter.Button(
+                buttons, text=u"Fetch", width=10, command=self.generate)
+            botton.pack(side=Tkconstants.LEFT)
+            Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
+            button = Tkinter.Button(
+                buttons, text=u"Quit", width=10, command=self.quit)
+            button.pack(side=Tkconstants.RIGHT)
+
+        def get_keypath(self):
+            keypath = tkFileDialog.asksaveasfilename(
+                parent=None, title=u"Select B&N ePub key file to produce",
+                defaultextension=u".b64",
+                filetypes=[('base64-encoded files', '.b64'),
+                           ('All Files', '.*')])
+            if keypath:
+                keypath = os.path.normpath(keypath)
+                self.keypath.delete(0, Tkconstants.END)
+                self.keypath.insert(0, keypath)
+            return
+
+        def generate(self):
+            email = self.name.get()
+            password = self.ccn.get()
+            keypath = self.keypath.get()
+            if not email:
+                self.status['text'] = u"Email address not given"
+                return
+            if not password:
+                self.status['text'] = u"Account password not given"
+                return
+            if not keypath:
+                self.status['text'] = u"Output keyfile path not set"
+                return
+            self.status['text'] = u"Fetching..."
+            try:
+                userkey = fetch_key(email, password)
+            except Exception, e:
+                self.status['text'] = u"Error: {0}".format(e.args[0])
+                return
+            if len(userkey) == 28:
+                open(keypath,'wb').write(userkey)
+                self.status['text'] = u"Keyfile fetched successfully"
+            else:
+                self.status['text'] = u"Keyfile fetch failed."
+
+    root = Tkinter.Tk()
+    root.title(u"Barnes & Noble ePub Keyfile Fetch v.{0}".format(__version__))
+    root.resizable(True, False)
+    root.minsize(300, 0)
+    DecryptionDialog(root).pack(fill=Tkconstants.X, expand=1)
+    root.mainloop()
+    return 0
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
+    sys.exit(gui_main())

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

@@ -1,13 +1,27 @@
-#! /usr/bin/python
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 from __future__ import with_statement
 
-# ignoblekeygen.pyw, version 2.3
+# ignoblekeygen.pyw, version 2.5
+# Copyright © 2009-2010 i♥cabbages
 
-# To run this program install Python 2.6 from <http://www.python.org/download/>
-# and OpenSSL or 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
-# ignoblekeygen.pyw and double-click on it to run it.
+# 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
+
+# Windows users: Before running this program, you must first install Python.
+#   We recommend ActiveState Python 2.7.X for Windows (x86) from
+#   http://www.activestate.com/activepython/downloads.
+#   You must also install PyCrypto from
+#   http://www.voidspace.org.uk/python/modules.shtml#pycrypto
+#   (make certain to install the version for Python 2.7).
+#   Then save this script file as ignoblekeygen.pyw and double-click on it to run it.
+#
+# Mac OS X users: Save this script file as ignoblekeygen.pyw.  You can run this
+#   program from the command line (python ignoblekeygen.pyw) or by double-clicking
+#   it when it has been associated with PythonLauncher.
 
 # Revision history:
 #   1 - Initial release
@@ -15,40 +29,99 @@ from __future__ import with_statement
 #   2.1 - Allow Windows versions of libcrypto to be found
 #   2.2 - On Windows try PyCrypto first and then OpenSSL next
 #   2.3 - Modify interface to allow use of import
+#   2.4 - Improvements to UI and now works in plugins
+#   2.5 - Additional improvement for unicode and plugin support
+#   2.6 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#   2.7 - Work if TkInter is missing
+#   2.8 - Fix bug in stand-alone use (import tkFileDialog)
 
 """
 Generate Barnes & Noble EPUB user key from name and credit card number.
 """
 
 __license__ = 'GPL v3'
+__version__ = "2.8"
 
 import sys
 import os
 import hashlib
-import Tkinter
-import Tkconstants
-import tkFileDialog
-import tkMessageBox
+
+# 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)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"ignoblekeygen.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
 
 
-
-# use openssl's libcrypt if it exists in place of pycrypto
-# code extracted from the Adobe Adept DRM removal code also by I HeartCabbages
 class IGNOBLEError(Exception):
     pass
 
-
 def _load_crypto_libcrypto():
     from ctypes import CDLL, POINTER, c_void_p, c_char_p, c_int, c_long, \
         Structure, c_ulong, create_string_buffer, cast
     from ctypes.util import find_library
 
-    if sys.platform.startswith('win'):
+    if iswindows:
         libcrypto = find_library('libeay32')
     else:
         libcrypto = find_library('crypto')
+
     if libcrypto is None:
-        print 'libcrypto not found'
         raise IGNOBLEError('libcrypto not found')
     libcrypto = CDLL(libcrypto)
 
@@ -73,6 +146,7 @@ def _load_crypto_libcrypto():
     AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',
                         [c_char_p, c_char_p, c_ulong, AES_KEY_p, c_char_p,
                          c_int])
+
     class AES(object):
         def __init__(self, userkey, iv):
             self._blocksize = len(userkey)
@@ -91,7 +165,6 @@ def _load_crypto_libcrypto():
 
     return AES
 
-
 def _load_crypto_pycrypto():
     from Crypto.Cipher import AES as _AES
 
@@ -123,86 +196,31 @@ def normalize_name(name):
     return ''.join(x for x in name.lower() if x != ' ')
 
 
-def generate_keyfile(name, ccn, outpath):
+def generate_key(name, ccn):
+    # remove spaces and case from name and CC numbers.
+    if type(name)==unicode:
+        name = name.encode('utf-8')
+    if type(ccn)==unicode:
+        ccn = ccn.encode('utf-8')
+
     name = normalize_name(name) + '\x00'
-    ccn = ccn + '\x00'
+    ccn = normalize_name(ccn) + '\x00'
+
     name_sha = hashlib.sha1(name).digest()[:16]
     ccn_sha = hashlib.sha1(ccn).digest()[:16]
     both_sha = hashlib.sha1(name + ccn).digest()
     aes = AES(ccn_sha, name_sha)
     crypt = aes.encrypt(both_sha + ('\x0c' * 0x0c))
     userkey = hashlib.sha1(crypt).digest()
-    with open(outpath, 'wb') as f:
-        f.write(userkey.encode('base64'))
-    return userkey
+    return userkey.encode('base64')
 
 
-class DecryptionDialog(Tkinter.Frame):
-    def __init__(self, root):
-        Tkinter.Frame.__init__(self, root, border=5)
-        self.status = Tkinter.Label(self, text='Enter parameters')
-        self.status.pack(fill=Tkconstants.X, expand=1)
-        body = Tkinter.Frame(self)
-        body.pack(fill=Tkconstants.X, expand=1)
-        sticky = Tkconstants.E + Tkconstants.W
-        body.grid_columnconfigure(1, weight=2)
-        Tkinter.Label(body, text='Name').grid(row=1)
-        self.name = Tkinter.Entry(body, width=30)
-        self.name.grid(row=1, column=1, sticky=sticky)
-        Tkinter.Label(body, text='CC#').grid(row=2)
-        self.ccn = Tkinter.Entry(body, width=30)
-        self.ccn.grid(row=2, column=1, sticky=sticky)
-        Tkinter.Label(body, text='Output file').grid(row=0)
-        self.keypath = Tkinter.Entry(body, width=30)
-        self.keypath.grid(row=0, column=1, sticky=sticky)
-        self.keypath.insert(0, 'bnepubkey.b64')
-        button = Tkinter.Button(body, text="...", command=self.get_keypath)
-        button.grid(row=0, column=2)
-        buttons = Tkinter.Frame(self)
-        buttons.pack()
-        botton = Tkinter.Button(
-            buttons, text="Generate", width=10, command=self.generate)
-        botton.pack(side=Tkconstants.LEFT)
-        Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
-        button = Tkinter.Button(
-            buttons, text="Quit", width=10, command=self.quit)
-        button.pack(side=Tkconstants.RIGHT)
-
-    def get_keypath(self):
-        keypath = tkFileDialog.asksaveasfilename(
-            parent=None, title='Select B&N EPUB key file to produce',
-            defaultextension='.b64',
-            filetypes=[('base64-encoded files', '.b64'),
-                       ('All Files', '.*')])
-        if keypath:
-            keypath = os.path.normpath(keypath)
-            self.keypath.delete(0, Tkconstants.END)
-            self.keypath.insert(0, keypath)
-        return
-
-    def generate(self):
-        name = self.name.get()
-        ccn = self.ccn.get()
-        keypath = self.keypath.get()
-        if not name:
-            self.status['text'] = 'Name not specified'
-            return
-        if not ccn:
-            self.status['text'] = 'Credit card number not specified'
-            return
-        if not keypath:
-            self.status['text'] = 'Output keyfile path not specified'
-            return
-        self.status['text'] = 'Generating...'
-        try:
-            generate_keyfile(name, ccn, keypath)
-        except Exception, e:
-            self.status['text'] = 'Error: ' + str(e)
-            return
-        self.status['text'] = 'Keyfile successfully generated'
 
 
-def cli_main(argv=sys.argv):
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
     progname = os.path.basename(argv[0])
     if AES is None:
         print "%s: This script requires OpenSSL or PyCrypto, which must be installed " \
@@ -210,14 +228,89 @@ def cli_main(argv=sys.argv):
               (progname,)
         return 1
     if len(argv) != 4:
-        print "usage: %s NAME CC# OUTFILE" % (progname,)
+        print u"usage: {0} <Name> <CC#> <keyfileout.b64>".format(progname)
         return 1
-    name, ccn, outpath = argv[1:]
-    generate_keyfile(name, ccn, outpath)
+    name, ccn, keypath = argv[1:]
+    userkey = generate_key(name, ccn)
+    open(keypath,'wb').write(userkey)
     return 0
 
 
 def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import tkFileDialog
+        import traceback
+    except:
+        return cli_main()
+
+    class DecryptionDialog(Tkinter.Frame):
+        def __init__(self, root):
+            Tkinter.Frame.__init__(self, root, border=5)
+            self.status = Tkinter.Label(self, text=u"Enter parameters")
+            self.status.pack(fill=Tkconstants.X, expand=1)
+            body = Tkinter.Frame(self)
+            body.pack(fill=Tkconstants.X, expand=1)
+            sticky = Tkconstants.E + Tkconstants.W
+            body.grid_columnconfigure(1, weight=2)
+            Tkinter.Label(body, text=u"Account Name").grid(row=0)
+            self.name = Tkinter.Entry(body, width=40)
+            self.name.grid(row=0, column=1, sticky=sticky)
+            Tkinter.Label(body, text=u"CC#").grid(row=1)
+            self.ccn = Tkinter.Entry(body, width=40)
+            self.ccn.grid(row=1, column=1, sticky=sticky)
+            Tkinter.Label(body, text=u"Output file").grid(row=2)
+            self.keypath = Tkinter.Entry(body, width=40)
+            self.keypath.grid(row=2, column=1, sticky=sticky)
+            self.keypath.insert(2, u"bnepubkey.b64")
+            button = Tkinter.Button(body, text=u"...", command=self.get_keypath)
+            button.grid(row=2, column=2)
+            buttons = Tkinter.Frame(self)
+            buttons.pack()
+            botton = Tkinter.Button(
+                buttons, text=u"Generate", width=10, command=self.generate)
+            botton.pack(side=Tkconstants.LEFT)
+            Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
+            button = Tkinter.Button(
+                buttons, text=u"Quit", width=10, command=self.quit)
+            button.pack(side=Tkconstants.RIGHT)
+
+        def get_keypath(self):
+            keypath = tkFileDialog.asksaveasfilename(
+                parent=None, title=u"Select B&N ePub key file to produce",
+                defaultextension=u".b64",
+                filetypes=[('base64-encoded files', '.b64'),
+                           ('All Files', '.*')])
+            if keypath:
+                keypath = os.path.normpath(keypath)
+                self.keypath.delete(0, Tkconstants.END)
+                self.keypath.insert(0, keypath)
+            return
+
+        def generate(self):
+            name = self.name.get()
+            ccn = self.ccn.get()
+            keypath = self.keypath.get()
+            if not name:
+                self.status['text'] = u"Name not specified"
+                return
+            if not ccn:
+                self.status['text'] = u"Credit card number not specified"
+                return
+            if not keypath:
+                self.status['text'] = u"Output keyfile path not specified"
+                return
+            self.status['text'] = u"Generating..."
+            try:
+                userkey = generate_key(name, ccn)
+            except Exception, e:
+                self.status['text'] = u"Error: (0}".format(e.args[0])
+                return
+            open(keypath,'wb').write(userkey)
+            self.status['text'] = u"Keyfile successfully generated"
+
     root = Tkinter.Tk()
     if AES is None:
         root.withdraw()
@@ -226,7 +319,7 @@ def gui_main():
             "This script requires OpenSSL or PyCrypto, which must be installed "
             "separately.  Read the top-of-script comment for details.")
         return 1
-    root.title('Ignoble EPUB Keyfile Generator')
+    root.title(u"Barnes & Noble ePub Keyfile Generator v.{0}".format(__version__))
     root.resizable(True, False)
     root.minsize(300, 0)
     DecryptionDialog(root).pack(fill=Tkconstants.X, expand=1)

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

@@ -1,18 +1,21 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from __future__ import with_statement
 
-# ineptepub.pyw, version 5.6
-# Copyright © 2009-2010 i♥cabbages
+# ineptepub.pyw, version 6.5
+# Copyright © 2009-2010 by i♥cabbages
 
-# Released under the terms of the GNU General Public Licence, version 3 or
-# later.  <http://www.gnu.org/licenses/>
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
 
-# Windows users: Before running this program, you must first install Python 2.6
+# 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.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
@@ -30,23 +33,91 @@ from __future__ import with_statement
 #   5.4 - add support for encoding to 'utf-8' when building up list of files to decrypt from encryption.xml
 #   5.5 - On Windows try PyCrypto first, OpenSSL next
 #   5.6 - Modify interface to allow use with import
+#   5.7 - Fix for potential problem with PyCrypto
+#   5.8 - Revised to allow use in calibre plugins to eliminate need for duplicate code
+#   5.9 - Fixed to retain zip file metadata (e.g. file modification date)
+#   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 ADEPT-encrypted EPUB books.
+Decrypt Adobe Digital Editions encrypted ePub books.
 """
 
 __license__ = 'GPL v3'
+__version__ = "6.5"
 
 import sys
 import os
+import traceback
 import zlib
 import zipfile
-from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
+from zipfile import ZipInfo, ZipFile, ZIP_STORED, ZIP_DEFLATED
 from contextlib import closing
 import xml.etree.ElementTree as etree
-import Tkinter
-import Tkconstants
-import tkFileDialog
-import tkMessageBox
+
+# 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)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        return [u"ineptepub.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
 
 class ADEPTError(Exception):
     pass
@@ -56,7 +127,7 @@ def _load_crypto_libcrypto():
         Structure, c_ulong, create_string_buffer, cast
     from ctypes.util import find_library
 
-    if sys.platform.startswith('win'):
+    if iswindows:
         libcrypto = find_library('libeay32')
     else:
         libcrypto = find_library('crypto')
@@ -235,7 +306,7 @@ def _load_crypto_pycrypto():
 
     class AES(object):
         def __init__(self, key):
-            self._aes = _AES.new(key, _AES.MODE_CBC)
+            self._aes = _AES.new(key, _AES.MODE_CBC, '\x00'*16)
 
         def decrypt(self, data):
             return self._aes.decrypt(data)
@@ -270,19 +341,13 @@ def _load_crypto():
         except (ImportError, ADEPTError):
             pass
     return (AES, RSA)
+
 AES, RSA = _load_crypto()
 
 META_NAMES = ('mimetype', 'META-INF/rights.xml', 'META-INF/encryption.xml')
 NSMAP = {'adept': 'http://ns.adobe.com/adept',
          'enc': 'http://www.w3.org/2001/04/xmlenc#'}
 
-class ZipInfo(zipfile.ZipInfo):
-    def __init__(self, *args, **kwargs):
-        if 'compress_type' in kwargs:
-            compress_type = kwargs.pop('compress_type')
-        super(ZipInfo, self).__init__(*args, **kwargs)
-        self.compress_type = compress_type
-
 class Decryptor(object):
     def __init__(self, bookkey, encryption):
         enc = lambda tag: '{%s}%s' % (NSMAP['enc'], tag)
@@ -306,164 +371,222 @@ class Decryptor(object):
         return bytes
 
     def decrypt(self, path, data):
-        if path in self._encrypted:
+        if path.encode('utf-8') in self._encrypted:
             data = self._aes.decrypt(data)[16:]
             data = data[:-ord(data[-1])]
             data = self.decompress(data)
         return data
 
-
-class DecryptionDialog(Tkinter.Frame):
-    def __init__(self, root):
-        Tkinter.Frame.__init__(self, root, border=5)
-        self.status = Tkinter.Label(self, text='Select files for decryption')
-        self.status.pack(fill=Tkconstants.X, expand=1)
-        body = Tkinter.Frame(self)
-        body.pack(fill=Tkconstants.X, expand=1)
-        sticky = Tkconstants.E + Tkconstants.W
-        body.grid_columnconfigure(1, weight=2)
-        Tkinter.Label(body, text='Key file').grid(row=0)
-        self.keypath = Tkinter.Entry(body, width=30)
-        self.keypath.grid(row=0, column=1, sticky=sticky)
-        if os.path.exists('adeptkey.der'):
-            self.keypath.insert(0, 'adeptkey.der')
-        button = Tkinter.Button(body, text="...", command=self.get_keypath)
-        button.grid(row=0, column=2)
-        Tkinter.Label(body, text='Input file').grid(row=1)
-        self.inpath = Tkinter.Entry(body, width=30)
-        self.inpath.grid(row=1, column=1, sticky=sticky)
-        button = Tkinter.Button(body, text="...", command=self.get_inpath)
-        button.grid(row=1, column=2)
-        Tkinter.Label(body, text='Output file').grid(row=2)
-        self.outpath = Tkinter.Entry(body, width=30)
-        self.outpath.grid(row=2, column=1, sticky=sticky)
-        button = Tkinter.Button(body, text="...", command=self.get_outpath)
-        button.grid(row=2, column=2)
-        buttons = Tkinter.Frame(self)
-        buttons.pack()
-        botton = Tkinter.Button(
-            buttons, text="Decrypt", width=10, command=self.decrypt)
-        botton.pack(side=Tkconstants.LEFT)
-        Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
-        button = Tkinter.Button(
-            buttons, text="Quit", width=10, command=self.quit)
-        button.pack(side=Tkconstants.RIGHT)
-
-    def get_keypath(self):
-        keypath = tkFileDialog.askopenfilename(
-            parent=None, title='Select ADEPT key file',
-            defaultextension='.der', filetypes=[('DER-encoded files', '.der'),
-                                                ('All Files', '.*')])
-        if keypath:
-            keypath = os.path.normpath(keypath)
-            self.keypath.delete(0, Tkconstants.END)
-            self.keypath.insert(0, keypath)
-        return
-
-    def get_inpath(self):
-        inpath = tkFileDialog.askopenfilename(
-            parent=None, title='Select ADEPT-encrypted EPUB file to decrypt',
-            defaultextension='.epub', filetypes=[('EPUB files', '.epub'),
-                                                 ('All files', '.*')])
-        if inpath:
-            inpath = os.path.normpath(inpath)
-            self.inpath.delete(0, Tkconstants.END)
-            self.inpath.insert(0, inpath)
-        return
-
-    def get_outpath(self):
-        outpath = tkFileDialog.asksaveasfilename(
-            parent=None, title='Select unencrypted EPUB file to produce',
-            defaultextension='.epub', filetypes=[('EPUB files', '.epub'),
-                                                 ('All files', '.*')])
-        if outpath:
-            outpath = os.path.normpath(outpath)
-            self.outpath.delete(0, Tkconstants.END)
-            self.outpath.insert(0, outpath)
-        return
-
-    def decrypt(self):
-        keypath = self.keypath.get()
-        inpath = self.inpath.get()
-        outpath = self.outpath.get()
-        if not keypath or not os.path.exists(keypath):
-            self.status['text'] = 'Specified key file does not exist'
-            return
-        if not inpath or not os.path.exists(inpath):
-            self.status['text'] = 'Specified input file does not exist'
-            return
-        if not outpath:
-            self.status['text'] = 'Output file not specified'
-            return
-        if inpath == outpath:
-            self.status['text'] = 'Must have different input and output files'
-            return
-        argv = [sys.argv[0], keypath, inpath, outpath]
-        self.status['text'] = 'Decrypting...'
-        try:
-            cli_main(argv)
-        except Exception, e:
-            self.status['text'] = 'Error: ' + str(e)
-            return
-        self.status['text'] = 'File successfully decrypted'
-
-
-def decryptBook(keypath, inpath, outpath):
-    with open(keypath, 'rb') as f:
-        keyder = f.read()
-    rsa = RSA(keyder)
+# check file to make check whether it's probably an Adobe Adept encrypted ePub
+def adeptBook(inpath):
     with closing(ZipFile(open(inpath, 'rb'))) as inf:
         namelist = set(inf.namelist())
         if 'META-INF/rights.xml' not in namelist or \
            'META-INF/encryption.xml' not in namelist:
-            raise ADEPTError('%s: not an ADEPT EPUB' % (inpath,))
+            return False
+        try:
+            rights = etree.fromstring(inf.read('META-INF/rights.xml'))
+            adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
+            expr = './/%s' % (adept('encryptedKey'),)
+            bookkey = ''.join(rights.findtext(expr))
+            if len(bookkey) == 172:
+                return True
+        except:
+            # if we couldn't check, assume it is
+            return True
+    return False
+
+def decryptBook(userkey, inpath, outpath):
+    if AES is None:
+        raise ADEPTError(u"PyCrypto or OpenSSL must be installed.")
+    rsa = RSA(userkey)
+    with closing(ZipFile(open(inpath, 'rb'))) as inf:
+        namelist = set(inf.namelist())
+        if 'META-INF/rights.xml' not in namelist or \
+           'META-INF/encryption.xml' not in namelist:
+            print u"{0:s} is DRM-free.".format(os.path.basename(inpath))
+            return 1
         for name in META_NAMES:
             namelist.remove(name)
-        rights = etree.fromstring(inf.read('META-INF/rights.xml'))
-        adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
-        expr = './/%s' % (adept('encryptedKey'),)
-        bookkey = ''.join(rights.findtext(expr))
-        bookkey = rsa.decrypt(bookkey.decode('base64'))
-        # Padded as per RSAES-PKCS1-v1_5
-        if bookkey[-17] != '\x00':
-            raise ADEPTError('problem decrypting session key')
-        encryption = inf.read('META-INF/encryption.xml')
-        decryptor = Decryptor(bookkey[-16:], encryption)
-        kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
-        with closing(ZipFile(open(outpath, 'wb'), 'w', **kwds)) as outf:
-            zi = ZipInfo('mimetype', compress_type=ZIP_STORED)
-            outf.writestr(zi, inf.read('mimetype'))
-            for path in namelist:
-                data = inf.read(path)
-                outf.writestr(path, decryptor.decrypt(path, data))
+        try:
+            rights = etree.fromstring(inf.read('META-INF/rights.xml'))
+            adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
+            expr = './/%s' % (adept('encryptedKey'),)
+            bookkey = ''.join(rights.findtext(expr))
+            if len(bookkey) != 172:
+                print u"{0:s} is not a secure Adobe Adept ePub.".format(os.path.basename(inpath))
+                return 1
+            bookkey = rsa.decrypt(bookkey.decode('base64'))
+            # Padded as per RSAES-PKCS1-v1_5
+            if bookkey[-17] != '\x00':
+                print u"Could not decrypt {0:s}. Wrong key".format(os.path.basename(inpath))
+                return 2
+            encryption = inf.read('META-INF/encryption.xml')
+            decryptor = Decryptor(bookkey[-16:], encryption)
+            kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
+            with closing(ZipFile(open(outpath, 'wb'), 'w', **kwds)) as outf:
+                zi = ZipInfo('mimetype')
+                zi.compress_type=ZIP_STORED
+                try:
+                    # if the mimetype is present, get its info, including time-stamp
+                    oldzi = inf.getinfo('mimetype')
+                    # copy across fields to be preserved
+                    zi.date_time = oldzi.date_time
+                    zi.comment = oldzi.comment
+                    zi.extra = oldzi.extra
+                    zi.internal_attr = oldzi.internal_attr
+                    # external attributes are dependent on the create system, so copy both.
+                    zi.external_attr = oldzi.external_attr
+                    zi.create_system = oldzi.create_system
+                except:
+                    pass
+                outf.writestr(zi, inf.read('mimetype'))
+                for path in namelist:
+                    data = inf.read(path)
+                    zi = ZipInfo(path)
+                    zi.compress_type=ZIP_DEFLATED
+                    try:
+                        # get the file info, including time-stamp
+                        oldzi = inf.getinfo(path)
+                        # copy across useful fields
+                        zi.date_time = oldzi.date_time
+                        zi.comment = oldzi.comment
+                        zi.extra = oldzi.extra
+                        zi.internal_attr = oldzi.internal_attr
+                        # external attributes are dependent on the create system, so copy both.
+                        zi.external_attr = oldzi.external_attr
+                        zi.create_system = oldzi.create_system
+                    except:
+                        pass
+                    outf.writestr(zi, decryptor.decrypt(path, data))
+        except:
+            print u"Could not decrypt {0:s} because of an exception:\n{1:s}".format(os.path.basename(inpath), traceback.format_exc())
+            return 2
     return 0
 
 
-def cli_main(argv=sys.argv):
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
     progname = os.path.basename(argv[0])
-    if AES is None:
-        print "%s: This script requires OpenSSL or PyCrypto, which must be" \
-              " installed separately.  Read the top-of-script comment for" \
-              " details." % (progname,)
-        return 1
     if len(argv) != 4:
-        print "usage: %s KEYFILE INBOOK OUTBOOK" % (progname,)
+        print u"usage: {0} <keyfile.der> <inbook.epub> <outbook.epub>".format(progname)
         return 1
     keypath, inpath, outpath = argv[1:]
-    return decryptBook(keypath, inpath, outpath)
-
+    userkey = open(keypath,'rb').read()
+    result = decryptBook(userkey, inpath, outpath)
+    if result == 0:
+        print u"Successfully decrypted {0:s} as {1:s}".format(os.path.basename(inpath),os.path.basename(outpath))
+    return result
 
 def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class DecryptionDialog(Tkinter.Frame):
+        def __init__(self, root):
+            Tkinter.Frame.__init__(self, root, border=5)
+            self.status = Tkinter.Label(self, text=u"Select files for decryption")
+            self.status.pack(fill=Tkconstants.X, expand=1)
+            body = Tkinter.Frame(self)
+            body.pack(fill=Tkconstants.X, expand=1)
+            sticky = Tkconstants.E + Tkconstants.W
+            body.grid_columnconfigure(1, weight=2)
+            Tkinter.Label(body, text=u"Key file").grid(row=0)
+            self.keypath = Tkinter.Entry(body, width=30)
+            self.keypath.grid(row=0, column=1, sticky=sticky)
+            if os.path.exists(u"adeptkey.der"):
+                self.keypath.insert(0, u"adeptkey.der")
+            button = Tkinter.Button(body, text=u"...", command=self.get_keypath)
+            button.grid(row=0, column=2)
+            Tkinter.Label(body, text=u"Input file").grid(row=1)
+            self.inpath = Tkinter.Entry(body, width=30)
+            self.inpath.grid(row=1, column=1, sticky=sticky)
+            button = Tkinter.Button(body, text=u"...", command=self.get_inpath)
+            button.grid(row=1, column=2)
+            Tkinter.Label(body, text=u"Output file").grid(row=2)
+            self.outpath = Tkinter.Entry(body, width=30)
+            self.outpath.grid(row=2, column=1, sticky=sticky)
+            button = Tkinter.Button(body, text=u"...", command=self.get_outpath)
+            button.grid(row=2, column=2)
+            buttons = Tkinter.Frame(self)
+            buttons.pack()
+            botton = Tkinter.Button(
+                buttons, text=u"Decrypt", width=10, command=self.decrypt)
+            botton.pack(side=Tkconstants.LEFT)
+            Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
+            button = Tkinter.Button(
+                buttons, text=u"Quit", width=10, command=self.quit)
+            button.pack(side=Tkconstants.RIGHT)
+
+        def get_keypath(self):
+            keypath = tkFileDialog.askopenfilename(
+                parent=None, title=u"Select Adobe Adept \'.der\' key file",
+                defaultextension=u".der",
+                filetypes=[('Adobe Adept DER-encoded files', '.der'),
+                           ('All Files', '.*')])
+            if keypath:
+                keypath = os.path.normpath(keypath)
+                self.keypath.delete(0, Tkconstants.END)
+                self.keypath.insert(0, keypath)
+            return
+
+        def get_inpath(self):
+            inpath = tkFileDialog.askopenfilename(
+                parent=None, title=u"Select ADEPT-encrypted ePub file to decrypt",
+                defaultextension=u".epub", filetypes=[('ePub files', '.epub')])
+            if inpath:
+                inpath = os.path.normpath(inpath)
+                self.inpath.delete(0, Tkconstants.END)
+                self.inpath.insert(0, inpath)
+            return
+
+        def get_outpath(self):
+            outpath = tkFileDialog.asksaveasfilename(
+                parent=None, title=u"Select unencrypted ePub file to produce",
+                defaultextension=u".epub", filetypes=[('ePub files', '.epub')])
+            if outpath:
+                outpath = os.path.normpath(outpath)
+                self.outpath.delete(0, Tkconstants.END)
+                self.outpath.insert(0, outpath)
+            return
+
+        def decrypt(self):
+            keypath = self.keypath.get()
+            inpath = self.inpath.get()
+            outpath = self.outpath.get()
+            if not keypath or not os.path.exists(keypath):
+                self.status['text'] = u"Specified key file does not exist"
+                return
+            if not inpath or not os.path.exists(inpath):
+                self.status['text'] = u"Specified input file does not exist"
+                return
+            if not outpath:
+                self.status['text'] = u"Output file not specified"
+                return
+            if inpath == outpath:
+                self.status['text'] = u"Must have different input and output files"
+                return
+            userkey = open(keypath,'rb').read()
+            self.status['text'] = u"Decrypting..."
+            try:
+                decrypt_status = decryptBook(userkey, inpath, outpath)
+            except Exception, e:
+                self.status['text'] = u"Error: {0}".format(e.args[0])
+                return
+            if decrypt_status == 0:
+                self.status['text'] = u"File successfully decrypted"
+            else:
+                self.status['text'] = u"The was an error decrypting the file."
+
     root = Tkinter.Tk()
-    if AES is None:
-        root.withdraw()
-        tkMessageBox.showerror(
-            "INEPT EPUB Decrypter",
-            "This script requires OpenSSL or PyCrypto, which must be"
-            " installed separately.  Read the top-of-script comment for"
-            " details.")
-        return 1
-    root.title('INEPT EPUB Decrypter')
+    root.title(u"Adobe Adept ePub Decrypter v.{0}".format(__version__))
     root.resizable(True, False)
     root.minsize(300, 0)
     DecryptionDialog(root).pack(fill=Tkconstants.X, expand=1)

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

@@ -1,13 +1,26 @@
-#! /usr/bin/env python
-# ineptpdf.pyw, version 7.11
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
 
 from __future__ import with_statement
 
-# To run this program install Python 2.6 from http://www.python.org/download/
-# and OpenSSL (already installed on Mac OS X and Linux) OR
-# 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
-# ineptpdf.pyw and double-click on it to run it.
+# 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.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.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
+#   program from the command line (pythonw ineptpdf.pyw) or by double-clicking
+#   it when it has been associated with PythonLauncher.
 
 # Revision history:
 #   1 - Initial release
@@ -36,12 +49,22 @@ from __future__ import with_statement
 #   7.9 - Bug fix for some session key errors when len(bookkey) > length required
 #   7.10 - Various tweaks to fix minor problems.
 #   7.11 - More tweaks to fix minor problems.
+#   7.12 - Revised to allow use in calibre plugins to eliminate need for duplicate code
+#   7.13 - Fixed erroneous mentions of ineptepub
+#   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.4"
 
 import sys
 import os
@@ -51,10 +74,63 @@ import struct
 import hashlib
 from itertools import chain, islice
 import xml.etree.ElementTree as etree
-import Tkinter
-import Tkconstants
-import tkFileDialog
-import tkMessageBox
+
+# 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)
+
+iswindows = sys.platform.startswith('win')
+isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        return [u"ineptpdf.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
 
 class ADEPTError(Exception):
     pass
@@ -879,8 +955,11 @@ class PSStackParser(PSBaseParser):
                 try:
                     (pos, objs) = self.end_type('d')
                     if len(objs) % 2 != 0:
-                        raise PSSyntaxError(
-                            'Invalid dictionary construct: %r' % objs)
+                        print "Incomplete dictionary construct"
+                        objs.append("") # this isn't necessary.
+                        # temporary fix. is this due to rental books?
+                        # raise PSSyntaxError(
+                        #     'Invalid dictionary construct: %r' % objs)
                     d = dict((literal_name(k), v) \
                                  for (k,v) in choplist(2, objs))
                     self.push((pos, d))
@@ -1520,9 +1599,7 @@ class PDFDocument(object):
 
     def initialize_ebx(self, password, docid, param):
         self.is_printable = self.is_modifiable = self.is_extractable = True
-        with open(password, 'rb') as f:
-            keyder = f.read()
-        rsa = RSA(keyder)
+        rsa = RSA(password)
         length = int_value(param.get('Length', 0)) / 8
         rights = str_value(param.get('ADEPT_LICENSE')).decode('base64')
         rights = zlib.decompress(rights, -15)
@@ -1907,14 +1984,14 @@ class PDFObjStrmParser(PDFParser):
 ### My own code, for which there is none else to blame
 
 class PDFSerializer(object):
-    def __init__(self, inf, keypath):
+    def __init__(self, inf, userkey):
         global GEN_XREF_STM, gen_xref_stm
         gen_xref_stm = GEN_XREF_STM > 1
         self.version = inf.read(8)
         inf.seek(0)
         self.doc = doc = PDFDocument()
         parser = PDFParser(doc, inf)
-        doc.initialize(keypath)
+        doc.initialize(userkey)
         self.objids = objids = set()
         for xref in reversed(doc.xrefs):
             trailer = xref.trailer
@@ -2097,142 +2174,150 @@ class PDFSerializer(object):
         self.write('endobj\n')
 
 
-class DecryptionDialog(Tkinter.Frame):
-    def __init__(self, root):
-        Tkinter.Frame.__init__(self, root, border=5)
-        ltext='Select file for decryption\n'
-        self.status = Tkinter.Label(self, text=ltext)
-        self.status.pack(fill=Tkconstants.X, expand=1)
-        body = Tkinter.Frame(self)
-        body.pack(fill=Tkconstants.X, expand=1)
-        sticky = Tkconstants.E + Tkconstants.W
-        body.grid_columnconfigure(1, weight=2)
-        Tkinter.Label(body, text='Key file').grid(row=0)
-        self.keypath = Tkinter.Entry(body, width=30)
-        self.keypath.grid(row=0, column=1, sticky=sticky)
-        if os.path.exists('adeptkey.der'):
-            self.keypath.insert(0, 'adeptkey.der')
-        button = Tkinter.Button(body, text="...", command=self.get_keypath)
-        button.grid(row=0, column=2)
-        Tkinter.Label(body, text='Input file').grid(row=1)
-        self.inpath = Tkinter.Entry(body, width=30)
-        self.inpath.grid(row=1, column=1, sticky=sticky)
-        button = Tkinter.Button(body, text="...", command=self.get_inpath)
-        button.grid(row=1, column=2)
-        Tkinter.Label(body, text='Output file').grid(row=2)
-        self.outpath = Tkinter.Entry(body, width=30)
-        self.outpath.grid(row=2, column=1, sticky=sticky)
-        button = Tkinter.Button(body, text="...", command=self.get_outpath)
-        button.grid(row=2, column=2)
-        buttons = Tkinter.Frame(self)
-        buttons.pack()
 
 
-        botton = Tkinter.Button(
-            buttons, text="Decrypt", width=10, command=self.decrypt)
-        botton.pack(side=Tkconstants.LEFT)
-        Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
-        button = Tkinter.Button(
-            buttons, text="Quit", width=10, command=self.quit)
-        button.pack(side=Tkconstants.RIGHT)
-
-
-    def get_keypath(self):
-        keypath = tkFileDialog.askopenfilename(
-            parent=None, title='Select ADEPT key file',
-            defaultextension='.der', filetypes=[('DER-encoded files', '.der'),
-                                                ('All Files', '.*')])
-        if keypath:
-            keypath = os.path.normpath(os.path.realpath(keypath))
-            self.keypath.delete(0, Tkconstants.END)
-            self.keypath.insert(0, keypath)
-        return
-
-    def get_inpath(self):
-        inpath = tkFileDialog.askopenfilename(
-            parent=None, title='Select ADEPT encrypted PDF file to decrypt',
-            defaultextension='.pdf', filetypes=[('PDF files', '.pdf'),
-                                                 ('All files', '.*')])
-        if inpath:
-            inpath = os.path.normpath(os.path.realpath(inpath))
-            self.inpath.delete(0, Tkconstants.END)
-            self.inpath.insert(0, inpath)
-        return
-
-    def get_outpath(self):
-        outpath = tkFileDialog.asksaveasfilename(
-            parent=None, title='Select unencrypted PDF file to produce',
-            defaultextension='.pdf', filetypes=[('PDF files', '.pdf'),
-                                                 ('All files', '.*')])
-        if outpath:
-            outpath = os.path.normpath(os.path.realpath(outpath))
-            self.outpath.delete(0, Tkconstants.END)
-            self.outpath.insert(0, outpath)
-        return
-
-    def decrypt(self):
-        keypath = self.keypath.get()
-        inpath = self.inpath.get()
-        outpath = self.outpath.get()
-        if not keypath or not os.path.exists(keypath):
-            # keyfile doesn't exist
-            self.status['text'] = 'Specified Adept key file does not exist'
-            return
-        if not inpath or not os.path.exists(inpath):
-            self.status['text'] = 'Specified input file does not exist'
-            return
-        if not outpath:
-            self.status['text'] = 'Output file not specified'
-            return
-        if inpath == outpath:
-            self.status['text'] = 'Must have different input and output files'
-            return
-        # patch for non-ascii characters
-        argv = [sys.argv[0], keypath, inpath, outpath]
-        self.status['text'] = 'Processing ...'
-        try:
-            cli_main(argv)
-        except Exception, a:
-            self.status['text'] = 'Error: ' + str(a)
-            return
-        self.status['text'] = 'File successfully decrypted.\n'+\
-                              'Close this window or decrypt another pdf file.'
-        return
-
-
-def decryptBook(keypath, inpath, outpath):
+def decryptBook(userkey, inpath, outpath):
+    if RSA is None:
+        raise ADEPTError(u"PyCrypto or OpenSSL must be installed.")
     with open(inpath, 'rb') as inf:
         try:
-            serializer = PDFSerializer(inf, keypath)
+            serializer = PDFSerializer(inf, userkey)
         except:
-            print "Error serializing pdf. Probably wrong key."
-            return 1
+            print u"Error serializing pdf {0}. Probably wrong key.".format(os.path.basename(inpath))
+            return 2
         # hope this will fix the 'bad file descriptor' problem
         with open(outpath, 'wb') as outf:
-        # help construct to make sure the method runs to the end
+            # help construct to make sure the method runs to the end
             try:
                 serializer.dump(outf)
-            except:
-                print "error writing pdf."
-                return 1
+            except Exception, e:
+                print u"error writing pdf: {0}".format(e.args[0])
+                return 2
     return 0
 
 
-def cli_main(argv=sys.argv):
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
     progname = os.path.basename(argv[0])
-    if RSA is None:
-        print "%s: This script requires OpenSSL or PyCrypto, which must be installed " \
-              "separately.  Read the top-of-script comment for details." % \
-              (progname,)
-        return 1
     if len(argv) != 4:
-        print "usage: %s KEYFILE INBOOK OUTBOOK" % (progname,)
+        print u"usage: {0} <keyfile.der> <inbook.pdf> <outbook.pdf>".format(progname)
         return 1
     keypath, inpath, outpath = argv[1:]
-    return decryptBook(keypath, inpath, outpath)
+    userkey = open(keypath,'rb').read()
+    result = decryptBook(userkey, inpath, outpath)
+    if result == 0:
+        print u"Successfully decrypted {0:s} as {1:s}".format(os.path.basename(inpath),os.path.basename(outpath))
+    return result
 
 
 def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class DecryptionDialog(Tkinter.Frame):
+        def __init__(self, root):
+            Tkinter.Frame.__init__(self, root, border=5)
+            self.status = Tkinter.Label(self, text=u"Select files for decryption")
+            self.status.pack(fill=Tkconstants.X, expand=1)
+            body = Tkinter.Frame(self)
+            body.pack(fill=Tkconstants.X, expand=1)
+            sticky = Tkconstants.E + Tkconstants.W
+            body.grid_columnconfigure(1, weight=2)
+            Tkinter.Label(body, text=u"Key file").grid(row=0)
+            self.keypath = Tkinter.Entry(body, width=30)
+            self.keypath.grid(row=0, column=1, sticky=sticky)
+            if os.path.exists(u"adeptkey.der"):
+                self.keypath.insert(0, u"adeptkey.der")
+            button = Tkinter.Button(body, text=u"...", command=self.get_keypath)
+            button.grid(row=0, column=2)
+            Tkinter.Label(body, text=u"Input file").grid(row=1)
+            self.inpath = Tkinter.Entry(body, width=30)
+            self.inpath.grid(row=1, column=1, sticky=sticky)
+            button = Tkinter.Button(body, text=u"...", command=self.get_inpath)
+            button.grid(row=1, column=2)
+            Tkinter.Label(body, text=u"Output file").grid(row=2)
+            self.outpath = Tkinter.Entry(body, width=30)
+            self.outpath.grid(row=2, column=1, sticky=sticky)
+            button = Tkinter.Button(body, text=u"...", command=self.get_outpath)
+            button.grid(row=2, column=2)
+            buttons = Tkinter.Frame(self)
+            buttons.pack()
+            botton = Tkinter.Button(
+                buttons, text=u"Decrypt", width=10, command=self.decrypt)
+            botton.pack(side=Tkconstants.LEFT)
+            Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
+            button = Tkinter.Button(
+                buttons, text=u"Quit", width=10, command=self.quit)
+            button.pack(side=Tkconstants.RIGHT)
+
+        def get_keypath(self):
+            keypath = tkFileDialog.askopenfilename(
+                parent=None, title=u"Select Adobe Adept \'.der\' key file",
+                defaultextension=u".der",
+                filetypes=[('Adobe Adept DER-encoded files', '.der'),
+                           ('All Files', '.*')])
+            if keypath:
+                keypath = os.path.normpath(keypath)
+                self.keypath.delete(0, Tkconstants.END)
+                self.keypath.insert(0, keypath)
+            return
+
+        def get_inpath(self):
+            inpath = tkFileDialog.askopenfilename(
+                parent=None, title=u"Select ADEPT-encrypted PDF file to decrypt",
+                defaultextension=u".pdf", filetypes=[('PDF files', '.pdf')])
+            if inpath:
+                inpath = os.path.normpath(inpath)
+                self.inpath.delete(0, Tkconstants.END)
+                self.inpath.insert(0, inpath)
+            return
+
+        def get_outpath(self):
+            outpath = tkFileDialog.asksaveasfilename(
+                parent=None, title=u"Select unencrypted PDF file to produce",
+                defaultextension=u".pdf", filetypes=[('PDF files', '.pdf')])
+            if outpath:
+                outpath = os.path.normpath(outpath)
+                self.outpath.delete(0, Tkconstants.END)
+                self.outpath.insert(0, outpath)
+            return
+
+        def decrypt(self):
+            keypath = self.keypath.get()
+            inpath = self.inpath.get()
+            outpath = self.outpath.get()
+            if not keypath or not os.path.exists(keypath):
+                self.status['text'] = u"Specified key file does not exist"
+                return
+            if not inpath or not os.path.exists(inpath):
+                self.status['text'] = u"Specified input file does not exist"
+                return
+            if not outpath:
+                self.status['text'] = u"Output file not specified"
+                return
+            if inpath == outpath:
+                self.status['text'] = u"Must have different input and output files"
+                return
+            userkey = open(keypath,'rb').read()
+            self.status['text'] = u"Decrypting..."
+            try:
+                decrypt_status = decryptBook(userkey, inpath, outpath)
+            except Exception, e:
+                self.status['text'] = u"Error; {0}".format(e.args[0])
+                return
+            if decrypt_status == 0:
+                self.status['text'] = u"File successfully decrypted"
+            else:
+                self.status['text'] = u"The was an error decrypting the file."
+
+
     root = Tkinter.Tk()
     if RSA is None:
         root.withdraw()
@@ -2241,7 +2326,7 @@ def gui_main():
             "This script requires OpenSSL or PyCrypto, which must be installed "
             "separately.  Read the top-of-script comment for details.")
         return 1
-    root.title('INEPT PDF Decrypter')
+    root.title(u"Adobe Adept PDF Decrypter v.{0}".format(__version__))
     root.resizable(True, False)
     root.minsize(370, 0)
     DecryptionDialog(root).pack(fill=Tkconstants.X, expand=1)

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

@@ -1,333 +0,0 @@
-# engine to remove drm from Kindle for Mac books
-# for personal use for archiving and converting your ebooks
-#  PLEASE DO NOT PIRATE!
-# We want all authors and Publishers, and eBook stores to live long and prosperous lives
-#
-# it borrows heavily from works by CMBDTC, IHeartCabbages, skindle,
-#    unswindle, DiapDealer, some_updates and many many others
-
-from __future__ import with_statement
-
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-
-import sys
-sys.stdout=Unbuffered(sys.stdout)
-import os, csv, getopt
-from struct import pack
-from struct import unpack
-import zlib
-
-# for handling sub processes
-import subprocess
-from subprocess import Popen, PIPE, STDOUT
-import subasyncio
-from subasyncio import Process
-
-
-#Exception Handling
-class K4MDEDRMError(Exception):
-    pass
-class K4MDEDRMFatal(Exception):
-    pass
-
-#
-# crypto routines
-#
-import hashlib
-
-def MD5(message):
-    ctx = hashlib.md5()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA1(message):
-    ctx = hashlib.sha1()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA256(message):
-    ctx = hashlib.sha256()
-    ctx.update(message)
-    return ctx.digest()
-
-# interface to needed routines in openssl's libcrypto
-def _load_crypto_libcrypto():
-    from ctypes import CDLL, byref, POINTER, c_void_p, c_char_p, c_int, c_long, \
-        Structure, c_ulong, create_string_buffer, addressof, string_at, cast
-    from ctypes.util import find_library
-
-    libcrypto = find_library('crypto')
-    if libcrypto is None:
-        raise K4MDEDRMError('libcrypto not found')
-    libcrypto = CDLL(libcrypto)
-
-    AES_MAXNR = 14
-    c_char_pp = POINTER(c_char_p)
-    c_int_p = POINTER(c_int)
-
-    class AES_KEY(Structure):
-        _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))), ('rounds', c_int)]
-    AES_KEY_p = POINTER(AES_KEY)
-
-    def F(restype, name, argtypes):
-        func = getattr(libcrypto, name)
-        func.restype = restype
-        func.argtypes = argtypes
-        return func
-
-    AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',[c_char_p, c_char_p, c_ulong, AES_KEY_p, c_char_p,c_int])
-
-    AES_set_decrypt_key = F(c_int, 'AES_set_decrypt_key',[c_char_p, c_int, AES_KEY_p])
-
-    PKCS5_PBKDF2_HMAC_SHA1 = F(c_int, 'PKCS5_PBKDF2_HMAC_SHA1',
-                                [c_char_p, c_ulong, c_char_p, c_ulong, c_ulong, c_ulong, c_char_p])
-
-    class LibCrypto(object):
-        def __init__(self):
-            self._blocksize = 0
-            self._keyctx = None
-            self.iv = 0
-        def set_decrypt_key(self, userkey, iv):
-            self._blocksize = len(userkey)
-            if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
-                raise K4MDEDRMError('AES improper key used')
-                return
-            keyctx = self._keyctx = AES_KEY()
-            self.iv = iv
-            rv = AES_set_decrypt_key(userkey, len(userkey) * 8, keyctx)
-            if rv < 0:
-                raise K4MDEDRMError('Failed to initialize AES key')
-        def decrypt(self, data):
-            out = create_string_buffer(len(data))
-            rv = AES_cbc_encrypt(data, out, len(data), self._keyctx, self.iv, 0)
-            if rv == 0:
-                raise K4MDEDRMError('AES decryption failed')
-            return out.raw
-        def keyivgen(self, passwd):
-            salt = '16743'
-            saltlen = 5
-            passlen = len(passwd)
-            iter = 0x3e8
-            keylen = 80
-            out = create_string_buffer(keylen)
-            rv = PKCS5_PBKDF2_HMAC_SHA1(passwd, passlen, salt, saltlen, iter, keylen, out)
-            return out.raw
-    return LibCrypto
-
-def _load_crypto():
-    LibCrypto = None
-    try:
-        LibCrypto = _load_crypto_libcrypto()
-    except (ImportError, K4MDEDRMError):
-        pass
-    return LibCrypto
-
-LibCrypto = _load_crypto()
-
-#
-# Utility Routines
-#
-
-# uses a sub process to get the Hard Drive Serial Number using ioreg
-# returns with the first found serial number in that class
-def GetVolumeSerialNumber():
-    sernum = os.getenv('MYSERIALNUMBER')
-    if sernum != None:
-        return sernum
-    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p = Process(cmdline, shell=True, bufsize=1, stdin=None, stdout=PIPE, stderr=PIPE, close_fds=False)
-    poll = p.wait('wait')
-    results = p.read()
-    reslst = results.split('\n')
-    cnt = len(reslst)
-    bsdname = None
-    sernum = None
-    foundIt = False
-    for j in xrange(cnt):
-        resline = reslst[j]
-        pp = resline.find('"Serial Number" = "')
-        if pp >= 0:
-            sernum = resline[pp+19:-1]
-            sernum = sernum.strip()
-        bb = resline.find('"BSD Name" = "')
-        if bb >= 0:
-            bsdname = resline[bb+14:-1]
-            bsdname = bsdname.strip()
-            if (bsdname == 'disk0') and (sernum != None):
-                foundIt = True
-                break
-    if not foundIt:
-        sernum = '9999999999'
-    return sernum
-
-# uses unix env to get username instead of using sysctlbyname
-def GetUserName():
-    username = os.getenv('USER')
-    return username
-
-MAX_PATH = 255
-
-#
-# start of Kindle specific routines
-#
-
-global kindleDatabase
-
-# Various character maps used to decrypt books. Probably supposed to act as obfuscation
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM"
-charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
-
-# Encode the bytes in data with the characters in map
-def encode(data, map):
-    result = ""
-    for char in data:
-        value = ord(char)
-        Q = (value ^ 0x80) // len(map)
-        R = value % len(map)
-        result += map[Q]
-        result += map[R]
-    return result
-
-# Hash the bytes in data and then encode the digest with the characters in map
-def encodeHash(data,map):
-    return encode(MD5(data),map)
-
-# Decode the string in data with the characters in map. Returns the decoded bytes
-def decode(data,map):
-    result = ""
-    for i in range (0,len(data)-1,2):
-        high = map.find(data[i])
-        low = map.find(data[i+1])
-        if (high == -1) or (low == -1) :
-            break
-        value = (((high * len(map)) ^ 0x80) & 0xFF) + low
-        result += pack("B",value)
-    return result
-
-# implements an Pseudo Mac Version of Windows built-in Crypto routine
-def CryptUnprotectData(encryptedData):
-    sp = GetVolumeSerialNumber() + '!@#' + GetUserName()
-    passwdData = encode(SHA256(sp),charMap1)
-    crp = LibCrypto()
-    key_iv = crp.keyivgen(passwdData)
-    key = key_iv[0:32]
-    iv = key_iv[32:48]
-    crp.set_decrypt_key(key,iv)
-    cleartext = crp.decrypt(encryptedData)
-    return cleartext
-
-# Locate and open the .kindle-info file
-def openKindleInfo():
-    home = os.getenv('HOME')
-    kinfopath = home +  '/Library/Application Support/Amazon/Kindle/storage/.kindle-info'
-    if not os.path.exists(kinfopath):
-        kinfopath = home +  '/Library/Application Support/Amazon/Kindle for Mac/storage/.kindle-info'
-        if not os.path.exists(kinfopath):
-            raise K4MDEDRMError('Error: .kindle-info file can not be found')
-    return open(kinfopath,'r')
-
-# Parse the Kindle.info file and return the records as a list of key-values
-def parseKindleInfo():
-    DB = {}
-    infoReader = openKindleInfo()
-    infoReader.read(1)
-    data = infoReader.read()
-    items = data.split('[')
-    for item in items:
-        splito = item.split(':')
-        DB[splito[0]] =splito[1]
-    return DB
-
-# Get a record from the Kindle.info file for the key "hashedKey" (already hashed and encoded). Return the decoded and decrypted record
-def getKindleInfoValueForHash(hashedKey):
-    global kindleDatabase
-    encryptedValue = decode(kindleDatabase[hashedKey],charMap2)
-    cleartext = CryptUnprotectData(encryptedValue)
-    return decode(cleartext, charMap1)
-
-#  Get a record from the Kindle.info file for the string in "key" (plaintext). Return the decoded and decrypted record
-def getKindleInfoValueForKey(key):
-    return getKindleInfoValueForHash(encodeHash(key,charMap2))
-
-# Find if the original string for a hashed/encoded string is known. If so return the original string othwise return an empty string.
-def findNameForHash(hash):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
-    result = ""
-    for name in names:
-        if hash == encodeHash(name, charMap2):
-            result = name
-            break
-    return result
-
-# Print all the records from the kindle.info file (option -i)
-def printKindleInfo():
-    for record in kindleDatabase:
-        name = findNameForHash(record)
-        if name != "" :
-            print (name)
-            print ("--------------------------")
-        else :
-            print ("Unknown Record")
-        print getKindleInfoValueForHash(record)
-        print "\n"
-
-#
-# PID generation routines
-#
-
-# Returns two bit at offset from a bit field
-def getTwoBitsFromBitField(bitField,offset):
-    byteNumber = offset // 4
-    bitPosition = 6 - 2*(offset % 4)
-    return ord(bitField[byteNumber]) >> bitPosition & 3
-
-# Returns the six bits at offset from a bit field
-def getSixBitsFromBitField(bitField,offset):
-    offset *= 3
-    value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
-    return value
-
-# 8 bits to six bits encoding from hash to generate PID string
-def encodePID(hash):
-    global charMap3
-    PID = ""
-    for position in range (0,8):
-        PID += charMap3[getSixBitsFromBitField(hash,position)]
-    return PID
-
-
-#
-# Main
-#
-
-def main(argv=sys.argv):
-    global kindleDatabase
-
-    kindleDatabase = None
-
-    #
-    # Read the encrypted database
-    #
-
-    try:
-        kindleDatabase = parseKindleInfo()
-    except Exception, message:
-        print(message)
-
-    if kindleDatabase != None :
-        printKindleInfo()
-
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main())

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

@@ -1,40 +1,73 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 from __future__ import with_statement
 
-# engine to remove drm from Kindle for Mac and Kindle for PC books
+# k4mobidedrm.py, version 5.3
+# Copyright © 2009-2015 by ApprenticeHarper et al.
+
+# engine to remove drm from Kindle and Mobipocket ebooks
 # for personal use for archiving and converting your ebooks
 
 # PLEASE DO NOT PIRATE EBOOKS!
 
-# We want all authors and publishers, and eBook stores to live
+# We want all authors and publishers, and ebook stores to live
 # long and prosperous lives but at the same time  we just want to
 # be able to read OUR books on whatever device we want and to keep
 # readable for a long, long time
 
-#  This borrows very heavily from works by CMBDTC, IHeartCabbages, skindle,
+# This borrows very heavily from works by CMBDTC, IHeartCabbages, skindle,
 #    unswindle, DarkReverser, ApprenticeAlf, DiapDealer, some_updates
 #    and many many others
+# Special thanks to The Dark Reverser for MobiDeDrm and CMBDTC for cmbdtc_dump
+# from which this script borrows most unashamedly.
 
 
-__version__ = '4.4'
+# Changelog
+#  1.0 - Name change to k4mobidedrm. Adds Mac support, Adds plugin code
+#  1.1 - Adds support for additional kindle.info files
+#  1.2 - Better error handling for older Mobipocket
+#  1.3 - Don't try to decrypt Topaz books
+#  1.7 - Add support for Topaz books and Kindle serial numbers. Split code.
+#  1.9 - Tidy up after Topaz, minor exception changes
+#  2.1 - Topaz fix and filename sanitizing
+#  2.2 - Topaz Fix and minor Mac code fix
+#  2.3 - More Topaz fixes
+#  2.4 - K4PC/Mac key generation fix
+#  2.6 - Better handling of non-K4PC/Mac ebooks
+#  2.7 - Better trailing bytes handling in mobidedrm
+#  2.8 - Moved parsing of kindle.info files to mac & pc util files.
+#  3.1 - Updated for new calibre interface. Now __init__ in plugin.
+#  3.5 - Now support Kindle for PC/Mac 1.6
+#  3.6 - Even better trailing bytes handling in mobidedrm
+#  3.7 - Add support for Amazon Print Replica ebooks.
+#  3.8 - Improved Topaz support
+#  4.1 - Improved Topaz support and faster decryption with alfcrypto
+#  4.2 - Added support for Amazon's KF8 format ebooks
+#  4.4 - Linux calls to Wine added, and improved configuration dialog
+#  4.5 - Linux works again without Wine. Some Mac key file search changes
+#  4.6 - First attempt to handle unicode properly
+#  4.7 - Added timing reports, and changed search for Mac key files
+#  4.8 - Much better unicode handling, matching the updated inept and ignoble scripts
+#      - Moved back into plugin, __init__ in plugin now only contains plugin code.
+#  4.9 - Missed some invalid characters in cleanup_name
+#  5.0 - Extraction of info from Kindle for PC/Mac moved into kindlekey.py
+#      - tweaked GetDecryptedBook interface to leave passed parameters unchanged
+#  5.1 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  5.2 - Fixed error in command line processing of unicode arguments
+#  5.3 - Changed Android support to allow passing of backup .ab files
 
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
+__version__ = '5.3'
 
-import sys
-import os, csv, getopt
-import string
+
+import sys, os, re
+import csv
+import getopt
 import re
 import traceback
-
-buildXML = False
+import time
+import htmlentitydefs
+import json
 
 class DrmException(Exception):
     pass
@@ -45,160 +78,241 @@ else:
     inCalibre = False
 
 if inCalibre:
-    from calibre_plugins.k4mobidedrm import mobidedrm
-    from calibre_plugins.k4mobidedrm import topazextract
-    from calibre_plugins.k4mobidedrm import kgenpids
+    from calibre_plugins.dedrm import mobidedrm
+    from calibre_plugins.dedrm import topazextract
+    from calibre_plugins.dedrm import kgenpids
+    from calibre_plugins.dedrm import androidkindlekey
 else:
     import mobidedrm
     import topazextract
     import kgenpids
+    import androidkindlekey
+
+# 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)
+
+iswindows = sys.platform.startswith('win')
+isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
 
 
-# cleanup bytestring filenames
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"mobidedrm.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+# cleanup unicode filenames
 # borrowed from calibre from calibre/src/calibre/__init__.py
-# added in removal of non-printing chars
-# and removal of . at start
-# convert underscores to spaces (we're OK with spaces in file names)
+# added in removal of control (<32) chars
+# and removal of . at start and end
+# and with some (heavily edited) code from Paul Durrant's kindlenamer.py
 def cleanup_name(name):
-    _filename_sanitize = re.compile(r'[\xae\0\\|\?\*<":>\+/]')
-    substitute='_'
-    one = ''.join(char for char in name if char in string.printable)
-    one = _filename_sanitize.sub(substitute, one)
-    one = re.sub(r'\s', ' ', one).strip()
-    one = re.sub(r'^\.+$', '_', one)
-    one = one.replace('..', substitute)
-    # Windows doesn't like path components that end with a period
-    if one.endswith('.'):
-        one = one[:-1]+substitute
-    # Mac and Unix don't like file names that begin with a full stop
-    if len(one) > 0 and one[0] == '.':
-        one = substitute+one[1:]
-    one = one.replace('_',' ')
-    return one
+    # substitute filename unfriendly characters
+    name = name.replace(u"<",u"[").replace(u">",u"]").replace(u" : ",u" – ").replace(u": ",u" – ").replace(u":",u"—").replace(u"/",u"_").replace(u"\\",u"_").replace(u"|",u"_").replace(u"\"",u"\'").replace(u"*",u"_").replace(u"?",u"")
+    # delete control characters
+    name = u"".join(char for char in name if ord(char)>=32)
+    # white space to single space, delete leading and trailing while space
+    name = re.sub(ur"\s", u" ", name).strip()
+    # remove leading dots
+    while len(name)>0 and name[0] == u".":
+        name = name[1:]
+    # remove trailing dots (Windows doesn't like them)
+    if name.endswith(u'.'):
+        name = name[:-1]
+    return name
 
-def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
-    global buildXML
+# must be passed unicode
+def unescape(text):
+    def fixup(m):
+        text = m.group(0)
+        if text[:2] == u"&#":
+            # character reference
+            try:
+                if text[:3] == u"&#x":
+                    return unichr(int(text[3:-1], 16))
+                else:
+                    return unichr(int(text[2:-1]))
+            except ValueError:
+                pass
+        else:
+            # named entity
+            try:
+                text = unichr(htmlentitydefs.name2codepoint[text[1:-1]])
+            except KeyError:
+                pass
+        return text # leave as is
+    return re.sub(u"&#?\w+;", fixup, text)
 
+def GetDecryptedBook(infile, kDatabases, androidFiles, serials, pids, starttime = time.time()):
     # handle the obvious cases at the beginning
     if not os.path.isfile(infile):
-        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: Input file does not exist"
-        return 1
+        raise DrmException(u"Input file does not exist.")
 
     mobi = True
-    magic3 = file(infile,'rb').read(3)
+    magic3 = open(infile,'rb').read(3)
     if magic3 == 'TPZ':
         mobi = False
 
-    bookname = os.path.splitext(os.path.basename(infile))[0]
-
     if mobi:
         mb = mobidedrm.MobiBook(infile)
     else:
         mb = topazextract.TopazBook(infile)
 
-    title = mb.getBookTitle()
-    print "Processing Book: ", title
-    filenametitle = cleanup_name(title)
-    outfilename = cleanup_name(bookname)
-    
-    # generate 'sensible' filename, that will sort with the original name,
-    # but is close to the name from the file.
-    outlength = len(outfilename)
-    comparelength = min(8,min(outlength,len(filenametitle)))
-    copylength = min(max(outfilename.find(' '),8),len(outfilename))
-    if outlength==0:
-        outfilename = filenametitle
-    elif comparelength > 0:
-    	if outfilename[:comparelength] == filenametitle[:comparelength]:
-        	outfilename = filenametitle
-        else:
-        	outfilename = outfilename[:copylength] + " " + filenametitle
+    bookname = unescape(mb.getBookTitle())
+    print u"Decrypting {1} ebook: {0}".format(bookname, mb.getBookType())
+
+    # copy list of pids
+    totalpids = list(pids)
+    # extend list of serials with serials from android databases
+    for aFile in androidFiles:
+        serials.extend(androidkindlekey.get_serials(aFile))
+    # extend PID list with book-specific PIDs from seriala and kDatabases
+    md1, md2 = mb.getPIDMetaInfo()
+    totalpids.extend(kgenpids.getPidList(md1, md2, serials, kDatabases))
+    # remove any duplicates
+    totalpid = list(set(totalpids))
+    print u"Found {1:d} keys to try after {0:.1f} seconds".format(time.time()-starttime, len(totalpids))
+
+    try:
+        mb.processBook(totalpids)
+    except:
+        mb.cleanup
+        raise
+
+    print u"Decryption succeeded after {0:.1f} seconds".format(time.time()-starttime)
+    return mb
+
+
+# kDatabaseFiles is a list of files created by kindlekey
+def decryptBook(infile, outdir, kDatabaseFiles, androidFiles, serials, pids):
+    starttime = time.time()
+    kDatabases = []
+    for dbfile in kDatabaseFiles:
+        kindleDatabase = {}
+        try:
+            with open(dbfile, 'r') as keyfilein:
+                kindleDatabase = json.loads(keyfilein.read())
+            kDatabases.append([dbfile,kindleDatabase])
+        except Exception, e:
+            print u"Error getting database from file {0:s}: {1:s}".format(dbfile,e)
+            traceback.print_exc()
+
+
+
+    try:
+        book = GetDecryptedBook(infile, kDatabases, androidFiles, serials, pids, starttime)
+    except Exception, e:
+        print u"Error decrypting book after {1:.1f} seconds: {0}".format(e.args[0],time.time()-starttime)
+        traceback.print_exc()
+        return 1
+
+    # if we're saving to the same folder as the original, use file name_
+    # if to a different folder, use book name
+    if os.path.normcase(os.path.normpath(outdir)) == os.path.normcase(os.path.normpath(os.path.dirname(infile))):
+        outfilename = os.path.splitext(os.path.basename(infile))[0]
+    else:
+        outfilename = cleanup_name(book.getBookTitle())
 
     # avoid excessively long file names
     if len(outfilename)>150:
-        outfilename = outfilename[:150]
+        outfilename = outfilename[:99]+"--"+outfilename[-49:]
 
-    # build pid list
-    md1, md2 = mb.getPIDMetaInfo()
-    pidlst = kgenpids.getPidList(md1, md2, k4, pids, serials, kInfoFiles)
+    outfilename = outfilename+u"_nodrm"
+    outfile = os.path.join(outdir, outfilename + book.getBookExtension())
 
-    try:
-        mb.processBook(pidlst)
+    book.getFile(outfile)
+    print u"Saved decrypted book {1:s} after {0:.1f} seconds".format(time.time()-starttime, outfilename)
 
-    except mobidedrm.DrmException, e:
-        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
-        return 1
-    except topazextract.TpzDRMError, e:
-        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
-        return 1
-    except Exception, e:
-        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
-        return 1
-
-    if mobi:
-        if mb.getPrintReplica():
-            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.azw4')
-        elif mb.getMobiVersion() >= 8:
-            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.azw3')
-        else:
-            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
-        mb.getMobiFile(outfile)
-        return 0
-
-    # topaz:
-    print "   Creating NoDRM HTMLZ Archive"
-    zipname = os.path.join(outdir, outfilename + '_nodrm' + '.htmlz')
-    mb.getHTMLZip(zipname)
-
-    print "   Creating SVG ZIP Archive"
-    zipname = os.path.join(outdir, outfilename + '_SVG' + '.zip')
-    mb.getSVGZip(zipname)
-
-    if buildXML:
-        print "   Creating XML ZIP Archive"
-        zipname = os.path.join(outdir, outfilename + '_XML' + '.zip')
-        mb.getXMLZip(zipname)
+    if book.getBookType()==u"Topaz":
+        zipname = os.path.join(outdir, outfilename + u"_SVG.zip")
+        book.getSVGZip(zipname)
+        print u"Saved SVG ZIP Archive for {1:s} after {0:.1f} seconds".format(time.time()-starttime, outfilename)
 
     # remove internal temporary directory of Topaz pieces
-    mb.cleanup()
-
+    book.cleanup()
     return 0
 
 
 def usage(progname):
-    print "Removes DRM protection from K4PC/M, Kindle, Mobi and Topaz ebooks"
-    print "Usage:"
-    print "    %s [-k <kindle.info>] [-p <pidnums>] [-s <kindleSerialNumbers>] <infile> <outdir>  " % progname
+    print u"Removes DRM protection from Mobipocket, Amazon KF8, Amazon Print Replica and Amazon Topaz ebooks"
+    print u"Usage:"
+    print u"    {0} [-k <kindle.k4i>] [-p <comma separated PIDs>] [-s <comma separated Kindle serial numbers>] [ -a <AmazonSecureStorage.xml|backup.ab> ] <infile> <outdir>".format(progname)
 
 #
 # Main
 #
-def main(argv=sys.argv):
+def cli_main():
+    argv=unicode_argv()
     progname = os.path.basename(argv[0])
-
-    k4 = False
-    kInfoFiles = []
-    serials = []
-    pids = []
-
-    print ('K4MobiDeDrm v%(__version__)s '
-           'provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, ApprenticeAlf, etc .' % globals())
+    print u"K4MobiDeDrm v{0}.\nCopyright © 2008-2013 The Dark Reverser et al.".format(__version__)
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
+        opts, args = getopt.getopt(argv[1:], "k:p:s:a:")
     except getopt.GetoptError, err:
-        print str(err)
+        print u"Error in options or arguments: {0}".format(err.args[0])
         usage(progname)
         sys.exit(2)
     if len(args)<2:
         usage(progname)
         sys.exit(2)
 
+    infile = args[0]
+    outdir = args[1]
+    kDatabaseFiles = []
+    androidFiles = []
+    serials = []
+    pids = []
+
     for o, a in opts:
         if o == "-k":
             if a == None :
                 raise DrmException("Invalid parameter for -k")
-            kInfoFiles.append(a)
+            kDatabaseFiles.append(a)
         if o == "-p":
             if a == None :
                 raise DrmException("Invalid parameter for -p")
@@ -207,17 +321,18 @@ def main(argv=sys.argv):
             if a == None :
                 raise DrmException("Invalid parameter for -s")
             serials = a.split(',')
+        if o == '-a':
+            if a == None:
+                raise DrmException("Invalid parameter for -a")
+            androidFiles.append(a)
 
-    # try with built in Kindle Info files
-    k4 = True
-    if sys.platform.startswith('linux'):
-        k4 = False
-        kInfoFiles = None
-    infile = args[0]
-    outdir = args[1]
-    return decryptBook(infile, outdir, k4, kInfoFiles, serials, pids)
+    # try with built in Kindle Info files if not on Linux
+    k4 = not sys.platform.startswith('linux')
+
+    return decryptBook(infile, outdir, kDatabaseFiles, androidFiles, serials, pids)
 
 
 if __name__ == '__main__':
-    sys.stdout=Unbuffered(sys.stdout)
-    sys.exit(main())
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    sys.exit(cli_main())

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

@@ -1,749 +0,0 @@
-# standlone set of Mac OSX specific routines needed for KindleBooks
-
-from __future__ import with_statement
-
-import sys
-import os
-import os.path
-import re
-import copy
-import subprocess
-from struct import pack, unpack, unpack_from
-
-class DrmException(Exception):
-    pass
-
-
-# interface to needed routines in openssl's libcrypto
-def _load_crypto_libcrypto():
-    from ctypes import CDLL, byref, POINTER, c_void_p, c_char_p, c_int, c_long, \
-        Structure, c_ulong, create_string_buffer, addressof, string_at, cast
-    from ctypes.util import find_library
-
-    libcrypto = find_library('crypto')
-    if libcrypto is None:
-        raise DrmException('libcrypto not found')
-    libcrypto = CDLL(libcrypto)
-
-    # From OpenSSL's crypto aes header
-    #
-    # AES_ENCRYPT     1
-    # AES_DECRYPT     0
-    # AES_MAXNR 14 (in bytes)
-    # AES_BLOCK_SIZE 16 (in bytes)
-    # 
-    # struct aes_key_st {
-    #    unsigned long rd_key[4 *(AES_MAXNR + 1)];
-    #    int rounds;
-    # };
-    # typedef struct aes_key_st AES_KEY;
-    #
-    # int AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key);
-    #
-    # note:  the ivec string, and output buffer are both mutable
-    # void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-    #     const unsigned long length, const AES_KEY *key, unsigned char *ivec, const int enc);
-
-    AES_MAXNR = 14
-    c_char_pp = POINTER(c_char_p)
-    c_int_p = POINTER(c_int)
-
-    class AES_KEY(Structure):
-        _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))), ('rounds', c_int)]
-    AES_KEY_p = POINTER(AES_KEY)
-
-    def F(restype, name, argtypes):
-        func = getattr(libcrypto, name)
-        func.restype = restype
-        func.argtypes = argtypes
-        return func
-
-    AES_cbc_encrypt = F(None, 'AES_cbc_encrypt',[c_char_p, c_char_p, c_ulong, AES_KEY_p, c_char_p,c_int])
-
-    AES_set_decrypt_key = F(c_int, 'AES_set_decrypt_key',[c_char_p, c_int, AES_KEY_p])
-
-    # From OpenSSL's Crypto evp/p5_crpt2.c
-    #
-    # int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-    #                        const unsigned char *salt, int saltlen, int iter,
-    #                        int keylen, unsigned char *out);
-
-    PKCS5_PBKDF2_HMAC_SHA1 = F(c_int, 'PKCS5_PBKDF2_HMAC_SHA1',
-                                [c_char_p, c_ulong, c_char_p, c_ulong, c_ulong, c_ulong, c_char_p])
-
-    class LibCrypto(object):
-        def __init__(self):
-            self._blocksize = 0
-            self._keyctx = None
-            self._iv = 0
-
-        def set_decrypt_key(self, userkey, iv):
-            self._blocksize = len(userkey)
-            if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
-                raise DrmException('AES improper key used')
-                return
-            keyctx = self._keyctx = AES_KEY()
-            self._iv = iv
-            self._userkey = userkey
-            rv = AES_set_decrypt_key(userkey, len(userkey) * 8, keyctx)
-            if rv < 0:
-                raise DrmException('Failed to initialize AES key')
-
-        def decrypt(self, data):
-            out = create_string_buffer(len(data))
-            mutable_iv = create_string_buffer(self._iv, len(self._iv))
-            keyctx = self._keyctx
-            rv = AES_cbc_encrypt(data, out, len(data), keyctx, mutable_iv, 0)
-            if rv == 0:
-                raise DrmException('AES decryption failed')
-            return out.raw
-
-        def keyivgen(self, passwd, salt, iter, keylen):
-            saltlen = len(salt)
-            passlen = len(passwd)
-            out = create_string_buffer(keylen)
-            rv = PKCS5_PBKDF2_HMAC_SHA1(passwd, passlen, salt, saltlen, iter, keylen, out)
-            return out.raw
-    return LibCrypto
-
-def _load_crypto():
-    LibCrypto = None
-    try:
-        LibCrypto = _load_crypto_libcrypto()
-    except (ImportError, DrmException):
-        pass
-    return LibCrypto
-
-LibCrypto = _load_crypto()
-
-#
-# Utility Routines
-#
-
-# crypto digestroutines
-import hashlib
-
-def MD5(message):
-    ctx = hashlib.md5()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA1(message):
-    ctx = hashlib.sha1()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA256(message):
-    ctx = hashlib.sha256()
-    ctx.update(message)
-    return ctx.digest()
-
-# Various character maps used to decrypt books. Probably supposed to act as obfuscation
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM"
-
-# For kinf approach of K4Mac 1.6.X or later
-# On K4PC charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
-# For Mac they seem to re-use charMap2 here
-charMap5 = charMap2
-
-# new in K4M 1.9.X
-testMap8 = "YvaZ3FfUm9Nn_c1XuG4yCAzB0beVg-TtHh5SsIiR6rJjQdW2wEq7KkPpL8lOoMxD"
-
-
-def encode(data, map):
-    result = ""
-    for char in data:
-        value = ord(char)
-        Q = (value ^ 0x80) // len(map)
-        R = value % len(map)
-        result += map[Q]
-        result += map[R]
-    return result
-
-# Hash the bytes in data and then encode the digest with the characters in map
-def encodeHash(data,map):
-    return encode(MD5(data),map)
-
-# Decode the string in data with the characters in map. Returns the decoded bytes
-def decode(data,map):
-    result = ""
-    for i in range (0,len(data)-1,2):
-        high = map.find(data[i])
-        low = map.find(data[i+1])
-        if (high == -1) or (low == -1) :
-            break
-        value = (((high * len(map)) ^ 0x80) & 0xFF) + low
-        result += pack("B",value)
-    return result
-
-# For K4M 1.6.X and later
-# generate table of prime number less than or equal to int n
-def primes(n):
-    if n==2: return [2]
-    elif n<2: return []
-    s=range(3,n+1,2)
-    mroot = n ** 0.5
-    half=(n+1)/2-1
-    i=0
-    m=3
-    while m <= mroot:
-        if s[i]:
-            j=(m*m-3)/2
-            s[j]=0
-            while j<half:
-                s[j]=0
-                j+=m
-        i=i+1
-        m=2*i+3
-    return [2]+[x for x in s if x]
-
-
-# uses a sub process to get the Hard Drive Serial Number using ioreg
-# returns with the serial number of drive whose BSD Name is "disk0"
-def GetVolumeSerialNumber():
-    sernum = os.getenv('MYSERIALNUMBER')
-    if sernum != None:
-        return sernum
-    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
-    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)
-    bsdname = None
-    sernum = None
-    foundIt = False
-    for j in xrange(cnt):
-        resline = reslst[j]
-        pp = resline.find('"Serial Number" = "')
-        if pp >= 0:
-            sernum = resline[pp+19:-1]
-            sernum = sernum.strip()
-        bb = resline.find('"BSD Name" = "')
-        if bb >= 0:
-            bsdname = resline[bb+14:-1]
-            bsdname = bsdname.strip()
-            if (bsdname == 'disk0') and (sernum != None):
-                foundIt = True
-                break
-    if not foundIt:
-        sernum = ''
-    return sernum
-
-def GetUserHomeAppSupKindleDirParitionName():
-    home = os.getenv('HOME')
-    dpath =  home + '/Library'
-    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
-
-# uses a sub process to get the UUID of the specified disk partition using ioreg
-def GetDiskPartitionUUID(diskpart):
-    uuidnum = os.getenv('MYUUIDNUMBER')
-    if uuidnum != None:
-        return uuidnum
-    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
-    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)
-    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 not foundIt:
-        uuidnum = ''
-    return uuidnum
-
-def GetMACAddressMunged():
-    macnum = os.getenv('MYMACNUM')
-    if macnum != None:
-        return macnum
-    cmdline = '/sbin/ifconfig 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 ')
-        if pp >= 0:
-            macnum = resline[pp+6:-1]
-            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
-            for i in range(6):
-                maclst[i] = int('0x' + maclst[i], 0)
-            mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
-            mlst[5] = maclst[5] ^ 0xa5
-            mlst[4] = maclst[3] ^ 0xa5
-            mlst[3] = maclst[4] ^ 0xa5
-            mlst[2] = maclst[2] ^ 0xa5
-            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 not foundIt:
-        macnum = ''
-    return macnum
-
-
-# uses unix env to get username instead of using sysctlbyname
-def GetUserName():
-    username = os.getenv('USER')
-    return username
-
-def isNewInstall():
-    home = os.getenv('HOME')
-    # soccer game fan anyone
-    dpath = home + '/Library/Application Support/Kindle/storage/.pes2011'
-    # print dpath, os.path.exists(dpath)
-    if os.path.exists(dpath):
-        return True
-    dpath = home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support/Kindle/storage/.pes2011'
-    # print dpath, os.path.exists(dpath)
-    if os.path.exists(dpath):
-        return True
-    return False
-
-
-def GetIDString():
-    # K4Mac now has an extensive set of ids strings it uses
-    # in encoding pids and in creating unique passwords
-    # for use in its own version of CryptUnprotectDataV2
-
-    # BUT Amazon has now become nasty enough to detect when its app
-    # is being run under a debugger and actually changes code paths
-    # including which one of these strings is chosen, all to try
-    # to prevent reverse engineering
-
-    # Sad really ... they will only hurt their own sales ...
-    # true book lovers really want to keep their books forever
-    # and move them to their devices and DRM prevents that so they
-    # will just buy from someplace else that they can remove
-    # the DRM from
-
-    # Amazon should know by now that true book lover's are not like
-    # penniless kids that pirate music, we do not pirate books
-
-    if isNewInstall():
-        mungedmac = GetMACAddressMunged()
-        if len(mungedmac) > 7:
-            print('Using Munged MAC Address for ID: '+mungedmac)
-            return mungedmac
-    sernum = GetVolumeSerialNumber()
-    if len(sernum) > 7:
-        print('Using Volume Serial Number for ID: '+sernum)
-        return sernum
-    diskpart = GetUserHomeAppSupKindleDirParitionName()
-    uuidnum = GetDiskPartitionUUID(diskpart)
-    if len(uuidnum) > 7:
-        print('Using Disk Partition UUID for ID: '+uuidnum)
-        return uuidnum
-    mungedmac = GetMACAddressMunged()
-    if len(mungedmac) > 7:
-        print('Using Munged MAC Address for ID: '+mungedmac)
-        return mungedmac
-    print('Using Fixed constant 9999999999 for ID.')
-    return '9999999999'
-
-
-# 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):
-        sernum = GetVolumeSerialNumber()
-        if sernum == '':
-            sernum = '9999999999'
-        sp = sernum + '!@#' + 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):
-        sp = GetUserName() + ':&%:' + GetIDString()
-        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):
-    passwdData = 'header_key_data'
-    salt = 'HEADER.2011'
-    iter = 0x80
-    keylen = 0x100
-    crp = LibCrypto()
-    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
-    key = key_iv[0:32]
-    iv = key_iv[32:48]
-    crp.set_decrypt_key(key,iv)
-    cleartext = crp.decrypt(encryptedData)
-    return cleartext
-
-
-# implements an Pseudo Mac Version of Windows built-in Crypto routine
-# used for Kindle for Mac Versions >= 1.9.0
-class CryptUnprotectDataV3(object):
-    def __init__(self, entropy):
-        sp = GetUserName() + '+@#$%+' + GetIDString()
-        passwdData = encode(SHA256(sp),charMap2)
-        salt = entropy
-        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, charMap2)
-        return cleartext
-
-
-# Locate the .kindle-info files
-def getKindleInfoFiles(kInfoFiles):
-    home = os.getenv('HOME')
-    # search for any .kinf2011 files in new location (Sep 2012)
-    cmdline = 'find "' + home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support" -name ".kinf2011"'
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    out1, out2 = p1.communicate()
-    reslst = out1.split('\n')
-    for resline in reslst:
-        if os.path.isfile(resline):
-            kInfoFiles.append(resline)
-            print('Found k4Mac kinf2011 file: ' + resline)
-            found = True
-   # search for any .kinf2011 files
-    cmdline = 'find "' + home + '/Library/Application Support" -name ".kinf2011"'
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    out1, out2 = p1.communicate()
-    reslst = out1.split('\n')
-    for resline in reslst:
-        if os.path.isfile(resline):
-            kInfoFiles.append(resline)
-            print('Found k4Mac kinf2011 file: ' + resline)
-            found = True
-    # search for any .kindle-info files
-    cmdline = 'find "' + home + '/Library/Application Support" -name ".kindle-info"'
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    out1, out2 = p1.communicate()
-    reslst = out1.split('\n')
-    kinfopath = 'NONE'
-    found = False
-    for resline in reslst:
-        if os.path.isfile(resline):
-            kInfoFiles.append(resline)
-            print('Found K4Mac kindle-info file: ' + resline)
-            found = True
-    # search for any .rainier*-kinf files
-    cmdline = 'find "' + home + '/Library/Application Support" -name ".rainier*-kinf"'
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    out1, out2 = p1.communicate()
-    reslst = out1.split('\n')
-    for resline in reslst:
-        if os.path.isfile(resline):
-            kInfoFiles.append(resline)
-            print('Found k4Mac kinf file: ' + resline)
-            found = True
-    if not found:
-        print('No k4Mac kindle-info/kinf/kinf2011 files have been found.')
-    return kInfoFiles
-
-# 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"]
-    DB = {}
-    cnt = 0
-    infoReader = open(kInfoFile, 'r')
-    hdr = infoReader.read(1)
-    data = infoReader.read()
-
-    if data.find('[') != -1 :
-
-        # older style kindle-info file
-        cud = CryptUnprotectData()
-        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)
-                DB[keyname] = cleartext
-                cnt = cnt + 1
-        if cnt == 0:
-            DB = None
-        return DB
-
-    if 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()
-
-        # 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"
-
-            # 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 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,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 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)
-            DB[keyname] = cleartext
-            cnt = cnt + 1
-
-        if cnt == 0:
-            DB = None
-        return DB
-
-    # 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)
-
-    # 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
-        DB[keyname] = cleartext
-        cnt = cnt + 1
-
-    if cnt == 0:
-        DB = None
-    return DB

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

@@ -1,437 +0,0 @@
-#!/usr/bin/env python
-# K4PC Windows specific routines
-
-from __future__ import with_statement
-
-import sys, os, re
-from struct import pack, unpack, unpack_from
-
-from ctypes import windll, c_char_p, c_wchar_p, c_uint, POINTER, byref, \
-    create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \
-    string_at, Structure, c_void_p, cast
-
-import _winreg as winreg
-MAX_PATH = 255
-kernel32 = windll.kernel32
-advapi32 = windll.advapi32
-crypt32 = windll.crypt32
-
-import traceback
-
-# crypto digestroutines
-import hashlib
-
-def MD5(message):
-    ctx = hashlib.md5()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA1(message):
-    ctx = hashlib.sha1()
-    ctx.update(message)
-    return ctx.digest()
-
-def SHA256(message):
-    ctx = hashlib.sha256()
-    ctx.update(message)
-    return ctx.digest()
-
-# For K4PC 1.9.X
-# use routines in alfcrypto:
-#    AES_cbc_encrypt
-#    AES_set_decrypt_key
-#    PKCS5_PBKDF2_HMAC_SHA1
-
-from alfcrypto import AES_CBC, KeyIVGen
-
-def UnprotectHeaderData(encryptedData):
-    passwdData = 'header_key_data'
-    salt = 'HEADER.2011'
-    iter = 0x80
-    keylen = 0x100
-    key_iv = KeyIVGen().pbkdf2(passwdData, salt, iter, keylen)
-    key = key_iv[0:32]
-    iv = key_iv[32:48]
-    aes=AES_CBC()
-    aes.set_decrypt_key(key, iv)
-    cleartext = aes.decrypt(encryptedData)
-    return cleartext
-
-
-# simple primes table (<= n) calculator
-def primes(n):
-    if n==2: return [2]
-    elif n<2: return []
-    s=range(3,n+1,2)
-    mroot = n ** 0.5
-    half=(n+1)/2-1
-    i=0
-    m=3
-    while m <= mroot:
-        if s[i]:
-            j=(m*m-3)/2
-            s[j]=0
-            while j<half:
-                s[j]=0
-                j+=m
-        i=i+1
-        m=2*i+3
-    return [2]+[x for x in s if x]
-
-
-# Various character maps used to decrypt kindle info values.
-# Probably supposed to act as obfuscation
-charMap2 = "AaZzB0bYyCc1XxDdW2wEeVv3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_"
-charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
-# New maps in K4PC 1.9.0
-testMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-testMap6 = "9YzAb0Cd1Ef2n5Pr6St7Uvh3Jk4M8WxG"
-testMap8 = "YvaZ3FfUm9Nn_c1XuG4yCAzB0beVg-TtHh5SsIiR6rJjQdW2wEq7KkPpL8lOoMxD"
-
-class DrmException(Exception):
-    pass
-
-# Encode the bytes in data with the characters in map
-def encode(data, map):
-    result = ""
-    for char in data:
-        value = ord(char)
-        Q = (value ^ 0x80) // len(map)
-        R = value % len(map)
-        result += map[Q]
-        result += map[R]
-    return result
-
-# Hash the bytes in data and then encode the digest with the characters in map
-def encodeHash(data,map):
-    return encode(MD5(data),map)
-
-# Decode the string in data with the characters in map. Returns the decoded bytes
-def decode(data,map):
-    result = ""
-    for i in range (0,len(data)-1,2):
-        high = map.find(data[i])
-        low = map.find(data[i+1])
-        if (high == -1) or (low == -1) :
-            break
-        value = (((high * len(map)) ^ 0x80) & 0xFF) + low
-        result += pack("B",value)
-    return result
-
-
-# interface with Windows OS Routines
-class DataBlob(Structure):
-    _fields_ = [('cbData', c_uint),
-                ('pbData', c_void_p)]
-DataBlob_p = POINTER(DataBlob)
-
-
-def GetSystemDirectory():
-    GetSystemDirectoryW = kernel32.GetSystemDirectoryW
-    GetSystemDirectoryW.argtypes = [c_wchar_p, c_uint]
-    GetSystemDirectoryW.restype = c_uint
-    def GetSystemDirectory():
-        buffer = create_unicode_buffer(MAX_PATH + 1)
-        GetSystemDirectoryW(buffer, len(buffer))
-        return buffer.value
-    return GetSystemDirectory
-GetSystemDirectory = GetSystemDirectory()
-
-def GetVolumeSerialNumber():
-    GetVolumeInformationW = kernel32.GetVolumeInformationW
-    GetVolumeInformationW.argtypes = [c_wchar_p, c_wchar_p, c_uint,
-                                      POINTER(c_uint), POINTER(c_uint),
-                                      POINTER(c_uint), c_wchar_p, c_uint]
-    GetVolumeInformationW.restype = c_uint
-    def GetVolumeSerialNumber(path = GetSystemDirectory().split('\\')[0] + '\\'):
-        vsn = c_uint(0)
-        GetVolumeInformationW(path, None, 0, byref(vsn), None, None, None, 0)
-        return str(vsn.value)
-    return GetVolumeSerialNumber
-GetVolumeSerialNumber = GetVolumeSerialNumber()
-
-def GetIDString():
-    vsn = GetVolumeSerialNumber()
-    print('Using Volume Serial Number for ID: '+vsn)
-    return vsn
-
-def getLastError():
-    GetLastError = kernel32.GetLastError
-    GetLastError.argtypes = None
-    GetLastError.restype = c_uint
-    def getLastError():
-        return GetLastError()
-    return getLastError
-getLastError = getLastError()
-
-def GetUserName():
-    GetUserNameW = advapi32.GetUserNameW
-    GetUserNameW.argtypes = [c_wchar_p, POINTER(c_uint)]
-    GetUserNameW.restype = c_uint
-    def GetUserName():
-        buffer = create_unicode_buffer(2)
-        size = c_uint(len(buffer))
-        while not GetUserNameW(buffer, byref(size)):
-            errcd = getLastError()
-            if errcd == 234:
-                # bad wine implementation up through wine 1.3.21
-                return "AlternateUserName"
-            buffer = create_unicode_buffer(len(buffer) * 2)
-            size.value = len(buffer)
-        return buffer.value.encode('utf-16-le')[::2]
-    return GetUserName
-GetUserName = GetUserName()
-
-def CryptUnprotectData():
-    _CryptUnprotectData = crypt32.CryptUnprotectData
-    _CryptUnprotectData.argtypes = [DataBlob_p, c_wchar_p, DataBlob_p,
-                                   c_void_p, c_void_p, c_uint, DataBlob_p]
-    _CryptUnprotectData.restype = c_uint
-    def CryptUnprotectData(indata, entropy, flags):
-        indatab = create_string_buffer(indata)
-        indata = DataBlob(len(indata), cast(indatab, c_void_p))
-        entropyb = create_string_buffer(entropy)
-        entropy = DataBlob(len(entropy), cast(entropyb, c_void_p))
-        outdata = DataBlob()
-        if not _CryptUnprotectData(byref(indata), None, byref(entropy),
-                                   None, None, flags, byref(outdata)):
-            # raise DrmException("Failed to Unprotect Data")
-            return 'failed'
-        return string_at(outdata.pbData, outdata.cbData)
-    return CryptUnprotectData
-CryptUnprotectData = CryptUnprotectData()
-
-
-# Locate all of the kindle-info style files and return as list
-def getKindleInfoFiles(kInfoFiles):
-    regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
-    path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
-
-    # some 64 bit machines do not have the proper registry key for some reason
-    # or the pythonn interface to the 32 vs 64 bit registry is broken
-    if 'LOCALAPPDATA' in os.environ.keys():
-        path = os.environ['LOCALAPPDATA']
-
-    print('searching for kinfoFiles in ' + path)
-    found = False
-
-    # first look for older kindle-info files
-    kinfopath = path +'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info'
-    if os.path.isfile(kinfopath):
-        found = True
-        print('Found K4PC kindle.info file: ' + kinfopath)
-        kInfoFiles.append(kinfopath)
-
-    # now look for newer (K4PC 1.5.0 and later rainier.2.1.1.kinf file
-
-    kinfopath = path +'\\Amazon\\Kindle For PC\\storage\\rainier.2.1.1.kinf'
-    if os.path.isfile(kinfopath):
-        found = True
-        print('Found K4PC 1.5.X kinf file: ' + kinfopath)
-        kInfoFiles.append(kinfopath)
-
-    # now look for even newer (K4PC 1.6.0 and later) rainier.2.1.1.kinf file
-    kinfopath = path +'\\Amazon\\Kindle\\storage\\rainier.2.1.1.kinf'
-    if os.path.isfile(kinfopath):
-        found = True
-        print('Found K4PC 1.6.X kinf file: ' + kinfopath)
-        kInfoFiles.append(kinfopath)
-
-    # now look for even newer (K4PC 1.9.0 and later) .kinf2011 file
-    kinfopath = path +'\\Amazon\\Kindle\\storage\\.kinf2011'
-    if os.path.isfile(kinfopath):
-        found = True
-        print('Found K4PC kinf2011 file: ' + kinfopath)
-        kInfoFiles.append(kinfopath)
-
-    if not found:
-        print('No K4PC kindle.info/kinf/kinf2011 files have been found.')
-    return kInfoFiles
-
-
-# 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"]
-    DB = {}
-    cnt = 0
-    infoReader = open(kInfoFile, 'r')
-    hdr = infoReader.read(1)
-    data = infoReader.read()
-
-    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)
-                cnt = cnt + 1
-        if cnt == 0:
-            DB = None
-        return DB
-
-    if 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('/')
-
-        # 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 raw keyhash string is used to create entropy for the actual
-            # CryptProtectData Blob that represents that keys contents
-            entropy = SHA1(keyhash)
-
-            # 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,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)
-            cnt = cnt + 1
-
-        if cnt == 0:
-            DB = None
-        return DB
-
-    # 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)
-
-
-    # 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)
-        DB[keyname] = cleartext
-        cnt = cnt + 1
-
-    if cnt == 0:
-        DB = None
-    return DB

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

@@ -1,12 +1,21 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 from __future__ import with_statement
+
+# kgenpids.py
+# Copyright © 2010-2015 by some_updates, Apprentice Alf and Apprentice Harper
+
+# Revision history:
+#  2.0   - Fix for non-ascii Windows user names
+
 import sys
 import os, csv
 import binascii
 import zlib
 import re
 from struct import pack, unpack, unpack_from
+import traceback
 
 class DrmException(Exception):
     pass
@@ -15,28 +24,10 @@ global charMap1
 global charMap3
 global charMap4
 
-if 'calibre' in sys.modules:
-    inCalibre = True
-else:
-    inCalibre = False
 
-if inCalibre:
-    if sys.platform.startswith('win'):
-        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
-
-    if sys.platform.startswith('darwin'):
-        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
-else:
-    if sys.platform.startswith('win'):
-        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
-
-    if sys.platform.startswith('darwin'):
-        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
-
-
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
+charMap1 = 'n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M'
+charMap3 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
+charMap4 = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
 
 # crypto digestroutines
 import hashlib
@@ -54,7 +45,7 @@ def SHA1(message):
 
 # Encode the bytes in data with the characters in map
 def encode(data, map):
-    result = ""
+    result = ''
     for char in data:
         value = ord(char)
         Q = (value ^ 0x80) // len(map)
@@ -69,14 +60,14 @@ def encodeHash(data,map):
 
 # Decode the string in data with the characters in map. Returns the decoded bytes
 def decode(data,map):
-    result = ""
+    result = ''
     for i in range (0,len(data)-1,2):
         high = map.find(data[i])
         low = map.find(data[i+1])
         if (high == -1) or (low == -1) :
             break
         value = (((high * len(map)) ^ 0x80) & 0xFF) + low
-        result += pack("B",value)
+        result += pack('B',value)
     return result
 
 #
@@ -98,7 +89,7 @@ def getSixBitsFromBitField(bitField,offset):
 # 8 bits to six bits encoding from hash to generate PID string
 def encodePID(hash):
     global charMap3
-    PID = ""
+    PID = ''
     for position in range (0,8):
         PID += charMap3[getSixBitsFromBitField(hash,position)]
     return PID
@@ -129,7 +120,7 @@ def generatePidSeed(table,dsn) :
 def generateDevicePID(table,dsn,nbRoll):
     global charMap4
     seed = generatePidSeed(table,dsn)
-    pidAscii = ""
+    pidAscii = ''
     pid = [(seed >>24) &0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF,(seed>>24) & 0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF]
     index = 0
     for counter in range (0,nbRoll):
@@ -176,53 +167,61 @@ def pidFromSerial(s, l):
 
 
 # Parse the EXTH header records and use the Kindle serial number to calculate the book pid.
-def getKindlePid(pidlst, rec209, token, serialnum):
+def getKindlePids(rec209, token, serialnum):
+    pids=[]
+
+    if isinstance(serialnum,unicode):
+        serialnum = serialnum.encode('utf-8')
+
     # Compute book PID
     pidHash = SHA1(serialnum+rec209+token)
     bookPID = encodePID(pidHash)
     bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
+    pids.append(bookPID)
 
     # compute fixed pid for old pre 2.5 firmware update pid as well
-    bookPID = pidFromSerial(serialnum, 7) + "*"
-    bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
+    kindlePID = pidFromSerial(serialnum, 7) + "*"
+    kindlePID = checksumPid(kindlePID)
+    pids.append(kindlePID)
 
-    return pidlst
+    return pids
 
 
 # parse the Kindleinfo file to calculate the book pid.
 
-keynames = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
+keynames = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber']
 
-def getK4Pids(pidlst, rec209, token, kInfoFile):
+def getK4Pids(rec209, token, kindleDatabase):
     global charMap1
-    kindleDatabase = None
-    try:
-        kindleDatabase = getDBfromFile(kInfoFile)
-    except Exception, message:
-        print(message)
-        kindleDatabase = None
-        pass
-
-    if kindleDatabase == None :
-        return pidlst
+    pids = []
 
     try:
         # Get the Mazama Random number
-        MazamaRandomNumber = kindleDatabase["MazamaRandomNumber"]
+        MazamaRandomNumber = (kindleDatabase[1])['MazamaRandomNumber'].decode('hex')
+
+        # Get the IDString used to decode the Kindle Info file
+        IDString = (kindleDatabase[1])['IDString'].decode('hex')
+
+        # Get the UserName stored when the Kindle Info file was decoded
+        UserName = (kindleDatabase[1])['UserName'].decode('hex')
 
-        # Get the kindle account token
-        kindleAccountToken = kindleDatabase["kindle.account.tokens"]
     except KeyError:
-        print "Keys not found in " + kInfoFile
-        return pidlst
+        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(GetIDString(),charMap1)
+    encodedIDString = encodeHash(IDString,charMap1)
 
     # Get the current user name
-    encodedUsername = encodeHash(GetUserName(),charMap1)
+    encodedUsername = encodeHash(UserName,charMap1)
 
     # concat, hash and encode to calculate the DSN
     DSN = encode(SHA1(MazamaRandomNumber+encodedIDString+encodedUsername),charMap1)
@@ -231,7 +230,7 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):
     table =  generatePidEncryptionTable()
     devicePID = generateDevicePID(table,DSN,4)
     devicePID = checksumPid(devicePID)
-    pidlst.append(devicePID)
+    pids.append(devicePID)
 
     # Compute book PIDs
 
@@ -239,38 +238,42 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):
     pidHash = SHA1(DSN+kindleAccountToken+rec209+token)
     bookPID = encodePID(pidHash)
     bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
+    pids.append(bookPID)
 
     # variant 1
     pidHash = SHA1(kindleAccountToken+rec209+token)
     bookPID = encodePID(pidHash)
     bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
+    pids.append(bookPID)
 
     # variant 2
     pidHash = SHA1(DSN+rec209+token)
     bookPID = encodePID(pidHash)
     bookPID = checksumPid(bookPID)
-    pidlst.append(bookPID)
+    pids.append(bookPID)
 
-    return pidlst
+    return pids
 
-def getPidList(md1, md2, k4, pids, serials, kInfoFiles):
+def getPidList(md1, md2, serials=[], kDatabases=[]):
     pidlst = []
-    if kInfoFiles is None:
-        kInfoFiles = []
-    if k4:
-        kInfoFiles = getKindleInfoFiles(kInfoFiles)
-    for infoFile in kInfoFiles:
+
+    if kDatabases is None:
+        kDatabases = []
+    if serials is None:
+        serials = []
+
+    for kDatabase in kDatabases:
         try:
-            pidlst = getK4Pids(pidlst, md1, md2, infoFile)
-        except Exception, message:
-            print("Error getting PIDs from " + infoFile + ": " + message)
+            pidlst.extend(getK4Pids(md1, md2, kDatabase))
+        except Exception, e:
+            print u"Error getting PIDs from database {0}: {1}".format(kDatabase[0],e.args[0])
+            traceback.print_exc()
+
     for serialnum in serials:
         try:
-            pidlst = getKindlePid(pidlst, md1, md2, serialnum)
-        except Exception, message:
-            print("Error getting PIDs from " + serialnum + ": " + message)
-    for pid in pids:
-        pidlst.append(pid)
+            pidlst.extend(getKindlePids(md1, md2, serialnum))
+        except Exception, e:
+            print u"Error getting PIDs from serial number {0}: {1}".format(serialnum ,e.args[0])
+            traceback.print_exc()
+
     return pidlst

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

@@ -1,29 +1,82 @@
 #!/usr/bin/python
-# Mobipocket PID calculator v0.2 for Amazon Kindle.
+# -*- coding: utf-8 -*-
+
+# Mobipocket PID calculator v0.4 for Amazon Kindle.
 # Copyright (c) 2007, 2009 Igor Skochinsky <skochinsky@mail.ru>
 # History:
 #  0.1 Initial release
 #  0.2 Added support for generating PID for iPhone (thanks to mbp)
 #  0.3 changed to autoflush stdout, fixed return code usage
-class Unbuffered:
+#  0.3 updated for unicode
+#  0.4 Added support for serial numbers starting with '9', fixed unicode bugs.
+#  0.5 moved unicode_argv call inside main for Windows DeDRM compatibility
+
+import sys
+import binascii
+
+# 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)
 
-import sys
-sys.stdout=Unbuffered(sys.stdout)
+iswindows = sys.platform.startswith('win')
+isosx = sys.platform.startswith('darwin')
 
-import binascii
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"kindlepid.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
 
 if sys.hexversion >= 0x3000000:
-    print "This script is incompatible with Python 3.x. Please install Python 2.6.x from python.org"
+    print 'This script is incompatible with Python 3.x. Please install Python 2.7.x.'
     sys.exit(2)
 
-letters = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
+letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
 
 def crc32(s):
     return (~binascii.crc32(s,-1))&0xFFFFFFFF
@@ -41,7 +94,6 @@ def checksumPid(s):
 
     return res
 
-
 def pidFromSerial(s, l):
     crc = crc32(s)
 
@@ -53,39 +105,40 @@ def pidFromSerial(s, l):
     for i in xrange(l):
         arr1[i] ^= crc_bytes[i&3]
 
-    pid = ""
+    pid = ''
     for i in xrange(l):
         b = arr1[i] & 0xff
         pid+=letters[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]
 
     return pid
 
-def main(argv=sys.argv):
-    print "Mobipocket PID calculator for Amazon Kindle. Copyright (c) 2007, 2009 Igor Skochinsky"
-    if len(sys.argv)==2:
-        serial = sys.argv[1]
+def cli_main():
+    print u"Mobipocket PID calculator for Amazon Kindle. Copyright © 2007, 2009 Igor Skochinsky"
+    argv=unicode_argv()
+    if len(argv)==2:
+        serial = argv[1]
     else:
-        print "Usage: kindlepid.py <Kindle Serial Number>/<iPhone/iPod Touch UDID>"
+        print u"Usage: kindlepid.py <Kindle Serial Number>/<iPhone/iPod Touch UDID>"
         return 1
     if len(serial)==16:
-        if serial.startswith("B"):
-            print "Kindle serial number detected"
+        if serial.startswith("B") or serial.startswith("9"):
+            print u"Kindle serial number detected"
         else:
-            print "Warning: unrecognized serial number. Please recheck input."
+            print u"Warning: unrecognized serial number. Please recheck input."
             return 1
-        pid = pidFromSerial(serial,7)+"*"
-        print "Mobipocket PID for Kindle serial# "+serial+" is "+checksumPid(pid)
+        pid = pidFromSerial(serial.encode("utf-8"),7)+'*'
+        print u"Mobipocket PID for Kindle serial#{0} is {1}".format(serial,checksumPid(pid))
         return 0
     elif len(serial)==40:
-        print "iPhone serial number (UDID) detected"
-        pid = pidFromSerial(serial,8)
-        print "Mobipocket PID for iPhone serial# "+serial+" is "+checksumPid(pid)
+        print u"iPhone serial number (UDID) detected"
+        pid = pidFromSerial(serial.encode("utf-8"),8)
+        print u"Mobipocket PID for iPhone serial#{0} is {1}".format(serial,checksumPid(pid))
         return 0
-    else:
-        print "Warning: unrecognized serial number. Please recheck input."
-        return 1
-    return 0
+    print u"Warning: unrecognized serial number. Please recheck input."
+    return 1
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    sys.exit(cli_main())

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

@@ -1,5 +1,11 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# mobidedrm.py, version 0.38
+# Copyright © 2008 The Dark Reverser
 #
+# Modified 2008–2012 by some_updates, DiapDealer and Apprentice Alf
+
 # This is a python script. You need a Python interpreter to run it.
 # For example, ActiveState Python, which exists for windows.
 #
@@ -59,26 +65,81 @@
 #  0.35 - add interface to get mobi_version
 #  0.36 - fixed problem with TEXtREAd and getBookTitle interface
 #  0.37 - Fixed double announcement for stand-alone operation
+#  0.38 - Unicode used wherever possible, cope with absent alfcrypto
+#  0.39 - Fixed problem with TEXtREAd and getBookType interface
+#  0.40 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  0.41 - Fixed potential unicode problem in command line calls
 
 
-__version__ = '0.37'
+__version__ = u"0.41"
 
 import sys
+import os
+import struct
+import binascii
+try:
+    from alfcrypto import Pukall_Cipher
+except:
+    print u"AlfCrypto not found. Using python PC1 implementation."
 
-class Unbuffered:
+# 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)
-sys.stdout=Unbuffered(sys.stdout)
 
-import os
-import struct
-import binascii
-from alfcrypto import Pukall_Cipher
+iswindows = sys.platform.startswith('win')
+isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"mobidedrm.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = 'utf-8'
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
 
 class DrmException(Exception):
     pass
@@ -90,40 +151,47 @@ class DrmException(Exception):
 
 # Implementation of Pukall Cipher 1
 def PC1(key, src, decryption=True):
-    return Pukall_Cipher().PC1(key,src,decryption)
-#     sum1 = 0;
-#     sum2 = 0;
-#     keyXorVal = 0;
-#     if len(key)!=16:
-#         print "Bad key length!"
-#         return None
-#     wkey = []
-#     for i in xrange(8):
-#         wkey.append(ord(key[i*2])<<8 | ord(key[i*2+1]))
-#     dst = ""
-#     for i in xrange(len(src)):
-#         temp1 = 0;
-#         byteXorVal = 0;
-#         for j in xrange(8):
-#             temp1 ^= wkey[j]
-#             sum2  = (sum2+j)*20021 + sum1
-#             sum1  = (temp1*346)&0xFFFF
-#             sum2  = (sum2+sum1)&0xFFFF
-#             temp1 = (temp1*20021+1)&0xFFFF
-#             byteXorVal ^= temp1 ^ sum2
-#         curByte = ord(src[i])
-#         if not decryption:
-#             keyXorVal = curByte * 257;
-#         curByte = ((curByte ^ (byteXorVal >> 8)) ^ byteXorVal) & 0xFF
-#         if decryption:
-#             keyXorVal = curByte * 257;
-#         for j in xrange(8):
-#             wkey[j] ^= keyXorVal;
-#         dst+=chr(curByte)
-#     return dst
+    # if we can get it from alfcrypto, use that
+    try:
+        return Pukall_Cipher().PC1(key,src,decryption)
+    except NameError:
+        pass
+    except TypeError:
+        pass
+
+    # use slow python version, since Pukall_Cipher didn't load
+    sum1 = 0;
+    sum2 = 0;
+    keyXorVal = 0;
+    if len(key)!=16:
+         DrmException (u"PC1: Bad key length")
+    wkey = []
+    for i in xrange(8):
+        wkey.append(ord(key[i*2])<<8 | ord(key[i*2+1]))
+    dst = ""
+    for i in xrange(len(src)):
+        temp1 = 0;
+        byteXorVal = 0;
+        for j in xrange(8):
+            temp1 ^= wkey[j]
+            sum2  = (sum2+j)*20021 + sum1
+            sum1  = (temp1*346)&0xFFFF
+            sum2  = (sum2+sum1)&0xFFFF
+            temp1 = (temp1*20021+1)&0xFFFF
+            byteXorVal ^= temp1 ^ sum2
+        curByte = ord(src[i])
+        if not decryption:
+            keyXorVal = curByte * 257;
+        curByte = ((curByte ^ (byteXorVal >> 8)) ^ byteXorVal) & 0xFF
+        if decryption:
+            keyXorVal = curByte * 257;
+        for j in xrange(8):
+            wkey[j] ^= keyXorVal;
+        dst+=chr(curByte)
+    return dst
 
 def checksumPid(s):
-    letters = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
+    letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
     crc = (~binascii.crc32(s,-1))&0xFFFFFFFF
     crc = crc ^ (crc >> 16)
     res = s
@@ -171,17 +239,24 @@ class MobiBook:
         off = self.sections[section][0]
         return self.data_file[off:endoff]
 
-    def __init__(self, infile, announce = True):
-        if announce:
-            print ('MobiDeDrm v%(__version__)s. '
-               'Copyright 2008-2012 The Dark Reverser et al.' % globals())
+    def cleanup(self):
+        # to match function in Topaz book
+        pass
+
+    def __init__(self, infile):
+        print u"MobiDeDrm v{0:s}.\nCopyright © 2008-2012 The Dark Reverser et al.".format(__version__)
+
+        try:
+            from alfcrypto import Pukall_Cipher
+        except:
+            print u"AlfCrypto not found. Using python PC1 implementation."
 
         # initial sanity check on file
         self.data_file = file(infile, 'rb').read()
         self.mobi_data = ''
         self.header = self.data_file[0:78]
         if self.header[0x3C:0x3C+8] != 'BOOKMOBI' and self.header[0x3C:0x3C+8] != 'TEXtREAd':
-            raise DrmException("invalid file format")
+            raise DrmException(u"Invalid file format")
         self.magic = self.header[0x3C:0x3C+8]
         self.crypto_type = -1
 
@@ -198,35 +273,37 @@ class MobiBook:
         self.records, = struct.unpack('>H', self.sect[0x8:0x8+2])
         self.compression, = struct.unpack('>H', self.sect[0x0:0x0+2])
 
+        # det default values before PalmDoc test
+        self.print_replica = False
+        self.extra_data_flags = 0
+        self.meta_array = {}
+        self.mobi_length = 0
+        self.mobi_codepage = 1252
+        self.mobi_version = -1
+
         if self.magic == 'TEXtREAd':
-            print "Book has format: ", self.magic
-            self.extra_data_flags = 0
-            self.mobi_length = 0
-            self.mobi_codepage = 1252
-            self.mobi_version = -1
-            self.meta_array = {}
+            print u"PalmDoc format book detected."
             return
+
         self.mobi_length, = struct.unpack('>L',self.sect[0x14:0x18])
         self.mobi_codepage, = struct.unpack('>L',self.sect[0x1c:0x20])
         self.mobi_version, = struct.unpack('>L',self.sect[0x68:0x6C])
-        print "MOBI header version = %d, length = %d" %(self.mobi_version, self.mobi_length)
-        self.extra_data_flags = 0
+        print u"MOBI header version {0:d}, header length {1:d}".format(self.mobi_version, self.mobi_length)
         if (self.mobi_length >= 0xE4) and (self.mobi_version >= 5):
             self.extra_data_flags, = struct.unpack('>H', self.sect[0xF2:0xF4])
-            print "Extra Data Flags = %d" % self.extra_data_flags
+            print u"Extra Data Flags: {0:d}".format(self.extra_data_flags)
         if (self.compression != 17480):
             # multibyte utf8 data is included in the encryption for PalmDoc compression
             # so clear that byte so that we leave it to be decrypted.
             self.extra_data_flags &= 0xFFFE
 
         # if exth region exists parse it for metadata array
-        self.meta_array = {}
         try:
             exth_flag, = struct.unpack('>L', self.sect[0x80:0x84])
-            exth = 'NONE'
+            exth = ''
             if exth_flag & 0x40:
                 exth = self.sect[16 + self.mobi_length:]
-            if (len(exth) >= 4) and (exth[:4] == 'EXTH'):
+            if (len(exth) >= 12) and (exth[:4] == 'EXTH'):
                 nitems, = struct.unpack('>I', exth[8:12])
                 pos = 12
                 for i in xrange(nitems):
@@ -236,16 +313,14 @@ class MobiBook:
                     # reset the text to speech flag and clipping limit, if present
                     if type == 401 and size == 9:
                         # set clipping limit to 100%
-                        self.patchSection(0, "\144", 16 + self.mobi_length + pos + 8)
+                        self.patchSection(0, '\144', 16 + self.mobi_length + pos + 8)
                     elif type == 404 and size == 9:
                         # make sure text to speech is enabled
-                        self.patchSection(0, "\0", 16 + self.mobi_length + pos + 8)
+                        self.patchSection(0, '\0', 16 + self.mobi_length + pos + 8)
                     # print type, size, content, content.encode('hex')
                     pos += size
         except:
-            self.meta_array = {}
             pass
-        self.print_replica = False
 
     def getBookTitle(self):
         codec_map = {
@@ -265,8 +340,8 @@ class MobiBook:
                 codec = codec_map[self.mobi_codepage]
         if title == '':
             title = self.header[:32]
-            title = title.split("\0")[0]
-        return unicode(title, codec).encode('utf-8')
+            title = title.split('\0')[0]
+        return unicode(title, codec)
 
     def getPIDMetaInfo(self):
         rec209 = ''
@@ -297,7 +372,7 @@ class MobiBook:
 
     def parseDRM(self, data, count, pidlist):
         found_key = None
-        keyvec1 = "\x72\x38\x33\xB0\xB4\xF2\xE3\xCA\xDF\x09\x01\xD6\xE2\xE0\x3F\x96"
+        keyvec1 = '\x72\x38\x33\xB0\xB4\xF2\xE3\xCA\xDF\x09\x01\xD6\xE2\xE0\x3F\x96'
         for pid in pidlist:
             bigpid = pid.ljust(16,'\0')
             temp_key = PC1(keyvec1, bigpid, False)
@@ -315,7 +390,7 @@ class MobiBook:
                 break
         if not found_key:
             # Then try the default encoding that doesn't require a PID
-            pid = "00000000"
+            pid = '00000000'
             temp_key = keyvec1
             temp_key_sum = sum(map(ord,temp_key)) & 0xff
             for i in xrange(count):
@@ -328,82 +403,94 @@ class MobiBook:
                         break
         return [found_key,pid]
 
-    def getMobiFile(self, outpath):
+    def getFile(self, outpath):
         file(outpath,'wb').write(self.mobi_data)
 
-    def getMobiVersion(self):
-        return self.mobi_version
-        
-    def getPrintReplica(self):
-        return self.print_replica
+    def getBookType(self):
+        if self.print_replica:
+            return u"Print Replica"
+        if self.mobi_version >= 8:
+            return u"Kindle Format 8"
+        if self.mobi_version >= 0:
+            return u"Mobipocket {0:d}".format(self.mobi_version)
+        return u"PalmDoc"
+
+    def getBookExtension(self):
+        if self.print_replica:
+            return u".azw4"
+        if self.mobi_version >= 8:
+            return u".azw3"
+        return u".mobi"
 
     def processBook(self, pidlist):
         crypto_type, = struct.unpack('>H', self.sect[0xC:0xC+2])
-        print 'Crypto Type is: ', crypto_type
+        print u"Crypto Type is: {0:d}".format(crypto_type)
         self.crypto_type = crypto_type
         if crypto_type == 0:
-            print "This book is not encrypted."
+            print u"This book is not encrypted."
             # we must still check for Print Replica
             self.print_replica = (self.loadSection(1)[0:4] == '%MOP')
             self.mobi_data = self.data_file
             return
         if crypto_type != 2 and crypto_type != 1:
-            raise DrmException("Cannot decode unknown Mobipocket encryption type %d" % crypto_type)
+            raise DrmException(u"Cannot decode unknown Mobipocket encryption type {0:d}".format(crypto_type))
         if 406 in self.meta_array:
             data406 = self.meta_array[406]
             val406, = struct.unpack('>Q',data406)
             if val406 != 0:
-                raise DrmException("Cannot decode library or rented ebooks.")
+                raise DrmException(u"Cannot decode library or rented ebooks.")
 
         goodpids = []
         for pid in pidlist:
             if len(pid)==10:
                 if checksumPid(pid[0:-2]) != pid:
-                    print "Warning: PID " + pid + " has incorrect checksum, should have been "+checksumPid(pid[0:-2])
+                    print u"Warning: PID {0} has incorrect checksum, should have been {1}".format(pid,checksumPid(pid[0:-2]))
                 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"
+            t1_keyvec = 'QDCVEPMU675RUBSZ'
             if self.magic == 'TEXtREAd':
                 bookkey_data = self.sect[0x0E:0x0E+16]
             elif self.mobi_version < 0:
                 bookkey_data = self.sect[0x90:0x90+16]
             else:
                 bookkey_data = self.sect[self.mobi_length+16:self.mobi_length+32]
-            pid = "00000000"
+            pid = '00000000'
             found_key = PC1(t1_keyvec, bookkey_data)
         else :
             # calculate the keys
             drm_ptr, drm_count, drm_size, drm_flags = struct.unpack('>LLLL', self.sect[0xA8:0xA8+16])
             if drm_count == 0:
-                raise DrmException("Not yet initialised with PID. Must be opened with Mobipocket Reader first.")
+                raise DrmException(u"Encryption not initialised. Must be opened with Mobipocket Reader first.")
             found_key, pid = self.parseDRM(self.sect[drm_ptr:drm_ptr+drm_size], drm_count, goodpids)
             if not found_key:
-                raise DrmException("No key found in " + str(len(goodpids)) + " keys tried. Please report this failure for help.")
+                raise DrmException(u"No key found in {0:d} keys tried.".format(len(goodpids)))
             # kill the drm keys
-            self.patchSection(0, "\0" * drm_size, drm_ptr)
+            self.patchSection(0, '\0' * drm_size, drm_ptr)
             # kill the drm pointers
-            self.patchSection(0, "\xff" * 4 + "\0" * 12, 0xA8)
+            self.patchSection(0, '\xff' * 4 + '\0' * 12, 0xA8)
 
-        if pid=="00000000":
-            print "File has default encryption, no specific PID."
+        if pid=='00000000':
+            print u"File has default encryption, no specific key needed."
         else:
-            print "File is encoded with PID "+checksumPid(pid)+"."
+            print u"File is encoded with PID {0}.".format(checksumPid(pid))
 
         # clear the crypto type
         self.patchSection(0, "\0" * 2, 0xC)
 
         # decrypt sections
-        print "Decrypting. Please wait . . .",
+        print u"Decrypting. Please wait . . .",
         mobidataList = []
         mobidataList.append(self.data_file[:self.sections[1][0]])
         for i in xrange(1, self.records+1):
             data = self.loadSection(i)
             extra_size = getSizeOfTrailingDataEntries(data, len(data), self.extra_data_flags)
             if i%100 == 0:
-                print ".",
+                print u".",
             # print "record %d, extra_size %d" %(i,extra_size)
             decoded_data = PC1(found_key, data[0:len(data) - extra_size])
             if i==1:
@@ -414,31 +501,25 @@ class MobiBook:
         if self.num_sections > self.records+1:
             mobidataList.append(self.data_file[self.sections[self.records+1][0]:])
         self.mobi_data = "".join(mobidataList)
-        print "done"
+        print u"done"
         return
 
-def getUnencryptedBook(infile,pid,announce=True):
+def getUnencryptedBook(infile,pidlist):
     if not os.path.isfile(infile):
-        raise DrmException('Input File Not Found')
-    book = MobiBook(infile,announce)
-    book.processBook([pid])
-    return book.mobi_data
-
-def getUnencryptedBookWithList(infile,pidlist,announce=True):
-    if not os.path.isfile(infile):
-        raise DrmException('Input File Not Found')
-    book = MobiBook(infile, announce)
+        raise DrmException(u"Input File Not Found.")
+    book = MobiBook(infile)
     book.processBook(pidlist)
     return book.mobi_data
 
 
-def main(argv=sys.argv):
-    print ('MobiDeDrm v%(__version__)s. '
-        'Copyright 2008-2012 The Dark Reverser et al.' % globals())
+def cli_main():
+    argv=unicode_argv()
+    progname = os.path.basename(argv[0])
     if len(argv)<3 or len(argv)>4:
-        print "Removes protection from Kindle/Mobipocket, Kindle/KF8 and Kindle/Print Replica ebooks"
-        print "Usage:"
-        print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
+        print u"MobiDeDrm v{0}.\nCopyright © 2008-2012 The Dark Reverser et al.".format(__version__)
+        print u"Removes protection from Kindle/Mobipocket, Kindle/KF8 and Kindle/Print Replica ebooks"
+        print u"Usage:"
+        print u"    {0} <infile> <outfile> [<Comma separated list of PIDs to try>]".format(progname)
         return 1
     else:
         infile = argv[1]
@@ -446,15 +527,17 @@ def main(argv=sys.argv):
         if len(argv) is 4:
             pidlist = argv[3].split(',')
         else:
-            pidlist = {}
+            pidlist = []
         try:
-            stripped_file = getUnencryptedBookWithList(infile, pidlist, False)
+            stripped_file = getUnencryptedBook(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)
         except DrmException, e:
-            print "Error: %s" % e
+            print u"MobiDeDRM v{0} Error: {1:s}".format(__version__,e.args[0])
             return 1
     return 0
 
 
-if __name__ == "__main__":
-    sys.exit(main())
+if __name__ == '__main__':
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    sys.exit(cli_main())

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

@@ -65,7 +65,7 @@ def load_libcrypto():
     class DES(object):
         def __init__(self, key):
             if len(key) != 8 :
-                raise Error('DES improper key used')
+                raise Exception('DES improper key used')
                 return
             self.key = key
             self.keyschedule = DES_KEY_SCHEDULE()

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

@@ -1,68 +0,0 @@
-# A simple implementation of pbkdf2 using stock python modules. See RFC2898
-# for details. Basically, it derives a key from a password and salt.
-
-# Copyright 2004 Matt Johnston <matt @ ucc asn au>
-# Copyright 2009 Daniel Holth <dholth@fastmail.fm>
-# This code may be freely used and modified for any purpose.
-
-# Revision history
-# v0.1  October 2004    - Initial release
-# v0.2  8 March 2007    - Make usable with hashlib in Python 2.5 and use
-# v0.3  ""                 the correct digest_size rather than always 20
-# v0.4  Oct 2009        - Rescue from chandler svn, test and optimize.
-
-import sys
-import hmac
-from struct import pack
-try:
-    # only in python 2.5
-    import hashlib
-    sha = hashlib.sha1
-    md5 = hashlib.md5
-    sha256 = hashlib.sha256
-except ImportError: # pragma: NO COVERAGE
-    # fallback
-    import sha
-    import md5
-
-# this is what you want to call.
-def pbkdf2( password, salt, itercount, keylen, hashfn = sha ):
-    try:
-        # depending whether the hashfn is from hashlib or sha/md5
-        digest_size = hashfn().digest_size
-    except TypeError: # pragma: NO COVERAGE
-        digest_size = hashfn.digest_size
-    # l - number of output blocks to produce
-    l = keylen / digest_size
-    if keylen % digest_size != 0:
-        l += 1
-
-    h = hmac.new( password, None, hashfn )
-
-    T = ""
-    for i in range(1, l+1):
-        T += pbkdf2_F( h, salt, itercount, i )
-
-    return T[0: keylen]
-
-def xorstr( a, b ):
-    if len(a) != len(b):
-        raise ValueError("xorstr(): lengths differ")
-    return ''.join((chr(ord(x)^ord(y)) for x, y in zip(a, b)))
-
-def prf( h, data ):
-    hm = h.copy()
-    hm.update( data )
-    return hm.digest()
-
-# Helper as per the spec. h is a hmac which has been created seeded with the
-# password, it will be copy()ed and not modified.
-def pbkdf2_F( h, salt, itercount, blocknum ):
-    U = prf( h, salt + pack('>i',blocknum ) )
-    T = U
-
-    for i in range(2, itercount+1):
-        U = prf( h, U )
-        T = xorstr( T, U )
-
-    return T

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

@@ -0,0 +1,295 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+
+from __future__ import with_statement
+__license__ = 'GPL v3'
+
+# Standard Python modules.
+import os, sys, re, hashlib
+import json
+import traceback
+
+from calibre.utils.config import dynamic, config_dir, JSONConfig
+from calibre_plugins.dedrm.__init__ import PLUGIN_NAME, PLUGIN_VERSION
+from calibre.constants import iswindows, isosx
+
+class DeDRM_Prefs():
+    def __init__(self):
+        JSON_PATH = os.path.join(u"plugins", PLUGIN_NAME.strip().lower().replace(' ', '_') + '.json')
+        self.dedrmprefs = JSONConfig(JSON_PATH)
+
+        self.dedrmprefs.defaults['configured'] = False
+        self.dedrmprefs.defaults['bandnkeys'] = {}
+        self.dedrmprefs.defaults['adeptkeys'] = {}
+        self.dedrmprefs.defaults['ereaderkeys'] = {}
+        self.dedrmprefs.defaults['kindlekeys'] = {}
+        self.dedrmprefs.defaults['androidkeys'] = {}
+        self.dedrmprefs.defaults['pids'] = []
+        self.dedrmprefs.defaults['serials'] = []
+        self.dedrmprefs.defaults['adobewineprefix'] = ""
+        self.dedrmprefs.defaults['kindlewineprefix'] = ""
+
+        # initialise
+        # we must actually set the prefs that are dictionaries and lists
+        # to empty dictionaries and lists, otherwise we are unable to add to them
+        # as then it just adds to the (memory only) dedrmprefs.defaults versions!
+        if self.dedrmprefs['bandnkeys'] == {}:
+            self.dedrmprefs['bandnkeys'] = {}
+        if self.dedrmprefs['adeptkeys'] == {}:
+            self.dedrmprefs['adeptkeys'] = {}
+        if self.dedrmprefs['ereaderkeys'] == {}:
+            self.dedrmprefs['ereaderkeys'] = {}
+        if self.dedrmprefs['kindlekeys'] == {}:
+            self.dedrmprefs['kindlekeys'] = {}
+        if self.dedrmprefs['androidkeys'] == {}:
+            self.dedrmprefs['androidkeys'] = {}
+        if self.dedrmprefs['pids'] == []:
+            self.dedrmprefs['pids'] = []
+        if self.dedrmprefs['serials'] == []:
+            self.dedrmprefs['serials'] = []
+
+    def __getitem__(self,kind = None):
+        if kind is not None:
+            return self.dedrmprefs[kind]
+        return self.dedrmprefs
+
+    def set(self, kind, value):
+        self.dedrmprefs[kind] = value
+
+    def writeprefs(self,value = True):
+        self.dedrmprefs['configured'] = value
+
+    def addnamedvaluetoprefs(self, prefkind, keyname, keyvalue):
+        try:
+            if keyvalue not in self.dedrmprefs[prefkind].values():
+                # ensure that the keyname is unique
+                # by adding a number (starting with 2) to the name if it is not
+                namecount = 1
+                newname = keyname
+                while newname in self.dedrmprefs[prefkind]:
+                    namecount += 1
+                    newname = "{0:s}_{1:d}".format(keyname,namecount)
+                # add to the preferences
+                self.dedrmprefs[prefkind][newname] = keyvalue
+                return (True, newname)
+        except:
+            traceback.print_exc()
+            pass
+        return (False, keyname)
+
+    def addvaluetoprefs(self, prefkind, prefsvalue):
+        # ensure the keyvalue isn't already in the preferences
+        try:
+            if prefsvalue not in self.dedrmprefs[prefkind]:
+                self.dedrmprefs[prefkind].append(prefsvalue)
+                return True
+        except:
+            traceback.print_exc()
+        return False
+
+
+def convertprefs(always = False):
+
+    def parseIgnobleString(keystuff):
+        from calibre_plugins.dedrm.ignoblekeygen import generate_key
+        userkeys = []
+        ar = keystuff.split(':')
+        for keystring in ar:
+            try:
+                name, ccn = keystring.split(',')
+                # Generate Barnes & Noble EPUB user key from name and credit card number.
+                keyname = u"{0}_{1}".format(name.strip(),ccn.strip()[-4:])
+                keyvalue = generate_key(name, ccn)
+                userkeys.append([keyname,keyvalue])
+            except Exception, e:
+                traceback.print_exc()
+                print e.args[0]
+                pass
+        return userkeys
+
+    def parseeReaderString(keystuff):
+        from calibre_plugins.dedrm.erdr2pml import getuser_key
+        userkeys = []
+        ar = keystuff.split(':')
+        for keystring in ar:
+            try:
+                name, cc = keystring.split(',')
+                # Generate eReader user key from name and credit card number.
+                keyname = u"{0}_{1}".format(name.strip(),cc.strip()[-4:])
+                keyvalue = getuser_key(name,cc).encode('hex')
+                userkeys.append([keyname,keyvalue])
+            except Exception, e:
+                traceback.print_exc()
+                print e.args[0]
+                pass
+        return userkeys
+
+    def parseKindleString(keystuff):
+        pids = []
+        serials = []
+        ar = keystuff.split(',')
+        for keystring in ar:
+            keystring = str(keystring).strip().replace(" ","")
+            if len(keystring) == 10 or len(keystring) == 8 and keystring not in pids:
+                pids.append(keystring)
+            elif len(keystring) == 16 and keystring[0] == 'B' and keystring not in serials:
+                serials.append(keystring)
+        return (pids,serials)
+
+    def getConfigFiles(extension, encoding = None):
+        # get any files with extension 'extension' in the config dir
+        userkeys = []
+        files = [f for f in os.listdir(config_dir) if f.endswith(extension)]
+        for filename in files:
+            try:
+                fpath = os.path.join(config_dir, filename)
+                key = os.path.splitext(filename)[0]
+                value = open(fpath, 'rb').read()
+                if encoding is not None:
+                    value = value.encode(encoding)
+                userkeys.append([key,value])
+            except:
+                traceback.print_exc()
+                pass
+        return userkeys
+
+    dedrmprefs = DeDRM_Prefs()
+
+    if (not always) and dedrmprefs['configured']:
+        # We've already converted old preferences,
+        # and we're not being forced to do it again, so just return
+        return
+
+
+    print u"{0} v{1}: Importing configuration data from old DeDRM plugins".format(PLUGIN_NAME, PLUGIN_VERSION)
+
+    IGNOBLEPLUGINNAME = "Ignoble Epub DeDRM"
+    EREADERPLUGINNAME = "eReader PDB 2 PML"
+    OLDKINDLEPLUGINNAME = "K4PC, K4Mac, Kindle Mobi and Topaz DeDRM"
+
+    # get prefs from older tools
+    kindleprefs = JSONConfig(os.path.join(u"plugins", u"K4MobiDeDRM"))
+    ignobleprefs = JSONConfig(os.path.join(u"plugins", u"ignoble_epub_dedrm"))
+
+    # Handle the old ignoble plugin's customization string by converting the
+    # old string to stored keys... get that personal data out of plain sight.
+    from calibre.customize.ui import config
+    sc = config['plugin_customization']
+    val = sc.pop(IGNOBLEPLUGINNAME, None)
+    if val is not None:
+        print u"{0} v{1}: Converting old Ignoble plugin configuration string.".format(PLUGIN_NAME, PLUGIN_VERSION)
+        priorkeycount = len(dedrmprefs['bandnkeys'])
+        userkeys = parseIgnobleString(str(val))
+        for keypair in userkeys:
+            name = keypair[0]
+            value = keypair[1]
+            dedrmprefs.addnamedvaluetoprefs('bandnkeys', name, value)
+        addedkeycount = len(dedrmprefs['bandnkeys'])-priorkeycount
+        print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from old Ignoble plugin configuration string".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"key" if addedkeycount==1 else u"keys")
+    # Make the json write all the prefs to disk
+    dedrmprefs.writeprefs(False)
+
+    # Handle the old eReader plugin's customization string by converting the
+    # old string to stored keys... get that personal data out of plain sight.
+    val = sc.pop(EREADERPLUGINNAME, None)
+    if val is not None:
+        print u"{0} v{1}: Converting old eReader plugin configuration string.".format(PLUGIN_NAME, PLUGIN_VERSION)
+        priorkeycount = len(dedrmprefs['ereaderkeys'])
+        userkeys = parseeReaderString(str(val))
+        for keypair in userkeys:
+            name = keypair[0]
+            value = keypair[1]
+            dedrmprefs.addnamedvaluetoprefs('ereaderkeys', name, value)
+        addedkeycount = len(dedrmprefs['ereaderkeys'])-priorkeycount
+        print u"{0} v{1}: {2:d} eReader {3} imported from old eReader plugin configuration string".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"key" if addedkeycount==1 else u"keys")
+    # Make the json write all the prefs to disk
+    dedrmprefs.writeprefs(False)
+
+    # get old Kindle plugin configuration string
+    val = sc.pop(OLDKINDLEPLUGINNAME, None)
+    if val is not None:
+        print u"{0} v{1}: Converting old Kindle plugin configuration string.".format(PLUGIN_NAME, PLUGIN_VERSION)
+        priorpidcount = len(dedrmprefs['pids'])
+        priorserialcount = len(dedrmprefs['serials'])
+        pids, serials = parseKindleString(val)
+        for pid in pids:
+            dedrmprefs.addvaluetoprefs('pids',pid)
+        for serial in serials:
+            dedrmprefs.addvaluetoprefs('serials',serial)
+        addedpidcount = len(dedrmprefs['pids']) - priorpidcount
+        addedserialcount = len(dedrmprefs['serials']) - priorserialcount
+        print u"{0} v{1}: {2:d} {3} and {4:d} {5} imported from old Kindle plugin configuration string.".format(PLUGIN_NAME, PLUGIN_VERSION, addedpidcount, u"PID" if addedpidcount==1 else u"PIDs", addedserialcount, u"serial number" if addedserialcount==1 else u"serial numbers")
+    # Make the json write all the prefs to disk
+    dedrmprefs.writeprefs(False)
+
+    # copy the customisations back into calibre preferences, as we've now removed the nasty plaintext
+    config['plugin_customization'] = sc
+
+    # get any .b64 files in the config dir
+    priorkeycount = len(dedrmprefs['bandnkeys'])
+    bandnfilekeys = getConfigFiles('.b64')
+    for keypair in bandnfilekeys:
+        name = keypair[0]
+        value = keypair[1]
+        dedrmprefs.addnamedvaluetoprefs('bandnkeys', name, value)
+    addedkeycount = len(dedrmprefs['bandnkeys'])-priorkeycount
+    if addedkeycount > 0:
+        print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"key file" if addedkeycount==1 else u"key files")
+    # Make the json write all the prefs to disk
+    dedrmprefs.writeprefs(False)
+
+    # get any .der files in the config dir
+    priorkeycount = len(dedrmprefs['adeptkeys'])
+    adeptfilekeys = getConfigFiles('.der','hex')
+    for keypair in adeptfilekeys:
+        name = keypair[0]
+        value = keypair[1]
+        dedrmprefs.addnamedvaluetoprefs('adeptkeys', name, value)
+    addedkeycount = len(dedrmprefs['adeptkeys'])-priorkeycount
+    if addedkeycount > 0:
+        print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"keyfile" if addedkeycount==1 else u"keyfiles")
+    # Make the json write all the prefs to disk
+    dedrmprefs.writeprefs(False)
+
+    # get ignoble json prefs
+    if 'keys' in ignobleprefs:
+        priorkeycount = len(dedrmprefs['bandnkeys'])
+        for name in ignobleprefs['keys']:
+            value = ignobleprefs['keys'][name]
+            dedrmprefs.addnamedvaluetoprefs('bandnkeys', name, value)
+        addedkeycount = len(dedrmprefs['bandnkeys']) - priorkeycount
+        # no need to delete old prefs, since they contain no recoverable private data
+        if addedkeycount > 0:
+            print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from Ignoble plugin preferences.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"key" if addedkeycount==1 else u"keys")
+    # Make the json write all the prefs to disk
+    dedrmprefs.writeprefs(False)
+
+    # get kindle json prefs
+    priorpidcount = len(dedrmprefs['pids'])
+    priorserialcount = len(dedrmprefs['serials'])
+    if 'pids' in kindleprefs:
+        pids, serials = parseKindleString(kindleprefs['pids'])
+        for pid in pids:
+            dedrmprefs.addvaluetoprefs('pids',pid)
+    if 'serials' in kindleprefs:
+        pids, serials = parseKindleString(kindleprefs['serials'])
+        for serial in serials:
+            dedrmprefs.addvaluetoprefs('serials',serial)
+    addedpidcount = len(dedrmprefs['pids']) - priorpidcount
+    if addedpidcount > 0:
+        print u"{0} v{1}: {2:d} {3} imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, addedpidcount, u"PID" if addedpidcount==1 else u"PIDs")
+    addedserialcount = len(dedrmprefs['serials']) - priorserialcount
+    if addedserialcount > 0:
+        print u"{0} v{1}: {2:d} {3} imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, addedserialcount, u"serial number" if addedserialcount==1 else u"serial numbers")
+    try:
+        if 'wineprefix' in kindleprefs and kindleprefs['wineprefix'] != "":
+            dedrmprefs.set('adobewineprefix',kindleprefs['wineprefix'])
+            dedrmprefs.set('kindlewineprefix',kindleprefs['wineprefix'])
+            print u"{0} v{1}: WINEPREFIX ‘(2)’ imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, kindleprefs['wineprefix'])
+    except:
+        traceback.print_exc()
+
+
+    # Make the json write all the prefs to disk
+    dedrmprefs.writeprefs()
+    print u"{0} v{1}: Finished setting up configuration data.".format(PLUGIN_NAME, PLUGIN_VERSION)

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

@@ -0,0 +1,198 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+import sys
+import os
+import re
+import ineptepub
+import ignobleepub
+import epubtest
+import zipfix
+import ineptpdf
+import erdr2pml
+import k4mobidedrm
+import traceback
+
+def decryptepub(infile, outdir, rscpath):
+    errlog = ''
+
+    # first fix the epub to make sure we do not get errors
+    name, ext = os.path.splitext(os.path.basename(infile))
+    bpath = os.path.dirname(infile)
+    zippath = os.path.join(bpath,name + '_temp.zip')
+    rv = zipfix.repairBook(infile, zippath)
+    if rv != 0:
+        print "Error while trying to fix epub"
+        return rv
+
+    # determine a good name for the output file
+    outfile = os.path.join(outdir, name + '_nodrm.epub')
+
+    rv = 1
+    # first try with the Adobe adept epub
+    if  ineptepub.adeptBook(zippath):
+        # try with any keyfiles (*.der) in the rscpath
+        files = os.listdir(rscpath)
+        filefilter = re.compile("\.der$", re.IGNORECASE)
+        files = filter(filefilter.search, files)
+        if files:
+            for filename in files:
+                keypath = os.path.join(rscpath, filename)
+                userkey = open(keypath,'rb').read()
+                try:
+                    rv = ineptepub.decryptBook(userkey, zippath, outfile)
+                    if rv == 0:
+                        print "Decrypted Adobe ePub with key file {0}".format(filename)
+                        break
+                except Exception, e:
+                    errlog += traceback.format_exc()
+                    errlog += str(e)
+                    rv = 1
+    # now try with ignoble epub
+    elif  ignobleepub.ignobleBook(zippath):
+        # try with any keyfiles (*.b64) in the rscpath
+        files = os.listdir(rscpath)
+        filefilter = re.compile("\.b64$", re.IGNORECASE)
+        files = filter(filefilter.search, files)
+        if files:
+            for filename in files:
+                keypath = os.path.join(rscpath, filename)
+                userkey = open(keypath,'r').read()
+                #print userkey
+                try:
+                    rv = ignobleepub.decryptBook(userkey, zippath, outfile)
+                    if rv == 0:
+                        print "Decrypted B&N ePub with key file {0}".format(filename)
+                        break
+                except Exception, e:
+                    errlog += traceback.format_exc()
+                    errlog += str(e)
+                    rv = 1
+    else:
+        encryption = epubtest.encryption(zippath)
+        if encryption == "Unencrypted":
+            print "{0} is not DRMed.".format(name)
+            rv = 0
+        else:
+            print "{0} has an unknown encryption.".format(name)
+
+    os.remove(zippath)
+    if rv != 0:
+        print errlog
+    return rv
+
+
+def decryptpdf(infile, outdir, rscpath):
+    errlog = ''
+    rv = 1
+
+    # determine a good name for the output file
+    name, ext = os.path.splitext(os.path.basename(infile))
+    outfile = os.path.join(outdir, name + '_nodrm.pdf')
+
+    # try with any keyfiles (*.der) in the rscpath
+    files = os.listdir(rscpath)
+    filefilter = re.compile("\.der$", re.IGNORECASE)
+    files = filter(filefilter.search, files)
+    if files:
+        for filename in files:
+            keypath = os.path.join(rscpath, filename)
+            userkey = open(keypath,'rb').read()
+            try:
+                rv = ineptpdf.decryptBook(userkey, infile, outfile)
+                if rv == 0:
+                    break
+            except Exception, e:
+                errlog += traceback.format_exc()
+                errlog += str(e)
+                rv = 1
+
+    if rv != 0:
+        print errlog
+    return rv
+
+
+def decryptpdb(infile, outdir, rscpath):
+    outname = os.path.splitext(os.path.basename(infile))[0] + ".pmlz"
+    outpath = os.path.join(outdir, outname)
+    rv = 1
+    socialpath = os.path.join(rscpath,'sdrmlist.txt')
+    if os.path.exists(socialpath):
+        keydata = file(socialpath,'r').read()
+        keydata = keydata.rstrip(os.linesep)
+        ar = keydata.split(',')
+        for i in ar:
+            try:
+                name, cc8 = i.split(':')
+            except ValueError:
+                print '   Error parsing user supplied social drm data.'
+                return 1
+            try:
+                rv = erdr2pml.decryptBook(infile, outpath, True, erdr2pml.getuser_key(name, cc8))
+            except Exception, e:
+                errlog += traceback.format_exc()
+                errlog += str(e)
+                rv = 1
+
+            if rv == 0:
+                break
+    return rv
+
+
+def decryptk4mobi(infile, outdir, rscpath):
+    rv = 1
+    pidnums = []
+    pidspath = os.path.join(rscpath,'pidlist.txt')
+    if os.path.exists(pidspath):
+        pidstr = file(pidspath,'r').read()
+        pidstr = pidstr.rstrip(os.linesep)
+        pidstr = pidstr.strip()
+        if pidstr != '':
+            pidnums = pidstr.split(',')
+    serialnums = []
+    serialnumspath = os.path.join(rscpath,'seriallist.txt')
+    if os.path.exists(serialnumspath):
+        serialstr = file(serialnumspath,'r').read()
+        serialstr = serialstr.rstrip(os.linesep)
+        serialstr = serialstr.strip()
+        if serialstr != '':
+            serialnums = serialstr.split(',')
+    kDatabaseFiles = []
+    files = os.listdir(rscpath)
+    filefilter = re.compile("\.k4i$", re.IGNORECASE)
+    files = filter(filefilter.search, files)
+    if files:
+        for filename in files:
+            dpath = os.path.join(rscpath,filename)
+            kDatabaseFiles.append(dpath)
+    androidFiles = []
+    files = os.listdir(rscpath)
+    filefilter = re.compile("\.ab$", re.IGNORECASE)
+    files = filter(filefilter.search, files)
+    if files:
+        for filename in files:
+            dpath = os.path.join(rscpath,filename)
+            androidFiles.append(dpath)
+    files = os.listdir(rscpath)
+    filefilter = re.compile("\.db$", re.IGNORECASE)
+    files = filter(filefilter.search, files)
+    if files:
+        for filename in files:
+            dpath = os.path.join(rscpath,filename)
+            androidFiles.append(dpath)
+    files = os.listdir(rscpath)
+    filefilter = re.compile("\.xml$", re.IGNORECASE)
+    files = filter(filefilter.search, files)
+    if files:
+        for filename in files:
+            dpath = os.path.join(rscpath,filename)
+            androidFiles.append(dpath)
+    try:
+        rv = k4mobidedrm.decryptBook(infile, outdir, kDatabaseFiles, androidFiles, serialnums, pidnums)
+    except Exception, e:
+        errlog += traceback.format_exc()
+        errlog += str(e)
+        rv = 1
+
+    return rv

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

@@ -10,6 +10,7 @@ import re
 from struct import pack
 from struct import unpack
 
+debug = False
 
 class DocParser(object):
     def __init__(self, flatxml, fontsize, ph, pw):
@@ -113,7 +114,9 @@ class DocParser(object):
 
         # process each style converting what you can
 
+        if debug: print '          ', 'Processing styles.'
         for j in xrange(stylecnt):
+            if debug: print '          ', 'Processing style %d' %(j)
             start = styleList[j]
             end = styleList[j+1]
 
@@ -132,6 +135,8 @@ class DocParser(object):
                 else :
                     sclass = ''
 
+                if debug: print 'sclass', sclass
+
                 # check for any "after class" specifiers
                 (pos, aftclass) = self.findinDoc('style._after_class',start,end)
                 if aftclass != None:
@@ -140,6 +145,8 @@ class DocParser(object):
                 else :
                     aftclass = ''
 
+                if debug: print 'aftclass', aftclass
+
                 cssargs = {}
 
                 while True :
@@ -147,6 +154,9 @@ class DocParser(object):
                     (pos1, attr) = self.findinDoc('style.rule.attr', start, end)
                     (pos2, val) = self.findinDoc('style.rule.value', start, end)
 
+                    if debug: print 'attr', attr
+                    if debug: print 'val', val
+
                     if attr == None : break
 
                     if (attr == 'display') or (attr == 'pos') or (attr == 'align'):
@@ -164,11 +174,16 @@ class DocParser(object):
                                 scale = self.pw
                             elif attr == 'line-space':
                                 scale = self.fontsize * 2.0
-                            
+
                             if val == "":
                                 val = 0
 
-                            if not ((attr == 'hang') and (int(val) == 0)) :
+                            if not ((attr == 'hang') and (int(val) == 0)):
+                                try:
+                                    f = float(val)
+                                except:
+                                    print "Warning: unrecognised val, ignoring"
+                                    val = 0
                                 pv = float(val)/scale
                                 cssargs[attr] = (self.attr_val_map[attr], pv)
                                 keep = True
@@ -179,6 +194,7 @@ class DocParser(object):
                 if aftclass != "" : keep = False
 
                 if keep :
+                    if debug: print 'keeping style'
                     # make sure line-space does not go below 100% or above 300% since
                     # it can be wacky in some styles
                     if 'line-space' in cssargs:
@@ -256,7 +272,9 @@ def convert2CSS(flatxml, fontsize, ph, pw):
 
     # create a document parser
     dp = DocParser(flatxml, fontsize, ph, pw)
+    if debug: print '          ', 'Created DocParser.'
     csspage = dp.process()
+    if debug: print '          ', 'Processed DocParser.'
     return csspage
 
 

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

@@ -1,43 +1,97 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
-class Unbuffered:
+# topazextract.py
+# Mostly written by some_updates based on code from many others
+
+# Changelog
+#  4.9  - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  5.0  - Fixed potential unicode problem with command line interface
+
+__version__ = '5.0'
+
+import sys
+import os, csv, getopt
+import zlib, zipfile, tempfile, shutil
+import traceback
+from struct import pack
+from struct import unpack
+from alfcrypto import Topaz_Cipher
+
+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)
 
-import sys
+iswindows = sys.platform.startswith('win')
+isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"mobidedrm.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = 'utf-8'
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+#global switch
+debug = False
 
 if 'calibre' in sys.modules:
     inCalibre = True
+    from calibre_plugins.dedrm import kgenpids
 else:
     inCalibre = False
+    import kgenpids
 
-buildXML = False
 
-import os, csv, getopt
-import zlib, zipfile, tempfile, shutil
-from struct import pack
-from struct import unpack
-from alfcrypto import Topaz_Cipher
-
-class TpzDRMError(Exception):
+class DrmException(Exception):
     pass
 
 
-# local support routines
-if inCalibre:
-    from calibre_plugins.k4mobidedrm import kgenpids
-else:
-    import kgenpids
-
 # recursive zip creation support routine
 def zipUpDir(myzip, tdir, localname):
     currentdir = tdir
-    if localname != "":
+    if localname != u"":
         currentdir = os.path.join(currentdir,localname)
     list = os.listdir(currentdir)
     for file in list:
@@ -73,7 +127,7 @@ def bookReadEncodedNumber(fo):
 # Get a length prefixed string from file
 def bookReadString(fo):
     stringLength = bookReadEncodedNumber(fo)
-    return unpack(str(stringLength)+"s",fo.read(stringLength))[0]
+    return unpack(str(stringLength)+'s',fo.read(stringLength))[0]
 
 #
 # crypto routines
@@ -112,13 +166,13 @@ def decryptRecord(data,PID):
 # Try to decrypt a dkey record (contains the bookPID)
 def decryptDkeyRecord(data,PID):
     record = decryptRecord(data,PID)
-    fields = unpack("3sB8sB8s3s",record)
-    if fields[0] != "PID" or fields[5] != "pid" :
-        raise TpzDRMError("Didn't find PID magic numbers in record")
+    fields = unpack('3sB8sB8s3s',record)
+    if fields[0] != 'PID' or fields[5] != 'pid' :
+        raise DrmException(u"Didn't find PID magic numbers in record")
     elif fields[1] != 8 or fields[3] != 8 :
-        raise TpzDRMError("Record didn't contain correct length fields")
+        raise DrmException(u"Record didn't contain correct length fields")
     elif fields[2] != PID :
-        raise TpzDRMError("Record didn't contain PID")
+        raise DrmException(u"Record didn't contain PID")
     return fields[4]
 
 # Decrypt all dkey records (contain the book PID)
@@ -131,11 +185,11 @@ def decryptDkeyRecords(data,PID):
         try:
             key = decryptDkeyRecord(data[1:length+1],PID)
             records.append(key)
-        except TpzDRMError:
+        except DrmException:
             pass
         data = data[1+length:]
     if len(records) == 0:
-        raise TpzDRMError("BookKey Not Found")
+        raise DrmException(u"BookKey Not Found")
     return records
 
 
@@ -148,9 +202,9 @@ class TopazBook:
         self.bookHeaderRecords = {}
         self.bookMetadata = {}
         self.bookKey = None
-        magic = unpack("4s",self.fo.read(4))[0]
+        magic = unpack('4s',self.fo.read(4))[0]
         if magic != 'TPZ0':
-            raise TpzDRMError("Parse Error : Invalid Header, not a Topaz file")
+            raise DrmException(u"Parse Error : Invalid Header, not a Topaz file")
         self.parseTopazHeaders()
         self.parseMetadata()
 
@@ -159,6 +213,7 @@ class TopazBook:
             # Read and return the data of one header record at the current book file position
             # [[offset,decompressedLength,compressedLength],...]
             nbValues = bookReadEncodedNumber(self.fo)
+            if debug: print "%d records in header " % nbValues,
             values = []
             for i in range (0,nbValues):
                 values.append([bookReadEncodedNumber(self.fo),bookReadEncodedNumber(self.fo),bookReadEncodedNumber(self.fo)])
@@ -167,33 +222,34 @@ class TopazBook:
             # Read and parse one header record at the current book file position and return the associated data
             # [[offset,decompressedLength,compressedLength],...]
             if ord(self.fo.read(1)) != 0x63:
-                raise TpzDRMError("Parse Error : Invalid Header")
+                raise DrmException(u"Parse Error : Invalid Header")
             tag = bookReadString(self.fo)
             record = bookReadHeaderRecordData()
             return [tag,record]
         nbRecords = bookReadEncodedNumber(self.fo)
+        if debug: print "Headers: %d" % nbRecords
         for i in range (0,nbRecords):
             result = parseTopazHeaderRecord()
-            # print result[0], result[1]
+            if debug: print result[0], ": ", result[1]
             self.bookHeaderRecords[result[0]] = result[1]
         if ord(self.fo.read(1))  != 0x64 :
-            raise TpzDRMError("Parse Error : Invalid Header")
+            raise DrmException(u"Parse Error : Invalid Header")
         self.bookPayloadOffset = self.fo.tell()
 
     def parseMetadata(self):
         # Parse the metadata record from the book payload and return a list of [key,values]
-        self.fo.seek(self.bookPayloadOffset + self.bookHeaderRecords["metadata"][0][0])
+        self.fo.seek(self.bookPayloadOffset + self.bookHeaderRecords['metadata'][0][0])
         tag = bookReadString(self.fo)
-        if tag != "metadata" :
-            raise TpzDRMError("Parse Error : Record Names Don't Match")
+        if tag != 'metadata' :
+            raise DrmException(u"Parse Error : Record Names Don't Match")
         flags = ord(self.fo.read(1))
         nbRecords = ord(self.fo.read(1))
-        # print nbRecords
+        if debug: print "Metadata Records: %d" % nbRecords
         for i in range (0,nbRecords) :
             keyval = bookReadString(self.fo)
             content = bookReadString(self.fo)
-            # print keyval
-            # print content
+            if debug: print keyval
+            if debug: print content
             self.bookMetadata[keyval] = content
         return self.bookMetadata
 
@@ -210,7 +266,7 @@ class TopazBook:
         title = ''
         if 'Title' in self.bookMetadata:
             title = self.bookMetadata['Title']
-        return title
+        return title.decode('utf-8')
 
     def setBookKey(self, key):
         self.bookKey = key
@@ -223,13 +279,13 @@ class TopazBook:
         try:
             recordOffset = self.bookHeaderRecords[name][index][0]
         except:
-            raise TpzDRMError("Parse Error : Invalid Record, record not found")
+            raise DrmException("Parse Error : Invalid Record, record not found")
 
         self.fo.seek(self.bookPayloadOffset + recordOffset)
 
         tag = bookReadString(self.fo)
         if tag != name :
-            raise TpzDRMError("Parse Error : Invalid Record, record name doesn't match")
+            raise DrmException("Parse Error : Invalid Record, record name doesn't match")
 
         recordIndex = bookReadEncodedNumber(self.fo)
         if recordIndex < 0 :
@@ -237,7 +293,7 @@ class TopazBook:
             recordIndex = -recordIndex -1
 
         if recordIndex != index :
-            raise TpzDRMError("Parse Error : Invalid Record, index doesn't match")
+            raise DrmException("Parse Error : Invalid Record, index doesn't match")
 
         if (self.bookHeaderRecords[name][index][2] > 0):
             compressed = True
@@ -250,7 +306,7 @@ class TopazBook:
                 ctx = topazCryptoInit(self.bookKey)
                 record = topazCryptoDecrypt(record,ctx)
             else :
-                raise TpzDRMError("Error: Attempt to decrypt without bookKey")
+                raise DrmException("Error: Attempt to decrypt without bookKey")
 
         if compressed:
             record = zlib.decompress(record)
@@ -262,20 +318,20 @@ class TopazBook:
         fixedimage=True
         try:
             keydata = self.getBookPayloadRecord('dkey', 0)
-        except TpzDRMError, e:
-            print "no dkey record found, book may not be encrypted"
-            print "attempting to extrct files without a book key"
+        except DrmException, e:
+            print u"no dkey record found, book may not be encrypted"
+            print u"attempting to extrct files without a book key"
             self.createBookDirectory()
             self.extractFiles()
-            print "Successfully Extracted Topaz contents"
+            print u"Successfully Extracted Topaz contents"
             if inCalibre:
-                from calibre_plugins.k4mobidedrm import genbook
+                from calibre_plugins.dedrm import genbook
             else:
                 import genbook
-            
+
             rv = genbook.generateBook(self.outdir, raw, fixedimage)
             if rv == 0:
-                print "\nBook Successfully generated"
+                print u"Book Successfully generated."
             return rv
 
         # try each pid to decode the file
@@ -283,33 +339,33 @@ class TopazBook:
         for pid in pidlst:
             # use 8 digit pids here
             pid = pid[0:8]
-            print "\nTrying: ", pid
+            print u"Trying: {0}".format(pid)
             bookKeys = []
             data = keydata
             try:
                 bookKeys+=decryptDkeyRecords(data,pid)
-            except TpzDRMError, e:
+            except DrmException, e:
                 pass
             else:
                 bookKey = bookKeys[0]
-                print "Book Key Found!"
+                print u"Book Key Found! ({0})".format(bookKey.encode('hex'))
                 break
 
         if not bookKey:
-            raise TpzDRMError('Decryption Unsucessful; No valid pid found')
+            raise DrmException(u"No key found in {0:d} keys tried. Read the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(len(pidlst)))
 
         self.setBookKey(bookKey)
         self.createBookDirectory()
-        self.extractFiles()
-        print "Successfully Extracted Topaz contents"
+        self.extractFiles() 
+        print u"Successfully Extracted Topaz contents"
         if inCalibre:
-            from calibre_plugins.k4mobidedrm import genbook
+            from calibre_plugins.dedrm import genbook
         else:
             import genbook
-        
+
         rv = genbook.generateBook(self.outdir, raw, fixedimage)
         if rv == 0:
-            print "\nBook Successfully generated"
+            print u"Book Successfully generated"
         return rv
 
     def createBookDirectory(self):
@@ -317,16 +373,16 @@ class TopazBook:
         # create output directory structure
         if not os.path.exists(outdir):
             os.makedirs(outdir)
-        destdir =  os.path.join(outdir,'img')
+        destdir =  os.path.join(outdir,u"img")
         if not os.path.exists(destdir):
             os.makedirs(destdir)
-        destdir =  os.path.join(outdir,'color_img')
+        destdir =  os.path.join(outdir,u"color_img")
         if not os.path.exists(destdir):
             os.makedirs(destdir)
-        destdir =  os.path.join(outdir,'page')
+        destdir =  os.path.join(outdir,u"page")
         if not os.path.exists(destdir):
             os.makedirs(destdir)
-        destdir =  os.path.join(outdir,'glyphs')
+        destdir =  os.path.join(outdir,u"glyphs")
         if not os.path.exists(destdir):
             os.makedirs(destdir)
 
@@ -334,149 +390,149 @@ class TopazBook:
         outdir = self.outdir
         for headerRecord in self.bookHeaderRecords:
             name = headerRecord
-            if name != "dkey" :
-                ext = '.dat'
-                if name == 'img' : ext = '.jpg'
-                if name == 'color' : ext = '.jpg'
-                print "\nProcessing Section: %s " % name
+            if name != 'dkey':
+                ext = u".dat"
+                if name == 'img': ext = u".jpg"
+                if name == 'color' : ext = u".jpg"
+                print u"Processing Section: {0}\n. . .".format(name),
                 for index in range (0,len(self.bookHeaderRecords[name])) :
-                    fnum = "%04d" % index
-                    fname = name + fnum + ext
+                    fname = u"{0}{1:04d}{2}".format(name,index,ext)
                     destdir = outdir
                     if name == 'img':
-                        destdir =  os.path.join(outdir,'img')
+                        destdir =  os.path.join(outdir,u"img")
                     if name == 'color':
-                        destdir =  os.path.join(outdir,'color_img')
+                        destdir =  os.path.join(outdir,u"color_img")
                     if name == 'page':
-                        destdir =  os.path.join(outdir,'page')
+                        destdir =  os.path.join(outdir,u"page")
                     if name == 'glyphs':
-                        destdir =  os.path.join(outdir,'glyphs')
+                        destdir =  os.path.join(outdir,u"glyphs")
                     outputFile = os.path.join(destdir,fname)
-                    print ".",
+                    print u".",
                     record = self.getBookPayloadRecord(name,index)
                     if record != '':
                         file(outputFile, 'wb').write(record)
-        print " "
+                print u" "
 
-    def getHTMLZip(self, zipname):
+    def getFile(self, zipname):
         htmlzip = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
-        htmlzip.write(os.path.join(self.outdir,'book.html'),'book.html')
-        htmlzip.write(os.path.join(self.outdir,'book.opf'),'book.opf')
-        if os.path.isfile(os.path.join(self.outdir,'cover.jpg')):
-            htmlzip.write(os.path.join(self.outdir,'cover.jpg'),'cover.jpg')
-        htmlzip.write(os.path.join(self.outdir,'style.css'),'style.css')
-        zipUpDir(htmlzip, self.outdir, 'img')
+        htmlzip.write(os.path.join(self.outdir,u"book.html"),u"book.html")
+        htmlzip.write(os.path.join(self.outdir,u"book.opf"),u"book.opf")
+        if os.path.isfile(os.path.join(self.outdir,u"cover.jpg")):
+            htmlzip.write(os.path.join(self.outdir,u"cover.jpg"),u"cover.jpg")
+        htmlzip.write(os.path.join(self.outdir,u"style.css"),u"style.css")
+        zipUpDir(htmlzip, self.outdir, u"img")
         htmlzip.close()
 
+    def getBookType(self):
+        return u"Topaz"
+
+    def getBookExtension(self):
+        return u".htmlz"
+
     def getSVGZip(self, zipname):
         svgzip = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
-        svgzip.write(os.path.join(self.outdir,'index_svg.xhtml'),'index_svg.xhtml')
-        zipUpDir(svgzip, self.outdir, 'svg')
-        zipUpDir(svgzip, self.outdir, 'img')
+        svgzip.write(os.path.join(self.outdir,u"index_svg.xhtml"),u"index_svg.xhtml")
+        zipUpDir(svgzip, self.outdir, u"svg")
+        zipUpDir(svgzip, self.outdir, u"img")
         svgzip.close()
-    
-    def getXMLZip(self, zipname):
-        xmlzip = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
-        targetdir = os.path.join(self.outdir,'xml')
-        zipUpDir(xmlzip, targetdir, '')
-        zipUpDir(xmlzip, self.outdir, 'img')
-        xmlzip.close()
 
     def cleanup(self):
         if os.path.isdir(self.outdir):
             shutil.rmtree(self.outdir, True)
 
 def usage(progname):
-    print "Removes DRM protection from Topaz ebooks and extract the contents"
-    print "Usage:"
-    print "    %s [-k <kindle.info>] [-p <pidnums>] [-s <kindleSerialNumbers>] <infile> <outdir>  " % progname
-
+    print u"Removes DRM protection from Topaz ebooks and extracts the contents"
+    print u"Usage:"
+    print u"    {0} [-k <kindle.k4i>] [-p <comma separated PIDs>] [-s <comma separated Kindle serial numbers>] <infile> <outdir>".format(progname)
 
 # Main
-def main(argv=sys.argv):
-    global buildXML
+def cli_main():
+    argv=unicode_argv()
     progname = os.path.basename(argv[0])
-    k4 = False
-    pids = []
-    serials = []
-    kInfoFiles = []
+    print u"TopazExtract v{0}.".format(__version__)
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
+        opts, args = getopt.getopt(argv[1:], "k:p:s:x")
     except getopt.GetoptError, err:
-        print str(err)
+        print u"Error in options or arguments: {0}".format(err.args[0])
         usage(progname)
         return 1
     if len(args)<2:
         usage(progname)
         return 1
 
-    for o, a in opts:
-        if o == "-k":
-            if a == None :
-                print "Invalid parameter for -k"
-                return 1
-            kInfoFiles.append(a)
-        if o == "-p":
-            if a == None :
-                print "Invalid parameter for -p"
-                return 1
-            pids = a.split(',')
-        if o == "-s":
-            if a == None :
-                print "Invalid parameter for -s"
-                return 1
-            serials = a.split(',')
-    k4 = True
-
     infile = args[0]
     outdir = args[1]
-
     if not os.path.isfile(infile):
-        print "Input File Does Not Exist"
+        print u"Input File {0} Does Not Exist.".format(infile)
         return 1
 
+    if not os.path.exists(outdir):
+        print u"Output Directory {0} Does Not Exist.".format(outdir)
+        return 1
+
+    kDatabaseFiles = []
+    serials = []
+    pids = []
+
+    for o, a in opts:
+        if o == '-k':
+            if a == None :
+                raise DrmException("Invalid parameter for -k")
+            kDatabaseFiles.append(a)
+        if o == '-p':
+            if a == None :
+                raise DrmException("Invalid parameter for -p")
+            pids = a.split(',')
+        if o == '-s':
+            if a == None :
+                raise DrmException("Invalid parameter for -s")
+            serials = [serial.replace(" ","") for serial in a.split(',')]
+
     bookname = os.path.splitext(os.path.basename(infile))[0]
 
     tb = TopazBook(infile)
     title = tb.getBookTitle()
-    print "Processing Book: ", title
-    keysRecord, keysRecordRecord = tb.getPIDMetaInfo()
-    pidlst = kgenpids.getPidList(keysRecord, keysRecordRecord, k4, pids, serials, kInfoFiles)
+    print u"Processing Book: {0}".format(title)
+    md1, md2 = tb.getPIDMetaInfo()
+    pids.extend(kgenpids.getPidList(md1, md2, serials, kDatabaseFiles))
 
     try:
-        print "Decrypting Book"
-        tb.processBook(pidlst)
+        print u"Decrypting Book"
+        tb.processBook(pids)
 
-        print "   Creating HTML ZIP Archive"
-        zipname = os.path.join(outdir, bookname + '_nodrm' + '.htmlz')
-        tb.getHTMLZip(zipname)
+        print u"   Creating HTML ZIP Archive"
+        zipname = os.path.join(outdir, bookname + u"_nodrm.htmlz")
+        tb.getFile(zipname)
 
-        print "   Creating SVG ZIP Archive"
-        zipname = os.path.join(outdir, bookname + '_SVG' + '.zip')
+        print u"   Creating SVG ZIP Archive"
+        zipname = os.path.join(outdir, bookname + u"_SVG.zip")
         tb.getSVGZip(zipname)
 
-        if buildXML:
-            print "   Creating XML ZIP Archive"
-            zipname = os.path.join(outdir, bookname + '_XML' + '.zip')
-            tb.getXMLZip(zipname)
-
         # removing internal temporary directory of pieces
         tb.cleanup()
 
-    except TpzDRMError, e:
-        print str(e)
-        # tb.cleanup()
+    except DrmException, e:
+        print u"Decryption failed\n{0}".format(traceback.format_exc())
+
+        try:
+            tb.cleanup()
+        except:
+            pass
         return 1
 
     except Exception, e:
-        print str(e)
-        # tb.cleanup
+        print u"Decryption failed\m{0}".format(traceback.format_exc())
+        try:
+            tb.cleanup()
+        except:
+            pass
         return 1
 
     return 0
 
 
 if __name__ == '__main__':
-    sys.stdout=Unbuffered(sys.stdout)
-    sys.exit(main())
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    sys.exit(cli_main())

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

@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+__license__ = 'GPL v3'
+
+DETAILED_MESSAGE = \
+'You have personal information stored in this plugin\'s customization '+ \
+'string from a previous version of this plugin.\n\n'+ \
+'This new version of the plugin can convert that info '+ \
+'into key data that the new plugin can then use (which doesn\'t '+ \
+'require personal information to be stored/displayed in an insecure '+ \
+'manner like the old plugin did).\n\nIf you choose NOT to migrate this data at this time '+ \
+'you will be prompted to save that personal data to a file elsewhere; and you\'ll have '+ \
+'to manually re-configure this plugin with your information.\n\nEither way... ' + \
+'this new version of the plugin will not be responsible for storing that personal '+ \
+'info in plain sight any longer.'
+
+def uStrCmp (s1, s2, caseless=False):
+    import unicodedata as ud
+    str1 = s1 if isinstance(s1, unicode) else unicode(s1)
+    str2 = s2 if isinstance(s2, unicode) else unicode(s2)
+    if caseless:
+        return ud.normalize('NFC', str1.lower()) == ud.normalize('NFC', str2.lower())
+    else:
+        return ud.normalize('NFC', str1) == ud.normalize('NFC', str2)
+
+def parseCustString(keystuff):
+    userkeys = []
+    ar = keystuff.split(':')
+    for i in ar:
+        try:
+            name, ccn = i.split(',')
+            # Generate Barnes & Noble EPUB user key from name and credit card number.
+            userkeys.append(generate_key(name, ccn))
+        except:
+            pass
+    return userkeys

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

@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+__license__ = 'GPL v3'
+
+# Standard Python modules.
+import os, sys, re, hashlib
+from calibre_plugins.dedrm.__init__ import PLUGIN_NAME, PLUGIN_VERSION
+
+def WineGetKeys(scriptpath, extension, wineprefix=""):
+    import subprocess
+    from subprocess import Popen, PIPE, STDOUT
+
+    import subasyncio
+    from subasyncio import Process
+
+    if extension == u".k4i":
+        import json
+
+    basepath, script = os.path.split(scriptpath)
+    print u"{0} v{1}: Running {2} under Wine".format(PLUGIN_NAME, PLUGIN_VERSION, script)
+
+    outdirpath = os.path.join(basepath, u"winekeysdir")
+    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:
+        cmdline = u"wine 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])
+        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)]
+    for filename in files:
+        try:
+            fpath = os.path.join(outdirpath, filename)
+            with open(fpath, 'rb') as keyfile:
+                if extension == u".k4i":
+                    new_key_value = json.loads(keyfile.read())
+                else:
+                    new_key_value = keyfile.read()
+            winekeys.append(new_key_value)
+        except:
+            print u"{0} v{1}: Error loading file {2}".format(PLUGIN_NAME, PLUGIN_VERSION, filename)
+            traceback.print_exc()
+        os.remove(fpath)
+    print u"{0} v{1}: Found and decrypted {2} {3}".format(PLUGIN_NAME, PLUGIN_VERSION, len(winekeys), u"key file" if len(winekeys) == 1 else u"key files")
+    return winekeys

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

@@ -1,8 +1,26 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# zipfix.py, version 1.1
+# Copyright © 2010-2013 by some_updates, DiapDealer and Apprentice Alf
+
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
+
+# Revision history:
+#   1.0 - Initial release
+#   1.1 - Updated to handle zip file metadata correctly
+
+"""
+Re-write zip (or ePub) fixing problems with file names (and mimetype entry).
+"""
+
+__license__ = 'GPL v3'
+__version__ = "1.1"
 
 import sys
 import zlib
-import zipfile
+import zipfilerugged
 import os
 import os.path
 import getopt
@@ -15,7 +33,7 @@ _FILENAME_OFFSET = 30
 _MAX_SIZE = 64 * 1024
 _MIMETYPE = 'application/epub+zip'
 
-class ZipInfo(zipfile.ZipInfo):
+class ZipInfo(zipfilerugged.ZipInfo):
     def __init__(self, *args, **kwargs):
         if 'compress_type' in kwargs:
             compress_type = kwargs.pop('compress_type')
@@ -27,8 +45,8 @@ class fixZip:
         self.ztype = 'zip'
         if zinput.lower().find('.epub') >= 0 :
             self.ztype = 'epub'
-        self.inzip = zipfile.ZipFile(zinput,'r')
-        self.outzip = zipfile.ZipFile(zoutput,'w')
+        self.inzip = zipfilerugged.ZipFile(zinput,'r')
+        self.outzip = zipfilerugged.ZipFile(zoutput,'w')
         # open the input zip for reading only as a raw file
         self.bzf = file(zinput,'rb')
 
@@ -76,11 +94,11 @@ class fixZip:
         data = None
 
         # if not compressed we are good to go
-        if zi.compress_type == zipfile.ZIP_STORED:
+        if zi.compress_type == zipfilerugged.ZIP_STORED:
             data = self.bzf.read(zi.file_size)
 
         # if compressed we must decompress it using zlib
-        if zi.compress_type == zipfile.ZIP_DEFLATED:
+        if zi.compress_type == zipfilerugged.ZIP_DEFLATED:
             cmpdata = self.bzf.read(zi.compress_size)
             data = self.uncompress(cmpdata)
 
@@ -95,25 +113,41 @@ class fixZip:
 
         # if epub write mimetype file first, with no compression
         if self.ztype == 'epub':
-            nzinfo = ZipInfo('mimetype', compress_type=zipfile.ZIP_STORED)
-            self.outzip.writestr(nzinfo, _MIMETYPE)
+            # first get a ZipInfo with current time and no compression
+            mimeinfo = ZipInfo('mimetype',compress_type=zipfilerugged.ZIP_STORED)
+            mimeinfo.internal_attr = 1 # text file
+            try:
+                # if the mimetype is present, get its info, including time-stamp
+                oldmimeinfo = self.inzip.getinfo('mimetype')
+                # copy across useful fields
+                mimeinfo.date_time = oldmimeinfo.date_time
+                mimeinfo.comment = oldmimeinfo.comment
+                mimeinfo.extra = oldmimeinfo.extra
+                mimeinfo.internal_attr = oldmimeinfo.internal_attr
+                mimeinfo.external_attr = oldmimeinfo.external_attr
+                mimeinfo.create_system = oldmimeinfo.create_system
+            except:
+                pass
+            self.outzip.writestr(mimeinfo, _MIMETYPE)
 
         # write the rest of the files
         for zinfo in self.inzip.infolist():
-            if zinfo.filename != "mimetype" or self.ztype == '.zip':
+            if zinfo.filename != "mimetype" or self.ztype != 'epub':
                 data = None
-                nzinfo = zinfo
                 try:
                     data = self.inzip.read(zinfo.filename)
-                except zipfile.BadZipfile or zipfile.error:
+                except zipfilerugged.BadZipfile or zipfilerugged.error:
                     local_name = self.getlocalname(zinfo)
                     data = self.getfiledata(zinfo)
-                    nzinfo.filename = local_name
+                    zinfo.filename = local_name
 
-                nzinfo.date_time = zinfo.date_time
-                nzinfo.compress_type = zinfo.compress_type
-                nzinfo.flag_bits = 0
-                nzinfo.internal_attr = 0
+                # create new ZipInfo with only the useful attributes from the old info
+                nzinfo = ZipInfo(zinfo.filename, zinfo.date_time, compress_type=zinfo.compress_type)
+                nzinfo.comment=zinfo.comment
+                nzinfo.extra=zinfo.extra
+                nzinfo.internal_attr=zinfo.internal_attr
+                nzinfo.external_attr=zinfo.external_attr
+                nzinfo.create_system=zinfo.create_system
                 self.outzip.writestr(nzinfo,data)
 
         self.bzf.close()

DeDRM_Windows_Application/DeDRM_App/DeDRM_Drop_Target.bat

@@ -0,0 +1 @@
+chcp 65001 > nul && set PWD="%~dp0" && cd /d "%~dp0DeDRM_lib" && start /min python DeDRM_App.pyw %*

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw

@@ -1,10 +1,45 @@
 #!/usr/bin/env python
-# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+# -*- coding: utf-8 -*-
+
+# DeDRM.pyw
+# Copyright 2010-2016 some_updates, Apprentice Alf and Apprentice Harper
+
+# Revision history:
+#   6.0.0 - Release along with unified plugin
+#   6.0.1 - Bug Fixes for Windows App
+#   6.0.2 - Fixed problem with spaces in paths and the bat file
+#   6.0.3 - Fix for Windows non-ascii user names
+#   6.0.4 - Fix for other potential unicode problems
+#   6.0.5 - Fix typo
+#   6.2.0 - Update to match plugin and AppleScript
+#   6.2.1 - Fix for non-ascii user names
+#   6.2.2 - Added URL method for B&N/nook books
+#   6.3.0 - Add in Android support
+#   6.3.1 - Version bump for clarity
+#   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
+#   6.5.0 - Fix for some new tags in Topaz ebooks
+#   6.5.1 - Version bump to match plugin & Mac app
+
+__version__ = '6.5.1'
 
 import sys
 import os, os.path
-sys.path.append(sys.path[0]+os.sep+'lib')
-os.environ['PYTHONIOENCODING'] = "utf-8"
+sys.path.append(os.path.join(sys.path[0],"lib"))
+import sys, os
+import codecs
+
+from argv_utils import add_cp65001_codec, set_utf8_default_encoding, unicode_argv
+add_cp65001_codec()
+set_utf8_default_encoding()
+
 
 import shutil
 import Tkinter
@@ -13,15 +48,32 @@ import Tkconstants
 import tkFileDialog
 from scrolltextwidget import ScrolledText
 from activitybar import ActivityBar
-import subprocess
-from subprocess import Popen, PIPE, STDOUT
-import subasyncio
-from subasyncio import Process
+if sys.platform.startswith("win"):
+    from askfolder_ed import AskFolder
 import re
 import simpleprefs
+import traceback
+
+from Queue import Full
+from Queue import Empty
+from multiprocessing import Process, Queue
+
+from scriptinterface import decryptepub, decryptpdb, decryptpdf, decryptk4mobi
 
 
-__version__ = '5.2'
+# Wrap a stream so that output gets flushed immediately
+# and appended to shared queue
+class QueuedUTF8Stream:
+    def __init__(self, stream, q):
+        self.stream = stream
+        self.encoding = 'utf-8'
+        self.q = q
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode('utf-8',"replace")
+        self.q.put(data)
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
 
 class DrmException(Exception):
     pass
@@ -32,6 +84,7 @@ class MainApp(Tk):
         self.withdraw()
         self.dnd = dnd
         self.apphome = apphome
+
         # preference settings
         # [dictionary key, file in preferences directory where info is stored]
         description = [ ['pids'   , 'pidlist.txt'   ],
@@ -52,13 +105,29 @@ class MainApp(Tk):
     def getPreferences(self):
         prefs = self.po.getPreferences()
         prefdir = prefs['dir']
-        keyfile = os.path.join(prefdir,'adeptkey.der')
-        if not os.path.exists(keyfile):
-            import ineptkey
+        adeptkeyfile = os.path.join(prefdir,'adeptkey.der')
+        if not os.path.exists(adeptkeyfile):
+            import adobekey
             try:
-                ineptkey.extractKeyfile(keyfile)
+                adobekey.getkey(adeptkeyfile)
             except:
                 pass
+        kindlekeyfile = os.path.join(prefdir,'kindlekey.k4i')
+        if not os.path.exists(kindlekeyfile):
+            import kindlekey
+            try:
+                kindlekey.getkey(kindlekeyfile)
+            except:
+                traceback.print_exc()
+                pass
+        bnepubkeyfile = os.path.join(prefdir,'bnepubkey.b64')
+        if not os.path.exists(bnepubkeyfile):
+            import ignoblekey
+            try:
+                ignoblekey.getkey(bnepubkeyfile)
+            except:
+                traceback.print_exc()
+                pass
         return prefs
 
     def setPreferences(self, newprefs):
@@ -75,8 +144,14 @@ class MainApp(Tk):
             nfile = os.path.join(prefdir,fname)
             if os.path.isfile(dfile):
                 shutil.copyfile(dfile,nfile)
-        if 'kinfofile' in newprefs:
-            dfile = newprefs['kinfofile']
+        if 'kindlefile' in newprefs:
+            dfile = newprefs['kindlefile']
+            fname = os.path.basename(dfile)
+            nfile = os.path.join(prefdir,fname)
+            if os.path.isfile(dfile):
+                shutil.copyfile(dfile,nfile)
+        if 'androidfile' in newprefs:
+            dfile = newprefs['androidfile']
             fname = os.path.basename(dfile)
             nfile = os.path.join(prefdir,fname)
             if os.path.isfile(dfile):
@@ -105,86 +180,106 @@ class PrefsDialog(Toplevel):
         sticky = Tkconstants.E + Tkconstants.W
         body.grid_columnconfigure(1, weight=2)
 
-        Tkinter.Label(body, text='Adept Key file (adeptkey.der)').grid(row=0, sticky=Tkconstants.E)
+        cur_row = 0
+        Tkinter.Label(body, text='Adobe Key file (adeptkey.der)').grid(row=cur_row, sticky=Tkconstants.E)
         self.adkpath = Tkinter.Entry(body, width=50)
-        self.adkpath.grid(row=0, column=1, sticky=sticky)
+        self.adkpath.grid(row=cur_row, column=1, sticky=sticky)
         prefdir = self.prefs_array['dir']
         keyfile = os.path.join(prefdir,'adeptkey.der')
         if os.path.isfile(keyfile):
             path = keyfile
-            self.adkpath.insert(0, path)
+            self.adkpath.insert(cur_row, path)
         button = Tkinter.Button(body, text="...", command=self.get_adkpath)
-        button.grid(row=0, column=2)
+        button.grid(row=cur_row, column=2)
 
-        Tkinter.Label(body, text='Barnes and Noble Key file (bnepubkey.b64)').grid(row=1, sticky=Tkconstants.E)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='Kindle Key file (kindlekey.k4i)').grid(row=cur_row, sticky=Tkconstants.E)
+        self.kkpath = Tkinter.Entry(body, width=50)
+        self.kkpath.grid(row=cur_row, column=1, sticky=sticky)
+        prefdir = self.prefs_array['dir']
+        keyfile = os.path.join(prefdir,'kindlekey.k4i')
+        if os.path.isfile(keyfile):
+            path = keyfile
+            self.kkpath.insert(0, path)
+        button = Tkinter.Button(body, text="...", command=self.get_kkpath)
+        button.grid(row=cur_row, column=2)
+
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='Android Kindle backup file (backup.ab)').grid(row=cur_row, sticky=Tkconstants.E)
+        self.akkpath = Tkinter.Entry(body, width=50)
+        self.akkpath.grid(row=cur_row, column=1, sticky=sticky)
+        prefdir = self.prefs_array['dir']
+        keyfile = os.path.join(prefdir,'backup.ab')
+        if os.path.isfile(keyfile):
+            path = keyfile
+            self.akkpath.insert(0, path)
+        button = Tkinter.Button(body, text="...", command=self.get_akkpath)
+        button.grid(row=cur_row, column=2)
+
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='Barnes and Noble Key file (bnepubkey.b64)').grid(row=cur_row, sticky=Tkconstants.E)
         self.bnkpath = Tkinter.Entry(body, width=50)
-        self.bnkpath.grid(row=1, column=1, sticky=sticky)
+        self.bnkpath.grid(row=cur_row, column=1, sticky=sticky)
         prefdir = self.prefs_array['dir']
         keyfile = os.path.join(prefdir,'bnepubkey.b64')
         if os.path.isfile(keyfile):
             path = keyfile
             self.bnkpath.insert(0, path)
         button = Tkinter.Button(body, text="...", command=self.get_bnkpath)
-        button.grid(row=1, column=2)
+        button.grid(row=cur_row, column=2)
 
-        Tkinter.Label(body, text='Additional kindle.info or .kinf file').grid(row=2, sticky=Tkconstants.E)
-        self.altinfopath = Tkinter.Entry(body, width=50)
-        self.altinfopath.grid(row=2, column=1, sticky=sticky)
-        prefdir = self.prefs_array['dir']
-        path = ''
-        infofile = os.path.join(prefdir,'kindle.info')
-        ainfofile = os.path.join(prefdir,'.kinf')
-        if os.path.isfile(infofile):
-            path = infofile
-        elif os.path.isfile(ainfofile):
-            path = ainfofile
-        self.altinfopath.insert(0, path)
-        button = Tkinter.Button(body, text="...", command=self.get_altinfopath)
-        button.grid(row=2, column=2)
-
-        Tkinter.Label(body, text='PID list (10 characters, no spaces, comma separated)').grid(row=3, sticky=Tkconstants.E)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='Mobipocket PID list\n(8 or 10 characters, comma separated)').grid(row=cur_row, sticky=Tkconstants.E)
         self.pidnums = Tkinter.StringVar()
         self.pidinfo = Tkinter.Entry(body, width=50, textvariable=self.pidnums)
         if 'pids' in self.prefs_array:
             self.pidnums.set(self.prefs_array['pids'])
-        self.pidinfo.grid(row=3, column=1, sticky=sticky)
+        self.pidinfo.grid(row=cur_row, column=1, sticky=sticky)
 
-        Tkinter.Label(body, text='Kindle Serial Number list (16 characters, no spaces, comma separated)').grid(row=4, sticky=Tkconstants.E)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='eInk Kindle Serial Number list\n(16 characters, comma separated)').grid(row=cur_row, sticky=Tkconstants.E)
         self.sernums = Tkinter.StringVar()
         self.serinfo = Tkinter.Entry(body, width=50, textvariable=self.sernums)
         if 'serials' in self.prefs_array:
             self.sernums.set(self.prefs_array['serials'])
-        self.serinfo.grid(row=4, column=1, sticky=sticky)
+        self.serinfo.grid(row=cur_row, column=1, sticky=sticky)
 
-        Tkinter.Label(body, text='eReader data list (name:last 8 digits on credit card, comma separated)').grid(row=5, sticky=Tkconstants.E)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='eReader data list\n(name:last 8 digits on credit card, comma separated)').grid(row=cur_row, sticky=Tkconstants.E)
         self.sdrmnums = Tkinter.StringVar()
         self.sdrminfo = Tkinter.Entry(body, width=50, textvariable=self.sdrmnums)
         if 'sdrms' in self.prefs_array:
             self.sdrmnums.set(self.prefs_array['sdrms'])
-        self.sdrminfo.grid(row=5, column=1, sticky=sticky)
+        self.sdrminfo.grid(row=cur_row, column=1, sticky=sticky)
 
-        Tkinter.Label(body, text="Output Folder (if blank, use input ebook's folder)").grid(row=6, sticky=Tkconstants.E)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text="Output Folder (if blank, use input ebook's folder)").grid(row=cur_row, sticky=Tkconstants.E)
         self.outpath = Tkinter.Entry(body, width=50)
-        self.outpath.grid(row=6, column=1, sticky=sticky)
+        self.outpath.grid(row=cur_row, column=1, sticky=sticky)
         if 'outdir' in self.prefs_array:
             dpath = self.prefs_array['outdir']
             self.outpath.insert(0, dpath)
         button = Tkinter.Button(body, text="...", command=self.get_outpath)
-        button.grid(row=6, column=2)
+        button.grid(row=cur_row, column=2)
 
-        Tkinter.Label(body, text='').grid(row=7, column=0, columnspan=2, sticky=Tkconstants.N)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='').grid(row=cur_row, column=0, columnspan=2, sticky=Tkconstants.N)
 
-        Tkinter.Label(body, text='Alternatively Process an eBook').grid(row=8, column=0, columnspan=2, sticky=Tkconstants.N)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='Alternatively Process an eBook').grid(row=cur_row, column=0, columnspan=2, sticky=Tkconstants.N)
 
-        Tkinter.Label(body, text='Select an eBook to Process*').grid(row=9, sticky=Tkconstants.E)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='Select an eBook to Process*').grid(row=cur_row, sticky=Tkconstants.E)
         self.bookpath = Tkinter.Entry(body, width=50)
-        self.bookpath.grid(row=9, column=1, sticky=sticky)
+        self.bookpath.grid(row=cur_row, column=1, sticky=sticky)
         button = Tkinter.Button(body, text="...", command=self.get_bookpath)
-        button.grid(row=9, column=2)
+        button.grid(row=cur_row, column=2)
 
-        Tkinter.Label(body, font=("Helvetica", "10", "italic"), text='*To DeDRM multiple ebooks simultaneously, set your preferences and quit.\nThen drag and drop ebooks or folders onto the DeDRM_Drop_Target').grid(row=10, column=1, sticky=Tkconstants.E)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, font=("Helvetica", "10", "italic"), text='*To DeDRM multiple ebooks simultaneously, set your preferences and quit.\nThen drag and drop ebooks or folders onto the DeDRM_Drop_Target').grid(row=cur_row, column=1, sticky=Tkconstants.E)
 
-        Tkinter.Label(body, text='').grid(row=11, column=0, columnspan=2, sticky=Tkconstants.E)
+        cur_row = cur_row + 1
+        Tkinter.Label(body, text='').grid(row=cur_row, column=0, columnspan=2, sticky=Tkconstants.E)
 
         buttons = Tkinter.Frame(self)
         buttons.pack()
@@ -218,9 +313,16 @@ class PrefsDialog(Toplevel):
 
     def get_outpath(self):
         cpath = self.outpath.get()
-        outpath = tkFileDialog.askdirectory(
-            parent=None, title='Folder to Store Unencrypted file(s) into',
-            initialdir=cpath, initialfile=None)
+        if sys.platform.startswith("win"):
+            # tk_chooseDirectory is horribly broken for unicode paths
+            # on windows - bug has been reported but not fixed for years
+            # workaround by using our own unicode aware version
+            outpath = AskFolder(message="Choose the folder for DRM-free ebooks",
+                defaultLocation=cpath)
+        else:
+            outpath = tkFileDialog.askdirectory(
+                parent=None, title='Choose the folder for DRM-free ebooks',
+                initialdir=cpath, initialfile=None)
         if outpath:
             outpath = os.path.normpath(outpath)
             self.outpath.delete(0, Tkconstants.END)
@@ -237,6 +339,26 @@ class PrefsDialog(Toplevel):
             self.adkpath.insert(0, adkpath)
         return
 
+    def get_kkpath(self):
+        cpath = self.kkpath.get()
+        kkpath = tkFileDialog.askopenfilename(initialdir = cpath, parent=None, title='Select Kindle Key file',
+            defaultextension='.k4i', filetypes=[('Kindle Key file', '.k4i'), ('All Files', '.*')])
+        if kkpath:
+            kkpath = os.path.normpath(kkpath)
+            self.kkpath.delete(0, Tkconstants.END)
+            self.kkpath.insert(0, kkpath)
+        return
+
+    def get_akkpath(self):
+        cpath = self.akkpath.get()
+        akkpath = tkFileDialog.askopenfilename(initialdir = cpath, parent=None, title='Select Android for Kindle backup file',
+            defaultextension='.ab', filetypes=[('Kindle for Android backup file', '.ab'), ('All Files', '.*')])
+        if akkpath:
+            akkpath = os.path.normpath(akkpath)
+            self.akkpath.delete(0, Tkconstants.END)
+            self.akkpath.insert(0, akkpath)
+        return
+
     def get_bnkpath(self):
         cpath = self.bnkpath.get()
         bnkpath = tkFileDialog.askopenfilename(initialdir = cpath, parent=None, title='Select Barnes and Noble Key file',
@@ -247,31 +369,20 @@ class PrefsDialog(Toplevel):
             self.bnkpath.insert(0, bnkpath)
         return
 
-    def get_altinfopath(self):
-        cpath = self.altinfopath.get()
-        altinfopath = tkFileDialog.askopenfilename(parent=None, title='Select Alternative kindle.info or .kinf File',
-            defaultextension='.info', filetypes=[('Kindle Info', '.info'),('Kindle KInf','.kinf')('All Files', '.*')],
-            initialdir=cpath)
-        if altinfopath:
-            altinfopath = os.path.normpath(altinfopath)
-            self.altinfopath.delete(0, Tkconstants.END)
-            self.altinfopath.insert(0, altinfopath)
-        return
-
     def get_bookpath(self):
         cpath = self.bookpath.get()
         bookpath = tkFileDialog.askopenfilename(parent=None, title='Select eBook for DRM Removal',
-            filetypes=[('ePub Files','.epub'),
-                       ('Kindle','.azw'),
-                       ('Kindle','.azw1'),
-                       ('Kindle','.azw3'),
-                       ('Kindle','.azw4'),
-                       ('Kindle','.tpz'),
-                       ('Kindle','.mobi'),
-                       ('Kindle','.prc'),
-                       ('eReader','.pdb'),
-                       ('PDF','.pdf'),
-                       ('All Files', '.*')],
+            filetypes=[('All Files', '.*'),
+                    ('ePub Files','.epub'),
+                    ('Kindle','.azw'),
+                    ('Kindle','.azw1'),
+                    ('Kindle','.azw3'),
+                    ('Kindle','.azw4'),
+                    ('Kindle','.tpz'),
+                    ('Kindle','.mobi'),
+                    ('Kindle','.prc'),
+                    ('eReader','.pdb'),
+                    ('PDF','.pdf')],
             initialdir=cpath)
         if bookpath:
             bookpath = os.path.normpath(bookpath)
@@ -287,9 +398,9 @@ class PrefsDialog(Toplevel):
         new_prefs = {}
         prefdir = self.prefs_array['dir']
         new_prefs['dir'] = prefdir
-        new_prefs['pids'] = self.pidinfo.get().strip()
-        new_prefs['serials'] = self.serinfo.get().strip()
-        new_prefs['sdrms'] = self.sdrminfo.get().strip()
+        new_prefs['pids'] = self.pidinfo.get().replace(" ","")
+        new_prefs['serials'] = self.serinfo.get().replace(" ","")
+        new_prefs['sdrms'] = self.sdrminfo.get().strip().replace(", ",",")
         new_prefs['outdir'] = self.outpath.get().strip()
         adkpath = self.adkpath.get()
         if os.path.dirname(adkpath) != prefdir:
@@ -297,10 +408,18 @@ class PrefsDialog(Toplevel):
         bnkpath = self.bnkpath.get()
         if os.path.dirname(bnkpath) != prefdir:
             new_prefs['bnkfile'] = bnkpath
-        altinfopath = self.altinfopath.get()
-        if os.path.dirname(altinfopath) != prefdir:
-            new_prefs['kinfofile'] = altinfopath
+        kkpath = self.kkpath.get()
+        if os.path.dirname(kkpath) != prefdir:
+            new_prefs['kindlefile'] = kkpath
+        akkpath = self.akkpath.get()
+        if os.path.dirname(akkpath) != prefdir:
+            new_prefs['androidfile'] = akkpath
         self.master.setPreferences(new_prefs)
+        # and update internal copies
+        self.prefs_array['pids'] = new_prefs['pids']
+        self.prefs_array['serials'] = new_prefs['serials']
+        self.prefs_array['sdrms'] = new_prefs['sdrms']
+        self.prefs_array['outdir'] = new_prefs['outdir']
 
     def doit(self):
         self.disablebuttons()
@@ -324,10 +443,10 @@ class ConvDialog(Toplevel):
         self.filenames = filenames
         self.interval = 50
         self.p2 = None
+        self.q = Queue()
         self.running = 'inactive'
         self.numgood = 0
         self.numbad = 0
-        self.log = ''
         self.status = Tkinter.Label(self, text='DeDRM processing...')
         self.status.pack(fill=Tkconstants.X, expand=1)
         body = Tkinter.Frame(self)
@@ -350,6 +469,8 @@ class ConvDialog(Toplevel):
         self.qbutton.pack(side=Tkconstants.BOTTOM)
         self.status['text'] = ''
 
+        self.logfile = open(os.path.join(os.path.expanduser('~'),'DeDRM.log'),'w')
+
     def show(self):
         self.deiconify()
         self.tkraise()
@@ -375,19 +496,19 @@ class ConvDialog(Toplevel):
             if len(self.filenames) > 0:
                 filename = self.filenames.pop(0)
             if filename == None:
-                msg = '\nComplete:  '
+                msg = 'Complete:  '
                 msg += 'Successes: %d, ' % self.numgood
                 msg += 'Failures: %d\n' % self.numbad
                 self.showCmdOutput(msg)
                 if self.numbad == 0:
                     self.after(2000,self.conversion_done())
-                logfile = os.path.join(rscpath,'dedrm.log')
-                file(logfile,'w').write(self.log)
+                self.logfile.write("DeDRM v{0}: {1}".format(__version__,msg))
+                self.logfile.close()
                 return
             infile = filename
             bname = os.path.basename(infile)
-            msg = 'Processing: ' + bname + ' ... '
-            self.log += msg
+            msg = 'Processing: ' + bname + '...'
+            self.logfile.write("DeDRM v{0}: {1}\n".format(__version__,msg))
             self.showCmdOutput(msg)
             outdir = os.path.dirname(filename)
             if 'outdir' in self.prefs_array:
@@ -398,10 +519,10 @@ class ConvDialog(Toplevel):
             if rv == 0:
                 self.bar.start()
                 self.running = 'active'
-                self.processPipe()
+                self.processQueue()
             else:
                 msg = 'Unknown File: ' + bname + '\n'
-                self.log += msg
+                self.logfile.write("DeDRM v{0}: {1}".format(__version__,msg))
                 self.showCmdOutput(msg)
                 self.numbad += 1
 
@@ -409,7 +530,7 @@ class ConvDialog(Toplevel):
         # kill any still running subprocess
         self.running = 'stopped'
         if self.p2 != None:
-            if (self.p2.wait('nowait') == None):
+            if (self.p2.exitcode == None):
                 self.p2.terminate()
         self.conversion_done()
 
@@ -425,131 +546,110 @@ class ConvDialog(Toplevel):
     # read from subprocess pipe without blocking
     # invoked every interval via the widget "after"
     # option being used, so need to reset it for the next time
-    def processPipe(self):
+    def processQueue(self):
         if self.p2 == None:
             # nothing to wait for so just return
             return
-        poll = self.p2.wait('nowait')
+        poll = self.p2.exitcode
+        #print "processing", poll
+        done = False
+        text = ''
+        while not done:
+            try:
+                data = self.q.get_nowait()
+                text += data
+            except Empty:
+                done = True
+        if text != '':
+            self.logfile.write(text)
         if poll != None:
             self.bar.stop()
             if poll == 0:
                 msg = 'Success\n'
                 self.numgood += 1
-                text = self.p2.read()
-                text += self.p2.readerr()
-                self.log += text
-                self.log += msg
-            if poll != 0:
+            else:
                 msg = 'Failed\n'
-                text = self.p2.read()
-                text += self.p2.readerr()
-                msg += text
-                msg += '\n'
                 self.numbad += 1
-                self.log += msg
+            self.p2.join()
+            self.logfile.write("DeDRM v{0}: {1}\n".format(__version__,msg))
             self.showCmdOutput(msg)
             self.p2 = None
             self.running = 'inactive'
             self.after(50,self.processBooks)
             return
         # make sure we get invoked again by event loop after interval
-        self.stext.after(self.interval,self.processPipe)
+        self.stext.after(self.interval,self.processQueue)
         return
 
     def decrypt_ebook(self, infile, outdir, rscpath):
-        apphome = self.apphome
+        q = self.q
         rv = 1
         name, ext = os.path.splitext(os.path.basename(infile))
         ext = ext.lower()
         if ext == '.epub':
-            self.p2 = processEPUB(apphome, infile, outdir, rscpath)
+            self.p2 = Process(target=processEPUB, args=(q, infile, outdir, rscpath))
+            self.p2.start()
             return 0
         if ext == '.pdb':
-            self.p2 = processPDB(apphome, infile, outdir, rscpath)
+            self.p2 = Process(target=processPDB, args=(q, infile, outdir, rscpath))
+            self.p2.start()
             return 0
-        if ext in ['.azw', '.azw1', '.azw3', '.azw4', '.prc', '.mobi', '.tpz']:
-            self.p2 = processK4MOBI(apphome, infile, outdir, rscpath)
+        if ext in ['.azw', '.azw1', '.azw3', '.azw4', '.prc', '.mobi', '.pobi', '.tpz']:
+            self.p2 = Process(target=processK4MOBI,args=(q, infile, outdir, rscpath))
+            self.p2.start()
             return 0
         if ext == '.pdf':
-            self.p2 = processPDF(apphome, infile, outdir, rscpath)
+            self.p2 = Process(target=processPDF, args=(q, infile, outdir, rscpath))
+            self.p2.start()
             return 0
         return rv
 
 
-# run as a subprocess via pipes and collect stdout, stderr, and return value
-def runit(apphome, ncmd, nparms):
-    pengine = sys.executable
-    if pengine is None or pengine == '':
-        pengine = 'python'
-    pengine = os.path.normpath(pengine)
-    cmdline = pengine + ' "' + os.path.join(apphome, ncmd) + '" '
-    # if sys.platform.startswith('win'):
-    #     search_path = os.environ['PATH']
-    #     search_path = search_path.lower()
-    #     if search_path.find('python') < 0:
-    #        # if no python hope that win registry finds what is associated with py extension
-    #        cmdline = pengine + ' "' + os.path.join(apphome, ncmd) + '" '
-    cmdline += nparms
-    cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p2 = subasyncio.Process(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    return p2
+# child process starts here
+def processK4MOBI(q, infile, outdir, rscpath):
+    add_cp65001_codec()
+    set_utf8_default_encoding()
+    sys.stdout = QueuedUTF8Stream(sys.stdout, q)
+    sys.stderr = QueuedUTF8Stream(sys.stderr, q)
+    rv = decryptk4mobi(infile, outdir, rscpath)
+    sys.exit(rv)
 
-def processK4MOBI(apphome, infile, outdir, rscpath):
-    cmd = os.path.join('lib','k4mobidedrm.py')
-    parms = ''
-    pidnums = ''
-    pidspath = os.path.join(rscpath,'pidlist.txt')
-    if os.path.exists(pidspath):
-        pidnums = file(pidspath,'r').read()
-        pidnums = pidnums.rstrip(os.linesep)
-    if pidnums != '':
-        parms += '-p "' + pidnums + '" '
-    serialnums = ''
-    serialnumspath = os.path.join(rscpath,'seriallist.txt')
-    if os.path.exists(serialnumspath):
-        serialnums = file(serialnumspath,'r').read()
-        serialnums = serialnums.rstrip(os.linesep)
-    if serialnums != '':
-        parms += '-s "' + serialnums + '" '
+# child process starts here
+def processPDF(q, infile, outdir, rscpath):
+    add_cp65001_codec()
+    set_utf8_default_encoding()
+    sys.stdout = QueuedUTF8Stream(sys.stdout, q)
+    sys.stderr = QueuedUTF8Stream(sys.stderr, q)
+    rv = decryptpdf(infile, outdir, rscpath)
+    sys.exit(rv)
 
-    files = os.listdir(rscpath)
-    filefilter = re.compile("\.info$|\.kinf$", re.IGNORECASE)
-    files = filter(filefilter.search, files)
-    if files:
-        for filename in files:
-            dpath = os.path.join(rscpath,filename)
-            parms += '-k "' + dpath + '" '
-    parms += '"' + infile +'" "' + outdir + '"'
-    p2 = runit(apphome, cmd, parms)
-    return p2
+# child process starts here
+def processEPUB(q, infile, outdir, rscpath):
+    add_cp65001_codec()
+    set_utf8_default_encoding()
+    sys.stdout = QueuedUTF8Stream(sys.stdout, q)
+    sys.stderr = QueuedUTF8Stream(sys.stderr, q)
+    rv = decryptepub(infile, outdir, rscpath)
+    sys.exit(rv)
 
-def processPDF(apphome, infile, outdir, rscpath):
-    cmd = os.path.join('lib','decryptpdf.py')
-    parms =  '"' + infile + '" "' + outdir + '" "' + rscpath + '"'
-    p2 = runit(apphome, cmd, parms)
-    return p2
-
-def processEPUB(apphome, infile, outdir, rscpath):
-    # invoke routine to check both Adept and Barnes and Noble
-    cmd = os.path.join('lib','decryptepub.py')
-    parms = '"' + infile + '" "' + outdir + '" "' + rscpath + '"'
-    p2 = runit(apphome, cmd, parms)
-    return p2
-
-def processPDB(apphome, infile, outdir, rscpath):
-    cmd = os.path.join('lib','decryptpdb.py')
-    parms = '"' + infile + '" "' + outdir + '" "' + rscpath + '"'
-    p2 = runit(apphome, cmd, parms)
-    return p2
+# child process starts here
+def processPDB(q, infile, outdir, rscpath):
+    add_cp65001_codec()
+    set_utf8_default_encoding()
+    sys.stdout = QueuedUTF8Stream(sys.stdout, q)
+    sys.stderr = QueuedUTF8Stream(sys.stderr, q)
+    rv = decryptpdb(infile, outdir, rscpath)
+    sys.exit(rv)
 
 
-def main(argv=sys.argv):
-    apphome = os.path.dirname(sys.argv[0])
+def main():
+    argv=unicode_argv()
+    apphome = os.path.dirname(argv[0])
     apphome = os.path.abspath(apphome)
 
     # windows may pass a spurious quoted null string as argv[1] from bat file
     # simply work around this until we can figure out a better way to handle things
-    if len(argv) == 2:
+    if sys.platform.startswith('win') and len(argv) == 2:
         temp = argv[1]
         temp = temp.strip('"')
         temp = temp.strip()
@@ -563,11 +663,10 @@ def main(argv=sys.argv):
     else : # processing books via drag and drop
         dnd = True
         # build a list of the files to be processed
+        # note all filenames and paths have been utf-8 encoded
         infilelst = argv[1:]
         filenames = []
         for infile in infilelst:
-            infile = infile.decode(sys.getfilesystemencoding())
-            print infile
             infile = infile.replace('"','')
             infile = os.path.abspath(infile)
             if os.path.isdir(infile):

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/DeDRM_Adobe Digital Editions Key_Help.htm

@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing Adobe Digital Editions Keys</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing Adobe Digital Editions Keys</h1>
+
+
+<p>If you have upgraded from an earlier version of the plugin, any existing Adobe Digital Editions keys will have been automatically imported, so you might not need to do any more configuration. In addition, on Windows and Mac, the default Adobe Digital Editions key is added the first time the plugin is run. Continue reading for key generation and management instructions.</p>
+
+<h3>Creating New Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog prompting you to enter a key name for the default Adobe Digital Editions key. </p>
+<ul>
+<li><span class="bold">Unique Key Name:</span> this is a unique name you choose to help you identify the key. This name will show in the list of configured keys.</li>
+</ul>
+
+<p>Click the OK button to create and store the Adobe Digital Editions key for the current installation of Adobe Digital Editions. Or Cancel if you don’t want to create the key.</p>
+<p>New keys are checked against the current list of keys before being added, and duplicates are discarded.</p>
+
+<h3>Deleting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted key in the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<h3>Renaming Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a sheet of paper. Clicking this button will promt you to enter a new name for the highlighted key in the list. Enter the new name for the encryption key and click the OK button to use the new name, or Cancel to revert to the old name..</p>
+
+<h3>Exporting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a computer’s hard-drive. Use this button to export the highlighted key to a file (with a ‘.der’ file name extension). Used for backup purposes or to migrate key data to other computers/calibre installations. The dialog will prompt you for a place to save the file.</p>
+
+<h3>Linux Users: WINEPREFIX</h3>
+
+<p>Under the list of keys, Linux users will see a text field labeled "WINEPREFIX". If you are use Adobe Digital Editions under Wine, and your wine installation containing Adobe Digital Editions isn't the default Wine installation, you may enter the full path to the correct Wine installation here. Leave blank if you are unsure.</p>
+
+<h3>Importing Existing Keyfiles:</h3>
+
+<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.der’ key files. Key files might come from being exported from this or older plugins, or may have been generated using the adobekey.pyw script running under Wine on Linux systems.</p>
+
+<p>Once done creating/deleting/renaming/importing decryption keys, click Close to exit the customization dialogue. Your changes will only be saved permanently when you click OK in the main configuration dialog.</p>
+
+
+</body>
+
+</html>

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/DeDRM_Barnes and Noble Key_Help.htm

@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing Barnes and Noble Keys</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing Barnes and Noble Keys</h1>
+
+
+<p>If you have upgraded from an earlier version of the plugin, any existing Barnes and Noble keys will have been automatically imported, so you might not need to do any more configuration. Continue reading for key generation and management instructions.</p>
+
+<h3>Changes at Barnes & Noble</h3>
+
+<p>In mid-2014, Barnes & Noble changed the way they generated encryption keys. Instead of deriving the key from the user's name and credit card number, they started generating a random key themselves, sending that key through to devices when they connected to the Barnes & Noble servers. This means that most users will now find that no combination of their name and CC# will work in decrypting their recently downloaded ebooks.</p>
+
+<p>Someone commenting at Apprentice Alf's blog detailed a way to retrieve a new account key using the account's email address and password. This method has now been incorporated into the plugin.
+
+<h3>Creating New Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering the necessary data to generate a new key.</p>
+<ul>
+<li><span class="bold">Unique Key Name:</span> this is a unique name you choose to help you identify the key. This name will show in the list of configured keys. Choose something that will help you remember the data (account email address) it was created with.</li>
+<li><span class="bold">B&N/nook account email address:</span> This is the default email address for your Barnes and Noble/nook account. This email will not be stored anywhere on your computer or in calibre. It will only be used to fetch the account key that from the B&N server, and it is that key that will be stored in the preferences.</li>
+<li><span class="bold">B&N/nook account password:</span> this is the password for your Barnes and Noble/nook account. As with the email address, this will not be stored anywhere on your computer or in calibre. It will only be used to fetch the key from the B&N server.</li>
+</ul>
+
+<p>Click the OK button to create and store the generated key. Or Cancel if you don’t want to create a key.</p>
+<p>New keys are checked against the current list of keys before being added, and duplicates are discarded.</p>
+
+<h3>Deleting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted key in the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<h3>Renaming Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a sheet of paper. Clicking this button will promt you to enter a new name for the highlighted key in the list. Enter the new name for the encryption key and click the OK button to use the new name, or Cancel to revert to the old name..</p>
+
+<h3>Exporting Keys:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a computer’s hard-drive. Use this button to export the highlighted key to a file (with a ‘.b64’ file name extension). Used for backup purposes or to migrate key data to other computers/calibre installations. The dialog will prompt you for a place to save the file.</p>
+
+<h3>Importing Existing Keyfiles:</h3>
+
+<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.b64’ key files. Key files might come from being exported from this or older plugins, or may have been generated using the original i♥cabbages script, or you may have made it by following the instructions above.</p>
+
+<p>Once done creating/deleting/renaming/importing decryption keys, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
+
+<h3>NOOK Study</h3>
+<p>Books downloaded through NOOK Study may or may not use the key found using the above method. If a book is not decrypted successfully with any of the keys, the plugin will attempt to recover keys from the NOOK Study log file and use them.</p>
+
+
+
+</body>
+
+</html>

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/DeDRM_EInk Kindle Serial Number_Help.htm

@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Managing eInk Kindle serial numbers</title>
+<style type="text/css">
+span.version {font-size: 50%}
+span.bold {font-weight: bold}
+h3 {margin-bottom: 0}
+p {margin-top: 0}
+li {margin-top: 0.5em}
+</style>
+</head>
+
+<body>
+
+<h1>Managing eInk Kindle serial numbers</h1>
+
+<p>If you have upgraded from an earlier version of the plugin, any existing eInk Kindle serial numbers will have been automatically imported, so you might not need to do any more configuration.</p>
+
+<p>Please note that Kindle serial numbers are only valid keys for eInk Kindles like the Kindle Touch and PaperWhite. The Kindle Fire and Fire HD do not use their serial number for DRM and it is useless to enter those serial numbers.</p>
+
+<h3>Creating New Kindle serial numbers:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering a new Kindle serial number.</p>
+<ul>
+<li><span class="bold">Eink Kindle Serial Number:</span> this is the unique serial number of your device. It usually starts with a ‘B’ or a ‘9’ and is sixteen characters long. For a reference of where to find serial numbers and their ranges, please refer to this <a href="http://wiki.mobileread.com/wiki/Kindle_serial_numbers">mobileread wiki page.</a></li>
+</ul>
+
+<p>Click the OK button to save the serial number. Or Cancel if you didn’t want to enter a serial number.</p>
+
+<h3>Deleting Kindle serial numbers:</h3>
+
+<p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a red "X". Clicking this button will delete the highlighted Kindle serial number from the list. You will be prompted once to be sure that’s what you truly mean to do. Once gone, it’s permanently gone.</p>
+
+<p>Once done creating/deleting serial numbers, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
+
+</body>
+
+</html>