tools v5.5.2

tools v5.5.1
tools v5.5
2015-03-07 13:58:52 +00:00 · 2015-03-07 13:55:45 +00:00 · 2015-03-07 13:48:25 +00:00 · 2015-03-07 13:28:34 +00:00 · 2015-03-07 13:14:37 +00:00 · 2015-03-07 13:05:48 +00:00
254 changed files with 25345 additions and 28876 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,6 @@
 __pycache__/
 *.pyc
 # C extensions
 *.so
 # Distribution / packaging
 .Python
 env/
--- a/Adobe_EPUB_Tools/README_ineptepub.txt
+++ b/Adobe_EPUB_Tools/README_ineptepub.txt
@@ -1,18 +0,0 @@
 From Apprentice Alf's Blog
 Adobe Adept ePub, .epub
 This directory includes modified versions of the I♥CABBAGES Adobe Adept inept scripts for epubs.  These scripts have been modified to work with OpenSSL on Windows as well as Linux and Mac OS X.  His original scripts can be found in the clearly labelled folder.  If a Windows User has OpenSSL installed, these scripts will make use of it in place of PyCrypto.
 The wonderful I♥CABBAGES has produced scripts that will remove the DRM from ePubs and PDFs encryped with Adobe’s DRM. These scripts require installation of the PyCrypto python package *or* the OpenSSL library on Windows.  For Mac OS X and Linux boxes, these scripts use the already installed OpenSSL libcrypto so there is no additional requirements for these platforms.
 For more info, see the author's blog:
 http://i-u2665-cabbages.blogspot.com/2009_02_01_archive.html
 There are two scripts:
 The first is called ineptkey_vX.X.pyw.  Simply double-click to launch it and it will create a key file that is needed later to actually remove the DRM.  This script need only be run once unless you change your ADE account information.
 The second is called in ineptepub_vX.X.pyw.  Simply double-click to launch it.  It will ask for your previously generated key file and the path to the book you want to remove the DRM from.
 Both of these scripts are gui python programs.   Python 2.X (32 bit) is already installed in Mac OSX.  We recommend ActiveState's Active Python Version 2.X (32 bit) for Windows users.
--- a/Adobe_PDF_Tools/README_ineptpdf.txt
+++ b/Adobe_PDF_Tools/README_ineptpdf.txt
@@ -1,18 +0,0 @@
 From Apprentice Alf's Blog
 Adobe Adept PDF, .pdf
 This directory includes modified versions of the I♥CABBAGES Adobe Adept inept scripts for pdfs.  These scripts have been modified to work with OpenSSL on Windows as well as Linux and Mac OS X.  If a Windows User has OpenSSL installed, these scripts will make use of it in place of PyCrypto.
 The wonderful I♥CABBAGES has produced scripts that will remove the DRM from ePubs and PDFs encryped with Adobe’s DRM. These scripts require installation of the PyCrypto python package *or* the OpenSSL library on Windows.  For Mac OS X and Linux boxes, these scripts use the already installed OpenSSL libcrypto so there is no additional requirements for these platforms.
 For more info, see the author's blog:
 http://i-u2665-cabbages.blogspot.com/2009_02_01_archive.html
 There are two scripts:
 The first is called ineptkey_vX.X.pyw.  Simply double-click to launch it and it will create a key file that is needed later to actually remove the DRM.  This script need only be run once unless you change your ADE account information.
 The second is called in ineptpdf_vX.X.pyw.  Simply double-click to launch it.  It will ask for your previously generated key file and the path to the book you want to remove the DRM from.
 Both of these scripts are gui python programs.   Python 2.X (32 bit) is already installed in Mac OSX.  We recommend ActiveState's Active Python Version 2.X (32 bit) for Windows users.
--- a/Adobe_PDF_Tools/ineptpdf8.pyw
+++ b/Adobe_PDF_Tools/ineptpdf8.pyw
--- a/Barnes_and_Noble_EPUB_Tools/README_ignoble_epub.txt
+++ b/Barnes_and_Noble_EPUB_Tools/README_ignoble_epub.txt
@@ -1,19 +0,0 @@
 Readme.txt
 Barnes and Noble EPUB ebooks use a form of Social DRM which requires information on your Credit Card Number and the Name on the Credit card used to purchase the book to actually unencrypt the book.
 For more info, see the author's blog:
 http://i-u2665-cabbages.blogspot.com/2009_12_01_archive.html
 The original scripts by IHeartCabbages are available here as well.  These scripts have been modified to allow the use of OpenSSL in place of PyCrypto to make them easier to run on Linux and Mac OS X, as well as to fix some minor bugs/
 There are 2 scripts:
 The first is ignoblekeygen_vX.X.pyw.  Double-click to launch it and provide the required information, and this program will generate a key file needed to remove the DRM from the books.  This key file need only be generated once unless either you change your credit card number or your name on the credit card (or if you use a different credit card to purchase your book).
 The second is ignobleepub_vX.X.pyw.  Double-click it and it will ask for your key file and the path to the book to remove the DRM from.
 All of these scripts are gui python programs.   Python 2.X (32 bit) is already installed in Mac OSX.  We recommend ActiveState's Active Python Version 2.X (32 bit) for Windows users.
 These scripts are based on the IHeartCabbages original scripts that allow the replacement of the requirement for PyCrypto with OpenSSL's libcrypto which is already installed on all Mac OS X machines and Linux Boxes.  Window's Users will still have to install PyCrypto or OpenSSL to get these scripts to work properly.
--- a/Barnes_and_Noble_EPUB_Tools/ignobleepub.pyw
+++ b/Barnes_and_Noble_EPUB_Tools/ignobleepub.pyw
@@ -1,336 +0,0 @@
 #! /usr/bin/python
 from __future__ import with_statement
 # ignobleepub.pyw, version 3.4
 # 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.
 # 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
 __license__ = 'GPL v3'
 import sys
 import os
 import zlib
 import zipfile
 from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
 from contextlib import closing
 import xml.etree.ElementTree as etree
 import Tkinter
 import Tkconstants
 import tkFileDialog
 import tkMessageBox
 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_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',
                        [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
    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
    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 = loader()
            break
        except (ImportError, IGNOBLEError):
            pass
    return AES
 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()
        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
 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)
    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,))
        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))
    return 0
 def cli_main(argv=sys.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,)
        return 1
    keypath, inpath, outpath = argv[1:]
    return decryptBook(keypath, inpath, outpath)
 def gui_main():
    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.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())
--- a/Barnes_and_Noble_EPUB_Tools/ignoblekey.pyw
+++ b/Barnes_and_Noble_EPUB_Tools/ignoblekey.pyw
@@ -1,112 +0,0 @@
 #! /usr/bin/python
 # ignoblekey.pyw, version 2
 # To run this program install Python 2.6 from <http://www.python.org/download/>
 # Save this script file as ignoblekey.pyw and double-click on it to run it.
 # Revision history:
 #   1 - Initial release
 #   2 - Add some missing code
 """
 Retrieve B&N DesktopReader EPUB user AES key.
 """
 from __future__ import with_statement
 __license__ = 'GPL v3'
 import sys
 import os
 import binascii
 import glob
 import Tkinter
 import Tkconstants
 import tkMessageBox
 import traceback
 BN_KEY_KEY = 'uhk00000000'
 BN_APPDATA_DIR = r'Barnes & Noble\DesktopReader'
 class IgnobleError(Exception):
    pass
 def retrieve_key(inpath, outpath):
    # The B&N DesktopReader 'ClientAPI' file is just a sqlite3 DB.  Requiring
    # users to install sqlite3 and bindings seems like overkill for retrieving
    # one value, so we go in hot and dirty.
    with open(inpath, 'rb') as f:
        data = f.read()
    if BN_KEY_KEY not in data:
        raise IgnobleError('B&N user key not found; unexpected DB format?')
    index = data.rindex(BN_KEY_KEY) + len(BN_KEY_KEY) + 1
    data = data[index:index + 40]
    for i in xrange(20, len(data)):
        try:
            keyb64 = data[:i]
            if len(keyb64.decode('base64')) == 20:
                break
        except binascii.Error:
            pass
    else:
        raise IgnobleError('Problem decoding key; unexpected DB format?')
    with open(outpath, 'wb') as f:
        f.write(keyb64 + '\n')
 def cli_main(argv=sys.argv):
    progname = os.path.basename(argv[0])
    args = argv[1:]
    if len(args) != 2:
        sys.stderr.write("USAGE: %s CLIENTDB KEYFILE" % (progname,))
        return 1
    inpath, outpath = args
    retrieve_key(inpath, outpath)
    return 0
 def find_bnclientdb_path():
    appdata = os.environ['APPDATA']
    bndir = os.path.join(appdata, BN_APPDATA_DIR)
    if not os.path.isdir(bndir):
        raise IgnobleError('Could not locate B&N Reader installation')
    dbpath = glob.glob(os.path.join(bndir, 'ClientAPI_*.db'))
    if len(dbpath) == 0:
        raise IgnobleError('Problem locating B&N Reader DB')
    return sorted(dbpath)[-1]
 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)
        self.text.insert(Tkconstants.END, text)
 def gui_main(argv=sys.argv):
    root = Tkinter.Tk()
    root.withdraw()
    progname = os.path.basename(argv[0])
    keypath = 'bnepubkey.b64'
    try:
        dbpath = find_bnclientdb_path()
        retrieve_key(dbpath, keypath)
    except IgnobleError, e:
        tkMessageBox.showerror("Ignoble Key", "Error: " + str(e))
        return 1
    except Exception:
        root.wm_state('normal')
        root.title('Ignoble Key')
        text = traceback.format_exc()
        ExceptionDialog(root, text).pack(fill=Tkconstants.BOTH, expand=1)
        root.mainloop()
        return 1
    tkMessageBox.showinfo(
        "Ignoble Key", "Key successfully retrieved to %s" % (keypath))
    return 0
 if __name__ == '__main__':
    if len(sys.argv) > 1:
        sys.exit(cli_main())
    sys.exit(gui_main())
--- a/Barnes_and_Noble_EPUB_Tools/ignoblekeygen.pyw
+++ b/Barnes_and_Noble_EPUB_Tools/ignoblekeygen.pyw
@@ -1,239 +0,0 @@
 #! /usr/bin/python
 from __future__ import with_statement
 # ignoblekeygen.pyw, version 2.3
 # 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.
 # Revision history:
 #   1 - Initial release
 #   2 - Add OS X support by using OpenSSL when available (taken/modified from ineptepub v5)
 #   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
 """
 Generate Barnes & Noble EPUB user key from name and credit card number.
 """
 __license__ = 'GPL v3'
 import sys
 import os
 import hashlib
 import Tkinter
 import Tkconstants
 import tkFileDialog
 import tkMessageBox
 # 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'):
        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)
    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_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)
            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
    return AES
 def _load_crypto_pycrypto():
    from Crypto.Cipher import AES as _AES
    class AES(object):
        def __init__(self, key, iv):
            self._aes = _AES.new(key, _AES.MODE_CBC, iv)
        def encrypt(self, data):
            return self._aes.encrypt(data)
    return AES
 def _load_crypto():
    AES = 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 = loader()
            break
        except (ImportError, IGNOBLEError):
            pass
    return AES
 AES = _load_crypto()
 def normalize_name(name):
    return ''.join(x for x in name.lower() if x != ' ')
 def generate_keyfile(name, ccn, outpath):
    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 = 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
 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):
    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 NAME CC# OUTFILE" % (progname,)
        return 1
    name, ccn, outpath = argv[1:]
    generate_keyfile(name, ccn, outpath)
    return 0
 def gui_main():
    root = Tkinter.Tk()
    if AES is None:
        root.withdraw()
        tkMessageBox.showerror(
            "Ignoble EPUB Keyfile Generator",
            "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.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())
--- a/Calibre_Plugins/Ignobleepub
+++ b/Calibre_Plugins/Ignobleepub
@@ -0,0 +1,70 @@
 Ignoble Epub DeDRM - ignobleepub_v02.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 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
 ------------
 Do **NOT** select "Get plugins to enhance calibre" as this is reserved for "official" calibre plugins, instead select "Change calibre behavior" to go to Calibre's Preferences page.  Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file (ignobleepub_v02.5_plugin.zip) and click the 'Add' button. Click 'Yes' in the the "Are you sure?" dialog. Click OK in the "Success" dialog.
 Customization
 -------------
 Upon first installing the plugin (or upgrading from a version earlier than 0.2.0), the plugin will be unconfigured. Until you create at least one B&N key—or migrate your existing key(s)/data from an earlier version of the plugin—the plugin will not function. When unconfigured (no saved keys)... an error message will occur whenever ePubs are imported to calibre. To eliminate the error message, open the plugin's customization dialog and create/import/migrate a key (or disable/uninstall the plugin). You can get to the plugin's customization dialog by opening calibre's Preferences dialog, and clicking Plugins (under the Advanced section). Once in the Plugin Preferences, expand the "File type plugins" section and look for the "Ignoble Epub DeDRM" plugin. Highlight that plugin and click the "Customize plugin" button.
 Upgrading from old keys
 If you are upgrading from an earlier version of this plugin and have provided your name(s) and credit card number(s) as part of the old plugin's customization string, you will be prompted to migrate this data to the plugin's new, more secure, key storage method when you open the customization dialog for the first time. If you choose NOT to migrate that data, you will be prompted to save that data as a text file in a location of your choosing. Either way, this plugin will no longer be storing names and credit card numbers in plain sight (or anywhere for that matter) on your computer or in calibre. If you don't choose to migrate OR save the data, that data will be lost. You have been warned!!
 Upon configuring for the first time, you may also be asked if you wish to import your existing *.b64 keyfiles (if you use them) to the plugin's new key storage method. The new plugin no longer looks for keyfiles in calibre's configuration directory, so it's highly recommended that you import any existing keyfiles when prompted ... but you always have the ability to import existing keyfiles anytime you might need/want to.
 If you have upgraded from an earlier version of the plugin, the above instructions may be all you need to do to get the new plugin up and running. Continue reading for new-key generation and existing-key management instructions.
 Creating New Keys:
 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.
 * Unique Key Name: this is a unique name you choose to help you identify the key after it's created. 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.
 * Your Name: Your name as set in your Barnes & Noble account, My Account page, directly under PERSONAL INFORMATION. It is usually just your first name and last name separated by a space. This name 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.
 * Credit Card number: this is the credit card number that was set as default with Barnes & Noble at the time of download. Nothing fancy here; no dashes or spaces ... just the 16 (15?) digits. Again... 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.
 Click the 'OK" button to create and store the generated key. Or Cancel if you didn't want to create a key.
 Deleting Keys:
 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.
 Exporting Keys:
 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 (*.b64). 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.
 Importing Existing Keyfiles:
 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 keyfiles. Used for migrating keyfiles from older versions of the plugin (or keys generated with the original I <3 Cabbages script), or moving keyfiles from computer to computer, or restoring a backup. Some very basic validation is done to try to avoid overwriting already configured keys with incoming, imported keyfiles with the same base file name, but I'm sure that could be broken if someone tried hard. Just take care when importing.
 Once done creating/importing/exporting/deleting decryption keys; click "OK" to exit the customization dialogue (the cancel button will actually work the same way here ... at this point all data/changes are committed already, so take your pick).
 Troubleshooting
 ---------------
 If you find that it's not working for you (imported ebooks still have DRM), you can save a lot of time and trouble by first deleting the DRMed ebook from calibre and then trying to add the 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. ;)
 On Macintosh only you must first run calibre, open Preferences, open Miscellaneous, and click on the “Install command line tools” button. (On Windows and Linux the command line tools are installed automatically.)
 On Windows, open a terminal/command window. (Start/Run… and then type 'cmd' (without the 's) as the program to run).
 On Macintosh, open the Terminal application (in your Utilities folder).
 On Linux open a command window. Hopefully all Linux users know how to do this, as I do not.
 You should now have a text-based command-line window open. Also have open the folder containing the ebook to be imported. Make sure that book isn’t already in calibre, and that calibre isn’t running.
 Now type in "calibredb add " (without the " but don’t miss that final space) and now drag the book to be imported onto the window. The full path to the book should be inserted into the command line. Now press the return/enter key. The import routines will run and produce some logging information.
 Now copy the output from the terminal window.
 On Windows, you must use the window menu (little icon at left of window bar) to select all the text and then to copy it.
 On Macintosh and Linux, just use the normal text select and copy commands.
 Paste the information into a comment at my blog, http://apprenticealf.wordpress.com/ describing your problem.
--- a/Calibre_Plugins/Ineptepub
+++ b/Calibre_Plugins/Ineptepub
@@ -0,0 +1,115 @@
 Inept Epub DeDRM - ineptepub_v02.0_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
 ------------
 Do **NOT** select "Get plugins to enhance calibre" as this is reserved for "official" calibre plugins, instead select "Change calibre behavior" to go to Calibre's Preferences page.  Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file (ineptepub_v02.0_plugin.zip) and click the 'Add' button. Click 'Yes' in the the "Are you sure?" dialog. Click OK in the "Success" dialog.
 Customization
 -------------
 When first run, the plugin will attempt to find your Adobe Digital Editions installation (on Windows and Mac OS). If successful, it will create 'calibre-adeptkey[number].der' file(s) and save them in Calibre's configuration directory. It will use those files and any other '*.der' files in any decryption attempts. If there is already at least one 'calibre-adept*.der' file in the directory, the plugin won't attempt to find the Adobe Digital Editions installation keys again.
 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 ebooks still have DRM), you can save a lot of time and trouble by first deleting the DRMed ebook from calibre and then trying to add the 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. ;)
 On Macintosh only you must first run calibre, open Preferences, open Miscellaneous, and click on the “Install command line tools” button. (On Windows and Linux the command line tools are installed automatically.)
 On Windows, open a terminal/command window. (Start/Run… and then type ‘cmd’ (without the ‘s) as the program to run).
 On Macintosh, open the Terminal application (in your Utilities folder).
 On Linux open a command window. Hopefully all Linux users know how to do this, as I do not.
 You should now have a text-based command-line window open. Also have open the folder containing the ebook to be imported. Make sure that book isn’t already in calibre, and that calibre isn’t running.
 Now type in "calibredb add " (without the " but don’t miss that final space) and now drag the book to be imported onto the window. The full path to the book should be inserted into the command line. Now press the return/enter key. The import routines will run and produce some logging information.
 Now copy the output from the terminal window.
 On Windows, you must use the window menu (little icon at left of window bar) to select all the text and then to copy it.
 On Macintosh and Linux, just use the normal text select and copy commands.
 Paste the information into a comment at my blog, http://apprenticealf.wordpress.com/ describing your problem.
 Linux and Adobe Digital Editions ePubs
 --------------------------------------
 Here are the instructions for using the tools with ePub books and Adobe Digital Editions on Linux under Wine. (Thank you mclien!)
 1. download the most recent version of wine from winehq.org (1.3.29 in my case)
 For debian users:
 to get a recent version of wine I decited to use aptosid (2011-02, xfce)
 (because I’m used to debian)
 install aptosid and upgrade it (see aptosid site for detaild instructions)
 2. properly install Wine (see the Wine site for details)
 For debian users:
 cd to this dir and install the packages as root:
 ‘dpkg -i *.deb’
 you will get some error messages, which can be ignored.
 again as root use
 ‘apt-get -f install’ to correct this errors
 3. python 2.7 should already be installed on your system but you may need the following additional python package
 'apt-get install python-tk’
 4. all programms need to be installed as normal user. All these programm are installed the same way:
 ‘wine ‘
 we need:
 a) Adobe Digital Edition 1.7.2(from: http://kb2.adobe.com/cps/403/kb403051.html)
 (there is a “can’t install ADE” site, where the setup.exe hides)
 b) ActivePython-2.7.2.5-win32-x86.msi (from: http://www.activestate.com/activepython/downloads)
 c) Win32OpenSSL_Light-0_9_8r.exe (from: http://www.slproweb.com/)
 d) pycrypto-2.3.win32-py2.7.msi (from: http://www.voidspace.org.uk/python/modules.shtml)
 5. now get and unpack the very latest tools_vX.X (from Apprentice Alf) in the users drive_c of wine
 (~/.wine/drive_c/)
 6. start ADE with:
 ‘wine digitaleditions.exe’ or from the start menue wine-adobe-digital..
 7. register this instance of ADE with your adobeID and close it
 change to the tools_vX.X dir:
 cd ~/.wine/drive_c/tools_vX.X/Other_Tools/
 8. create the adeptkey.der with:
 ‘wine python ineptkey.py’ (only need once!)
 (key will be here: ~/.wine/drive_c/tools_vX.X/Other_Tools/adeptkey.der)
 9. Use ADE running under Wine to dowload all of your purchased ePub ebooks
 10. install the ineptepub and ineptpdf plugins from the tools as discribed in the readmes.
 11. copy the adeptkey.der into the config dir of calibre (~/.config/calibre in debian). Your ADE books imported to calibre will automatically be freed from DRM.
--- a/Calibre_Plugins/Ineptpdf
+++ b/Calibre_Plugins/Ineptpdf
@@ -0,0 +1,114 @@
 Inept PDF Plugin - ineptpdf_v01.9_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
 ------------
 Do **NOT** select "Get plugins to enhance calibre" as this is reserved for "official" calibre plugins, instead select "Change calibre behavior" to go to Calibre's Preferences page.  Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file (ineptpdf_v01.9_plugin.zip) and click the 'Add' button. Click 'Yes' in the the "Are you sure?" dialog. Click OK in the "Success" dialog.
 Customization
 -------------
 When first run, the plugin will attempt to find your Adobe Digital Editions installation (on Windows and Mac OS). If successful, it will create 'calibre-adeptkey[number].der' file(s) and save them in Calibre's configuration directory. It will use those files and any other '*.der' files in any decryption attempts. If there is already at least one 'calibre-adept*.der' file in the directory, the plugin won't attempt to find the Adobe Digital Editions installation keys again.
 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 PDF plugin.
 Troubleshooting
 ---------------
 If you find that it's not working for you (imported ebooks still have DRM), you can save a lot of time and trouble by first deleting the DRMed ebook from calibre and then trying to add the 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. ;)
 On Macintosh only you must first run calibre, open Preferences, open Miscellaneous, and click on the “Install command line tools” button. (On Windows and Linux the command line tools are installed automatically.)
 On Windows, open a terminal/command window. (Start/Run… and then type ‘cmd’ (without the ‘s) as the program to run).
 On Macintosh, open the Terminal application (in your Utilities folder).
 On Linux open a command window. Hopefully all Linux users know how to do this, as I do not.
 You should now have a text-based command-line window open. Also have open the folder containing the ebook to be imported. Make sure that book isn’t already in calibre, and that calibre isn’t running.
 Now type in "calibredb add " (without the " but don’t miss that final space) and now drag the book to be imported onto the window. The full path to the book should be inserted into the command line. Now press the return/enter key. The import routines will run and produce some logging information.
 Now copy the output from the terminal window.
 On Windows, you must use the window menu (little icon at left of window bar) to select all the text and then to copy it.
 On Macintosh and Linux, just use the normal text select and copy commands.
 Paste the information into a comment at my blog, http://apprenticealf.wordpress.com/ describing your problem.
 Linux and Adobe Digital Editions PDFs
 --------------------------------------
 Here are the instructions for using the tools with ePub books and Adobe Digital Editions on Linux under Wine. (Thank you mclien!)
 1. download the most recent version of wine from winehq.org (1.3.29 in my case)
 For debian users:
 to get a recent version of wine I decited to use aptosid (2011-02, xfce)
 (because I’m used to debian)
 install aptosid and upgrade it (see aptosid site for detaild instructions)
 2. properly install Wine (see the Wine site for details)
 For debian users:
 cd to this dir and install the packages as root:
 ‘dpkg -i *.deb’
 you will get some error messages, which can be ignored.
 again as root use
 ‘apt-get -f install’ to correct this errors
 3. python 2.7 should already be installed on your system but you may need the following additional python package
 'apt-get install python-tk’
 4. all programms need to be installed as normal user. All these programm are installed the same way:
 ‘wine ‘
 we need:
 a) Adobe Digital Edition 1.7.2(from: http://kb2.adobe.com/cps/403/kb403051.html)
 (there is a “can’t install ADE” site, where the setup.exe hides)
 b) ActivePython-2.7.2.5-win32-x86.msi (from: http://www.activestate.com/activepython/downloads)
 c) Win32OpenSSL_Light-0_9_8r.exe (from: http://www.slproweb.com/)
 d) pycrypto-2.3.win32-py2.7.msi (from: http://www.voidspace.org.uk/python/modules.shtml)
 5. now get and unpack the very latest tools_vX.X (from Apprentice Alf) in the users drive_c of wine
 (~/.wine/drive_c/)
 6. start ADE with:
 ‘wine digitaleditions.exe’ or from the start menue wine-adobe-digital..
 7. register this instance of ADE with your adobeID and close it
 change to the tools_vX.X dir:
 cd ~/.wine/drive_c/tools_vX.X/Other_Tools/
 8. create the adeptkey.der with:
 ‘wine python ineptkey.py’ (only need once!)
 (key will be here: ~/.wine/drive_c/tools_vX.X/Other_Tools/adeptkey.der)
 9. Use ADE running under Wine to dowload all of your purchased ePub ebooks
 10. install the ineptepub and ineptpdf plugins from the tools as discribed in the readmes.
 11. copy the adeptkey.der into the config dir of calibre (~/.config/calibre in debian). Your ADE books imported to calibre will automatically be freed from DRM.
--- a/Calibre_Plugins/K4MobiDeDRM
+++ b/Calibre_Plugins/K4MobiDeDRM
@@ -0,0 +1,122 @@
 Kindle and Mobipocket Plugin - K4MobiDeDRM_v04.10_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 should be removed, as should any earlier versions of this plugin.
 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 books from those programs.
 Installation
 ------------
 Do **NOT** select "Get plugins to enhance calibre" as this is reserved for "official" calibre plugins, instead select "Change calibre behavior" to go to Calibre's Preferences page.  Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file (K4MobiDeDRM_v04.10_plugin.zip) and click the 'Add' button. Click 'Yes' in the the "Are you sure?" dialog. Click OK in the "Success" dialog.
 Make sure that you delete any old versions of the plugin. They might interfere with the operation of the new one.
 Customization
 -------------
 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 character serial number (these all begin a "B" or a "9") in the serial numbers field. The easiest way to make sure that you have the serial number right is to copy it from your Amazon account pages (the "Manage Your Devices" page). If you have more than one eInk Kindle, you can enter multiple serial numbers separated by commas.
 If you have Mobipocket books, enter your 8 or 10 digit PID in the Mobipocket PIDs field. If you have more than one PID, separate them with commas.
 These configuration steps are not needed if you only want to decode "Kindle for PC" or "Kindle for Mac" books.
 Troubleshooting
 ---------------
 If you find that it's not working for you (imported ebooks still have DRM), you can save a lot of time and trouble by first deleting the DRMed ebook from calibre and then trying to add the 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. ;)
 On Macintosh only you must first run calibre, open Preferences, open Miscellaneous, and click on the “Install command line tools” button. (On Windows and Linux the command line tools are installed automatically.)
 On Windows, open a terminal/command window. (Start/Run… and then type 'cmd' (without the 's) as the program to run).
 On Macintosh, open the Terminal application (in your Utilities folder).
 On Linux open a command window. Hopefully all Linux users know how to do this, as I do not.
 You should now have a text-based command-line window open. Also have open the folder containing the ebook to be imported. Make sure that book isn’t already in calibre, and that calibre isn’t running.
 Now type in "calibredb add " (without the " but don’t miss that final space) and now drag the book to be imported onto the window. The full path to the book should be inserted into the command line. Now press the return/enter key. The import routines will run and produce some logging information.
 Now copy the output from the terminal window.
 On Windows, you must use the window menu (little icon at left of window bar) to select all the text and then to copy it.
 On Macintosh and Linux, just use the normal text select and copy commands.
 Paste the information into a comment at my blog, http://apprenticealf.wordpress.com/ describing your problem.
 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. You will need to install Python and PyCrypto under Wine as detailed below. In addition, some people who have successfully used the plugin in this way have commented as follows:
 Here are the instructions for using Kindle for PC on Linux under Wine. (Thank you Eyeless and Pete)
 1. upgrade to very recent versions of Wine; This has been tested with Wine 1.3.15 – 1.3.2X. It may work with earlier versions but no promises. It does not work with wine 1.2.X versions.
 If you have not already installed Kindle for PC under wine, follow steps 2 and 3 otherwise jump to step 4
 2. Some versions of winecfg have a bug in setting the volume serial number, so create a .windows-serial file at root of drive_c to set a proper windows volume serial number (8 digit hex value for unsigned integer).
 cd ~
 cd .wine
 cd drive_c
 echo deadbeef > .windows-serial
 Replace "deadbeef" with whatever hex value you want but I would stay away from the default setting of "ffffffff" which does not seem to work. BTW: deadbeef is itself a valid possible hex value if you want to use it
 3. Only ***after*** setting the volume serial number properly – download and install under wine K4PC version for Windows. Register it and download from your Archive one of your Kindle ebooks. Versions known to work are K4PC 1.7.1 and earlier. Later version may work but no promises.
 FIRST user
 ----------
 Hi everyone, I struggled to get this working on Ubuntu 12.04. Here are the secrets for everyone:
 1. Make sure your Wine installation is set up to be 32 bit. 64 bit is not going to work! To do this, remove your .wine directory (or use a different wineprefix). Then use WINEARCH=win32 winecfg
 2. But wait, you can’t install Kindle yet. It won’t work. You need to do: winetricks -q vcrun2008 or else you’ll get an error: unimplemented function msvcp90.dll .
 3. Now download and install Kindle for PC and download your content as normal.
 4. Now download and install Python 2.7 32 bit for Windows from python.org, 32 bit, install it the usual way, and you can now run the Kindle DRM tools.
 SECOND USER
 -----------
 It took a while to figure out that I needed wine 32 bit, plus Python 27 32 bit, plus the winetricks, to get all this working together but once it’s done, it’s great and I can read my Kindle content on my Nook Color running Cyanogenmod!!!
 Linux Systems Only:
 For all of the following wine installs, use WINEARCH=win32 if you are on x86_64. Also remember that in order to execute a *.msi file, you have to run ‘WINEARCH=win32 wine msiexec /i xxxxx.msi’.
 1. Install Kindle for PC with wine.
 2. Install ActivePython 2.7.x (Windows x86) with wine from here: http://www.activestate.com/activepython/downloads
 3. Install the pycrypto (Windows 32 bit for Python 2.7) module with wine from here: http://www.voidspace.org.uk/python/modules.shtml#pycrypto
 4. Install the K4MobiDeDRM plugin into your _Linux_ Calibre installation
 Now all Kindle books downloaded from Kindle for PC in Wine will be automatically de-DRM’d when they are added to your _Linux_ Calibre. As always, you can troubleshoot problems by adding a book from the terminal using ‘calibredb add xxxx’.
 Or something like that! Hope that helps someone out.
 Installing Python on Windows
 ----------------------------
 I strongly recommend fully installing ActiveState’s Active Python, free Community Edition for Windows (x86) 32 bits. This is a free, full version of the Python.  It comes with some important additional modules that are not included in the bare-bones version from www.python.org unless you choose to install everything.
 1. Download ActivePython 2.7.X for Windows (x86) (or later 2.7 version for Windows (x86) ) from http://www.activestate.com/activepython/downloads. Do not download the ActivePython 2.7.X for Windows (64-bit, x64) verson, even if you are running 64-bit Windows.
 2. When it has finished downloading, run the installer. Accept the default options.
 Installing PyCrypto on Windows
 ------------------------------
 PyCrypto is a set of encryption/decryption routines that work with Python. The sources are freely available, and compiled versions are available from several sources. You must install a version that is for 32-bit Windows and Python 2.7. I recommend the installer linked from Michael Foord’s blog.
 1. Download PyCrypto 2.1 for 32bit Windows and Python 2.7 from http://www.voidspace.org.uk/python/modules.shtml#pycrypto
 2. When it has finished downloading, unzip it. This will produce a file “pycrypto-2.1.0.win32-py2.7.exe”.
 3. Double-click “pycrypto-2.1.0.win32-py2.7.exe” to run it. Accept the default options.
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/init.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/init.py
@@ -0,0 +1,267 @@
 #!/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/>
 #
 # Requires Calibre version 0.7.55 or higher.
 #
 # All credit given to The Dark Reverser for the original mobidedrm script.
 # Thanks to all those who've worked on the scripts since 2008 to improve
 # the support for formats and sources.
 #
 # Revision history:
 #   0.4.8  - Major code change to use unaltered k4mobidedrm.py 4.8 and later
 #   0.4.9  - typo fix
 #   0.4.10 - Another Topaz Fix (class added to page and group and region)
 #   0.4.11 - Fixed Linux support of K4PC
 #   0.4.12 - More Linux Wine fixes
 """
 Decrypt Amazon Kindle and Mobipocket encrypted ebooks.
 """
 PLUGIN_NAME = u"Kindle and Mobipocket DeDRM"
 PLUGIN_VERSION_TUPLE = (0, 4, 12)
 PLUGIN_VERSION = '.'.join([str(x) for x in PLUGIN_VERSION_TUPLE])
 import sys, os, re
 import time
 from zipfile import ZipFile
 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
 # encoded using "replace" before writing them.
 class SafeUnbuffered:
    def __init__(self, stream):
        self.stream = stream
        self.encoding = stream.encoding
        if self.encoding == None:
            self.encoding = "utf-8"
    def write(self, data):
        if isinstance(data,unicode):
            data = data.encode(self.encoding,"replace")
        self.stream.write(data)
        self.stream.flush()
    def __getattr__(self, attr):
        return getattr(self.stream, attr)
 class K4DeDRM(FileTypePlugin):
    name                = PLUGIN_NAME
    description         = u"Removes DRM from eInk Kindle, Kindle 4 Mac and Kindle 4 PC ebooks, and from Mobipocket ebooks. Provided by the work of many including The Dark Reverser, DiapDealer, SomeUpdates, i♥cabbages, CMBDTC, Skindle, mdlnx, ApprenticeAlf, and probably others."
    supported_platforms = ['osx', 'windows', 'linux'] # Platforms this plugin will run on
    author              = u"DiapDealer, SomeUpdates, mdlnx, Apprentice Alf and The Dark Reverser"
    version             = PLUGIN_VERSION_TUPLE
    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            = 521  # 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 = [u"alfcrypto.dll",u"alfcrypto64.dll"]
        elif isosx:
            names = [u"libalfcrypto.dylib"]
        else:
            names = [u"libalfcrypto32.so",u"libalfcrypto64.so",u"alfcrypto.py",u"alfcrypto.dll",u"alfcrypto64.dll",u"getk4pcpids.py",u"k4mobidedrm.py",u"mobidedrm.py",u"kgenpids.py",u"k4pcutils.py",u"topazextract.py"]
        lib_dict = self.load_resources(names)
        self.alfdir = os.path.join(config_dir,u"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)
            open(file_path,'wb').write(data)
    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)
        starttime = time.time()
        print u"{0} v{1}: Trying to decrypt {2}.".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(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 k4mobidedrm
        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 u"{0} v{1}: \'{2}\' is not a valid Mobipocket PID.".format(PLUGIN_NAME, PLUGIN_VERSION, 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).replace(" ","")
            if len(serial) == 16 and serial[0] in ['B','9']:
                serials.append(serial)
            else:
                if len(serial) > 0:
                    print u"{0} v{1}: \'{2}\' is not a valid eInk Kindle serial number.".format(PLUGIN_NAME, PLUGIN_VERSION, serial)
        # Load any kindle info files (*.info) included Calibre's config directory.
        try:
            print u"{0} v{1}: Calibre configuration directory is {2}".format(PLUGIN_NAME, PLUGIN_VERSION, 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 u"{0} v{1}: Kindle info/kinf file {2} found in config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, filename)
        except IOError, e:
            print u"{0} v{1}: Error \'{2}\' reading kindle info/kinf files from config directory.".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0])
            pass
        try:
            book = k4mobidedrm.GetDecryptedBook(path_to_ebook,kInfoFiles,serials,pids,starttime)
        except Exception, 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, u"{0} v{1}".format(PLUGIN_NAME, PLUGIN_VERSION), u"Error after {1:.1f} seconds: {0}".format(e.args[0],time.time()-starttime))
                d.show()
                d.raise_()
                d.exec_()
            raise Exception(u"{0} v{1}: Error after {3:.1f} seconds: {2}".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0],time.time()-starttime))
        print u"{0} v{1}: Successfully decrypted book after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-starttime)
        of = self.temporary_file(k4mobidedrm.cleanup_name(k4mobidedrm.unescape(book.getBookTitle()))+book.getBookExtension())
        book.getFile(of.name)
        book.cleanup()
        return of.name
    def WINEgetPIDs(self, infile):
        import subprocess
        from subprocess import Popen, PIPE, STDOUT
        import subasyncio
        from subasyncio import Process
        print u"   Getting PIDs from Wine"
        outfile = os.path.join(self.alfdir + u"winepids.txt")
        # Remove any previous winepids.txt file.
        if os.path.exists(outfile):
            os.remove(outfile)
        cmdline = u"wine python.exe \"{0}/getk4pcpids.py\" \"{1}\" \"{2}\"".format(self.alfdir,infile,outfile)
        env = os.environ
        print u"wine_prefix from tweaks is \'{0}\'".format(self.wine_prefix)
        if ("WINEPREFIX" in env):
            print u"Using WINEPREFIX from the environment instead: \'{0}\'".format(env["WINEPREFIX"])
        elif (self.wine_prefix is not None):
            env["WINEPREFIX"] = self.wine_prefix
            print u"Using WINEPREFIX from tweaks \'{0}\'".format(self.wine_prefix)
        else:
            print u"No wine prefix used."
        print u"Trying command: {0}".format(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"WINE subprocess error: {0}".format(e.args[0])
            return []
        print u"WINE subprocess returned {0}".format(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)
                        print u"Found PID '{0}'".format(customvalue)
                    else:
                        print u"'{0}' is not a valid PID.".format(customvalue)
            except Exception, e:
                print u"Error parsing winepids.txt: {0}".format(e.args[0])
                return []
        if len(WINEpids) == 0:
            print u"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
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/aescbc.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/aescbc.py
@@ -0,0 +1,568 @@
 #! /usr/bin/env python
 """
    Routines for doing AES CBC in one file
    Modified by some_updates to extract
    and combine only those parts needed for AES CBC
    into one simple to add python file
    Original Version
    Copyright (c) 2002 by Paul A. Lambert
    Under:
    CryptoPy Artisitic License Version 1.0
    See the wonderful pure python package cryptopy-1.2.5
    and read its LICENSE.txt for complete license details.
 """
 class CryptoError(Exception):
    """ Base class for crypto exceptions """
    def __init__(self,errorMessage='Error!'):
        self.message = errorMessage
    def __str__(self):
        return self.message
 class InitCryptoError(CryptoError):
    """ Crypto errors during algorithm initialization """
 class BadKeySizeError(InitCryptoError):
    """ Bad key size error """
 class EncryptError(CryptoError):
    """ Error in encryption processing """
 class DecryptError(CryptoError):
    """ Error in decryption processing """
 class DecryptNotBlockAlignedError(DecryptError):
    """ Error in decryption processing """
 def xorS(a,b):
    """ XOR two strings """
    assert len(a)==len(b)
    x = []
    for i in range(len(a)):
        x.append( chr(ord(a[i])^ord(b[i])))
    return ''.join(x)
 def xor(a,b):
    """ XOR two strings """
    x = []
    for i in range(min(len(a),len(b))):
        x.append( chr(ord(a[i])^ord(b[i])))
    return ''.join(x)
 """
    Base 'BlockCipher' and Pad classes for cipher instances.
    BlockCipher supports automatic padding and type conversion. The BlockCipher
    class was written to make the actual algorithm code more readable and
    not for performance.
 """
 class BlockCipher:
    """ Block ciphers """
    def __init__(self):
        self.reset()
    def reset(self):
        self.resetEncrypt()
        self.resetDecrypt()
    def resetEncrypt(self):
        self.encryptBlockCount = 0
        self.bytesToEncrypt = ''
    def resetDecrypt(self):
        self.decryptBlockCount = 0
        self.bytesToDecrypt = ''
    def encrypt(self, plainText, more = None):
        """ Encrypt a string and return a binary string """
        self.bytesToEncrypt += plainText  # append plainText to any bytes from prior encrypt
        numBlocks, numExtraBytes = divmod(len(self.bytesToEncrypt), self.blockSize)
        cipherText = ''
        for i in range(numBlocks):
            bStart = i*self.blockSize
            ctBlock = self.encryptBlock(self.bytesToEncrypt[bStart:bStart+self.blockSize])
            self.encryptBlockCount += 1
            cipherText += ctBlock
        if numExtraBytes > 0:        # save any bytes that are not block aligned
            self.bytesToEncrypt = self.bytesToEncrypt[-numExtraBytes:]
        else:
            self.bytesToEncrypt = ''
        if more == None:   # no more data expected from caller
            finalBytes = self.padding.addPad(self.bytesToEncrypt,self.blockSize)
            if len(finalBytes) > 0:
                ctBlock = self.encryptBlock(finalBytes)
                self.encryptBlockCount += 1
                cipherText += ctBlock
            self.resetEncrypt()
        return cipherText
    def decrypt(self, cipherText, more = None):
        """ Decrypt a string and return a string """
        self.bytesToDecrypt += cipherText  # append to any bytes from prior decrypt
        numBlocks, numExtraBytes = divmod(len(self.bytesToDecrypt), self.blockSize)
        if more == None:  # no more calls to decrypt, should have all the data
            if numExtraBytes  != 0:
                raise DecryptNotBlockAlignedError, 'Data not block aligned on decrypt'
        # hold back some bytes in case last decrypt has zero len
        if (more != None) and (numExtraBytes == 0) and (numBlocks >0) :
            numBlocks -= 1
            numExtraBytes = self.blockSize
        plainText = ''
        for i in range(numBlocks):
            bStart = i*self.blockSize
            ptBlock = self.decryptBlock(self.bytesToDecrypt[bStart : bStart+self.blockSize])
            self.decryptBlockCount += 1
            plainText += ptBlock
        if numExtraBytes > 0:        # save any bytes that are not block aligned
            self.bytesToEncrypt = self.bytesToEncrypt[-numExtraBytes:]
        else:
            self.bytesToEncrypt = ''
        if more == None:         # last decrypt remove padding
            plainText = self.padding.removePad(plainText, self.blockSize)
            self.resetDecrypt()
        return plainText
 class Pad:
    def __init__(self):
        pass              # eventually could put in calculation of min and max size extension
 class padWithPadLen(Pad):
    """ Pad a binary string with the length of the padding """
    def addPad(self, extraBytes, blockSize):
        """ Add padding to a binary string to make it an even multiple
            of the block size """
        blocks, numExtraBytes = divmod(len(extraBytes), blockSize)
        padLength = blockSize - numExtraBytes
        return extraBytes + padLength*chr(padLength)
    def removePad(self, paddedBinaryString, blockSize):
        """ Remove padding from a binary string """
        if not(0<len(paddedBinaryString)):
            raise DecryptNotBlockAlignedError, 'Expected More Data'
        return paddedBinaryString[:-ord(paddedBinaryString[-1])]
 class noPadding(Pad):
    """ No padding. Use this to get ECB behavior from encrypt/decrypt """
    def addPad(self, extraBytes, blockSize):
        """ Add no padding """
        return extraBytes
    def removePad(self, paddedBinaryString, blockSize):
        """ Remove no padding """
        return paddedBinaryString
 """
    Rijndael encryption algorithm
    This byte oriented implementation is intended to closely
    match FIPS specification for readability.  It is not implemented
    for performance.
 """
 class Rijndael(BlockCipher):
    """ Rijndael encryption algorithm """
    def __init__(self, key = None, padding = padWithPadLen(), keySize=16, blockSize=16 ):
        self.name       = 'RIJNDAEL'
        self.keySize    = keySize
        self.strength   = keySize*8
        self.blockSize  = blockSize  # blockSize is in bytes
        self.padding    = padding    # change default to noPadding() to get normal ECB behavior
        assert( keySize%4==0 and NrTable[4].has_key(keySize/4)),'key size must be 16,20,24,29 or 32 bytes'
        assert( blockSize%4==0 and NrTable.has_key(blockSize/4)), 'block size must be 16,20,24,29 or 32 bytes'
        self.Nb = self.blockSize/4          # Nb is number of columns of 32 bit words
        self.Nk = keySize/4                 # Nk is the key length in 32-bit words
        self.Nr = NrTable[self.Nb][self.Nk] # The number of rounds (Nr) is a function of
                                            # the block (Nb) and key (Nk) sizes.
        if key != None:
            self.setKey(key)
    def setKey(self, key):
        """ Set a key and generate the expanded key """
        assert( len(key) == (self.Nk*4) ), 'Key length must be same as keySize parameter'
        self.__expandedKey = keyExpansion(self, key)
        self.reset()                   # BlockCipher.reset()
    def encryptBlock(self, plainTextBlock):
        """ Encrypt a block, plainTextBlock must be a array of bytes [Nb by 4] """
        self.state = self._toBlock(plainTextBlock)
        AddRoundKey(self, self.__expandedKey[0:self.Nb])
        for round in range(1,self.Nr):          #for round = 1 step 1 to Nr
            SubBytes(self)
            ShiftRows(self)
            MixColumns(self)
            AddRoundKey(self, self.__expandedKey[round*self.Nb:(round+1)*self.Nb])
        SubBytes(self)
        ShiftRows(self)
        AddRoundKey(self, self.__expandedKey[self.Nr*self.Nb:(self.Nr+1)*self.Nb])
        return self._toBString(self.state)
    def decryptBlock(self, encryptedBlock):
        """ decrypt a block (array of bytes) """
        self.state = self._toBlock(encryptedBlock)
        AddRoundKey(self, self.__expandedKey[self.Nr*self.Nb:(self.Nr+1)*self.Nb])
        for round in range(self.Nr-1,0,-1):
            InvShiftRows(self)
            InvSubBytes(self)
            AddRoundKey(self, self.__expandedKey[round*self.Nb:(round+1)*self.Nb])
            InvMixColumns(self)
        InvShiftRows(self)
        InvSubBytes(self)
        AddRoundKey(self, self.__expandedKey[0:self.Nb])
        return self._toBString(self.state)
    def _toBlock(self, bs):
        """ Convert binary string to array of bytes, state[col][row]"""
        assert ( len(bs) == 4*self.Nb ), 'Rijndarl blocks must be of size blockSize'
        return [[ord(bs[4*i]),ord(bs[4*i+1]),ord(bs[4*i+2]),ord(bs[4*i+3])] for i in range(self.Nb)]
    def _toBString(self, block):
        """ Convert block (array of bytes) to binary string """
        l = []
        for col in block:
            for rowElement in col:
                l.append(chr(rowElement))
        return ''.join(l)
 #-------------------------------------
 """    Number of rounds Nr = NrTable[Nb][Nk]
            Nb  Nk=4   Nk=5   Nk=6   Nk=7   Nk=8
            -------------------------------------   """
 NrTable =  {4: {4:10,  5:11,  6:12,  7:13,  8:14},
            5: {4:11,  5:11,  6:12,  7:13,  8:14},
            6: {4:12,  5:12,  6:12,  7:13,  8:14},
            7: {4:13,  5:13,  6:13,  7:13,  8:14},
            8: {4:14,  5:14,  6:14,  7:14,  8:14}}
 #-------------------------------------
 def keyExpansion(algInstance, keyString):
    """ Expand a string of size keySize into a larger array """
    Nk, Nb, Nr = algInstance.Nk, algInstance.Nb, algInstance.Nr # for readability
    key = [ord(byte) for byte in keyString]  # convert string to list
    w = [[key[4*i],key[4*i+1],key[4*i+2],key[4*i+3]] for i in range(Nk)]
    for i in range(Nk,Nb*(Nr+1)):
        temp = w[i-1]        # a four byte column
        if (i%Nk) == 0 :
            temp     = temp[1:]+[temp[0]]  # RotWord(temp)
            temp     = [ Sbox[byte] for byte in temp ]
            temp[0] ^= Rcon[i/Nk]
        elif Nk > 6 and  i%Nk == 4 :
            temp     = [ Sbox[byte] for byte in temp ]  # SubWord(temp)
        w.append( [ w[i-Nk][byte]^temp[byte] for byte in range(4) ] )
    return w
 Rcon = (0,0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x1b,0x36,     # note extra '0' !!!
        0x6c,0xd8,0xab,0x4d,0x9a,0x2f,0x5e,0xbc,0x63,0xc6,
        0x97,0x35,0x6a,0xd4,0xb3,0x7d,0xfa,0xef,0xc5,0x91)
 #-------------------------------------
 def AddRoundKey(algInstance, keyBlock):
    """ XOR the algorithm state with a block of key material """
    for column in range(algInstance.Nb):
        for row in range(4):
            algInstance.state[column][row] ^= keyBlock[column][row]
 #-------------------------------------
 def SubBytes(algInstance):
    for column in range(algInstance.Nb):
        for row in range(4):
            algInstance.state[column][row] = Sbox[algInstance.state[column][row]]
 def InvSubBytes(algInstance):
    for column in range(algInstance.Nb):
        for row in range(4):
            algInstance.state[column][row] = InvSbox[algInstance.state[column][row]]
 Sbox =    (0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,
           0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
           0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,
           0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
           0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,
           0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
           0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a,
           0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75,
           0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0,
           0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84,
           0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b,
           0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf,
           0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85,
           0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8,
           0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5,
           0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2,
           0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17,
           0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73,
           0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88,
           0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb,
           0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c,
           0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79,
           0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9,
           0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08,
           0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6,
           0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a,
           0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e,
           0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e,
           0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,
           0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
           0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,
           0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16)
 InvSbox = (0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38,
           0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb,
           0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87,
           0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb,
           0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d,
           0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e,
           0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2,
           0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25,
           0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16,
           0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92,
           0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda,
           0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84,
           0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a,
           0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06,
           0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02,
           0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b,
           0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea,
           0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73,
           0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85,
           0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e,
           0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89,
           0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b,
           0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20,
           0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4,
           0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31,
           0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f,
           0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d,
           0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef,
           0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0,
           0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61,
           0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26,
           0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d)
 #-------------------------------------
 """ For each block size (Nb), the ShiftRow operation shifts row i
    by the amount Ci.  Note that row 0 is not shifted.
                 Nb      C1 C2 C3
               -------------------  """
 shiftOffset  = { 4 : ( 0, 1, 2, 3),
                 5 : ( 0, 1, 2, 3),
                 6 : ( 0, 1, 2, 3),
                 7 : ( 0, 1, 2, 4),
                 8 : ( 0, 1, 3, 4) }
 def ShiftRows(algInstance):
    tmp = [0]*algInstance.Nb   # list of size Nb
    for r in range(1,4):       # row 0 reamains unchanged and can be skipped
        for c in range(algInstance.Nb):
            tmp[c] = algInstance.state[(c+shiftOffset[algInstance.Nb][r]) % algInstance.Nb][r]
        for c in range(algInstance.Nb):
            algInstance.state[c][r] = tmp[c]
 def InvShiftRows(algInstance):
    tmp = [0]*algInstance.Nb   # list of size Nb
    for r in range(1,4):       # row 0 reamains unchanged and can be skipped
        for c in range(algInstance.Nb):
            tmp[c] = algInstance.state[(c+algInstance.Nb-shiftOffset[algInstance.Nb][r]) % algInstance.Nb][r]
        for c in range(algInstance.Nb):
            algInstance.state[c][r] = tmp[c]
 #-------------------------------------
 def MixColumns(a):
    Sprime = [0,0,0,0]
    for j in range(a.Nb):    # for each column
        Sprime[0] = mul(2,a.state[j][0])^mul(3,a.state[j][1])^mul(1,a.state[j][2])^mul(1,a.state[j][3])
        Sprime[1] = mul(1,a.state[j][0])^mul(2,a.state[j][1])^mul(3,a.state[j][2])^mul(1,a.state[j][3])
        Sprime[2] = mul(1,a.state[j][0])^mul(1,a.state[j][1])^mul(2,a.state[j][2])^mul(3,a.state[j][3])
        Sprime[3] = mul(3,a.state[j][0])^mul(1,a.state[j][1])^mul(1,a.state[j][2])^mul(2,a.state[j][3])
        for i in range(4):
            a.state[j][i] = Sprime[i]
 def InvMixColumns(a):
    """ Mix the four bytes of every column in a linear way
        This is the opposite operation of Mixcolumn """
    Sprime = [0,0,0,0]
    for j in range(a.Nb):    # for each column
        Sprime[0] = mul(0x0E,a.state[j][0])^mul(0x0B,a.state[j][1])^mul(0x0D,a.state[j][2])^mul(0x09,a.state[j][3])
        Sprime[1] = mul(0x09,a.state[j][0])^mul(0x0E,a.state[j][1])^mul(0x0B,a.state[j][2])^mul(0x0D,a.state[j][3])
        Sprime[2] = mul(0x0D,a.state[j][0])^mul(0x09,a.state[j][1])^mul(0x0E,a.state[j][2])^mul(0x0B,a.state[j][3])
        Sprime[3] = mul(0x0B,a.state[j][0])^mul(0x0D,a.state[j][1])^mul(0x09,a.state[j][2])^mul(0x0E,a.state[j][3])
        for i in range(4):
            a.state[j][i] = Sprime[i]
 #-------------------------------------
 def mul(a, b):
    """ Multiply two elements of GF(2^m)
        needed for MixColumn and InvMixColumn """
    if (a !=0 and  b!=0):
        return Alogtable[(Logtable[a] + Logtable[b])%255]
    else:
        return 0
 Logtable = ( 0,   0,  25,   1,  50,   2,  26, 198,  75, 199,  27, 104,  51, 238, 223,   3,
           100,   4, 224,  14,  52, 141, 129, 239,  76, 113,   8, 200, 248, 105,  28, 193,
           125, 194,  29, 181, 249, 185,  39, 106,  77, 228, 166, 114, 154, 201,   9, 120,
           101,  47, 138,   5,  33,  15, 225,  36,  18, 240, 130,  69,  53, 147, 218, 142,
           150, 143, 219, 189,  54, 208, 206, 148,  19,  92, 210, 241,  64,  70, 131,  56,
           102, 221, 253,  48, 191,   6, 139,  98, 179,  37, 226, 152,  34, 136, 145,  16,
           126, 110,  72, 195, 163, 182,  30,  66,  58, 107,  40,  84, 250, 133,  61, 186,
            43, 121,  10,  21, 155, 159,  94, 202,  78, 212, 172, 229, 243, 115, 167,  87,
           175,  88, 168,  80, 244, 234, 214, 116,  79, 174, 233, 213, 231, 230, 173, 232,
            44, 215, 117, 122, 235,  22,  11, 245,  89, 203,  95, 176, 156, 169,  81, 160,
           127,  12, 246, 111,  23, 196,  73, 236, 216,  67,  31,  45, 164, 118, 123, 183,
           204, 187,  62,  90, 251,  96, 177, 134,  59,  82, 161, 108, 170,  85,  41, 157,
           151, 178, 135, 144,  97, 190, 220, 252, 188, 149, 207, 205,  55,  63,  91, 209,
            83,  57, 132,  60,  65, 162, 109,  71,  20,  42, 158,  93,  86, 242, 211, 171,
            68,  17, 146, 217,  35,  32,  46, 137, 180, 124, 184,  38, 119, 153, 227, 165,
           103,  74, 237, 222, 197,  49, 254,  24,  13,  99, 140, 128, 192, 247, 112,   7)
 Alogtable= ( 1,   3,   5,  15,  17,  51,  85, 255,  26,  46, 114, 150, 161, 248,  19,  53,
            95, 225,  56,  72, 216, 115, 149, 164, 247,   2,   6,  10,  30,  34, 102, 170,
           229,  52,  92, 228,  55,  89, 235,  38, 106, 190, 217, 112, 144, 171, 230,  49,
            83, 245,   4,  12,  20,  60,  68, 204,  79, 209, 104, 184, 211, 110, 178, 205,
            76, 212, 103, 169, 224,  59,  77, 215,  98, 166, 241,   8,  24,  40, 120, 136,
           131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206,  73, 219, 118, 154,
           181, 196,  87, 249,  16,  48,  80, 240,  11,  29,  39, 105, 187, 214,  97, 163,
           254,  25,  43, 125, 135, 146, 173, 236,  47, 113, 147, 174, 233,  32,  96, 160,
           251,  22,  58,  78, 210, 109, 183, 194,  93, 231,  50,  86, 250,  21,  63,  65,
           195,  94, 226,  61,  71, 201,  64, 192,  91, 237,  44, 116, 156, 191, 218, 117,
           159, 186, 213, 100, 172, 239,  42, 126, 130, 157, 188, 223, 122, 142, 137, 128,
           155, 182, 193,  88, 232,  35, 101, 175, 234,  37, 111, 177, 200,  67, 197,  84,
           252,  31,  33,  99, 165, 244,   7,   9,  27,  45, 119, 153, 176, 203,  70, 202,
            69, 207,  74, 222, 121, 139, 134, 145, 168, 227,  62,  66, 198,  81, 243,  14,
            18,  54,  90, 238,  41, 123, 141, 140, 143, 138, 133, 148, 167, 242,  13,  23,
            57,  75, 221, 124, 132, 151, 162, 253,  28,  36, 108, 180, 199,  82, 246,   1)
 """
    AES Encryption Algorithm
    The AES algorithm is just Rijndael algorithm restricted to the default
    blockSize of 128 bits.
 """
 class AES(Rijndael):
    """ The AES algorithm is the Rijndael block cipher restricted to block
        sizes of 128 bits and key sizes of 128, 192 or 256 bits
    """
    def __init__(self, key = None, padding = padWithPadLen(), keySize=16):
        """ Initialize AES, keySize is in bytes """
        if  not (keySize == 16 or keySize == 24 or keySize == 32) :
            raise BadKeySizeError, 'Illegal AES key size, must be 16, 24, or 32 bytes'
        Rijndael.__init__( self, key, padding=padding, keySize=keySize, blockSize=16 )
        self.name       = 'AES'
 """
    CBC mode of encryption for block ciphers.
    This algorithm mode wraps any BlockCipher to make a
    Cipher Block Chaining mode.
 """
 from random             import Random  # should change to crypto.random!!!
 class CBC(BlockCipher):
    """ The CBC class wraps block ciphers to make cipher block chaining (CBC) mode
        algorithms.  The initialization (IV) is automatic if set to None.  Padding
        is also automatic based on the Pad class used to initialize the algorithm
    """
    def __init__(self, blockCipherInstance, padding = padWithPadLen()):
        """ CBC algorithms are created by initializing with a BlockCipher instance """
        self.baseCipher = blockCipherInstance
        self.name       = self.baseCipher.name + '_CBC'
        self.blockSize  = self.baseCipher.blockSize
        self.keySize    = self.baseCipher.keySize
        self.padding    = padding
        self.baseCipher.padding = noPadding()   # baseCipher should NOT pad!!
        self.r          = Random()            # for IV generation, currently uses
                                              # mediocre standard distro version     <----------------
        import time
        newSeed = time.ctime()+str(self.r)    # seed with instance location
        self.r.seed(newSeed)                  # to make unique
        self.reset()
    def setKey(self, key):
        self.baseCipher.setKey(key)
    # Overload to reset both CBC state and the wrapped baseCipher
    def resetEncrypt(self):
        BlockCipher.resetEncrypt(self)  # reset CBC encrypt state (super class)
        self.baseCipher.resetEncrypt()  # reset base cipher encrypt state
    def resetDecrypt(self):
        BlockCipher.resetDecrypt(self)  # reset CBC state (super class)
        self.baseCipher.resetDecrypt()  # reset base cipher decrypt state
    def encrypt(self, plainText, iv=None, more=None):
        """ CBC encryption - overloads baseCipher to allow optional explicit IV
            when iv=None, iv is auto generated!
        """
        if self.encryptBlockCount == 0:
            self.iv = iv
        else:
            assert(iv==None), 'IV used only on first call to encrypt'
        return BlockCipher.encrypt(self,plainText, more=more)
    def decrypt(self, cipherText, iv=None, more=None):
        """ CBC decryption - overloads baseCipher to allow optional explicit IV
            when iv=None, iv is auto generated!
        """
        if self.decryptBlockCount == 0:
            self.iv = iv
        else:
            assert(iv==None), 'IV used only on first call to decrypt'
        return BlockCipher.decrypt(self, cipherText, more=more)
    def encryptBlock(self, plainTextBlock):
        """ CBC block encryption, IV is set with 'encrypt' """
        auto_IV = ''
        if self.encryptBlockCount == 0:
            if self.iv == None:
                # generate IV and use
                self.iv = ''.join([chr(self.r.randrange(256)) for i in range(self.blockSize)])
                self.prior_encr_CT_block = self.iv
                auto_IV = self.prior_encr_CT_block    # prepend IV if it's automatic
            else:                       # application provided IV
                assert(len(self.iv) == self.blockSize ),'IV must be same length as block'
                self.prior_encr_CT_block = self.iv
        """ encrypt the prior CT XORed with the PT """
        ct = self.baseCipher.encryptBlock( xor(self.prior_encr_CT_block, plainTextBlock) )
        self.prior_encr_CT_block = ct
        return auto_IV+ct
    def decryptBlock(self, encryptedBlock):
        """ Decrypt a single block """
        if self.decryptBlockCount == 0:   # first call, process IV
            if self.iv == None:    # auto decrypt IV?
                self.prior_CT_block = encryptedBlock
                return ''
            else:
                assert(len(self.iv)==self.blockSize),"Bad IV size on CBC decryption"
                self.prior_CT_block = self.iv
        dct = self.baseCipher.decryptBlock(encryptedBlock)
        """ XOR the prior decrypted CT with the prior CT """
        dct_XOR_priorCT = xor( self.prior_CT_block, dct )
        self.prior_CT_block = encryptedBlock
        return dct_XOR_priorCT
 """
    AES_CBC Encryption Algorithm
 """
 class AES_CBC(CBC):
    """ AES encryption in CBC feedback mode """
    def __init__(self, key=None, padding=padWithPadLen(), keySize=16):
        CBC.__init__( self, AES(key, noPadding(), keySize), padding)
        self.name       = 'AES_CBC'
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/alfcrypto.dll
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/alfcrypto.dll
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/alfcrypto.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/alfcrypto.py
@@ -0,0 +1,297 @@
 #!/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
    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, sizeof
    pointer_size = ctypes.sizeof(ctypes.c_voidp)
    name_of_lib = None
    if sys.platform.startswith('darwin'):
        name_of_lib = 'libalfcrypto.dylib'
    elif sys.platform.startswith('win'):
        if pointer_size == 4:
            name_of_lib = 'alfcrypto.dll'
        else:
            name_of_lib = 'alfcrypto64.dll'
    else:
        if pointer_size == 4:
            name_of_lib = 'libalfcrypto32.so'
        else:
            name_of_lib = 'libalfcrypto64.so'
    libalfcrypto = os.path.join(sys.path[0],name_of_lib)
    if not os.path.isfile(libalfcrypto):
        raise Exception('libalfcrypto not found')
    libalfcrypto = CDLL(libalfcrypto)
    c_char_pp = POINTER(c_char_p)
    c_int_p = POINTER(c_int)
    def F(restype, name, argtypes):
        func = getattr(libalfcrypto, name)
        func.restype = restype
        func.argtypes = argtypes
        return func
    # aes cbc decryption
    #
    # 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);
    #
    #
    # 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
    class AES_KEY(Structure):
        _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))), ('rounds', c_int)]
    AES_KEY_p = POINTER(AES_KEY)
    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])
    # Pukall 1 Cipher
    # unsigned char *PC1(const unsigned char *key, unsigned int klen, const unsigned char *src,
    #                unsigned char *dest, unsigned int len, int decryption);
    PC1 = F(c_char_p, 'PC1', [c_char_p, c_ulong, c_char_p, c_char_p, c_ulong, c_ulong])
    # Topaz Encryption
    # typedef struct _TpzCtx {
    #    unsigned int v[2];
    # } TpzCtx;
    #
    # void topazCryptoInit(TpzCtx *ctx, const unsigned char *key, int klen);
    # void topazCryptoDecrypt(const TpzCtx *ctx, const unsigned char *in, unsigned char *out, int len);
    class TPZ_CTX(Structure):
        _fields_ = [('v', c_long * 2)]
    TPZ_CTX_p = POINTER(TPZ_CTX)
    topazCryptoInit = F(None, 'topazCryptoInit', [TPZ_CTX_p, c_char_p, c_ulong])
    topazCryptoDecrypt = F(None, 'topazCryptoDecrypt', [TPZ_CTX_p, c_char_p, c_char_p, c_ulong])
    class AES_CBC(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 Exception('AES CBC 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 Exception('Failed to initialize AES CBC key')
        def decrypt(self, data):
            out = create_string_buffer(len(data))
            mutable_iv = create_string_buffer(self._iv, len(self._iv))
            rv = AES_cbc_encrypt(data, out, len(data), self._keyctx, mutable_iv, 0)
            if rv == 0:
                raise Exception('AES CBC decryption failed')
            return out.raw
    class Pukall_Cipher(object):
        def __init__(self):
            self.key = None
        def PC1(self, key, src, decryption=True):
            self.key = key
            out = create_string_buffer(len(src))
            de = 0
            if decryption:
                de = 1
            rv = PC1(key, len(key), src, out, len(src), de)
            return out.raw
    class Topaz_Cipher(object):
        def __init__(self):
            self._ctx = None
        def ctx_init(self, key):
            tpz_ctx = self._ctx = TPZ_CTX()
            topazCryptoInit(tpz_ctx, key, len(key))
            return tpz_ctx
        def decrypt(self, data,  ctx=None):
            if ctx == None:
                ctx = self._ctx
            out = create_string_buffer(len(data))
            topazCryptoDecrypt(ctx, data, out, len(data))
            return out.raw
    print u"Using Library AlfCrypto DLL/DYLIB/SO"
    return (AES_CBC, Pukall_Cipher, Topaz_Cipher)
 def _load_python_alfcrypto():
    import aescbc
    class Pukall_Cipher(object):
        def __init__(self):
            self.key = None
        def PC1(self, key, src, decryption=True):
            sum1 = 0;
            sum2 = 0;
            keyXorVal = 0;
            if len(key)!=16:
                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]))
            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
    class Topaz_Cipher(object):
        def __init__(self):
            self._ctx = None
        def ctx_init(self, key):
            ctx1 = 0x0CAFFE19E
            for keyChar in key:
                keyByte = ord(keyChar)
                ctx2 = ctx1
                ctx1 = ((((ctx1 >>2) * (ctx1 >>7))&0xFFFFFFFF) ^ (keyByte * keyByte * 0x0F902007)& 0xFFFFFFFF )
            self._ctx = [ctx1, ctx2]
            return [ctx1,ctx2]
        def decrypt(self, data,  ctx=None):
            if ctx == None:
                ctx = self._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
    class AES_CBC(object):
        def __init__(self):
            self._key = None
            self._iv = None
            self.aes = None
        def set_decrypt_key(self, userkey, iv):
            self._key = userkey
            self._iv = iv
            self.aes = aescbc.AES_CBC(userkey, aescbc.noPadding(), len(userkey))
        def decrypt(self, data):
            iv = self._iv
            cleartext = self.aes.decrypt(iv + data)
            return cleartext
    print u"Using Library AlfCrypto Python"
    return (AES_CBC, Pukall_Cipher, Topaz_Cipher)
 def _load_crypto():
    AES_CBC = Pukall_Cipher = Topaz_Cipher = None
    cryptolist = (_load_libalfcrypto, _load_python_alfcrypto)
    for loader in cryptolist:
        try:
            AES_CBC, Pukall_Cipher, Topaz_Cipher = loader()
            break
        except (ImportError, Exception):
            pass
    return AES_CBC, Pukall_Cipher, Topaz_Cipher
 AES_CBC, Pukall_Cipher, Topaz_Cipher = _load_crypto()
 class KeyIVGen(object):
    # this only exists in openssl so we will use pure python implementation instead
    # 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])
    def pbkdf2(self, passwd, salt, iter, keylen):
        def xorstr( a, b ):
            if len(a) != len(b):
                raise Exception("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()
        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
        sha = hashlib.sha1
        digest_size = sha().digest_size
        # l - number of output blocks to produce
        l = keylen / digest_size
        if keylen % digest_size != 0:
            l += 1
        h = hmac.new( passwd, None, sha )
        T = ""
        for i in range(1, l+1):
            T += pbkdf2_F( h, salt, iter, i )
        return T[0: keylen]
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/alfcrypto64.dll
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/alfcrypto64.dll
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/alfcrypto_src.zip
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/alfcrypto_src.zip
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/config.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/config.py
@@ -0,0 +1,62 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 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('eInk Kindle Serial numbers (First character B, 16 characters, use commas if more than one)')
        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 (8 or 10 characters, use commas if more than one)')
        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()).replace(" ","")
        prefs['serials'] = str(self.serials.text()).replace(" ","")
        winepref=str(self.wineprefix.text())
        if winepref.strip() != '':
            prefs['WINEPREFIX'] = winepref
        else:
            prefs['WINEPREFIX'] = None
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/convert2xml.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/convert2xml.py
@@ -20,8 +20,10 @@ import getopt
 from struct import pack
 from struct import unpack
 class TpzDRMError(Exception):
    pass
-# Get a 7 bit encoded number from string. The most 
+# Get a 7 bit encoded number from string. The most
 # significant byte comes first and has the high bit (8th) set
 def readEncodedNumber(file):
@@ -30,57 +32,57 @@ def readEncodedNumber(file):
    if (len(c) == 0):
        return None
    data = ord(c)
-    
+
    if data == 0xFF:
-       flag = True
+        flag = True
-       c = file.read(1)
+        c = file.read(1)
-       if (len(c) == 0):
+        if (len(c) == 0):
-           return None
+            return None
-       data = ord(c)
+        data = ord(c)
-       
+
    if data >= 0x80:
        datax = (data & 0x7F)
        while data >= 0x80 :
            c = file.read(1)
-            if (len(c) == 0): 
+            if (len(c) == 0):
                return None
            data = ord(c)
            datax = (datax <<7) + (data & 0x7F)
-        data = datax 
+        data = datax
-    
+
    if flag:
-       data = -data
+        data = -data
    return data
-    
+
 # returns a binary string that encodes a number into 7 bits
 # most significant byte first which has the high bit set
 def encodeNumber(number):
-   result = ""
+    result = ""
-   negative = False
+    negative = False
-   flag = 0
+    flag = 0
-   
+
-   if number < 0 :
+    if number < 0 :
-       number = -number + 1
+        number = -number + 1
-       negative = True
+        negative = True
-   
+
-   while True:
+    while True:
-       byte = number & 0x7F
+        byte = number & 0x7F
-       number = number >> 7
+        number = number >> 7
-       byte += flag
+        byte += flag
-       result += chr(byte)
+        result += chr(byte)
-       flag = 0x80
+        flag = 0x80
-       if number == 0 :
+        if number == 0 :
-           if (byte == 0xFF and negative == False) :
+            if (byte == 0xFF and negative == False) :
-               result += chr(0x80)
+                result += chr(0x80)
-           break
+            break
-   
+
-   if negative:
+    if negative:
-       result += chr(0xFF)
+        result += chr(0xFF)
-   
+
-   return result[::-1]
+    return result[::-1]
-  
+
 # create / read  a length prefixed string from the file
@@ -95,9 +97,9 @@ def readString(file):
    sv = file.read(stringLength)
    if (len(sv)  != stringLength):
        return ""
-    return unpack(str(stringLength)+"s",sv)[0]  
+    return unpack(str(stringLength)+"s",sv)[0]
 # convert a binary string generated by encodeNumber (7 bit encoded number)
 # to the value you would find inside the page*.dat files to be processed
@@ -138,7 +140,8 @@ class Dictionary(object):
            return self.stable[self.pos]
        else:
            print "Error - %d outside of string table limits" % val
-            sys.exit(-1)
+            raise TpzDRMError('outside of string table limits')
            # sys.exit(-1)
    def getSize(self):
        return self.size
@@ -211,6 +214,7 @@ class PageParser(object):
        'links.title'  : (1, 'text', 0, 0),
        'links.href'   : (1, 'text', 0, 0),
        'links.type'   : (1, 'text', 0, 0),
        'links.id'     : (1, 'number', 0, 0),
        'paraCont'          : (0, 'number', 1, 1),
        'paraCont.rootID'   : (1, 'number', 0, 0),
@@ -226,6 +230,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),
@@ -234,15 +239,19 @@ 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),
        'region.h'         : (1, 'scalar_number', 0, 0),
        'region.w'         : (1, 'scalar_number', 0, 0),
        'region.orientation' : (1, 'scalar_text', 0, 0),
        'empty_text_region' : (1, 'snippets', 1, 0),
@@ -258,6 +267,13 @@ class PageParser(object):
        'paragraph.class'     : (1, 'scalar_text', 0, 0),
        'paragraph.firstWord' : (1, 'scalar_number', 0, 0),
        'paragraph.lastWord'  : (1, 'scalar_number', 0, 0),
        '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),
        'word_semantic'           : (1, 'snippets', 1, 1),
        'word_semantic.type'      : (1, 'scalar_text', 0, 0),
@@ -272,11 +288,21 @@ class PageParser(object):
        '_span'           : (1, 'snippets', 1, 0),
        '_span.firstWord' : (1, 'scalar_number', 0, 0),
-        '-span.lastWord'  : (1, 'scalar_number', 0, 0),
+        '_span.lastWord'  : (1, 'scalar_number', 0, 0),
        '_span.gridSize'  : (1, 'scalar_number', 0, 0),
        '_span.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
        '_span.gridTopCenter' : (1, 'scalar_number', 0, 0),
        '_span.gridBeginCenter' : (1, 'scalar_number', 0, 0),
        '_span.gridEndCenter' : (1, 'scalar_number', 0, 0),
        'span'           : (1, 'snippets', 1, 0),
        'span.firstWord' : (1, 'scalar_number', 0, 0),
        'span.lastWord'  : (1, 'scalar_number', 0, 0),
        'span.gridSize'  : (1, 'scalar_number', 0, 0),
        'span.gridBottomCenter'  : (1, 'scalar_number', 0, 0),
        'span.gridTopCenter' : (1, 'scalar_number', 0, 0),
        '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),
@@ -362,14 +388,14 @@ class PageParser(object):
        for j in xrange(i+1, cnt) :
            result += '.' + self.tagpath[j]
        return result
-            
+
    # list of absolute command byte values values that indicate
    # various types of loop meachanisms typically used to generate vectors
    cmd_list = (0x76, 0x76)
-    # peek at and return 1 byte that is ahead by i bytes 
+    # peek at and return 1 byte that is ahead by i bytes
    def peek(self, aheadi):
        c = self.fo.read(aheadi)
        if (len(c) == 0):
@@ -402,7 +428,7 @@ class PageParser(object):
        return result
-    # process the next tag token, recursively handling subtags, 
+    # process the next tag token, recursively handling subtags,
    # arguments, and commands
    def procToken(self, token):
@@ -424,7 +450,7 @@ class PageParser(object):
        if known_token :
-            # handle subtags if present 
+            # handle subtags if present
            subtagres = []
            if (splcase == 1):
                # this type of tag uses of escape marker 0x74 indicate subtag count
@@ -433,7 +459,7 @@ class PageParser(object):
                    subtags = 1
                    num_args = 0
-            if (subtags == 1): 
+            if (subtags == 1):
                ntags = readEncodedNumber(self.fo)
                if self.debug : print 'subtags: ' + token + ' has ' + str(ntags)
                for j in xrange(ntags):
@@ -464,7 +490,7 @@ class PageParser(object):
            return result
        # all tokens that need to be processed should be in the hash
-        # table if it may indicate a problem, either new token 
+        # table if it may indicate a problem, either new token
        # or an out of sync condition
        else:
            result = []
@@ -516,7 +542,7 @@ class PageParser(object):
    # dispatches loop commands bytes with various modes
    # The 0x76 style loops are used to build vectors
-    # This was all derived by trial and error and 
+    # This was all derived by trial and error and
    # new loop types may exist that are not handled here
    # since they did not appear in the test cases
@@ -535,7 +561,7 @@ class PageParser(object):
        return result
-            
+
    # add full tag path to injected snippets
    def updateName(self, tag, prefix):
        name = tag[0]
@@ -563,7 +589,7 @@ class PageParser(object):
        argtype = tag[2]
        argList = tag[3]
        nsubtagList = []
-        if len(argList) > 0 : 
+        if len(argList) > 0 :
            for j in argList:
                asnip = self.snippetList[j]
                aso, atag = self.injectSnippets(asnip)
@@ -595,65 +621,70 @@ class PageParser(object):
        nodename = fullpathname.pop()
        ilvl = len(fullpathname)
        indent = ' ' * (3 * ilvl)
-        result = indent + '<' + nodename + '>'
+        rlst = []
        rlst.append(indent + '<' + nodename + '>')
        if len(argList) > 0:
-            argres = ''
+            alst = []
            for j in argList:
                if (argtype == 'text') or (argtype == 'scalar_text') :
-                    argres += j + '|'
+                    alst.append(j + '|')
                else :
-                    argres += str(j) + ','
+                    alst.append(str(j) + ',')
            argres = "".join(alst)
            argres = argres[0:-1]
            if argtype == 'snippets' :
-                result += 'snippets:' + argres
+                rlst.append('snippets:' + argres)
            else :
-                result += argres
+                rlst.append(argres)
        if len(subtagList) > 0 :
-            result += '\n'
+            rlst.append('\n')
            for j in subtagList:
                if len(j) > 0 :
-                    result += self.formatTag(j)
+                    rlst.append(self.formatTag(j))
-            result += indent + '</' + nodename + '>\n'
+            rlst.append(indent + '</' + nodename + '>\n')
        else:
-            result += '</' + nodename + '>\n'
+            rlst.append('</' + nodename + '>\n')
-        return result
+        return "".join(rlst)
-   # flatten tag
+    # flatten tag
    def flattenTag(self, node):
        name = node[0]
        subtagList = node[1]
        argtype = node[2]
        argList = node[3]
-        result = name
+        rlst = []
        rlst.append(name)
        if (len(argList) > 0):
-            argres = ''
+            alst = []
            for j in argList:
                if (argtype == 'text') or (argtype == 'scalar_text') :
-                    argres += j + '|'
+                    alst.append(j + '|')
                else :
-                    argres += str(j) + '|'
+                    alst.append(str(j) + '|')
            argres = "".join(alst)
            argres = argres[0:-1]
            if argtype == 'snippets' :
-                result += '.snippets=' + argres
+                rlst.append('.snippets=' + argres)
            else :
-                result += '=' + argres
+                rlst.append('=' + argres)
-        result += '\n'
+        rlst.append('\n')
        for j in subtagList:
            if len(j) > 0 :
-                result += self.flattenTag(j)
+                rlst.append(self.flattenTag(j))
-        return result
+        return "".join(rlst)
    # reduce create xml output
    def formatDoc(self, flat_xml):
-        result = ''
+        rlst = []
        for j in self.doc :
            if len(j) > 0:
                if flat_xml:
-                    result += self.flattenTag(j)
+                    rlst.append(self.flattenTag(j))
                else:
-                    result += self.formatTag(j)
+                    rlst.append(self.formatTag(j))
        result = "".join(rlst)
        if self.debug : print result
        return result
@@ -698,7 +729,7 @@ class PageParser(object):
                first_token = None
            v = self.getNext()
-            if (v == None): 
+            if (v == None):
                break
            if (v == 0x72):
@@ -709,7 +740,7 @@ class PageParser(object):
                    self.doc.append(tag)
            else:
                if self.debug:
-                    print "Main Loop:  Unknown value: %x" % v 
+                    print "Main Loop:  Unknown value: %x" % v
                if (v == 0):
                    if (self.peek(1) == 0x5f):
                        skip = self.fo.read(1)
@@ -762,7 +793,7 @@ def usage():
 #
 # Main
-#   
+#
 def main(argv):
    dictFile = ""
@@ -783,11 +814,11 @@ def main(argv):
        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) 
+        sys.exit(2)
-       
+
    for o, a in opts:
        if o =="-d":
            debug=True
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/flatxml2html.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/flatxml2html.py
@@ -68,7 +68,7 @@ class DocParser(object):
        ys = []
        gdefs = []
-        # get path defintions, positions, dimensions for each glyph 
+        # 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
@@ -79,7 +79,7 @@ class DocParser(object):
            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])
@@ -124,12 +124,12 @@ class DocParser(object):
            item = self.docList[pos]
            if item.find('=') >= 0:
                (name, argres) = item.split('=',1)
-            else : 
+            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
@@ -142,10 +142,10 @@ class DocParser(object):
            item = self.docList[j]
            if item.find('=') >= 0:
                (name, argres) = item.split('=',1)
-            else : 
+            else :
                name = item
                argres = ''
-            if name.endswith(tagpath) : 
+            if name.endswith(tagpath) :
                result = argres
                foundat = j
                break
@@ -182,13 +182,13 @@ class DocParser(object):
        # 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 
+        # 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(' ','-')
@@ -211,7 +211,7 @@ class DocParser(object):
        return nclass
-    # develop a sorted description of the starting positions of 
+    # develop a sorted description of the starting positions of
    # groups and regions on the page, as well as the page type
    def PageDescription(self):
@@ -267,10 +267,13 @@ class DocParser(object):
        result = []
        # paragraph
-        (pos, pclass) = self.findinDoc('paragraph.class',start,end) 
+        (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)
@@ -278,16 +281,22 @@ class DocParser(object):
        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): 
+            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):
@@ -328,10 +337,10 @@ class DocParser(object):
            result.append(('svg', num))
            return pclass, result
-        # this type of paragraph may be made up of multiple spans, inline 
+        # this type of paragraph may be made up of multiple spans, inline
-        # word monograms (images), and words with semantic meaning, 
+        # 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 = ''
@@ -340,7 +349,7 @@ class DocParser(object):
        if end == -1 :
            end = self.docSize
-        # seems some xml has last* coming before first* so we have to 
+        # seems some xml has last* coming before first* so we have to
        # handle any order
        sp_first = -1
        sp_last = -1
@@ -353,6 +362,8 @@ class DocParser(object):
        word_class = ''
        word_semantic_type = ''
        while (line < end) :
            (name, argres) = self.lineinDoc(line)
@@ -376,10 +387,10 @@ class DocParser(object):
                ws_last = int(argres)
            elif name.endswith('word.class'):
-               (cname, space) = argres.split('-',1)
+                (cname, space) = argres.split('-',1)
-               if space == '' : space = '0'
+                if space == '' : space = '0'
-               if (cname == 'spaceafter') and (int(space) > 0) :
+                if (cname == 'spaceafter') and (int(space) > 0) :
-                   word_class = 'sa'
+                    word_class = 'sa'
            elif name.endswith('word.img.src'):
                result.append(('img' + word_class, int(argres)))
@@ -410,11 +421,11 @@ class DocParser(object):
                    result.append(('ocr', wordnum))
                ws_first = -1
                ws_last = -1
-                              
+
            line += 1
        return pclass, result
-                            
+
    def buildParagraph(self, pclass, pdesc, type, regtype) :
        parares = ''
@@ -427,7 +438,7 @@ class DocParser(object):
        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 + '>'
@@ -456,7 +467,7 @@ class DocParser(object):
                        if linktype == 'external' :
                            linkhref = self.link_href[link-1]
                            linkhtml = '<a href="%s">' % linkhref
-                        else : 
+                        else :
                            if len(self.link_page) >= link :
                                ptarget = self.link_page[link-1] - 1
                                linkhtml = '<a href="#page%04d">' % ptarget
@@ -503,7 +514,7 @@ class DocParser(object):
            elif wtype == 'svg' :
                sep = ''
-                parares += '<img src="img/' + self.id + '_%04d.svg" alt="" />' % num 
+                parares += '<img src="img/' + self.id + '_%04d.svg" alt="" />' % num
                parares += sep
        if len(sep) > 0 : parares = parares[0:-1]
@@ -512,13 +523,80 @@ class DocParser(object):
        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):
-        htmlpage = ''
+        tocinfo = ''
        hlst = []
        # get the ocr text
        (pos, argres) = self.findinDoc('info.word.ocrText',0,-1)
@@ -529,8 +607,8 @@ class DocParser(object):
        # 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) 
+        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)
@@ -558,25 +636,25 @@ class DocParser(object):
        # get a descriptions of the starting points of the regions
        # and groups on the page
-        (pagetype, pageDesc) = self.PageDescription() 
+        (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:
-                htmlpage += '<div style="visibility: hidden; height: 0; width: 0;" id="' 
+                hlst.append('<div style="visibility: hidden; height: 0; width: 0;" id="')
-                htmlpage += self.id + '" title="pagetype_' + pagetype + '"></div>\n'
+                hlst.append(self.id + '" title="pagetype_' + pagetype + '"></div>\n')
                anchorSet = True
            # handle groups of graphics with text captions
@@ -585,12 +663,12 @@ class DocParser(object):
                if grptype != None:
                    if grptype == 'graphic':
                        gcstr = ' class="' + grptype + '"'
-                        htmlpage += '<div' + gcstr + '>'
+                        hlst.append('<div' + gcstr + '>')
                        inGroup = True
-                
+
            elif (etype == 'grpend'):
                if inGroup:
-                    htmlpage += '</div>\n'
+                    hlst.append('</div>\n')
                    inGroup = False
            else:
@@ -600,25 +678,25 @@ class DocParser(object):
                    (pos, simgsrc) = self.findinDoc('img.src',start,end)
                    if simgsrc:
                        if inGroup:
-                            htmlpage += '<img src="img/img%04d.jpg" alt="" />' % int(simgsrc)
+                            hlst.append('<img src="img/img%04d.jpg" alt="" />' % int(simgsrc))
                        else:
-                            htmlpage += '<div class="graphic"><img src="img/img%04d.jpg" alt="" /></div>' % int(simgsrc)
+                            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:
-                        htmlpage += '<div style="page-break-after: always;">&nbsp;</div>\n'
+                        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'
-                        htmlpage += '<' + tag + ' class="' + pclass + '">'
+                        hlst.append('<' + tag + ' class="' + pclass + '">')
                    else:
-                        htmlpage += '<' + tag + '>'
+                        hlst.append('<' + tag + '>')
-                    htmlpage += self.buildParagraph(pclass, pdesc, 'middle', regtype)
+                    hlst.append(self.buildParagraph(pclass, pdesc, 'middle', regtype))
-                    htmlpage += '</' + tag + '>'
+                    hlst.append('</' + tag + '>')
                elif (regtype == 'text') or (regtype == 'fixed') or (regtype == 'insert') or (regtype == 'listitem'):
                    ptype = 'full'
@@ -632,11 +710,11 @@ class DocParser(object):
                        if pclass[3:6] == 'h1-' : tag = 'h4'
                        if pclass[3:6] == 'h2-' : tag = 'h5'
                        if pclass[3:6] == 'h3-' : tag = 'h6'
-                        htmlpage += '<' + tag + ' class="' + pclass + '">'
+                        hlst.append('<' + tag + ' class="' + pclass + '">')
-                        htmlpage += self.buildParagraph(pclass, pdesc, 'middle', regtype)
+                        hlst.append(self.buildParagraph(pclass, pdesc, 'middle', regtype))
-                        htmlpage += '</' + tag + '>'
+                        hlst.append('</' + tag + '>')
                    else :
-                        htmlpage += self.buildParagraph(pclass, pdesc, ptype, regtype)
+                        hlst.append(self.buildParagraph(pclass, pdesc, ptype, regtype))
                elif (regtype == 'tocentry') :
                    ptype = 'full'
@@ -644,8 +722,8 @@ class DocParser(object):
                        ptype = 'end'
                        first_para_continued = False
                    (pclass, pdesc) = self.getParaDescription(start,end, regtype)
-                    htmlpage += self.buildParagraph(pclass, pdesc, ptype, regtype)
+                    tocinfo += self.buildTOCEntry(pdesc)
-
+                    hlst.append(self.buildParagraph(pclass, pdesc, ptype, regtype))
                elif (regtype == 'vertical') or (regtype == 'table') :
                    ptype = 'full'
@@ -655,13 +733,13 @@ class DocParser(object):
                        ptype = 'end'
                        first_para_continued = False
                    (pclass, pdesc) = self.getParaDescription(start, end, regtype)
-                    htmlpage += self.buildParagraph(pclass, pdesc, ptype, regtype)
+                    hlst.append(self.buildParagraph(pclass, pdesc, ptype, regtype))
                elif (regtype == 'synth_fcvr.center'):
                    (pos, simgsrc) = self.findinDoc('img.src',start,end)
                    if simgsrc:
-                        htmlpage += '<div class="graphic"><img src="img/img%04d.jpg" alt="" /></div>' % int(simgsrc)
+                        hlst.append('<div class="graphic"><img src="img/img%04d.jpg" alt="" /></div>' % int(simgsrc))
                else :
                    print '          Making region type', regtype,
@@ -687,29 +765,29 @@ class DocParser(object):
                            if pclass[3:6] == 'h1-' : tag = 'h4'
                            if pclass[3:6] == 'h2-' : tag = 'h5'
                            if pclass[3:6] == 'h3-' : tag = 'h6'
-                            htmlpage += '<' + tag + ' class="' + pclass + '">'
+                            hlst.append('<' + tag + ' class="' + pclass + '">')
-                            htmlpage += self.buildParagraph(pclass, pdesc, 'middle', regtype)
+                            hlst.append(self.buildParagraph(pclass, pdesc, 'middle', regtype))
-                            htmlpage += '</' + tag + '>'
+                            hlst.append('</' + tag + '>')
                        else :
-                            htmlpage += self.buildParagraph(pclass, pdesc, ptype, regtype)
+                            hlst.append(self.buildParagraph(pclass, pdesc, ptype, regtype))
                    else :
                        print ' a "graphic" region'
                        (pos, simgsrc) = self.findinDoc('img.src',start,end)
                        if simgsrc:
-                            htmlpage += '<div class="graphic"><img src="img/img%04d.jpg" alt="" /></div>' % int(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
+        return htmlpage, tocinfo
 def convert2HTML(flatxml, classlst, fileid, bookDir, gdict, fixedimage):
    # create a document parser
    dp = DocParser(flatxml, classlst, fileid, bookDir, gdict, fixedimage)
-    htmlpage = dp.process()
+    htmlpage, tocinfo = dp.process()
-    return htmlpage
+    return htmlpage, tocinfo
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/flatxml2svg.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/flatxml2svg.py
@@ -10,17 +10,94 @@ from struct import unpack
 class PParser(object):
-    def __init__(self, gd, flatxml):
+    def __init__(self, gd, flatxml, meta_array):
        self.gd = gd
        self.flatdoc = flatxml.split('\n')
        self.docSize = len(self.flatdoc)
        self.temp = []
-        foo = self.getData('page.h') or self.getData('book.h')
+
-        self.ph = foo[0]
+        self.ph = -1
-        foo = self.getData('page.w') or self.getData('book.w')
+        self.pw = -1
-        self.pw = foo[0]
+        startpos = self.posinDoc('page.h') or self.posinDoc('book.h')
-        self.gx = self.getData('info.glyph.x')
+        for p in startpos:
-        self.gy = self.getData('info.glyph.y')
+            (name, argres) = self.lineinDoc(p)
-        self.gid = self.getData('info.glyph.glyphID')
+            self.ph = max(self.ph, int(argres))
        startpos = self.posinDoc('page.w') or self.posinDoc('book.w')
        for p in startpos:
            (name, argres) = self.lineinDoc(p)
            self.pw = max(self.pw, int(argres))
        if self.ph <= 0:
            self.ph = int(meta_array.get('pageHeight', '11000'))
        if self.pw <= 0:
            self.pw = int(meta_array.get('pageWidth', '8500'))
        res = []
        startpos = self.posinDoc('info.glyph.x')
        for p in startpos:
            argres = self.getDataatPos('info.glyph.x', p)
            res.extend(argres)
        self.gx = res
        res = []
        startpos = self.posinDoc('info.glyph.y')
        for p in startpos:
            argres = self.getDataatPos('info.glyph.y', p)
            res.extend(argres)
        self.gy = res
        res = []
        startpos = self.posinDoc('info.glyph.glyphID')
        for p in startpos:
            argres = self.getDataatPos('info.glyph.glyphID', p)
            res.extend(argres)
        self.gid = res
    # return tag at line pos in document
    def lineinDoc(self, pos) :
        if (pos >= 0) and (pos < self.docSize) :
            item = self.flatdoc[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.flatdoc[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
    def getData(self, path):
        result = None
        cnt = len(self.flatdoc)
@@ -39,6 +116,23 @@ class PParser(object):
            for j in xrange(0,len(argres)):
                argres[j] = int(argres[j])
        return result
    def getDataatPos(self, path, pos):
        result = None
        item = self.flatdoc[pos]
        if item.find('=') >= 0:
            (name, argt) = item.split('=')
            argres = argt.split('|')
        else:
            name = item
            argres = []
        if (len(argres) > 0) :
            for j in xrange(0,len(argres)):
                argres[j] = int(argres[j])
        if (name.endswith(path)):
            result = argres
        return result
    def getDataTemp(self, path):
        result = None
        cnt = len(self.temp)
@@ -58,6 +152,7 @@ class PParser(object):
            for j in xrange(0,len(argres)):
                argres[j] = int(argres[j])
        return result
    def getImages(self):
        result = []
        self.temp = self.flatdoc
@@ -69,6 +164,7 @@ class PParser(object):
            src = self.getDataTemp('img.src')[0]
            result.append('<image xlink:href="../img/img%04d.jpg" x="%d" y="%d" width="%d" height="%d" />\n' % (src, x, y, w, h))
        return result
    def getGlyphs(self):
        result = []
        if (self.gid != None) and (len(self.gid) > 0):
@@ -84,68 +180,70 @@ class PParser(object):
        return result
-def convert2SVG(gdict, flat_xml, counter, numfiles, svgDir, raw, meta_array, scaledpi):
+def convert2SVG(gdict, flat_xml, pageid, previd, nextid, svgDir, raw, meta_array, scaledpi):
-    ml = ''
+    mlst = []
-    pp = PParser(gdict, flat_xml)
+    pp = PParser(gdict, flat_xml, meta_array)
-    ml += '<?xml version="1.0" standalone="no"?>\n'
+    mlst.append('<?xml version="1.0" standalone="no"?>\n')
    if (raw):
-        ml += '<!DOCTYPE svg PUBLIC "-//W3C/DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n'
+        mlst.append('<!DOCTYPE svg PUBLIC "-//W3C/DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n')
-        ml += '<svg width="%fin" height="%fin" viewBox="0 0 %d %d" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">\n' % (pp.pw / scaledpi, pp.ph / scaledpi, pp.pw -1, pp.ph -1)
+        mlst.append('<svg width="%fin" height="%fin" viewBox="0 0 %d %d" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">\n' % (pp.pw / scaledpi, pp.ph / scaledpi, pp.pw -1, pp.ph -1))
-        ml += '<title>Page %d - %s by %s</title>\n' % (counter, meta_array['Title'],meta_array['Authors'])
+        mlst.append('<title>Page %d - %s by %s</title>\n' % (pageid, meta_array['Title'],meta_array['Authors']))
    else:
-        ml += '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n'
+        mlst.append('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n')
-        ml += '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" ><head>\n'
+        mlst.append('<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" ><head>\n')
-        ml += '<title>Page %d - %s by %s</title>\n' % (counter, meta_array['Title'],meta_array['Authors'])
+        mlst.append('<title>Page %d - %s by %s</title>\n' % (pageid, meta_array['Title'],meta_array['Authors']))
-        ml += '<script><![CDATA[\n'
+        mlst.append('<script><![CDATA[\n')
-        ml += 'function gd(){var p=window.location.href.replace(/^.*\?dpi=(\d+).*$/i,"$1");return p;}\n'
+        mlst.append('function gd(){var p=window.location.href.replace(/^.*\?dpi=(\d+).*$/i,"$1");return p;}\n')
-        ml += 'var dpi=%d;\n' % scaledpi
+        mlst.append('var dpi=%d;\n' % scaledpi)
-        if (counter) :
+        if (previd) :
-            ml += 'var prevpage="page%04d.xhtml";\n' % (counter - 1)
+            mlst.append('var prevpage="page%04d.xhtml";\n' % (previd))
-        if (counter < numfiles-1) :
+        if (nextid) :
-            ml += 'var nextpage="page%04d.xhtml";\n' % (counter + 1)
+            mlst.append('var nextpage="page%04d.xhtml";\n' % (nextid))
-        ml += 'var pw=%d;var ph=%d;' % (pp.pw, pp.ph)
+        mlst.append('var pw=%d;var ph=%d;' % (pp.pw, pp.ph))
-        ml += 'function zoomin(){dpi=dpi*(0.8);setsize();}\n'
+        mlst.append('function zoomin(){dpi=dpi*(0.8);setsize();}\n')
-        ml += 'function zoomout(){dpi=dpi*1.25;setsize();}\n'
+        mlst.append('function zoomout(){dpi=dpi*1.25;setsize();}\n')
-        ml += 'function setsize(){var svg=document.getElementById("svgimg");var prev=document.getElementById("prevsvg");var next=document.getElementById("nextsvg");var width=(pw/dpi)+"in";var height=(ph/dpi)+"in";svg.setAttribute("width",width);svg.setAttribute("height",height);prev.setAttribute("height",height);prev.setAttribute("width","50px");next.setAttribute("height",height);next.setAttribute("width","50px");}\n'
+        mlst.append('function setsize(){var svg=document.getElementById("svgimg");var prev=document.getElementById("prevsvg");var next=document.getElementById("nextsvg");var width=(pw/dpi)+"in";var height=(ph/dpi)+"in";svg.setAttribute("width",width);svg.setAttribute("height",height);prev.setAttribute("height",height);prev.setAttribute("width","50px");next.setAttribute("height",height);next.setAttribute("width","50px");}\n')
-        ml += 'function ppage(){window.location.href=prevpage+"?dpi="+Math.round(dpi);}\n'
+        mlst.append('function ppage(){window.location.href=prevpage+"?dpi="+Math.round(dpi);}\n')
-        ml += 'function npage(){window.location.href=nextpage+"?dpi="+Math.round(dpi);}\n'
+        mlst.append('function npage(){window.location.href=nextpage+"?dpi="+Math.round(dpi);}\n')
-        ml += 'var gt=gd();if(gt>0){dpi=gt;}\n'
+        mlst.append('var gt=gd();if(gt>0){dpi=gt;}\n')
-        ml += 'window.onload=setsize;\n'
+        mlst.append('window.onload=setsize;\n')
-        ml += ']]></script>\n'
+        mlst.append(']]></script>\n')
-        ml += '</head>\n'
+        mlst.append('</head>\n')
-        ml += '<body onLoad="setsize();" style="background-color:#777;text-align:center;">\n'
+        mlst.append('<body onLoad="setsize();" style="background-color:#777;text-align:center;">\n')
-        ml += '<div style="white-space:nowrap;">\n'
+        mlst.append('<div style="white-space:nowrap;">\n')
-        if (counter == 0) :
+        if previd == None:
-            ml += '<a href="javascript:ppage();"><svg id="prevsvg" viewBox="0 0 100 300" xmlns="http://www.w3.org/2000/svg" version="1.1" style="background-color:#777"></svg></a>\n'
+            mlst.append('<a href="javascript:ppage();"><svg id="prevsvg" viewBox="0 0 100 300" xmlns="http://www.w3.org/2000/svg" version="1.1" style="background-color:#777"></svg></a>\n')
        else:
-            ml += '<a href="javascript:ppage();"><svg id="prevsvg" viewBox="0 0 100 300" xmlns="http://www.w3.org/2000/svg" version="1.1" style="background-color:#777"><polygon points="5,150,95,5,95,295" fill="#AAAAAA" /></svg></a>\n'
+            mlst.append('<a href="javascript:ppage();"><svg id="prevsvg" viewBox="0 0 100 300" xmlns="http://www.w3.org/2000/svg" version="1.1" style="background-color:#777"><polygon points="5,150,95,5,95,295" fill="#AAAAAA" /></svg></a>\n')
-        ml += '<a href="javascript:npage();"><svg id="svgimg" viewBox="0 0 %d %d" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" style="background-color:#FFF;border:1px solid black;">' % (pp.pw, pp.ph)
+
-    if (pp.gid != None): 
+        mlst.append('<a href="javascript:npage();"><svg id="svgimg" viewBox="0 0 %d %d" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" style="background-color:#FFF;border:1px solid black;">' % (pp.pw, pp.ph))
-        ml += '<defs>\n'
+    if (pp.gid != None):
        mlst.append('<defs>\n')
        gdefs = pp.getGlyphs()
        for j in xrange(0,len(gdefs)):
-            ml += gdefs[j]
+            mlst.append(gdefs[j])
-        ml += '</defs>\n'
+        mlst.append('</defs>\n')
    img = pp.getImages()
    if (img != None):
        for j in xrange(0,len(img)):
-            ml += img[j]
+            mlst.append(img[j])
-    if (pp.gid != None): 
+    if (pp.gid != None):
        for j in xrange(0,len(pp.gid)):
-            ml += '<use xlink:href="#gl%d" x="%d" y="%d" />\n' % (pp.gid[j], pp.gx[j], pp.gy[j])
+            mlst.append('<use xlink:href="#gl%d" x="%d" y="%d" />\n' % (pp.gid[j], pp.gx[j], pp.gy[j]))
    if (img == None or len(img) == 0) and (pp.gid == None or len(pp.gid) == 0):
-        ml += '<text x="10" y="10" font-family="Helvetica" font-size="100" stroke="black">This page intentionally left blank.</text>\n<text x="10" y="110" font-family="Helvetica" font-size="50" stroke="black">Until this notice unintentionally gave it content.  (gensvg.py)</text>\n'
+        xpos = "%d" % (pp.pw // 3)
        ypos = "%d" % (pp.ph // 3)
        mlst.append('<text x="' + xpos + '" y="' + ypos + '" font-size="' + meta_array['fontSize'] + '" font-family="Helvetica" stroke="black">This page intentionally left blank.</text>\n')
    if (raw) :
-        ml += '</svg>'
+        mlst.append('</svg>')
    else :
-        ml += '</svg></a>\n'
+        mlst.append('</svg></a>\n')
-        if (counter == numfiles - 1) :
+        if nextid == None:
-            ml += '<a href="javascript:npage();"><svg id="nextsvg" viewBox="0 0 100 300" xmlns="http://www.w3.org/2000/svg" version="1.1" style="background-color:#777"></svg></a>\n'
+            mlst.append('<a href="javascript:npage();"><svg id="nextsvg" viewBox="0 0 100 300" xmlns="http://www.w3.org/2000/svg" version="1.1" style="background-color:#777"></svg></a>\n')
        else :
-            ml += '<a href="javascript:npage();"><svg id="nextsvg" viewBox="0 0 100 300" xmlns="http://www.w3.org/2000/svg" version="1.1" style="background-color:#777"><polygon points="5,5,5,295,95,150" fill="#AAAAAA" /></svg></a>\n'
+            mlst.append('<a href="javascript:npage();"><svg id="nextsvg" viewBox="0 0 100 300" xmlns="http://www.w3.org/2000/svg" version="1.1" style="background-color:#777"><polygon points="5,5,5,295,95,150" fill="#AAAAAA" /></svg></a>\n')
-        ml += '</div>\n'
+        mlst.append('</div>\n')
-        ml += '<div><a href="javascript:zoomin();">zoom in</a> - <a href="javascript:zoomout();">zoom out</a></div>\n'
+        mlst.append('<div><a href="javascript:zoomin();">zoom in</a> - <a href="javascript:zoomout();">zoom out</a></div>\n')
-        ml += '</body>\n'
+        mlst.append('</body>\n')
-        ml += '</html>\n'
+        mlst.append('</html>\n')
-    return ml
+    return "".join(mlst)
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/genbook.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/genbook.py
@@ -19,13 +19,28 @@ import getopt
 from struct import pack
 from struct import unpack
 class TpzDRMError(Exception):
    pass
 # local support routines
-import convert2xml
+if 'calibre' in sys.modules:
-import flatxml2html
+    inCalibre = True
-import flatxml2svg
+else:
-import stylexml2css
+    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):
@@ -33,27 +48,27 @@ def readEncodedNumber(file):
    c = file.read(1)
    if (len(c) == 0):
        return None
-    data = ord(c)    
+    data = ord(c)
    if data == 0xFF:
-       flag = True
+        flag = True
-       c = file.read(1)
+        c = file.read(1)
-       if (len(c) == 0):
+        if (len(c) == 0):
-           return None
+            return None
-       data = ord(c)       
+        data = ord(c)
    if data >= 0x80:
        datax = (data & 0x7F)
        while data >= 0x80 :
            c = file.read(1)
-            if (len(c) == 0): 
+            if (len(c) == 0):
                return None
            data = ord(c)
            datax = (datax <<7) + (data & 0x7F)
-        data = datax 
+        data = datax
    if flag:
-       data = -data
+        data = -data
    return data
-# Get a length prefixed string from the file 
+# Get a length prefixed string from the file
 def lengthPrefixString(data):
    return encodeNumber(len(data))+data
@@ -64,7 +79,7 @@ def readString(file):
    sv = file.read(stringLength)
    if (len(sv)  != stringLength):
        return ""
-    return unpack(str(stringLength)+"s",sv)[0]  
+    return unpack(str(stringLength)+"s",sv)[0]
 def getMetaArray(metaFile):
    # parse the meta file
@@ -103,7 +118,8 @@ class Dictionary(object):
            return self.stable[self.pos]
        else:
            print "Error - %d outside of string table limits" % val
-            sys.exit(-1)
+            raise TpzDRMError('outside or string table limits')
            # sys.exit(-1)
    def getSize(self):
        return self.size
    def getPos(self):
@@ -127,10 +143,10 @@ class PageDimParser(object):
            item = docList[j]
            if item.find('=') >= 0:
                (name, argres) = item.split('=')
-            else : 
+            else :
                name = item
                argres = ''
-            if name.endswith(tagpath) : 
+            if name.endswith(tagpath) :
                result = argres
                foundat = j
                break
@@ -284,9 +300,10 @@ def generateBook(bookDir, raw, fixedimage):
    if not os.path.exists(svgDir) :
        os.makedirs(svgDir)
-    xmlDir = os.path.join(bookDir,'xml')
+    if buildXML:
-    if not os.path.exists(xmlDir) :
+        xmlDir = os.path.join(bookDir,'xml')
-        os.makedirs(xmlDir)
+        if not os.path.exists(xmlDir) :
            os.makedirs(xmlDir)
    otherFile = os.path.join(bookDir,'other0000.dat')
    if not os.path.exists(otherFile) :
@@ -322,7 +339,7 @@ def generateBook(bookDir, raw, fixedimage):
    print 'Processing Meta Data and creating OPF'
    meta_array = getMetaArray(metaFile)
-    # replace special chars in title and authors like & < > 
+    # replace special chars in title and authors like & < >
    title = meta_array.get('Title','No Title Provided')
    title = title.replace('&','&amp;')
    title = title.replace('<','&lt;')
@@ -334,23 +351,38 @@ def generateBook(bookDir, raw, fixedimage):
    authors = authors.replace('>','&gt;')
    meta_array['Authors'] = authors
-    xname = os.path.join(xmlDir, 'metadata.xml')
+    if buildXML:
-    metastr = ''
+        xname = os.path.join(xmlDir, 'metadata.xml')
-    for key in meta_array:
+        mlst = []
-        metastr += '<meta name="' + key + '" content="' + meta_array[key] + '" />\n'
+        for key in meta_array:
-    file(xname, 'wb').write(metastr)
+            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)
@@ -360,14 +392,39 @@ def generateBook(bookDir, raw, fixedimage):
    (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
-    # print '     ', 'other0000.dat'
+    # 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)
-    xname = os.path.join(xmlDir, 'other0000.xml')
+    if buildXML:
-    file(xname, 'wb').write(convert2xml.getXML(dict, otherFile))
+        xname = os.path.join(xmlDir, 'other0000.xml')
        file(xname, 'wb').write(convert2xml.getXML(dict, otherFile))
    print 'Processing Glyphs'
    gd = GlyphDict()
@@ -387,8 +444,9 @@ def generateBook(bookDir, raw, fixedimage):
        fname = os.path.join(glyphsDir,filename)
        flat_xml = convert2xml.fromData(dict, fname)
-        xname = os.path.join(xmlDir, filename.replace('.dat','.xml'))
+        if buildXML:
-        file(xname, 'wb').write(convert2xml.getXML(dict, fname))
+            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):
@@ -403,108 +461,188 @@ def generateBook(bookDir, raw, fixedimage):
    glyfile.close()
    print " "
    # start up the html
    # also build up tocentries while processing html
    htmlFileName = "book.html"
-    htmlstr = '<?xml version="1.0" encoding="utf-8"?>\n'
+    hlst = []
-    htmlstr += '<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.1 Strict//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11-strict.dtd">\n'
+    hlst.append('<?xml version="1.0" encoding="utf-8"?>\n')
-    htmlstr += '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\n'
+    hlst.append('<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.1 Strict//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11-strict.dtd">\n')
-    htmlstr += '<head>\n'
+    hlst.append('<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\n')
-    htmlstr += '<meta http-equiv="content-type" content="text/html; charset=utf-8"/>\n'
+    hlst.append('<head>\n')
-    htmlstr += '<title>' + meta_array['Title'] + ' by ' + meta_array['Authors'] + '</title>\n' 
+    hlst.append('<meta http-equiv="content-type" content="text/html; charset=utf-8"/>\n')
-    htmlstr += '<meta name="Author" content="' + meta_array['Authors'] + '" />\n'
+    hlst.append('<title>' + meta_array['Title'] + ' by ' + meta_array['Authors'] + '</title>\n')
-    htmlstr += '<meta name="Title" content="' + meta_array['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:
-        htmlstr += '<meta name="ASIN" content="' + meta_array['ASIN'] + '" />\n'
+        hlst.append('<meta name="ASIN" content="' + meta_array['ASIN'] + '" />\n')
    if 'GUID' in meta_array:
-        htmlstr += '<meta name="GUID" content="' + meta_array['GUID'] + '" />\n'
+        hlst.append('<meta name="GUID" content="' + meta_array['GUID'] + '" />\n')
-    htmlstr += '<link href="style.css" rel="stylesheet" type="text/css" />\n'
+    hlst.append('<link href="style.css" rel="stylesheet" type="text/css" />\n')
-    htmlstr += '</head>\n<body>\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.  
+    # readability when rendering to the screen.
    scaledpi = 1440.0
    svgindex = '<?xml version="1.0" encoding="utf-8"?>\n'
    svgindex += '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n'
    svgindex += '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >'
    svgindex += '<head>\n'
    svgindex += '<title>' + meta_array['Title'] + '</title>\n'
    svgindex += '<meta name="Author" content="' + meta_array['Authors'] + '" />\n'
    svgindex += '<meta name="Title" content="' + meta_array['Title'] + '" />\n'
    if 'ASIN' in meta_array:
        svgindex += '<meta name="ASIN" content="' + meta_array['ASIN'] + '" />\n'
    if 'GUID' in meta_array:
        svgindex += '<meta name="GUID" content="' + meta_array['GUID'] + '" />\n'
    svgindex += '</head>\n'
    svgindex += '<body>\n'
    filenames = os.listdir(pageDir)
    filenames = sorted(filenames)
    numfiles = len(filenames)
-    counter = 0
+
    xmllst = []
    elst = []
    for filename in filenames:
        # print '     ', filename
        print ".",
        fname = os.path.join(pageDir,filename)
        flat_xml = convert2xml.fromData(dict, fname)
-        xname = os.path.join(xmlDir, filename.replace('.dat','.xml'))
+        # keep flat_xml for later svg processing
-        file(xname, 'wb').write(convert2xml.getXML(dict, fname))
+        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
-        htmlstr += flatxml2html.convert2HTML(flat_xml, classlst, fname, bookDir, gd, fixedimage)
+        pagehtml, tocinfo = flatxml2html.convert2HTML(flat_xml, classlst, fname, bookDir, gd, fixedimage)
        elst.append(tocinfo)
        hlst.append(pagehtml)
-        # now get the svg image of the page
+    # finish up the html string and output it
-        svgxml = flatxml2svg.convert2SVG(gd, flat_xml, counter, numfiles, svgDir, raw, meta_array, scaledpi)
+    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,filename.replace('.dat','.svg')), 'w')
+            pfile = open(os.path.join(svgDir,'page%04d.svg' % pageid),'w')
-            svgindex += '<a href="svg/page%04d.svg">Page %d</a>\n' % (counter, counter)
+            slst.append('<a href="svg/page%04d.svg">Page %d</a>\n' % (pageid, pageid))
        else :
-            pfile = open(os.path.join(svgDir,'page%04d.xhtml' % counter), 'w')
+            pfile = open(os.path.join(svgDir,'page%04d.xhtml' % pageid), 'w')
-            svgindex += '<a href="svg/page%04d.xhtml">Page %d</a>\n' % (counter, counter)
+            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 " "
    # finish up the html string and output it
    htmlstr += '</body>\n</html>\n'
    file(os.path.join(bookDir, htmlFileName), 'wb').write(htmlstr)
    # finish up the svg index string and output it
    svgindex += '</body>\n</html>\n'
    file(os.path.join(bookDir, 'index_svg.xhtml'), 'wb').write(svgindex)
    # build the opf file
    opfname = os.path.join(bookDir, 'book.opf')
-    opfstr = '<?xml version="1.0" encoding="utf-8"?>\n'
+    olst = []
-    opfstr += '<package xmlns="http://www.idpf.org/2007/opf" unique-identifier="guid_id">\n'
+    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
-    opfstr += '   <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">\n'
+    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:
-        opfstr += '      <dc:identifier opf:scheme="GUID" id="guid_id">' + meta_array['GUID'] + '</dc:identifier>\n'
+        olst.append('      <dc:identifier opf:scheme="GUID" id="guid_id">' + meta_array['GUID'] + '</dc:identifier>\n')
    if 'ASIN' in meta_array:
-        opfstr += '      <dc:identifier opf:scheme="ASIN">' + meta_array['ASIN'] + '</dc:identifier>\n'
+        olst.append('      <dc:identifier opf:scheme="ASIN">' + meta_array['ASIN'] + '</dc:identifier>\n')
    if 'oASIN' in meta_array:
-        opfstr += '      <dc:identifier opf:scheme="oASIN">' + meta_array['oASIN'] + '</dc:identifier>\n'
+        olst.append('      <dc:identifier opf:scheme="oASIN">' + meta_array['oASIN'] + '</dc:identifier>\n')
-    opfstr += '      <dc:title>' + meta_array['Title'] + '</dc:title>\n'
+    olst.append('      <dc:title>' + meta_array['Title'] + '</dc:title>\n')
-    opfstr += '      <dc:creator opf:role="aut">' + meta_array['Authors'] + '</dc:creator>\n'
+    olst.append('      <dc:creator opf:role="aut">' + meta_array['Authors'] + '</dc:creator>\n')
-    opfstr += '      <dc:language>en</dc:language>\n'
+    olst.append('      <dc:language>en</dc:language>\n')
-    opfstr += '      <dc:date>' + meta_array['UpdateTime'] + '</dc:date>\n'
+    olst.append('      <dc:date>' + meta_array['UpdateTime'] + '</dc:date>\n')
    if isCover:
-        opfstr += '      <meta name="cover" content="bookcover"/>\n'
+        olst.append('      <meta name="cover" content="bookcover"/>\n')
-    opfstr += '   </metadata>\n'
+    olst.append('   </metadata>\n')
-    opfstr += '<manifest>\n'
+    olst.append('<manifest>\n')
-    opfstr += '   <item id="book" href="book.html" media-type="application/xhtml+xml"/>\n'
+    olst.append('   <item id="book" href="book.html" media-type="application/xhtml+xml"/>\n')
-    opfstr += '   <item id="stylesheet" href="style.css" media-type="text.css"/>\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)
@@ -514,17 +652,19 @@ def generateBook(bookDir, raw, fixedimage):
            imgext = 'jpeg'
        if imgext == '.svg':
            imgext = 'svg+xml'
-        opfstr += '   <item id="' + imgname + '" href="img/' + filename + '" media-type="image/' + imgext + '"/>\n'
+        olst.append('   <item id="' + imgname + '" href="img/' + filename + '" media-type="image/' + imgext + '"/>\n')
    if isCover:
-        opfstr += '   <item id="bookcover" href="cover.jpg" media-type="image/jpeg" />\n'
+        olst.append('   <item id="bookcover" href="cover.jpg" media-type="image/jpeg" />\n')
-    opfstr += '</manifest>\n'
+    olst.append('</manifest>\n')
    # adding spine
-    opfstr += '<spine>\n   <itemref idref="book" />\n</spine>\n'
+    olst.append('<spine>\n   <itemref idref="book" />\n</spine>\n')
    if isCover:
-        opfstr += '   <guide>\n'
+        olst.append('   <guide>\n')
-        opfstr += '      <reference href="cover.jpg" type="cover" title="Cover"/>\n'
+        olst.append('      <reference href="cover.jpg" type="cover" title="Cover"/>\n')
-        opfstr += '   </guide>\n'
+        olst.append('   </guide>\n')
-    opfstr += '</package>\n'
+    olst.append('</package>\n')
    opfstr = "".join(olst)
    olst = None
    file(opfname, 'wb').write(opfstr)
    print 'Processing Complete'
@@ -545,7 +685,6 @@ def usage():
 def main(argv):
    bookDir = ''
    if len(argv) == 0:
        argv = sys.argv
@@ -559,10 +698,10 @@ def main(argv):
    if len(opts) == 0 and len(args) == 0 :
        usage()
-        return 1 
+        return 1
    raw = 0
-    fixedimage = False
+    fixedimage = True
    for o, a in opts:
        if o =="-h":
            usage()
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/getk4pcpids.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/getk4pcpids.py
@@ -0,0 +1,84 @@
 #!/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
 #  1.01 - getPidList interface change
 __version__ = '1.01'
 import sys
 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=SafeUnbuffered(sys.stdout)
 sys.stderr=SafeUnbuffered(sys.stderr)
 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)
    else:
        mb = topazextract.TopazBook(path_to_ebook)
    md1, md2 = mb.getPIDMetaInfo()
    return kgenpids.getPidList(md1, md2)
 def main(argv=sys.argv):
    print ('getk4pcpids.py v%(__version__)s. '
        'Copyright 2012 Apprentice 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())
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/k4mobidedrm.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/k4mobidedrm.py
@@ -0,0 +1,302 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 # ignobleepub.pyw, version 3.6
 # Copyright © 2009-2012 by DiapDealer et al.
 # 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
 # Special thanks to The Dark Reverser for MobiDeDrm and CMBDTC for cmbdtc_dump
 # from which this script borrows most unashamedly.
 # 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.
 __version__ = '4.8'
 import sys, os, re
 import csv
 import getopt
 import re
 import traceback
 import time
 import htmlentitydefs
 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
 # 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]
 # 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 cleanup_name(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
 # 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, kInfoFiles, serials, pids, starttime = time.time()):
    # handle the obvious cases at the beginning
    if not os.path.isfile(infile):
        raise DRMException (u"Input file does not exist.")
    mobi = True
    magic3 = file(infile,'rb').read(3)
    if magic3 == 'TPZ':
        mobi = False
    if mobi:
        mb = mobidedrm.MobiBook(infile)
    else:
        mb = topazextract.TopazBook(infile)
    bookname = unescape(mb.getBookTitle())
    print u"Decrypting {1} ebook: {0}".format(bookname, mb.getBookType())
    # extend PID list with book-specific PIDs
    md1, md2 = mb.getPIDMetaInfo()
    pids.extend(kgenpids.getPidList(md1, md2, serials, kInfoFiles))
    print u"Found {1:d} keys to try after {0:.1f} seconds".format(time.time()-starttime, len(pids))
    try:
        mb.processBook(pids)
    except:
        mb.cleanup
        raise
    print u"Decryption succeeded after {0:.1f} seconds".format(time.time()-starttime)
    return mb
 # infile, outdir and kInfoFiles should be unicode strings
 def decryptBook(infile, outdir, kInfoFiles, serials, pids):
    starttime = time.time()
    print "Starting decryptBook routine."
    try:
        book = GetDecryptedBook(infile, kInfoFiles, serials, pids, starttime)
    except Exception, e:
        print u"Error decrypting book after {1:.1f} seconds: {0}".format(e.args[0],time.time()-starttime)
        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+u"_nodrm"
    outfile = os.path.join(outdir, outfilename + book.getBookExtension())
    book.getFile(outfile)
    print u"Saved decrypted book {1:s} after {0:.1f} seconds".format(time.time()-starttime, outfilename)
    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
    book.cleanup()
 def usage(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.info>] [-p <comma separated PIDs>] [-s <comma separated Kindle serial numbers>] <infile> <outdir>".format(progname)
 #
 # Main
 #
 def cli_main(argv=unicode_argv()):
    progname = os.path.basename(argv[0])
    print u"K4MobiDeDrm v{0}.\nCopyright © 2008-2012 The Dark Reverser et al.".format(__version__)
    try:
        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
    except getopt.GetoptError, 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]
    kInfoFiles = []
    serials = []
    pids = []
    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 if not on Linux
    k4 = not sys.platform.startswith('linux')
    return decryptBook(infile, outdir, kInfoFiles, serials, pids)
 if __name__ == '__main__':
    sys.stdout=SafeUnbuffered(sys.stdout)
    sys.stderr=SafeUnbuffered(sys.stderr)
    sys.exit(cli_main())
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/kgenpids.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/kgenpids.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 import sys
@@ -11,20 +12,30 @@ from struct import pack, unpack, unpack_from
 class DrmException(Exception):
    pass
 global kindleDatabase
 global charMap1
 global charMap2
 global charMap3
 global charMap4
-if sys.platform.startswith('win'):
+if 'calibre' in sys.modules:
-    from k4pcutils import getKindleInfoFiles, parseKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap2
+    inCalibre = True
-if sys.platform.startswith('darwin'):
+    from calibre.constants import iswindows, isosx
-    from k4mutils import getKindleInfoFiles, parseKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap2
+    if iswindows:
        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
    if isosx:
        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 else:
    inCalibre = False
    iswindows = sys.platform.startswith('win')
    isosx = sys.platform.startswith('darwin')
    if iswindows:
        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
    if isosx:
        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
+
-charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+charMap1 = 'n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M'
-charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
+charMap3 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
 charMap4 = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
 # crypto digestroutines
 import hashlib
@@ -42,7 +53,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)
@@ -50,70 +61,27 @@ def encode(data, 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 = ""
+    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
 # 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
    global charMap1
    global charMap2
    encryptedValue = decode(kindleDatabase[hashedKey],charMap2)
    if sys.platform.startswith('win'):
        return CryptUnprotectData(encryptedValue,"")
    else:
        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):
    global charMap2
    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):
    global charMap2
    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
@@ -122,14 +90,14 @@ def getTwoBitsFromBitField(bitField,offset):
 # Returns the six bits at offset from a bit field
 def getSixBitsFromBitField(bitField,offset):
-     offset *= 3
+    offset *= 3
-     value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
+    value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
-     return value
+    return value
-     
+
 # 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
@@ -152,15 +120,15 @@ def generatePidEncryptionTable() :
 def generatePidSeed(table,dsn) :
    value = 0
    for counter in range (0,4) :
-       index = (ord(dsn[counter]) ^ value) &0xFF
+        index = (ord(dsn[counter]) ^ value) &0xFF
-       value = (value >> 8) ^ table[index]
+        value = (value >> 8) ^ table[index]
    return value
 # Generate the device PID
 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):
@@ -172,7 +140,7 @@ def generateDevicePID(table,dsn,nbRoll):
    return pidAscii
 def crc32(s):
-  return (~binascii.crc32(s,-1))&0xFFFFFFFF 
+    return (~binascii.crc32(s,-1))&0xFFFFFFFF
 # convert from 8 digit PID to 10 digit PID with checksum
 def checksumPid(s):
@@ -207,62 +175,65 @@ 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=[]
    # 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) + "*"
+    kindlePID = pidFromSerial(serialnum, 7) + "*"
-    bookPID = checksumPid(bookPID)
+    kindlePID = checksumPid(kindlePID)
-    pidlst.append(bookPID)
+    pids.append(kindlePID)
-    return pidlst
+    return pids
-# Parse the EXTH header records and parse the Kindleinfo
+# parse the Kindleinfo file to calculate the book pid.
 # file to calculate the book pid.
-def getK4Pids(pidlst, rec209, token, kInfoFile):
+keynames = ['kindle.account.tokens','kindle.cookie.item','eulaVersionAccepted','login_date','kindle.token.item','login','kindle.key.item','kindle.name.info','kindle.device.info', 'MazamaRandomNumber']
-    global kindleDatabase
+
 def getK4Pids(rec209, token, kInfoFile):
    global charMap1
    kindleDatabase = None
    pids = []
    try:
-        kindleDatabase = parseKindleInfo(kInfoFile)
+        kindleDatabase = getDBfromFile(kInfoFile)
    except Exception, message:
        print(message)
        kindleDatabase = None
        pass
-    
+
    if kindleDatabase == None :
-        return pidlst
+        return pids
-        
+
    try:
        # Get the Mazama Random number
-        MazamaRandomNumber = getKindleInfoValueForKey("MazamaRandomNumber")
+        MazamaRandomNumber = kindleDatabase['MazamaRandomNumber']
        # Get the kindle account token
-        kindleAccountToken = getKindleInfoValueForKey("kindle.account.tokens")
+        kindleAccountToken = kindleDatabase['kindle.account.tokens']
    except KeyError:
-        print "Keys not found in " + kInfoFile
+        print u"Keys not found in {0}".format(os.path.basename(kInfoFile))
-        return pidlst
+        return pids
-        
+
-    # Get the HDD serial
+    # Get the ID string used
-    encodedSystemVolumeSerialNumber = encodeHash(GetVolumeSerialNumber(),charMap1)
+    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+encodedSystemVolumeSerialNumber+encodedUsername),charMap1)
+    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)
+    pids.append(devicePID)
    # Compute book PIDs
@@ -270,32 +241,38 @@ 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=[], kInfoFiles=[]):
    pidlst = []
    if kInfoFiles is None:
-    	kInfoFiles = []
+        kInfoFiles = []
-    if k4:
+    if serials is None:
-        kInfoFiles = getKindleInfoFiles(kInfoFiles)
+        serials = []
    if iswindows or isosx:
        kInfoFiles.extend(getKindleInfoFiles())
    for infoFile in kInfoFiles:
-        pidlst = getK4Pids(pidlst, md1, md2, infoFile)
+        try:
            pidlst.extend(getK4Pids(md1, md2, infoFile))
        except Exception, e:
            print u"Error getting PIDs from {0}: {1}".format(os.path.basename(infoFile),e.args[0])
    for serialnum in serials:
-        pidlst = getKindlePid(pidlst, md1, md2, serialnum)
+        try:
-    for pid in pids:
+            pidlst.extend(getKindlePids(md1, md2, serialnum))
-        pidlst.append(pid)
+        except Exception, message:
            print u"Error getting PIDs from serial number {0}: {1}".format(serialnum ,e.args[0])
    return pidlst
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/kindlepid.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/kindlepid.py
@@ -0,0 +1,142 @@
 #!/usr/bin/python
 # -*- 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
 #  0.3 updated for unicode
 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)
 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]
 if sys.hexversion >= 0x3000000:
    print 'This script is incompatible with Python 3.x. Please install Python 2.7.x.'
    sys.exit(2)
 letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
 def crc32(s):
    return (~binascii.crc32(s,-1))&0xFFFFFFFF
 def checksumPid(s):
    crc = crc32(s)
    crc = crc ^ (crc >> 16)
    res = s
    l = len(letters)
    for i in (0,1):
        b = crc & 0xff
        pos = (b // l) ^ (b % l)
        res += letters[pos%l]
        crc >>= 8
    return res
 def pidFromSerial(s, l):
    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+=letters[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]
    return pid
 def cli_main(argv=unicode_argv()):
    print u"Mobipocket PID calculator for Amazon Kindle. Copyright © 2007, 2009 Igor Skochinsky"
    if len(sys.argv)==2:
        serial = sys.argv[1]
    else:
        print u"Usage: kindlepid.py <Kindle Serial Number>/<iPhone/iPod Touch UDID>"
        return 1
    if len(serial)==16:
        if serial.startswith("B"):
            print u"Kindle serial number detected"
        else:
            print u"Warning: unrecognized serial number. Please recheck input."
            return 1
        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 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
    print u"Warning: unrecognized serial number. Please recheck input."
     return 1
 if __name__ == "__main__":
    sys.stdout=SafeUnbuffered(sys.stdout)
    sys.stderr=SafeUnbuffered(sys.stderr)
    sys.exit(cli_main())
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/libalfcrypto.dylib
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/libalfcrypto.dylib
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/libalfcrypto32.so
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/libalfcrypto32.so
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/libalfcrypto64.so
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/libalfcrypto64.so
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/plugin-import-name-k4mobidedrm.txt
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/plugin-import-name-k4mobidedrm.txt
--- a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/scrolltextwidget.py
+++ b/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/scrolltextwidget.py
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/stylexml2css.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/stylexml2css.py
@@ -6,6 +6,7 @@ import csv
 import sys
 import os
 import getopt
 import re
 from struct import pack
 from struct import unpack
@@ -43,8 +44,8 @@ class DocParser(object):
        'pos-right' : 'text-align: right;',
        'pos-center' : 'text-align: center; margin-left: auto; margin-right: auto;',
    }
-    
+
-    
+
    # find tag if within pos to end inclusive
    def findinDoc(self, tagpath, pos, end) :
        result = None
@@ -59,10 +60,10 @@ class DocParser(object):
            item = docList[j]
            if item.find('=') >= 0:
                (name, argres) = item.split('=',1)
-            else : 
+            else :
                name = item
                argres = ''
-            if name.endswith(tagpath) : 
+            if name.endswith(tagpath) :
                result = argres
                foundat = j
                break
@@ -81,6 +82,21 @@ class DocParser(object):
            pos = foundpos + 1
        return startpos
    # returns a vector of integers for the tagpath
    def getData(self, tagpath, pos, end, clean=False):
        if clean:
            digits_only = re.compile(r'''([0-9]+)''')
        argres=[]
        (foundat, argt) = self.findinDoc(tagpath, pos, end)
        if (argt != None) and (len(argt) > 0) :
            argList = argt.split('|')
            for strval in argList:
                if clean:
                    m = re.search(digits_only, strval)
                    if m != None:
                        strval = m.group()
                argres.append(int(strval))
        return argres
    def process(self):
@@ -104,7 +120,7 @@ class DocParser(object):
            (pos, tag) = self.findinDoc('style._tag',start,end)
            if tag == None :
                (pos, tag) = self.findinDoc('style.type',start,end)
-                
+
            # Is this something we know how to convert to css
            if tag in self.stags :
@@ -113,7 +129,7 @@ class DocParser(object):
                if sclass != None:
                    sclass = sclass.replace(' ','-')
                    sclass = '.cl-' + sclass.lower()
-                else : 
+                else :
                    sclass = ''
                # check for any "after class" specifiers
@@ -121,7 +137,7 @@ class DocParser(object):
                if aftclass != None:
                    aftclass = aftclass.replace(' ','-')
                    aftclass = '.cl-' + aftclass.lower()
-                else : 
+                else :
                    aftclass = ''
                cssargs = {}
@@ -132,7 +148,7 @@ class DocParser(object):
                    (pos2, val) = self.findinDoc('style.rule.value', start, end)
                    if attr == None : break
-                    
+
                    if (attr == 'display') or (attr == 'pos') or (attr == 'align'):
                        # handle text based attributess
                        attr = attr + '-' + val
@@ -148,6 +164,9 @@ 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)) :
                                pv = float(val)/scale
@@ -160,7 +179,7 @@ class DocParser(object):
                if aftclass != "" : keep = False
                if keep :
-                    # make sure line-space does not go below 100% or above 300% since 
+                    # 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:
                        seg = cssargs['line-space'][0]
@@ -170,7 +189,7 @@ class DocParser(object):
                        del cssargs['line-space']
                        cssargs['line-space'] = (self.attr_val_map['line-space'], val)
-                    
+
                    # handle modifications for css style hanging indents
                    if 'hang' in cssargs:
                        hseg = cssargs['hang'][0]
@@ -203,7 +222,7 @@ class DocParser(object):
                    if sclass != '' :
                        classlst += sclass + '\n'
-                    
+
                    # handle special case of paragraph class used inside chapter heading
                    # and non-chapter headings
                    if sclass != '' :
@@ -224,7 +243,7 @@ class DocParser(object):
                    if cssline != ' { }':
                        csspage += self.stags[tag] + cssline + '\n'
-                
+
        return csspage, classlst
@@ -237,7 +256,11 @@ def convert2CSS(flatxml, fontsize, ph, pw):
    # create a document parser
    dp = DocParser(flatxml, fontsize, ph, pw)
    csspage = dp.process()
    return csspage
 def getpageIDMap(flatxml):
    dp = DocParser(flatxml, 0, 0, 0)
    pageidnumbers = dp.getData('info.original.pid', 0, -1, True)
    return pageidnumbers
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/subasyncio.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/subasyncio.py
@@ -52,7 +52,7 @@ class Process(object):
            self.__stdout_thread = threading.Thread(
                name="stdout-thread",
                target=self.__reader, args=(self.__collected_outdata,
-					    self.__process.stdout))
+                                            self.__process.stdout))
            self.__stdout_thread.setDaemon(True)
            self.__stdout_thread.start()
@@ -60,7 +60,7 @@ class Process(object):
            self.__stderr_thread = threading.Thread(
                name="stderr-thread",
                target=self.__reader, args=(self.__collected_errdata,
-					    self.__process.stderr))
+                                            self.__process.stderr))
            self.__stderr_thread.setDaemon(True)
            self.__stderr_thread.start()
@@ -146,4 +146,3 @@ class Process(object):
        self.__quit = True
        self.__inputsem.release()
        self.__lock.release()
--- a/Calibre_Plugins/K4MobiDeDRM_plugin/topazextract.py
+++ b/Calibre_Plugins/K4MobiDeDRM_plugin/topazextract.py
@@ -1,27 +1,101 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-class Unbuffered:
+# topazextract.py, version ?
 # Mostly written by some_updates based on code from many others
 __version__ = '4.8'
 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')
-sys.stdout=Unbuffered(sys.stdout)
+isosx = sys.platform.startswith('darwin')
 import os, csv, getopt
 import zlib, zipfile, tempfile, shutil
 from struct import pack
 from struct import unpack
-class TpzDRMError(Exception):
+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]
 if 'calibre' in sys.modules:
    inCalibre = True
    from calibre_plugins.k4mobidedrm import kgenpids
 else:
    inCalibre = False
    import kgenpids
 class DrmException(Exception):
    pass
-    
+
-# local support routines
+
-import kgenpids
+# recursive zip creation support routine
-import genbook
+def zipUpDir(myzip, tdir, localname):
    currentdir = tdir
    if localname != u"":
        currentdir = os.path.join(currentdir,localname)
    list = os.listdir(currentdir)
    for file in list:
        afilename = file
        localfilePath = os.path.join(localname, afilename)
        realfilePath = os.path.join(currentdir,file)
        if os.path.isfile(realfilePath):
            myzip.write(realfilePath, localfilePath)
        elif os.path.isdir(realfilePath):
            zipUpDir(myzip, tdir, localfilePath)
 #
 # Utility routines
 #
@@ -31,22 +105,22 @@ def bookReadEncodedNumber(fo):
    flag = False
    data = ord(fo.read(1))
    if data == 0xFF:
-       flag = True
+        flag = True
-       data = ord(fo.read(1))
+        data = ord(fo.read(1))
    if data >= 0x80:
        datax = (data & 0x7F)
        while data >= 0x80 :
            data = ord(fo.read(1))
            datax = (datax <<7) + (data & 0x7F)
-        data = datax 
+        data = datax
    if flag:
-       data = -data
+        data = -data
    return data
-    
+
-# Get a length prefixed string from file 
+# 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
@@ -54,25 +128,28 @@ def bookReadString(fo):
 # Context initialisation for the Topaz Crypto
 def topazCryptoInit(key):
-    ctx1 = 0x0CAFFE19E
+    return Topaz_Cipher().ctx_init(key)
-    for keyChar in key:
+
-        keyByte = ord(keyChar)
+#     ctx1 = 0x0CAFFE19E
-        ctx2 = ctx1 
+#     for keyChar in key:
-        ctx1 = ((((ctx1 >>2) * (ctx1 >>7))&0xFFFFFFFF) ^ (keyByte * keyByte * 0x0F902007)& 0xFFFFFFFF )
+#         keyByte = ord(keyChar)
-    return [ctx1,ctx2]
+#         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]
+    return Topaz_Cipher().decrypt(data, ctx)
-    ctx2 = ctx[1]
+#     ctx1 = ctx[0]
-    plainText = ""
+#     ctx2 = ctx[1]
-    for dataChar in data:
+#     plainText = ""
-        dataByte = ord(dataChar)
+#     for dataChar in data:
-        m = (dataByte ^ ((ctx1 >> 3) &0xFF) ^ ((ctx2<<3) & 0xFF)) &0xFF
+#         dataByte = ord(dataChar)
-        ctx2 = ctx1
+#         m = (dataByte ^ ((ctx1 >> 3) &0xFF) ^ ((ctx2<<3) & 0xFF)) &0xFF
-        ctx1 = (((ctx1 >> 2) * (ctx1 >> 7)) &0xFFFFFFFF) ^((m * m * 0x0F902007) &0xFFFFFFFF)
+#         ctx2 = ctx1
-        plainText += chr(m)
+#         ctx1 = (((ctx1 >> 2) * (ctx1 >> 7)) &0xFFFFFFFF) ^((m * m * 0x0F902007) &0xFFFFFFFF)
-    return plainText
+#         plainText += chr(m)
 #     return plainText
 # Decrypt data with the PID
 def decryptRecord(data,PID):
@@ -82,13 +159,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)
+    fields = unpack('3sB8sB8s3s',record)
-    if fields[0] != "PID" or fields[5] != "pid" :
+    if fields[0] != 'PID' or fields[5] != 'pid' :
-        raise TpzDRMError("Didn't find PID magic numbers in record")
+        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)
@@ -101,31 +178,32 @@ 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
 class TopazBook:
-    def __init__(self, filename, outdir):
+    def __init__(self, filename):
        self.fo = file(filename, 'rb')
-        self.outdir = outdir
+        self.outdir = tempfile.mkdtemp()
        # self.outdir = 'rawdat'
        self.bookPayloadOffset = 0
        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()
    def parseTopazHeaders(self):
        def bookReadHeaderRecordData():
-            # Read and return the data of one header record at the current book file position 
+            # Read and return the data of one header record at the current book file position
            # [[offset,decompressedLength,compressedLength],...]
            nbValues = bookReadEncodedNumber(self.fo)
            values = []
@@ -136,7 +214,7 @@ 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]
@@ -146,15 +224,15 @@ class TopazBook:
            # 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" :
+        if tag != 'metadata' :
-            raise TpzDRMError("Parse Error : Record Names Don't Match")
+            raise DrmException(u"Parse Error : Record Names Don't Match")
        flags = ord(self.fo.read(1))
        nbRecords = ord(self.fo.read(1))
        # print nbRecords
@@ -179,26 +257,26 @@ 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
    def getBookPayloadRecord(self, name, index):
-        # Get a record in the book payload, given its name and index. 
+        # Get a record in the book payload, given its name and index.
-        # decrypted and decompressed if necessary 
+        # decrypted and decompressed if necessary
        encrypted = False
        compressed = False
-        try: 
+        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 :
@@ -206,7 +284,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
@@ -219,7 +297,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)
@@ -231,61 +309,71 @@ class TopazBook:
        fixedimage=True
        try:
            keydata = self.getBookPayloadRecord('dkey', 0)
-        except TpzDRMError, e:
+        except DrmException, e:
-            print "no dkey record found, book may not be encrypted"
+            print u"no dkey record found, book may not be encrypted"
-            print "attempting to extrct files without a book key"
+            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
            else:
                import genbook
            rv = genbook.generateBook(self.outdir, raw, fixedimage)
            if rv == 0:
-                print "\nBook Successfully generated"
+                print u"Book Successfully generated."
-            return rv            
+            return rv
-    
+
        # try each pid to decode the file
        bookKey = None
        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"
+        print u"Successfully Extracted Topaz contents"
        if inCalibre:
            from calibre_plugins.k4mobidedrm 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            
+        return rv
    def createBookDirectory(self):
        outdir = self.outdir
        # 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)
@@ -293,148 +381,148 @@ class TopazBook:
        outdir = self.outdir
        for headerRecord in self.bookHeaderRecords:
            name = headerRecord
-            if name != "dkey" :
+            if name != 'dkey':
-                ext = '.dat'
+                ext = u".dat"
-                if name == 'img' : ext = '.jpg'
+                if name == 'img': ext = u".jpg"
-                if name == 'color' : ext = '.jpg'
+                if name == 'color' : ext = u".jpg"
-                print "\nProcessing Section: %s " % name
+                print u"Processing Section: {0}\n. . .".format(name),
                for index in range (0,len(self.bookHeaderRecords[name])) :
-                    fnum = "%04d" % index
+                    fname = u"{0}{1:04d}{2}".format(name,index,ext)
                    fname = name + fnum + 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 getFile(self, zipname):
        htmlzip = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
        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 zipUpDir(myzip, tempdir,localname):
+    def getBookType(self):
-    currentdir = tempdir
+        return u"Topaz"
    if localname != "":
        currentdir = os.path.join(currentdir,localname)
    list = os.listdir(currentdir)
    for file in list:
        afilename = file
        localfilePath = os.path.join(localname, afilename)
        realfilePath = os.path.join(currentdir,file)
        if os.path.isfile(realfilePath):
            myzip.write(realfilePath, localfilePath)
        elif os.path.isdir(realfilePath):
            zipUpDir(myzip, tempdir, localfilePath)
    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,u"index_svg.xhtml"),u"index_svg.xhtml")
        zipUpDir(svgzip, self.outdir, u"svg")
        zipUpDir(svgzip, self.outdir, u"img")
        svgzip.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 u"Removes DRM protection from Topaz ebooks and extracts the contents"
-    print "Usage:"
+    print u"Usage:"
-    print "    %s [-k <kindle.info>] [-p <pidnums>] [-s <kindleSerialNumbers>] <infile> <outdir>  " % progname
+    print u"    {0} [-k <kindle.info>] [-p <comma separated PIDs>] [-s <comma separated Kindle serial numbers>] <infile> <outdir>".format(progname)
 # Main
-def main(argv=sys.argv):
+def cli_main(argv=unicode_argv()):
    progname = os.path.basename(argv[0])
-    k4 = False
+    print u"TopazExtract v{0}.".format(__version__)
-    pids = []
+
    serials = []
    kInfoFiles = []
    try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
+        opts, args = getopt.getopt(sys.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
    kInfoFiles = []
    serials = []
    pids = []
    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 = [serial.replace(" ","") for serial in a.split(',')]
    bookname = os.path.splitext(os.path.basename(infile))[0]
    tempdir = tempfile.mkdtemp()
-    tb = TopazBook(infile, tempdir)
+    tb = TopazBook(infile)
    title = tb.getBookTitle()
-    print "Processing Book: ", title
+    print u"Processing Book: {0}".format(title)
-    keysRecord, keysRecordRecord = tb.getPIDMetaInfo()
+    md1, md2 = tb.getPIDMetaInfo()
-    pidlst = kgenpids.getPidList(keysRecord, keysRecordRecord, k4, pids, serials, kInfoFiles) 
+    pids.extend(kgenpids.getPidList(md1, md2, serials, kInfoFiles))
    try:
-        tb.processBook(pidlst)
+        print u"Decrypting Book"
-    except TpzDRMError, e:
+        tb.processBook(pids)
-        print str(e)
+
-        print "   Creating DeBug Full Zip Archive of Book"
+        print u"   Creating HTML ZIP Archive"
-        zipname = os.path.join(outdir, bookname + '_debug' + '.zip')
+        zipname = os.path.join(outdir, bookname + u"_nodrm.htmlz")
-        myzip = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
+        tb.getFile(zipname)
-        zipUpDir(myzip, tempdir, '')
+
-        myzip.close()
+        print u"   Creating SVG ZIP Archive"
-        shutil.rmtree(tempdir, True)
+        zipname = os.path.join(outdir, bookname + u"_SVG.zip")
        tb.getSVGZip(zipname)
        # removing internal temporary directory of pieces
        tb.cleanup()
    except DrmException, e:
        print u"Decryption failed\n{0}".format(traceback.format_exc())
        try:
            tb.cleanup()
        except:
            pass
        return 1
-    print "   Creating HTML ZIP Archive"
+    except Exception, e:
-    zipname = os.path.join(outdir, bookname + '_nodrm' + '.zip')
+        print u"Decryption failed\m{0}".format(traceback.format_exc())
-    myzip1 = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
+        try:
-    myzip1.write(os.path.join(tempdir,'book.html'),'book.html')
+            tb.cleanup()
-    myzip1.write(os.path.join(tempdir,'book.opf'),'book.opf')
+        except:
-    if os.path.isfile(os.path.join(tempdir,'cover.jpg')):
+            pass
-        myzip1.write(os.path.join(tempdir,'cover.jpg'),'cover.jpg')
+        return 1
    myzip1.write(os.path.join(tempdir,'style.css'),'style.css')
    zipUpDir(myzip1, tempdir, 'img')
    myzip1.close()
    print "   Creating SVG ZIP Archive"
    zipname = os.path.join(outdir, bookname + '_SVG' + '.zip')
    myzip2 = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
    myzip2.write(os.path.join(tempdir,'index_svg.xhtml'),'index_svg.xhtml')
    zipUpDir(myzip2, tempdir, 'svg')
    zipUpDir(myzip2, tempdir, 'img')
    myzip2.close()
    print "   Creating XML ZIP Archive"
    zipname = os.path.join(outdir, bookname + '_XML' + '.zip')
    myzip3 = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
    targetdir = os.path.join(tempdir,'xml')
    zipUpDir(myzip3, targetdir, '')
    zipUpDir(myzip3, tempdir, 'img')
    myzip3.close()
    shutil.rmtree(tempdir, True)
    return 0
-                
+
 if __name__ == '__main__':
-    sys.exit(main())
+    sys.stdout=SafeUnbuffered(sys.stdout)
-
+    sys.stderr=SafeUnbuffered(sys.stderr)
    sys.exit(cli_main())
--- a/Calibre_Plugins/README-Ineptpdf-plugin.txt
+++ b/Calibre_Plugins/README-Ineptpdf-plugin.txt
@@ -1,39 +0,0 @@
 Inept PDF Plugin - ineptpdf_vXX_plugin.zip
 Requires Calibre version 0.6.44 or higher.
 All credit given to IHeartCabbages 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... click on the Plugins button. Use the file dialog 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.
--- a/Calibre_Plugins/README-K4MobiDeDRM-plugin.txt
+++ b/Calibre_Plugins/README-K4MobiDeDRM-plugin.txt
@@ -1,23 +0,0 @@
 Plugin for K4PC, K4Mac, standalone Kindles, Mobi Books, and for Devices with Fixed PIDs.
 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, .azw, .azw1, 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... click on the Plugins button. Use the file dialog button to select the plugin's zip file  (K4MobiDeDRM_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 (K4MobiDeDRM under the "File type plugins" category) and click the "Customize Plugin" button on Calibre's Preferences->Plugins page. Enter a comma separated list of your 10 digit PIDs.  Include in this list (again separated by commas) any 16 digit serial numbers the standalone Kindles you may have (these typically begin "B0...")  This is not needed if you only want to decode "Kindle for PC" or "Kindle for Mac" books. 
--- a/Calibre_Plugins/README-eReaderPDB2PML-plugin.txt
+++ b/Calibre_Plugins/README-eReaderPDB2PML-plugin.txt
@@ -1,23 +0,0 @@
 eReader PDB2PML - eReaderPDB2PML_vXX_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... 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.
 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
--- a/Calibre_Plugins/README-ignobleepub-plugin.txt
+++ b/Calibre_Plugins/README-ignobleepub-plugin.txt
@@ -1,40 +0,0 @@
 Ignoble Epub DeDRM - ignobleepub_vXX_plugin.zip
 Requires Calibre version 0.6.44 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 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... click on the Plugins button. Use the file dialog 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
--- a/Calibre_Plugins/README-ineptepub-plugin.txt
+++ b/Calibre_Plugins/README-ineptepub-plugin.txt
@@ -1,39 +0,0 @@
 Inept Epub DeDRM - ineptepub_vXX_plugin.zip
 Requires Calibre version 0.6.44 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.
 Installation:
 Go to Calibre's Preferences page... click on the Plugins button. Use the file dialog 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.
--- a/Calibre_Plugins/eReaderPDB2PML
+++ b/Calibre_Plugins/eReaderPDB2PML
@@ -0,0 +1,42 @@
 eReader PDB2PML - eReaderPDB2PML_v08_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
 ------------
 Do **NOT** select "Get plugins to enhance calibre" as this is reserved for "official" calibre plugins, instead select "Change calibre behavior" to go to Calibre's Preferences page.  Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file  (eReaderPDB2PML_v08_plugin.zip) and click the 'Add' button.  Click 'Yes' in the the "Are you sure?" dialog. Click OK in the "Success" dialog.
 Customization
 -------------
 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
 Troubleshooting
 ---------------
 If you find that it's not working for you (imported ebooks still have DRM), you can save a lot of time and trouble by first deleting the DRMed ebook from calibre and then trying to add the 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. ;)
 On Macintosh only you must first run calibre, open Preferences, open Miscellaneous, and click on the “Install command line tools” button. (On Windows and Linux the command line tools are installed automatically.)
 On Windows, open a terminal/command window. (Start/Run… and then type ‘cmd’ (without the ‘s) as the program to run).
 On Macintosh, open the Terminal application (in your Utilities folder).
 On Linux open a command window. Hopefully all Linux users know how to do this, as I do not.
 You should now have a text-based command-line window open. Also have open the folder containing the ebook to be imported. Make sure that book isn’t already in calibre, and that calibre isn’t running.
 Now type in "calibredb add " (without the " but don’t miss that final space) and now drag the book to be imported onto the window. The full path to the book should be inserted into the command line. Now press the return/enter key. The import routines will run and produce some logging information.
 Now copy the output from the terminal window.
 On Windows, you must use the window menu (little icon at left of window bar) to select all the text and then to copy it.
 On Macintosh and Linux, just use the normal text select and copy commands.
 Paste the information into a comment at my blog, http://apprenticealf.wordpress.com/ describing your problem.
--- a/Calibre_Plugins/eReaderPDB2PML_plugin.zip
+++ b/Calibre_Plugins/eReaderPDB2PML_plugin.zip
--- a/Calibre_Plugins/eReaderPDB2PML_plugin/init.py
+++ b/Calibre_Plugins/eReaderPDB2PML_plugin/init.py
@@ -0,0 +1,124 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # eReaderPDB2PML_plugin.py
 # Released under the terms of the GNU General Public Licence, version 3
 # <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
 #   0.0.6 - unknown changes
 #   0.0.7 - improved config dialog processing and fix possible output/unicode problem
 #   0.0.8 - Proper fix for unicode problems, separate out erdr2pml from plugin
 PLUGIN_NAME = u"eReader PDB 2 PML"
 PLUGIN_VERSION_TUPLE = (0, 0, 8)
 PLUGIN_VERSION = '.'.join([str(x) for x in PLUGIN_VERSION_TUPLE])
 import sys, os
 from calibre.customize import FileTypePlugin
 from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.constants import iswindows, isosx
 # Wrap a stream so that output gets flushed immediately
 # and also make sure that any unicode strings get
 # encoded using "replace" before writing them.
 class SafeUnbuffered:
    def __init__(self, stream):
        self.stream = stream
        self.encoding = stream.encoding
        if self.encoding == None:
            self.encoding = "utf-8"
    def write(self, data):
        if isinstance(data,unicode):
            data = data.encode(self.encoding,"replace")
        self.stream.write(data)
        self.stream.flush()
    def __getattr__(self, attr):
        return getattr(self.stream, attr)
 class eRdrDeDRM(FileTypePlugin):
    name                = PLUGIN_NAME
    description         = u"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              = u"DiapDealer, Apprentice Alf and The Dark Reverser"
    version             = PLUGIN_VERSION_TUPLE
    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)
    priority            = 100
    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))
        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:
            from calibre_plugins.erdrpdb2pml import erdr2pml
            keydata = self.site_customization
            ar = keydata.split(':')
            for i in ar:
                try:
                    name, cc = i.split(',')
                    user_key = erdr2pml.getuser_key(name,cc)
                except ValueError:
                    print u"{0} v{1}: Error parsing user supplied data.".format(PLUGIN_NAME, PLUGIN_VERSION)
                    return path_to_ebook
                try:
                    print u"{0} v{1}: Processing...".format(PLUGIN_NAME, PLUGIN_VERSION)
                    import time
                    start_time = time.time()
                    if erdr2pml.decryptBook(infile,pmlzfile.name,True,user_key) == 0:
                        print u"{0} v{1}: Elapsed time: {2:.2f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-start_time)
                        return pmlzfile.name
                    else:
                        raise ValueError(u"{0} v{1}: Error Creating PML file.".format(PLUGIN_NAME, PLUGIN_VERSION))
                except ValueError, e:
                        print u"{0} v{1}: Error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION,e.args[0])
                        pass
            raise Exception(u"{0} v{1}: Couldn\'t decrypt pdb file. See Apprentice Alf's blog for help.".format(PLUGIN_NAME, PLUGIN_VERSION))
        else:
            raise Exception(u"{0} v{1}: No name and CC# provided.".format(PLUGIN_NAME, PLUGIN_VERSION))
    def customization_help(self, gui=False):
        return u"Enter Account Name & Last 8 digits of Credit Card number (separate with a comma, multiple pairs with a colon)"
--- a/Calibre_Plugins/eReaderPDB2PML_plugin/eReaderPDB2PML_plugin.py
+++ b/Calibre_Plugins/eReaderPDB2PML_plugin/eReaderPDB2PML_plugin.py
@@ -1,137 +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
 import sys, os
 from calibre.customize import FileTypePlugin
 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, 4)   # 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
    def run(self, path_to_ebook):
        from calibre.ptempfile import PersistentTemporaryDirectory
        from calibre.constants import iswindows, isosx
        global bookname, erdr2pml
        import 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.loadSection, 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)'
--- a/Calibre_Plugins/eReaderPDB2PML_plugin/erdr2pml.py
+++ b/Calibre_Plugins/eReaderPDB2PML_plugin/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
@@ -16,7 +19,7 @@
 # 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, 
+#   - 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
@@ -58,45 +61,117 @@
 #  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?)
 #  0.22 - Unicode and plugin support, different image folders for PMLZ and source
-__version__='0.19'
+__version__='0.22'
-class Unbuffered:
+import sys, re
 import struct, binascii, getopt, zlib, os, os.path, urllib, tempfile
 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)
-import sys
+iswindows = sys.platform.startswith('win')
-sys.stdout=Unbuffered(sys.stdout)
+isosx = sys.platform.startswith('darwin')
-import struct, binascii, getopt, zlib, os, os.path, urllib, tempfile
+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
-    import pycrypto_des
+    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
-        import openssl_des
+        if inCalibre:
            from calibre_plugins.erdrpdb2pml import openssl_des
        else:
            import openssl_des
        Des = openssl_des.load_libcrypto()
 else:
    # first try with openssl
-    import openssl_des
+    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
-        import pycrypto_des
+        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:
-    import python_des
+    if inCalibre:
        from calibre_plugins.erdrpdb2pml import python_des
    else:
        import python_des
    Des = python_des.Des
    # Import Psyco if available
    try:
@@ -121,12 +196,18 @@ logging.basicConfig()
 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:
-            raise ValueError('Invalid file format')
+            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])
@@ -140,17 +221,30 @@ class Sectionizer(object):
        off = self.sections[section][0]
        return self.contents[off:end_off]
-def sanitizeFileName(s):
+# cleanup unicode filenames
-    r = ''
+# borrowed from calibre from calibre/src/calibre/__init__.py
-    for c in s:
+# added in removal of control (<32) chars
-        if c in "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.-":
+# and removal of . at start and end
-            r += c
+# and with some (heavily edited) code from Paul Durrant's kindlenamer.py
-    return r
+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=''
@@ -163,15 +257,15 @@ def deXOR(text, sp, table):
    return r
 class EreaderProcessor(object):
-    def __init__(self, section_reader, username, creditcard):
+    def __init__(self, sect, user_key):
-        self.section_reader = section_reader
+        self.section_reader = sect.loadSection
-        data = section_reader(0)
+        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 = section_reader(1)
+        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:]))
@@ -184,27 +278,25 @@ 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]
        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]
-            self.num_sidebar_pages = struct.unpack('>H', r[38:38+2])[0]
+            if (sect.bkType == "Book"):
-            self.first_sidebar_page = struct.unpack('>H', r[36:36+2])[0]
+                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]
@@ -220,10 +312,8 @@ class EreaderProcessor(object):
            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:
-            self.num_footnote_pages = 0
+            # Nothing needs to be done
-            self.num_sidebar_pages = 0
+            pass
            self.first_footnote_page = -1
            self.first_sidebar_page = -1
            # self.num_bookinfo_pages = 0
            # self.num_chapter_pages = 0
            # self.num_link_pages = 0
@@ -248,10 +338,14 @@ class EreaderProcessor(object):
            encrypted_key_sha = r[44:44+20]
            encrypted_key = r[64:64+8]
        elif version == 260:
-            if drm_sub_version != 13:
+            if drm_sub_version != 13 and drm_sub_version != 11:
                raise ValueError('incorrect eReader version %d (error 3)' % drm_sub_version)
-            encrypted_key = r[44:44+8]
+            if drm_sub_version == 13:
-            encrypted_key_sha = r[52:52+20]
+                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]
@@ -266,7 +360,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):
@@ -278,7 +372,7 @@ class EreaderProcessor(object):
    #             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) 
+    #             cv += '%d|%s\n' % (offset, name)
    #     return cv
    # def getLinkNamePMLOffsetData(self):
@@ -290,7 +384,7 @@ class EreaderProcessor(object):
    #             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) 
+    #             lv += '%d|%s\n' % (offset, name)
    #     return lv
    # def getExpandedTextSizesData(self):
@@ -318,7 +412,7 @@ class EreaderProcessor(object):
        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'
@@ -337,6 +431,12 @@ class EreaderProcessor(object):
                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'
@@ -349,7 +449,7 @@ class EreaderProcessor(object):
                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_footnote_page + i)))
+                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:]
@@ -357,60 +457,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
+    pml2 = pml
-	for k in xrange(128,256):
+    for k in xrange(128,256):
-		badChar = chr(k)
+        badChar = chr(k)
-		pml2 = pml2.replace(badChar, '\\a%03d' % k)
+        pml2 = pml2.replace(badChar, '\\a%03d' % k)
-	return pml2
+    return pml2
-def convertEreaderToPml(infile, name, cc, outdir):
+def decryptBook(infile, outpath, make_pmlz, user_key):
    if not os.path.exists(outdir):
        os.makedirs(outdir)
    bookname = os.path.splitext(os.path.basename(infile))[0]
-    print "   Decoding File"
+    if make_pmlz:
-    sect = Sectionizer(infile, 'PNRdPPrs')
+        # outpath is actually pmlz name
-    er = EreaderProcessor(sect.loadSection, name, cc)
+        pmlzname = outpath
    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()
        imagedirpath = os.path.join(outdir,u"images")
    else:
        pmlzname = None
        outdir = outpath
        imagedirpath = os.path.join(outdir,bookname + u"_img")
    try:
-        print "Processing..."
+        if not os.path.exists(outdir):
-        convertEreaderToPml(infile, name, cc, outdir)
+            os.makedirs(outdir)
-        if make_pmlz :
+        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"
+            print u"Creating PMLZ file {0}".format(os.path.basename(pmlzname))
-            zipname = infile[:-4] + '.pmlz'
+            myZipFile = zipfile.ZipFile(pmlzname,'w',zipfile.ZIP_STORED, False)
            myZipFile = zipfile.ZipFile(zipname,'w',zipfile.ZIP_STORED, False)
            list = os.listdir(outdir)
-            for file in list:
+            for filename in list:
-                localname = file
+                localname = filename
-                filePath = os.path.join(outdir,file)
+                filePath = os.path.join(outdir,filename)
                if os.path.isfile(filePath):
                    myZipFile.write(filePath, localname)
                elif os.path.isdir(filePath):
@@ -424,36 +517,46 @@ 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.args[0])
        return 1
    return 0
 def usage():
-    print "Converts DRMed eReader books to PML Source"
+    print u"Converts DRMed eReader books to PML Source"
-    print "Usage:"
+    print u"Usage:"
-    print "  erdr2pml [options] infile.pdb [outdir] \"your name\" credit_card_number "
+    print u"  erdr2pml [options] infile.pdb [outpath] \"your name\" credit_card_number"
-    print " "
+    print u" "
-    print "Options: "
+    print u"Options: "
-    print "  -h                prints this message"
+    print u"  -h             prints this message"
-    print "  --make-pmlz       create PMLZ instead of using output directory"
+    print u"  -p             create PMLZ instead of source folder"
-    print " "
+    print u"  --make-pmlz    create PMLZ instead of source folder"
-    print "Note:"
+    print u" "
-    print "  if ommitted, outdir defaults based on 'infile.pdb'"
+    print u"Note:"
-    print "  It's enough to enter the last 8 digits of the credit card number"
+    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 cli_main(argv=unicode_argv()):
    print u"eRdr2Pml v{0}. Copyright © 2009–2012 The Dark Reverser et al.".format(__version__)
 def main(argv=None):
    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
@@ -461,24 +564,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]
+        infile, name, cc = args
-        outdir = infile[:-4] + '_Source'
+        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.exit(main())
+    sys.stdout=SafeUnbuffered(sys.stdout)
    sys.stderr=SafeUnbuffered(sys.stderr)
    sys.exit(cli_main())
--- a/Calibre_Plugins/eReaderPDB2PML_plugin/openssl_des.py
+++ b/Calibre_Plugins/eReaderPDB2PML_plugin/openssl_des.py
@@ -18,7 +18,7 @@ def load_libcrypto():
        return None
    libcrypto = CDLL(libcrypto)
-    
+
    # typedef struct DES_ks
    #     {
    #     union
@@ -30,7 +30,7 @@ def load_libcrypto():
    #         } ks[16];
    #     } DES_key_schedule;
-    # just create a big enough place to hold everything 
+    # 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),
@@ -61,7 +61,7 @@ def load_libcrypto():
    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 :
@@ -87,4 +87,3 @@ def load_libcrypto():
            return ''.join(result)
    return DES
--- a/Calibre_Plugins/eReaderPDB2PML_plugin/plugin-import-name-erdrpdb2pml.txt
+++ b/Calibre_Plugins/eReaderPDB2PML_plugin/plugin-import-name-erdrpdb2pml.txt
--- a/Calibre_Plugins/eReaderPDB2PML_plugin/pycrypto_des.py
+++ b/Calibre_Plugins/eReaderPDB2PML_plugin/pycrypto_des.py
@@ -28,4 +28,3 @@ def load_pycrypto():
                i += 8
            return ''.join(result)
    return DES
--- a/Calibre_Plugins/eReaderPDB2PML_plugin/python_des.py
+++ b/Calibre_Plugins/eReaderPDB2PML_plugin/python_des.py
@@ -2,8 +2,8 @@
 # vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
 import sys
-ECB =	0
+ECB =   0
-CBC =	1
+CBC =   1
 class Des(object):
    __pc1 = [56, 48, 40, 32, 24, 16,  8,  0, 57, 49, 41, 33, 25, 17,
          9,  1, 58, 50, 42, 34, 26, 18, 10,  2, 59, 51, 43, 35,
@@ -11,13 +11,13 @@ class Des(object):
         13,  5, 60, 52, 44, 36, 28, 20, 12,  4, 27, 19, 11,  3]
    __left_rotations = [1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1]
    __pc2 = [13, 16, 10, 23,  0,  4,2, 27, 14,  5, 20,  9,
-        22, 18, 11,  3, 25,  7,	15,  6, 26, 19, 12,  1,
+        22, 18, 11,  3, 25,  7, 15,  6, 26, 19, 12,  1,
-        40, 51, 30, 36, 46, 54,	29, 39, 50, 44, 32, 47,
+        40, 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47,
-        43, 48, 38, 55, 33, 52,	45, 41, 49, 35, 28, 31]
+        43, 48, 38, 55, 33, 52, 45, 41, 49, 35, 28, 31]
-    __ip = [57, 49, 41, 33, 25, 17, 9,  1,	59, 51, 43, 35, 27, 19, 11, 3,
+    __ip = [57, 49, 41, 33, 25, 17, 9,  1,      59, 51, 43, 35, 27, 19, 11, 3,
-        61, 53, 45, 37, 29, 21, 13, 5,	63, 55, 47, 39, 31, 23, 15, 7,
+        61, 53, 45, 37, 29, 21, 13, 5,  63, 55, 47, 39, 31, 23, 15, 7,
-        56, 48, 40, 32, 24, 16, 8,  0,	58, 50, 42, 34, 26, 18, 10, 2,
+        56, 48, 40, 32, 24, 16, 8,  0,  58, 50, 42, 34, 26, 18, 10, 2,
-        60, 52, 44, 36, 28, 20, 12, 4,	62, 54, 46, 38, 30, 22, 14, 6]
+        60, 52, 44, 36, 28, 20, 12, 4,  62, 54, 46, 38, 30, 22, 14, 6]
    __expansion_table = [31,  0,  1,  2,  3,  4, 3,  4,  5,  6,  7,  8,
         7,  8,  9, 10, 11, 12,11, 12, 13, 14, 15, 16,
        15, 16, 17, 18, 19, 20,19, 20, 21, 22, 23, 24,
@@ -61,8 +61,8 @@ class Des(object):
        35,  3, 43, 11, 51, 19, 59, 27,34,  2, 42, 10, 50, 18, 58, 26,
        33,  1, 41,  9, 49, 17, 57, 25,32,  0, 40,  8, 48, 16, 56, 24]
    # Type of crypting being done
-    ENCRYPT =	0x00
+    ENCRYPT =   0x00
-    DECRYPT =	0x01
+    DECRYPT =   0x01
    def __init__(self, key, mode=ECB, IV=None):
        if len(key) != 8:
            raise ValueError("Invalid DES key size. Key must be exactly 8 bytes long.")
@@ -74,7 +74,7 @@ class Des(object):
            self.setIV(IV)
        self.L = []
        self.R = []
-        self.Kn = [ [0] * 48 ] * 16	# 16 48-bit keys (K1 - K16)
+        self.Kn = [ [0] * 48 ] * 16     # 16 48-bit keys (K1 - K16)
        self.final = []
        self.setKey(key)
    def getKey(self):
--- a/Calibre_Plugins/ignobleepub_plugin.zip
+++ b/Calibre_Plugins/ignobleepub_plugin.zip
--- a/Calibre_Plugins/ignobleepub_plugin/Ignoble
+++ b/Calibre_Plugins/ignobleepub_plugin/Ignoble
@@ -0,0 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Ignoble Epub DeDRM Plugin Configuration</title>
 </head>
 <body>
 <h1>Ignoble Epub DeDRM Plugin</h1>
 <h3>(version 0.2.4)</h3>
 <h3> For additional help read the <a href="http://apprenticealf.wordpress.com/2011/01/17/frequently-asked-questions-about-the-drm-removal-tools/" target="_blank">FAQ</a> on <a href="http://apprenticealf.wordpress.com" target="_blank">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/" target="_blank">first post</a>.</h3>
 <p>All credit given to I ♥ Cabbages for the original standalone scripts (I had the much easier job of converting them to a calibre plugin).</p>
 <p>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.</p>
 <p>This help file is always available from within the plugin's customization dialog in calibre (when installed, of course). The "Plugin Help" link can be found in the upper-right portion of the customization dialog.</p> 
 <h3>Installation:</h3>
 <p>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_v02.3_plugin.zip) and click the 'Add' button. Click 'Yes' in the the "Are you sure?" dialog. Click OK in the "Success" dialog. <b><u>Now restart calibre</u></b>.</p>
 <h3>Configuration:</h3>
 <p>Upon first installing the plugin (or upgrading from a version earlier than 0.2.0), the plugin will be unconfigured. Until you create at least one B&amp;N key&mdash;or migrate your existing key(s)/data from an earlier version of the plugin&mdash;the plugin will not function. When unconfigured (no saved keys)... an error message will occur whenever ePubs are imported to calibre. To eliminate the error message, open the plugin's customization dialog and create/import/migrate a key (or disable/uninstall the plugin). You can get to the plugin's customization dialog by opening calibre's Preferences dialog, and clicking Plugins (under the Advanced section). Once in the Plugin Preferences, expand the "File type plugins" section and look for the "Ignoble Epub DeDRM" plugin. Highlight that plugin and click the "Customize plugin" button.</p>
 <p>If you are upgrading from an earlier version of this plugin and have provided your name(s) and credit card number(s) as part of the old plugin's customization string, you will be prompted to migrate this data to the plugin's new, more secure, key storage method when you open the customization dialog for the first time. If you choose NOT to migrate that data, you will be prompted to save that data as a text file in a location of your choosing. Either way, this plugin will no longer be storing names and credit card numbers in plain sight (or anywhere for that matter) on your computer or in calibre. If you don't choose to migrate OR save the data, that data will be lost. You have been warned!!</p>
 <p>Upon configuring for the first time, you may also be asked if you wish to import your existing *.b64 keyfiles (if you use them) to the plugin's new key storage method. The new plugin no longer looks for keyfiles in calibre's configuration directory, so it's highly recommended that you import any existing keyfiles when prompted ... but you <i>always</i> have the ability to import existing keyfiles anytime you might need/want to.</p>
 <p>If you have upgraded from an earlier version of the plugin, the above instructions may be all you need to do to get the new plugin up and running. Continue reading for new-key generation and existing-key management instructions.</p>
 <h4 style="margin-left: 1.0em;"><u>Creating New Keys:</u></h4>
 <p style="margin-left: 1.0em">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 style="margin-left: 2.0em;">
 <li><b>Unique Key Name:</b> this is a unique name you choose to help you identify the key after it's created. 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.</i>
 <li style="margin-top: 0.5em;"><b>Your Name:</b> Your name as set in your Barnes & Noble account, My Account page, directly under PERSONAL INFORMATION. It is usually just your first name and last name separated by a space. This name 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.</i>
 <li style="margin-top: 0.5em;"><b>Credit Card#:</b> this is the default credit card number that was on file with Barnes & Noble at the time of download of the ebook to be de-DRMed. Nothing fancy here; no dashes or spaces ... just the 16 (15 for American Express) digits. Again... 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.</i> 
 </ul> 
 <p style="margin-left: 1.0em;">Click the 'OK" button to create and store the generated key. Or Cancel if you didn't want to create a key.</p>
 <h4 style="margin-left: 1.0em;"><u>Deleting Keys:</u></h4>
 <p style="margin-left: 1.0em;">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>
 <h4 style="margin-left: 1.0em;"><u>Exporting Keys:</u></h4>
 <p style="margin-left: 1.0em;">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 (*.b64). 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>
 <h4 style="margin-left: 1.0em;"><u>Importing Existing Keyfiles:</u></h4>
 <p style="margin-left: 1.0em;">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 keyfiles. Used for migrating keyfiles from older versions of the plugin (or keys generated with the original I &lt;3 Cabbages script), or moving keyfiles from computer to computer, or restoring a backup. Some very basic validation is done to try to avoid overwriting already configured keys with incoming, imported keyfiles with the same base file name, but I'm sure that could be broken if someone tried hard. Just take care when importing.</p>
 <p>Once done creating/importing/exporting/deleting decryption keys; click "OK" to exit the customization dialogue (the cancel button will actually work the same way here ... at this point all data/changes are committed already, so take your pick).</p>
 <h3>Troubleshooting:</h3>
 <p style="margin-top: 0.5em;">If you find that it's not working for you (imported Barnes & Noble 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. ;)</p>
 <p>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.</p>
 <p>Another way to debug (perhaps easier if you're not all that comfortable with command-line stuff) is to launch calibre in debug mode. Open a command prompt (terminal) and type "calibre-debug -g" (again without the quotes). Calibre will launch, and you can can add the problem book(s) using the normal gui method. The debug info will be output to the original command prompt (terminal window). Copy the resulting output and paste it into any online help request you make.</p>
 <p>&nbsp;</p>
 <p>** 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.</p>
 <p>&nbsp;</p>
 <h4>Revision history:</h4>
 <pre>
   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 to the new calibre plugin interface
   0.1.7 - Fix for potential problem with PyCrypto
   0.1.8 - an updated/modified zipfix.py and included zipfilerugged.py
   0.2.0 - Completely overhauled plugin configuration dialog and key management/storage
   0.2.1 - an updated/modified zipfix.py and included zipfilerugged.py
   0.2.2 - added in potential fixes from 0.1.7 that had been missed.
   0.2.3 - fixed possible output/unicode problem
   0.2.4 - ditched nearly hopeless caselessStrCmp method in favor of uStrCmp.
         - added ability to rename existing keys.
 </pre>
 </body>
 </html>
--- a/Calibre_Plugins/ignobleepub_plugin/init.py
+++ b/Calibre_Plugins/ignobleepub_plugin/init.py
@@ -0,0 +1,199 @@
 #!/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/>
 #
 # Requires Calibre version 0.7.55 or higher.
 #
 # 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 a version of 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:
 # Check out the plugin's configuration settings by clicking the "Customize plugin"
 # button when you have the "BnN ePub 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:
 #   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 for the new calibre plugin interface
 #   0.1.7 - Fix for potential problem with PyCrypto
 #   0.1.8 - an updated/modified zipfix.py and included zipfilerugged.py
 #   0.2.0 - Completely overhauled plugin configuration dialog and key management/storage
 #   0.2.1 - added zipfix.py and included zipfilerugged.py from 0.1.8
 #   0.2.2 - added in potential fixes from 0.1.7 that had been missed.
 #   0.2.3 - fixed possible output/unicode problem
 #   0.2.4 - ditched nearly hopeless caselessStrCmp method in favor of uStrCmp.
 #         - added ability to rename existing keys.
 #   0.2.5 - Major code change to use unaltered ignobleepub.py 3.6 and
 #         - ignoblekeygen 2.4 and later.
 """
 Decrypt Barnes & Noble ADEPT encrypted EPUB books.
 """
 PLUGIN_NAME = u"Ignoble Epub DeDRM"
 PLUGIN_VERSION_TUPLE = (0, 2, 5)
 PLUGIN_VERSION = '.'.join([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 zipfile
 from zipfile import ZipFile
 class IGNOBLEError(Exception):
    pass
 from calibre.customize import FileTypePlugin
 from calibre.constants import iswindows, isosx
 from calibre.gui2 import is_ok_to_use_qt
 # Wrap a stream so that output gets flushed immediately
 # and also make sure that any unicode strings get
 # encoded using "replace" before writing them.
 class SafeUnbuffered:
    def __init__(self, stream):
        self.stream = stream
        self.encoding = stream.encoding
        if self.encoding == None:
            self.encoding = "utf-8"
    def write(self, data):
        if isinstance(data,unicode):
            data = data.encode(self.encoding,"replace")
        self.stream.write(data)
        self.stream.flush()
    def __getattr__(self, attr):
        return getattr(self.stream, attr)
 class IgnobleDeDRM(FileTypePlugin):
    name                    = PLUGIN_NAME
    description             = u"Removes DRM from secure Barnes & Noble epub files. Credit given to i♥cabbages for the original stand-alone scripts."
    supported_platforms     = ['linux', 'osx', 'windows']
    author                  = u"DiapDealer, Apprentice Alf and i♥cabbages"
    version                 = PLUGIN_VERSION_TUPLE
    minimum_calibre_version = (0, 7, 55)  # Compiled python libraries cannot be imported in earlier versions.
    file_types              = set(['epub'])
    on_import               = True
    priority                = 101
    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))
        # First time use or first time after upgrade to new key-handling/storage method
        # or no keys configured. Give a visual prompt to configure.
        import calibre_plugins.ignobleepub.config as cfg
        if not cfg.prefs['configured']:
            titlemsg = '%s v%s' % (PLUGIN_NAME, PLUGIN_VERSION)
            errmsg = titlemsg + ' not (properly) configured!\n' + \
                    '\nThis may be the first time you\'ve used this plugin' + \
                    ' (or the first time since upgrading this plugin).' + \
                    ' You\'ll need to open the customization dialog (Preferences->Plugins->File type plugins)' + \
                    ' and follow the instructions there.\n' + \
                    '\nIf you don\'t use the ' + PLUGIN_NAME + ' plugin, you should disable or uninstall it.'
            if is_ok_to_use_qt():
                from PyQt4.Qt import QMessageBox
                d = QMessageBox(QMessageBox.Warning, titlemsg, errmsg )
                d.show()
                d.raise_()
                d.exec_()
            raise Exception('%s Plugin v%s: Plugin not configured.' % (PLUGIN_NAME, PLUGIN_VERSION))
        # Create a TemporaryPersistent file to work with.
        # Check original epub archive for zip errors.
        from calibre_plugins.ignobleepub import 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)
            return
        #check the book
        from calibre_plugins.ignobleepub import ignobleepub
        if not ignobleepub.ignobleBook(inf.name):
            print u"{0} v{1}: {2} is not a secure Barnes & Noble ePub.".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
            # return the original file, so that no error message is generated in the GUI
            return path_to_ebook
        # Attempt to decrypt epub with each encryption key (generated or provided).
        for keyname, userkey in cfg.prefs['keys'].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.
            result = ignobleepub.decryptBook(userkey, inf.name, of.name)
            # Ebook is not a B&N epub... do nothing and pass it on.
            # This allows a non-encrypted epub to be imported without error messages.
            if  result[0] == 1:
                print u"{0} v{1}: {2}".format(PLUGIN_NAME, PLUGIN_VERSION, result[1])
                of.close()
                return path_to_ebook
                break
            # Decryption was successful return the modified PersistentTemporary
            # file to Calibre's import process.
            if  result[0] == 0:
                print u"{0} v{1}: Encryption successfully removed.".format(PLUGIN_NAME, PLUGIN_VERSION)
                of.close()
                return of.name
                break
            print u"{0} v{1}: {2}".format(PLUGIN_NAME, PLUGIN_VERSION, result[1])
            of.close()
        # Something went wrong with decryption.
        # Import the original unmolested epub.
        print(u"{0} v{1}: Ultimately failed to decrypt".format(PLUGIN_NAME, PLUGIN_VERSION))
        return path_to_ebook
    def is_customizable(self):
        # return true to allow customization via the Plugin->Preferences.
        return True
    def config_widget(self):
        from calibre_plugins.ignobleepub.config import ConfigWidget
        # Extract the helpfile contents from in the plugin's zipfile.
        # The helpfile must be named <plugin name variable> + '_Help.htm'
        return ConfigWidget(self.load_resources(RESOURCE_NAME)[RESOURCE_NAME])
    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
    def save_settings(self, config_widget):
        config_widget.save_settings()
--- a/Calibre_Plugins/ignobleepub_plugin/config.py
+++ b/Calibre_Plugins/ignobleepub_plugin/config.py
@@ -0,0 +1,305 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 __license__ = 'GPL v3'
 # Standard Python modules.
 import os, sys, re, hashlib
 # PyQT4 modules (part of calibre).
 from PyQt4.Qt import (Qt, QWidget, QHBoxLayout, QVBoxLayout, QLabel, QLineEdit,
                      QGroupBox, QPushButton, QListWidget, QListWidgetItem,
                      QAbstractItemView, QIcon, QDialog, QUrl, QString)
 from PyQt4 import QtGui
 # calibre modules and constants.
 from calibre.gui2 import (error_dialog, question_dialog, info_dialog, open_url,
                            choose_dir, choose_files)
 from calibre.utils.config import dynamic, config_dir, JSONConfig
 # modules from this plugin's zipfile.
 from calibre_plugins.ignobleepub.__init__ import PLUGIN_NAME, PLUGIN_VERSION
 from calibre_plugins.ignobleepub.__init__ import RESOURCE_NAME as help_file_name
 from calibre_plugins.ignobleepub.utilities import (uStrCmp, DETAILED_MESSAGE, parseCustString)
 from calibre_plugins.ignobleepub.dialogs import AddKeyDialog, RenameKeyDialog
 from calibre_plugins.ignobleepub.ignoblekeygen import generate_key
 JSON_NAME = PLUGIN_NAME.strip().lower().replace(' ', '_')
 JSON_PATH = 'plugins/' + JSON_NAME + '.json'
 # 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(JSON_PATH)
 # Set defaults
 prefs.defaults['keys'] = {}
 prefs.defaults['configured'] = False
 class ConfigWidget(QWidget):
    def __init__(self, help_file_data):
        QWidget.__init__(self)
        self.help_file_data = help_file_data
        self.plugin_keys = prefs['keys']
        # Handle the old plugin's customization string by either converting the
        # old string to stored keys or by saving the string to a text file of the
        # user's choice. Either way... get that personal data out of plain sight.
        from calibre.customize.ui import config
        sc = config['plugin_customization']
        val = sc.get(PLUGIN_NAME, None)
        if val is not None:
            title = 'Convert existing customization data?'
            msg = '<p>Convert your existing insecure customization data? (Please '+ \
                        'read the detailed message)'
            det_msg = DETAILED_MESSAGE
            # Offer to convert the old string to the new format
            if question_dialog(self, _(title), _(msg), det_msg, True, True):
                userkeys = parseCustString(str(val))
                if userkeys:
                    counter = 0
                    # Yay! We found valid customization data... add it to the new plugin
                    for k in userkeys:
                        counter += 1
                        self.plugin_keys['Converted Old Plugin Key - ' + str(counter)] = k
                    msg = '<p><b>' + str(counter) + '</b> User key(s) configured from old plugin customization string'
                    inf = info_dialog(None, _(PLUGIN_NAME + 'info_dlg'), _(msg), show=True)
                    val = sc.pop(PLUGIN_NAME, None)
                    if val is not None:
                        config['plugin_customization'] = sc
                else:
                    # The existing customization string was invalid and wouldn't have
                    # worked anyway. Offer to save it as a text file and get rid of it.
                    errmsg = '<p>Unknown Error converting user supplied-customization string'
                    r = error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
                    self.saveOldCustomizationData(str(val))
                    val = sc.pop(PLUGIN_NAME, None)
                    if val is not None:
                        config['plugin_customization'] = sc
            # If they don't want to convert the old string to keys then
            # offer to save the old string to a text file and delete the
            # the old customization string.
            else:
                self.saveOldCustomizationData(str(val))
                val = sc.pop(PLUGIN_NAME, None)
                if val is not None:
                    config['plugin_customization'] = sc
        # First time run since upgrading to new key storage method, or 0 keys configured.
        # Prompt to import pre-existing key files.
        if not prefs['configured']:
            title = 'Import existing key files?'
            msg = '<p>This plugin no longer uses *.b64 keyfiles stored in calibre\'s configuration '+ \
                        'directory. Do you have any exsiting key files there (or anywhere) that you\'d '+ \
                        'like to migrate into the new plugin preferences method?'
            if question_dialog(self, _(title), _(msg)):
                self.migrate_files()
        # Start Qt Gui dialog layout
        layout = QVBoxLayout(self)
        self.setLayout(layout)
        help_layout = QHBoxLayout()
        layout.addLayout(help_layout)
        # Add hyperlink to a help file at the right. We will replace the correct name when it is clicked.
        help_label = QLabel('<a href="http://www.foo.com/">Plugin Help</a>', self)
        help_label.setTextInteractionFlags(Qt.LinksAccessibleByMouse | Qt.LinksAccessibleByKeyboard)
        help_label.setAlignment(Qt.AlignRight)
        help_label.linkActivated.connect(self.help_link_activated)
        help_layout.addWidget(help_label)
        keys_group_box = QGroupBox(_('Configured Ignoble Keys:'), self)
        layout.addWidget(keys_group_box)
        keys_group_box_layout = QHBoxLayout()
        keys_group_box.setLayout(keys_group_box_layout)
        self.listy = QListWidget(self)
        self.listy.setToolTip(_('<p>Stored Ignoble keys that will be used for decryption'))
        self.listy.setSelectionMode(QAbstractItemView.SingleSelection)
        self.populate_list()
        keys_group_box_layout.addWidget(self.listy)
        button_layout = QVBoxLayout()
        keys_group_box_layout.addLayout(button_layout)
        self._add_key_button = QtGui.QToolButton(self)
        self._add_key_button.setToolTip(_('Create new key'))
        self._add_key_button.setIcon(QIcon(I('plus.png')))
        self._add_key_button.clicked.connect(self.add_key)
        button_layout.addWidget(self._add_key_button)
        self._delete_key_button = QtGui.QToolButton(self)
        self._delete_key_button.setToolTip(_('Delete highlighted key'))
        self._delete_key_button.setIcon(QIcon(I('list_remove.png')))
        self._delete_key_button.clicked.connect(self.delete_key)
        button_layout.addWidget(self._delete_key_button)
        self._rename_key_button = QtGui.QToolButton(self)
        self._rename_key_button.setToolTip(_('Rename highlighted key'))
        self._rename_key_button.setIcon(QIcon(I('edit-select-all.png')))
        self._rename_key_button.clicked.connect(self.rename_key)
        button_layout.addWidget(self._rename_key_button)
        self.export_key_button = QtGui.QToolButton(self)
        self.export_key_button.setToolTip(_('Export highlighted key'))
        self.export_key_button.setIcon(QIcon(I('save.png')))
        self.export_key_button.clicked.connect(self.export_key)
        button_layout.addWidget(self.export_key_button)
        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
        button_layout.addItem(spacerItem)
        layout.addSpacing(20)
        migrate_layout = QHBoxLayout()
        layout.addLayout(migrate_layout)
        self.migrate_btn = QPushButton(_('Import Existing Keyfiles'), self)
        self.migrate_btn.setToolTip(_('<p>Import *.b64 keyfiles (used by older versions of the plugin).'))
        self.migrate_btn.clicked.connect(self.migrate_wrapper)
        migrate_layout.setAlignment(Qt.AlignLeft)
        migrate_layout.addWidget(self.migrate_btn)
        self.resize(self.sizeHint())
    def populate_list(self):
        for key in self.plugin_keys.keys():
            self.listy.addItem(QListWidgetItem(key))
    def add_key(self):
        d = AddKeyDialog(self)
        d.exec_()
        if d.result() != d.Accepted:
            # New key generation cancelled.
            return
        self.plugin_keys[d.key_name] = generate_key(d.user_name, d.cc_number)
        self.listy.clear()
        self.populate_list()
    def rename_key(self):
        if not self.listy.currentItem():
            errmsg = '<p>No keyfile selected to export. Highlight a keyfile first.'
            r = error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
            return
        d = RenameKeyDialog(self)
        d.exec_()
        if d.result() != d.Accepted:
            # rename cancelled or moot.
            return
        keyname = unicode(self.listy.currentItem().text().toUtf8(), 'utf8')
        if not question_dialog(self, _('Are you sure?'), _('<p>'+
                    'Do you really want to rename the Ignoble key named <strong>%s</strong> to <strong>%s</strong>?') % (keyname, d.key_name),
                    show_copy_button=False, default_yes=False):
            return
        self.plugin_keys[d.key_name] = self.plugin_keys[keyname]
        del self.plugin_keys[keyname]
        self.listy.clear()
        self.populate_list()
    def delete_key(self):
        if not self.listy.currentItem():
            return
        keyname = unicode(self.listy.currentItem().text().toUtf8(), 'utf8')
        if not question_dialog(self, _('Are you sure?'), _('<p>'+
                    'Do you really want to delete the Ignoble key named <strong>%s</strong>?') % keyname,
                    show_copy_button=False, default_yes=False):
            return
        del self.plugin_keys[keyname]
        self.listy.clear()
        self.populate_list()
    def help_link_activated(self, url):
        def get_help_file_resource():
            # Copy the HTML helpfile to the plugin directory each time the
            # link is clicked in case the helpfile is updated in newer plugins.
            file_path = os.path.join(config_dir, 'plugins', help_file_name)
            with open(file_path,'w') as f:
                f.write(self.help_file_data)
            return file_path
        url = 'file:///' + get_help_file_resource()
        open_url(QUrl(url))
    def save_settings(self):
        prefs['keys'] = self.plugin_keys
        if prefs['keys']:
            prefs['configured'] = True
        else:
            prefs['configured'] = False
    def migrate_files(self):
        dynamic[PLUGIN_NAME + 'config_dir'] = config_dir
        files = choose_files(self, PLUGIN_NAME + 'config_dir',
                _('Select Ignoble keyfiles to import'), [('Ignoble Keyfiles', ['b64'])], False)
        if files:
            counter = 0
            skipped = 0
            for filename in files:
                fpath = os.path.join(config_dir, filename)
                new_key_name = os.path.splitext(os.path.basename(filename))[0]
                match = False
                for key in self.plugin_keys.keys():
                    if uStrCmp(new_key_name, key, True):
                        skipped += 1
                        msg = '<p>A key with the name <strong>' + new_key_name + '</strong> already exists! </p>' + \
                           '<p>Skipping key file named <strong>' + filename + '</strong>.</p>' + \
                           '<p>Either delete the existing key and re-migrate, or ' + \
                           'create that key manually with a different name.'
                        inf = info_dialog(None, _(PLUGIN_NAME + 'info_dlg'),
                                _(msg), show=True)
                        match = True
                        break
                if not match:
                    with open(fpath, 'rb') as f:
                        counter += 1
                        self.plugin_keys[unicode(new_key_name)] = f.read()
            msg = '<p>Done migrating <strong>' + str(counter) + '</strong> ' + \
                                'key files...</p><p>Skipped <strong>' + str(skipped) + '</strong> key files.'
            inf = info_dialog(None, _(PLUGIN_NAME + 'info_dlg'),
                                    _(msg), show=True)
            return 1
        return 0
    def migrate_wrapper(self):
        if self.migrate_files():
            self.listy.clear()
            self.populate_list()
    def export_key(self):
        if not self.listy.currentItem():
            errmsg = '<p>No keyfile selected to export. Highlight a keyfile first.'
            r = error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
            return
        filter = QString('Ignoble Key Files (*.b64)')
        keyname = unicode(self.listy.currentItem().text().toUtf8(), 'utf8')
        if dynamic.get(PLUGIN_NAME + 'save_dir'):
            defaultname = os.path.join(dynamic.get(PLUGIN_NAME + 'save_dir'), keyname + '.b64')
        else:
            defaultname = os.path.join(os.path.expanduser('~'), keyname + '.b64')
        filename = unicode(QtGui.QFileDialog.getSaveFileName(self, "Save Ignoble Key File as...", defaultname,
                                            "Ignoble Key Files (*.b64)", filter))
        if filename:
            dynamic[PLUGIN_NAME + 'save_dir'] = os.path.split(filename)[0]
            fname = open(filename, 'w')
            fname.write(self.plugin_keys[keyname])
            fname.close()
    def saveOldCustomizationData(self, strdata):
        filter = QString('Text files (*.txt)')
        default_basefilename = PLUGIN_NAME + ' old customization data.txt'
        defaultname = os.path.join(os.path.expanduser('~'), default_basefilename)
        filename = unicode(QtGui.QFileDialog.getSaveFileName(self, "Save old plugin style customization data as...", defaultname,
                                    "Text Files (*.txt)", filter))
        if filename:
            fname = open(filename, 'w')
            fname.write(strdata)
            fname.close()
--- a/Calibre_Plugins/ignobleepub_plugin/dialogs.py
+++ b/Calibre_Plugins/ignobleepub_plugin/dialogs.py
@@ -0,0 +1,160 @@
 #!/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'
 from PyQt4.Qt import (Qt, QHBoxLayout, QVBoxLayout, QLabel, QLineEdit,
                      QGroupBox, QDialog, QDialogButtonBox)
 from calibre.gui2 import error_dialog
 from calibre_plugins.ignobleepub.__init__ import PLUGIN_NAME, PLUGIN_VERSION
 from calibre_plugins.ignobleepub.utilities import uStrCmp
 class AddKeyDialog(QDialog):
    def __init__(self, parent=None,):
        QDialog.__init__(self, parent)
        self.parent = parent
        self.setWindowTitle('Create New Ignoble Key')
        layout = QVBoxLayout(self)
        self.setLayout(layout)
        data_group_box = QGroupBox('', self)
        layout.addWidget(data_group_box)
        data_group_box_layout = QVBoxLayout()
        data_group_box.setLayout(data_group_box_layout)
        key_group = QHBoxLayout()
        data_group_box_layout.addLayout(key_group)
        key_group.addWidget(QLabel('Unique Key Name:', self))
        self.key_ledit = QLineEdit('', self)
        self.key_ledit.setToolTip(_('<p>Enter an identifying name for this new Ignoble key.</p>' +
                                '<p>It should be something that will help you remember ' +
                                'what personal information was used to create it.'))
        key_group.addWidget(self.key_ledit)
        key_label = QLabel(_(''), self)
        key_label.setAlignment(Qt.AlignHCenter)
        data_group_box_layout.addWidget(key_label)
        name_group = QHBoxLayout()
        data_group_box_layout.addLayout(name_group)
        name_group.addWidget(QLabel('Your Name:', self))
        self.name_ledit = QLineEdit('', self)
        self.name_ledit.setToolTip(_('<p>Enter your name as it appears in your B&N ' +
                                'account and/or on your credit card.</p>' +
                                '<p>It will only be used to generate this ' +
                                'one-time key and won\'t be stored anywhere ' +
                                'in calibre or on your computer.</p>' +
                                '<p>(ex: Jonathan Smith)'))
        name_group.addWidget(self.name_ledit)
        name_disclaimer_label = QLabel(_('Will not be stored/saved in configuration data:'), self)
        name_disclaimer_label.setAlignment(Qt.AlignHCenter)
        data_group_box_layout.addWidget(name_disclaimer_label)
        ccn_group = QHBoxLayout()
        data_group_box_layout.addLayout(ccn_group)
        ccn_group.addWidget(QLabel('Credit Card#:', self))
        self.cc_ledit = QLineEdit('', self)
        self.cc_ledit.setToolTip(_('<p>Enter the full credit card number on record ' +
                                'in your B&N account.</p>' +
                                '<p>No spaces or dashes... just the numbers. ' +
                                'This CC# will only be used to generate this ' +
                                'one-time key and won\'t be stored anywhere in ' +
                                'calibre or on your computer.'))
        ccn_group.addWidget(self.cc_ledit)
        ccn_disclaimer_label = QLabel(_('Will not be stored/saved in configuration data:'), self)
        ccn_disclaimer_label.setAlignment(Qt.AlignHCenter)
        data_group_box_layout.addWidget(ccn_disclaimer_label)
        layout.addSpacing(20)
        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
        self.button_box.accepted.connect(self.accept)
        self.button_box.rejected.connect(self.reject)
        layout.addWidget(self.button_box)
        self.resize(self.parent.sizeHint())
    def accept(self):
        if (self.key_ledit.text().isEmpty() or self.name_ledit.text().isEmpty()
                                or self.cc_ledit.text().isEmpty()):
            errmsg = '<p>All fields are required!'
            return error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
        if (unicode(self.key_ledit.text()).isspace() or unicode(self.name_ledit.text()).isspace()
                                or unicode(self.cc_ledit.text()).isspace()):
            errmsg = '<p>All fields are required!'
            return error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
        if not unicode(self.cc_ledit.text()).isdigit():
            errmsg = '<p>Numbers only in the credit card number field!'
            return error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
        if len(self.key_ledit.text()) < 4:
            errmsg = '<p>Key name must be at <i>least</i> 4 characters long!'
            return error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
        for k in self.parent.plugin_keys.keys():
            if uStrCmp(self.key_ledit.text(), k, True):
                errmsg = '<p>The key name <strong>%s</strong> is already being used.' % self.key_ledit.text()
                return error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
        QDialog.accept(self)
    @property
    def user_name(self):
        return unicode(self.name_ledit.text().toUtf8(), 'utf8').strip().lower().replace(' ','')
    @property
    def cc_number(self):
        return unicode(self.cc_ledit.text().toUtf8(), 'utf8').strip().replace(' ', '').replace('-','')
    @property
    def key_name(self):
        return unicode(self.key_ledit.text().toUtf8(), 'utf8')
 class RenameKeyDialog(QDialog):
    def __init__(self, parent=None,):
        QDialog.__init__(self, parent)
        self.parent = parent
        self.setWindowTitle('Rename Ignoble Key')
        layout = QVBoxLayout(self)
        self.setLayout(layout)
        data_group_box = QGroupBox('', self)
        layout.addWidget(data_group_box)
        data_group_box_layout = QVBoxLayout()
        data_group_box.setLayout(data_group_box_layout)
        data_group_box_layout.addWidget(QLabel('Key Name:', self))
        self.key_ledit = QLineEdit(self.parent.listy.currentItem().text(), self)
        self.key_ledit.setToolTip(_('<p>Enter a new name for this existing Ignoble key.'))
        data_group_box_layout.addWidget(self.key_ledit)
        layout.addSpacing(20)
        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
        self.button_box.accepted.connect(self.accept)
        self.button_box.rejected.connect(self.reject)
        layout.addWidget(self.button_box)
    def accept(self):
        if self.key_ledit.text().isEmpty() or unicode(self.key_ledit.text()).isspace():
            errmsg = '<p>Key name field cannot be empty!'
            return error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
        if len(self.key_ledit.text()) < 4:
            errmsg = '<p>Key name must be at <i>least</i> 4 characters long!'
            return error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
        if uStrCmp(self.key_ledit.text(), self.parent.listy.currentItem().text()):
                # Same exact name ... do nothing.
                return QDialog.reject(self)
        for k in self.parent.plugin_keys.keys():
            if (uStrCmp(self.key_ledit.text(), k, True) and
                        not uStrCmp(k, self.parent.listy.currentItem().text(), True)):
                errmsg = '<p>The key name <strong>%s</strong> is already being used.' % self.key_ledit.text()
                return error_dialog(None, PLUGIN_NAME,
                                    _(errmsg), show=True, show_copy_button=False)
        QDialog.accept(self)
    @property
    def key_name(self):
        return unicode(self.key_ledit.text().toUtf8(), 'utf8')
--- a/Calibre_Plugins/ignobleepub_plugin/ignobleepub.py
+++ b/Calibre_Plugins/ignobleepub_plugin/ignobleepub.py
@@ -0,0 +1,420 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 # ignobleepub.pyw, version 3.6
 # 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
 # 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.5 - Fix for potential problem with PyCrypto
 #   3.6 - Revised to allow use in calibre plugins to eliminate need for duplicate code
 """
 Decrypt Barnes & Noble encrypted ePub books.
 """
 __license__ = 'GPL v3'
 __version__ = "3.6"
 import sys
 import os
 import traceback
 import zlib
 import zipfile
 from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
 from contextlib import closing
 import xml.etree.ElementTree as etree
 # 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
 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 iswindows:
        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_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
    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, '\x00'*16)
        def decrypt(self, data):
            return self._aes.decrypt(data)
    return AES
 def _load_crypto():
    AES = 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 = loader()
            break
        except (ImportError, IGNOBLEError):
            pass
    return AES
 AES = _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)
        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)
            if path is not None:
                path = path.encode('utf-8')
                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
 # 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:
            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
 # return error code and error message duple
 def decryptBook(keyb64, inpath, outpath):
    if AES is None:
        # 1 means don't try again
        return (1, 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:
            return (1, u"Not a secure Barnes & Noble ePub.")
        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))
            if len(bookkey) != 64:
                return (1, u"Not a secure Barnes & Noble ePub.")
            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 Exception, e:
            return (2, u"{0}.".format(e.args[0]))
    return (0, u"Success")
 def cli_main(argv=unicode_argv()):
    progname = os.path.basename(argv[0])
    if len(argv) != 4:
        print u"usage: {0} <keyfile.der> <inbook.epub> <outbook.epub>".format(progname)
        return 1
    keypath, inpath, outpath = argv[1:]
    userkey = open(keypath,'rb').read()
    result = decryptBook(userkey, inpath, outpath)
    print result[1]
    return result[0]
 def gui_main():
    import Tkinter
    import Tkconstants
    import tkFileDialog
    import traceback
    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] == 0:
                self.status['text'] = u"File successfully decrypted"
            else:
                self.status['text'] = decrypt_status[1]
    root = Tkinter.Tk()
    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.stdout=SafeUnbuffered(sys.stdout)
        sys.stderr=SafeUnbuffered(sys.stderr)
        sys.exit(cli_main())
    sys.exit(gui_main())
--- a/Calibre_Plugins/ignobleepub_plugin/ignobleepub_plugin.py
+++ b/Calibre_Plugins/ignobleepub_plugin/ignobleepub_plugin.py
@@ -1,384 +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.6.44 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
 """
 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
 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, 5)
    minimum_calibre_version = (0, 6, 44)  # 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
        from calibre.gui2 import is_ok_to_use_qt
        from PyQt4.Qt import QMessageBox
        from calibre.constants import iswindows, isosx
        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.
            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)'
--- a/Calibre_Plugins/ignobleepub_plugin/ignoblekeygen.py
+++ b/Calibre_Plugins/ignobleepub_plugin/ignoblekeygen.py
@@ -0,0 +1,319 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 # ignoblekeygen.pyw, version 2.5
 # Copyright © 2009-2010 by i♥cabbages
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 # Modified 2010–2012 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
 #   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 (pythonw ignoblekeygen.pyw) or by double-clicking
 #   it when it has been associated with PythonLauncher.
 # Revision history:
 #   1 - Initial release
 #   2 - Add OS X support by using OpenSSL when available (taken/modified from ineptepub v5)
 #   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
 """
 Generate Barnes & Noble EPUB user key from name and credit card number.
 """
 __license__ = 'GPL v3'
 __version__ = "2.5"
 import sys
 import os
 import hashlib
 # 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"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]
 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 iswindows:
        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_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)
            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
    return AES
 def _load_crypto_pycrypto():
    from Crypto.Cipher import AES as _AES
    class AES(object):
        def __init__(self, key, iv):
            self._aes = _AES.new(key, _AES.MODE_CBC, iv)
        def encrypt(self, data):
            return self._aes.encrypt(data)
    return AES
 def _load_crypto():
    AES = 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 = loader()
            break
        except (ImportError, IGNOBLEError):
            pass
    return AES
 AES = _load_crypto()
 def normalize_name(name):
    return ''.join(x for x in name.lower() if x != ' ')
 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 = 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()
    return userkey.encode('base64')
 def cli_main(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 u"usage: {0} <Name> <CC#> <keyfileout.b64>".format(progname)
        return 1
    name, ccn, keypath = argv[1:]
    userkey = generate_key(name, ccn)
    open(keypath,'wb').write(userkey)
    return 0
 def gui_main():
    import Tkinter
    import Tkconstants
    import tkFileDialog
    import tkMessageBox
    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()
        tkMessageBox.showerror(
            "Ignoble EPUB Keyfile Generator",
            "This script requires OpenSSL or PyCrypto, which must be installed "
            "separately.  Read the top-of-script comment for details.")
        return 1
    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)
    root.mainloop()
    return 0
 if __name__ == '__main__':
    if len(sys.argv) > 1:
        sys.stdout=SafeUnbuffered(sys.stdout)
        sys.stderr=SafeUnbuffered(sys.stderr)
        sys.exit(cli_main())
    sys.exit(gui_main())
--- a/Calibre_Plugins/ignobleepub_plugin/plugin-import-name-ignobleepub.txt
+++ b/Calibre_Plugins/ignobleepub_plugin/plugin-import-name-ignobleepub.txt
--- a/Calibre_Plugins/ignobleepub_plugin/utilities.py
+++ b/Calibre_Plugins/ignobleepub_plugin/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
--- a/Calibre_Plugins/ignobleepub_plugin/zipfilerugged.py
+++ b/Calibre_Plugins/ignobleepub_plugin/zipfilerugged.py
--- a/Calibre_Plugins/ignobleepub_plugin/zipfix.py
+++ b/Calibre_Plugins/ignobleepub_plugin/zipfix.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import sys
 import zlib
-import zipfile
+import zipfilerugged
 import os
 import os.path
 import getopt
@@ -15,7 +16,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,11 +28,11 @@ class fixZip:
        self.ztype = 'zip'
        if zinput.lower().find('.epub') >= 0 :
            self.ztype = 'epub'
-        self.inzip = zipfile.ZipFile(zinput,'r')
+        self.inzip = zipfilerugged.ZipFile(zinput,'r')
-        self.outzip = zipfile.ZipFile(zoutput,'w')
+        self.outzip = zipfilerugged.ZipFile(zoutput,'w')
        # open the input zip for reading only as a raw file
-	self.bzf = file(zinput,'rb')
+        self.bzf = file(zinput,'rb')
-        
+
    def getlocalname(self, zi):
        local_header_offset = zi.header_offset
        self.bzf.seek(local_header_offset + _FILENAME_LEN_OFFSET)
@@ -76,17 +77,17 @@ 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)
        return data
-        
+
    def fix(self):
        # get the zipinfo for each member of the input archive
@@ -95,7 +96,7 @@ class fixZip:
        # if epub write mimetype file first, with no compression
        if self.ztype == 'epub':
-            nzinfo = ZipInfo('mimetype', compress_type=zipfile.ZIP_STORED)
+            nzinfo = ZipInfo('mimetype', compress_type=zipfilerugged.ZIP_STORED)
            self.outzip.writestr(nzinfo, _MIMETYPE)
        # write the rest of the files
@@ -103,9 +104,9 @@ class fixZip:
            if zinfo.filename != "mimetype" or self.ztype == '.zip':
                data = None
                nzinfo = zinfo
-                try: 
+                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
@@ -126,7 +127,7 @@ def usage():
     inputzip is the source zipfile to fix
     outputzip is the fixed zip archive
    """
-    
+
 def repairBook(infile, outfile):
    if not os.path.exists(infile):
@@ -152,5 +153,3 @@ def main(argv=sys.argv):
 if __name__ == '__main__' :
    sys.exit(main())
--- a/Calibre_Plugins/ineptepub_plugin.zip
+++ b/Calibre_Plugins/ineptepub_plugin.zip
--- a/Calibre_Plugins/ineptepub_plugin/init.py
+++ b/Calibre_Plugins/ineptepub_plugin/init.py
@@ -0,0 +1,213 @@
 #!/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 or
 # later.  <http://www.gnu.org/licenses/>
 #
 # Requires Calibre version 0.7.55 or higher.
 #
 # 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.
 #
 # 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 one or more
 # 'calibre-adeptkey<n>.der' files and save them in calibre's configuration directory.
 # It will use those files on subsequent runs. If there is already a 'calibre-adeptkey*.der'
 # file 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♥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. Copy 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
 #   0.1.8 - Fix for potential problem with PyCrypto
 #   0.1.9 - Fix for potential problem with ADE keys and fix possible output/unicode problem
 #   0.2.0 - Major code change to use unaltered ineptepub.py file 5.8 or later.
 PLUGIN_NAME = u"Inept Epub DeDRM"
 PLUGIN_VERSION_TUPLE = (0, 2, 0)
 PLUGIN_VERSION = u'.'.join([str(x) for x in PLUGIN_VERSION_TUPLE])
 import sys, os, re
 class ADEPTError(Exception):
    pass
 from calibre.customize import FileTypePlugin
 from calibre.constants import iswindows, isosx
 # Wrap a stream so that output gets flushed immediately
 # and also make sure that any unicode strings get
 # encoded using "replace" before writing them.
 class SafeUnbuffered:
    def __init__(self, stream):
        self.stream = stream
        self.encoding = stream.encoding
        if self.encoding == None:
            self.encoding = "utf-8"
    def write(self, data):
        if isinstance(data,unicode):
            data = data.encode(self.encoding,"replace")
        self.stream.write(data)
        self.stream.flush()
    def __getattr__(self, attr):
        return getattr(self.stream, attr)
 class IneptDeDRM(FileTypePlugin):
    name                    = PLUGIN_NAME
    description             = u"Removes DRM from secure Adobe epub files. Credit given to i♥cabbages for the original stand-alone scripts."
    supported_platforms     = ['linux', 'osx', 'windows']
    author                  = u"DiapDealer, Apprentice Alf and i♥cabbages"
    version                 = PLUGIN_VERSION_TUPLE
    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):
        # 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))
        # Create a TemporaryPersistent file to work with.
        # Check original epub archive for zip errors.
        from calibre_plugins.ineptepub import 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 when checking zip archive.".format(PLUGIN_NAME, PLUGIN_VERSION)
            raise Exception(e)
            return
        #check the book
        from calibre_plugins.ineptepub import ineptepub
        if not ineptepub.adeptBook(inf.name):
            print u"{0} v{1}: {2} is not a secure Adobe Adept ePub.".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
            # return the original file, so that no error message is generated in the GUI
            return path_to_ebook
        # Load any keyfiles (*.der) included Calibre's config directory.
        userkeys = []
        # Find Calibre's configuration directory.
        # self.plugin_path is passed in unicode because we defined our name in unicode
        confpath = os.path.split(os.path.split(self.plugin_path)[0])[0]
        print u"{0} v{1}: Calibre configuration directory = {2}".format(PLUGIN_NAME, PLUGIN_VERSION, confpath)
        files = os.listdir(confpath)
        filefilter = re.compile(u"\.der$", re.IGNORECASE)
        files = filter(filefilter.search, files)
        foundDefault = False
        if files:
            try:
                for filename in files:
                    if filename[:16] == u"calibre-adeptkey":
                        foundDefault = True
                    fpath = os.path.join(confpath, filename)
                    with open(fpath, 'rb') as f:
                        userkeys.append([f.read(), filename])
                    print u"{0} v{1}: Keyfile {2} found in config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, filename)
            except IOError:
                print u"{0} v{1}: Error reading keyfiles from config directory.".format(PLUGIN_NAME, PLUGIN_VERSION)
                pass
        if not foundDefault:
            # Try to find key from ADE install and save the key in
            # Calibre's configuration directory for future use.
            if iswindows or isosx:
                #ignore annoying future warning from key generation
                import warnings
                warnings.filterwarnings('ignore', category=FutureWarning)
                # ADE key retrieval script included in respective OS folder.
                from calibre_plugins.ineptepub.ineptkey import retrieve_keys
                try:
                    keys = retrieve_keys()
                    for i,key in enumerate(keys):
                        keyname = u"calibre-adeptkey{0:d}.der".format(i)
                        userkeys.append([key,keyname])
                        keypath = os.path.join(confpath, keyname)
                        open(keypath, 'wb').write(key)
                        print u"{0} v{1}: Created keyfile {2} from ADE install.".format(PLUGIN_NAME, PLUGIN_VERSION, keyname)
                except:
                   print u"{0} v{1}: Couldn\'t Retrieve key from ADE install.".format(PLUGIN_NAME, PLUGIN_VERSION)
                   pass
        if not userkeys:
            # No user keys found... bail out.
            raise ADEPTError(u"{0} v{1}: No keys found. Check keyfile(s)/ADE install".format(PLUGIN_NAME, PLUGIN_VERSION))
            return
        # Attempt to decrypt epub with each encryption key found.
        for userkeyinfo in userkeys:
            print u"{0} v{1}: Trying Encryption key {2:s}".format(PLUGIN_NAME, PLUGIN_VERSION, userkeyinfo[1])
            of = self.temporary_file(u".epub")
            # Give the user key, ebook and TemporaryPersistent file to the decryption function.
            result = ineptepub.decryptBook(userkeyinfo[0], 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 u"{0} v{1}: {2} is not a secure Adobe Adept ePub.".format(PLUGIN_NAME, PLUGIN_VERSION,os.path.basename(path_to_ebook))
                of.close()
                return path_to_ebook
                break
            # Decryption was successful return the modified PersistentTemporary
            # file to Calibre's import process.
            if  result == 0:
                print u"{0} v{1}: Encryption successfully removed.".format(PLUGIN_NAME, PLUGIN_VERSION)
                of.close()
                return of.name
                break
            print u"{0} v{1}: Encryption key incorrect.".format(PLUGIN_NAME, PLUGIN_VERSION)
            of.close
        # Something went wrong with decryption.
        # Import the original unmolested epub.
        raise ADEPTError(u"{0} v{1}: Ultimately failed to decrypt".format(PLUGIN_NAME, PLUGIN_VERSION))
        return
--- a/Calibre_Plugins/ineptepub_plugin/ade_key.py
+++ b/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
--- a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptepub.py
+++ b/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptepub.py
@@ -3,11 +3,13 @@
 from __future__ import with_statement
-# ineptepub.pyw, version 5.6
+# ineptepub.pyw, version 5.8
-# Copyright © 2009-2010 i♥cabbages
+# Copyright © 2009-2010 by i♥cabbages
-# Released under the terms of the GNU General Public Licence, version 3 or
+# Released under the terms of the GNU General Public Licence, version 3
-# later.  <http://www.gnu.org/licenses/>
+# <http://www.gnu.org/licenses/>
 # Modified 2010–2012 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
@@ -30,23 +32,84 @@ 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
 """
-Decrypt Adobe ADEPT-encrypted EPUB books.
+Decrypt Adobe Digital Editions encrypted ePub books.
 """
 __license__ = 'GPL v3'
 __version__ = "5.8"
 import sys
 import os
 import traceback
 import zlib
 import zipfile
 from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
 from contextlib import closing
 import xml.etree.ElementTree as etree
-import Tkinter
+
-import Tkconstants
+# Wrap a stream so that output gets flushed immediately
-import tkFileDialog
+# and also make sure that any unicode strings get
-import tkMessageBox
+# 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 +119,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')
@@ -67,25 +130,25 @@ def _load_crypto_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])
@@ -97,7 +160,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 RSA(object):
        def __init__(self, der):
            buf = create_string_buffer(der)
@@ -105,7 +168,7 @@ def _load_crypto_libcrypto():
            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))
@@ -114,7 +177,7 @@ def _load_crypto_libcrypto():
            if dlen < 0:
                raise ADEPTError('RSA decryption failed')
            return to[:dlen]
-    
+
        def __del__(self):
            if self._rsa is not None:
                RSA_free(self._rsa)
@@ -130,7 +193,7 @@ def _load_crypto_libcrypto():
            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)
@@ -148,13 +211,13 @@ def _load_crypto_pycrypto():
    # 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")
@@ -164,22 +227,22 @@ def _load_crypto_pycrypto():
                    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:
@@ -189,19 +252,19 @@ def _load_crypto_pycrypto():
                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
@@ -209,13 +272,13 @@ def _load_crypto_pycrypto():
                    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):
@@ -224,7 +287,7 @@ def _load_crypto_pycrypto():
                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:
@@ -235,7 +298,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)
@@ -252,7 +315,7 @@ def _load_crypto_pycrypto():
            for byte in bytes:
                total = (total << 8) + byte
            return total
-    
+
        def decrypt(self, data):
            return self._rsa.decrypt(data)
@@ -270,6 +333,7 @@ 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')
@@ -312,158 +376,181 @@ class Decryptor(object):
            data = self.decompress(data)
        return data
-
+# check file to make check whether it's probably an Adobe Adept encrypted ePub
-class DecryptionDialog(Tkinter.Frame):
+def adeptBook(inpath):
    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)
    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'))
+        try:
-        adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
+            rights = etree.fromstring(inf.read('META-INF/rights.xml'))
-        expr = './/%s' % (adept('encryptedKey'),)
+            adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
-        bookkey = ''.join(rights.findtext(expr))
+            expr = './/%s' % (adept('encryptedKey'),)
-        bookkey = rsa.decrypt(bookkey.decode('base64'))
+            bookkey = ''.join(rights.findtext(expr))
-        # Padded as per RSAES-PKCS1-v1_5
+            if len(bookkey) != 172:
-        if bookkey[-17] != '\x00':
+                print u"{0:s} is not a secure Adobe Adept ePub.".format(os.path.basename(inpath))
-            raise ADEPTError('problem decrypting session key')
+                return 1
-        encryption = inf.read('META-INF/encryption.xml')
+            bookkey = rsa.decrypt(bookkey.decode('base64'))
-        decryptor = Decryptor(bookkey[-16:], encryption)
+            # Padded as per RSAES-PKCS1-v1_5
-        kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
+            if bookkey[-17] != '\x00':
-        with closing(ZipFile(open(outpath, 'wb'), 'w', **kwds)) as outf:
+                print u"Could not decrypt {0:s}. Wrong key".format(os.path.basename(inpath))
-            zi = ZipInfo('mimetype', compress_type=ZIP_STORED)
+                return 2
-            outf.writestr(zi, inf.read('mimetype'))
+            encryption = inf.read('META-INF/encryption.xml')
-            for path in namelist:
+            decryptor = Decryptor(bookkey[-16:], encryption)
-                data = inf.read(path)
+            kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
-                outf.writestr(path, decryptor.decrypt(path, data))
+            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:
            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(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():
    import Tkinter
    import Tkconstants
    import tkFileDialog
    import traceback
    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)
                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.title(u"Adobe Adept ePub Decrypter v.{0}".format(__version__))
        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.resizable(True, False)
    root.minsize(300, 0)
    DecryptionDialog(root).pack(fill=Tkconstants.X, expand=1)
@@ -472,5 +559,7 @@ def gui_main():
 if __name__ == '__main__':
    if len(sys.argv) > 1:
        sys.stdout=SafeUnbuffered(sys.stdout)
        sys.stderr=SafeUnbuffered(sys.stderr)
        sys.exit(cli_main())
    sys.exit(gui_main())
--- a/Calibre_Plugins/ineptepub_plugin/ineptepub_plugin.py
+++ b/Calibre_Plugins/ineptepub_plugin/ineptepub_plugin.py
@@ -1,479 +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.6.44 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
 """
 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
 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, 6)
    minimum_calibre_version = (0, 6, 44)  # 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
        from calibre.gui2 import is_ok_to_use_qt
        from PyQt4.Qt import QMessageBox
        from calibre.constants import iswindows, isosx
        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 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.
            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
--- a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptkey.py
+++ b/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptkey.py
@@ -3,11 +3,11 @@
 from __future__ import with_statement
-# ineptkey.pyw, version 5.4
+# ineptkey.pyw, version 5.6
 # Copyright © 2009-2010 i♥cabbages
-# Released under the terms of the GNU General Public Licence, version 3 or
+# Released under the terms of the GNU General Public Licence, version 3
-# later.  <http://www.gnu.org/licenses/>
+# <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
@@ -36,6 +36,8 @@ from __future__ import with_statement
 #   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
 """
 Retrieve Adobe ADEPT user key.
@@ -46,15 +48,70 @@ __license__ = 'GPL v3'
 import sys
 import os
 import struct
-import Tkinter
+
-import Tkconstants
+# Wrap a stream so that output gets flushed immediately
-import tkMessageBox
+# and also make sure that any unicode strings get
-import traceback
+# 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"ineptkey.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, \
@@ -76,13 +133,13 @@ if sys.platform.startswith('win'):
            _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',
@@ -110,7 +167,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 +349,9 @@ if sys.platform.startswith('win'):
        return CryptUnprotectData
    CryptUnprotectData = CryptUnprotectData()
-    def retrieve_key(keypath):
+    def retrieve_keys():
        if AES is None:
-            tkMessageBox.showerror(
+            raise ADEPTError("PyCrypto or OpenSSL must be installed")
                "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()
@@ -308,11 +361,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,50 +388,43 @@ if sys.platform.startswith('win'):
                if ktype != 'privateLicenseKey':
                    continue
                userkey = winreg.QueryValueEx(plkkey, 'value')[0]
-                break
+                userkey = userkey.decode('base64')
-            if userkey is not None:
+                aes = AES(keykey)
-                break
+                userkey = aes.decrypt(userkey)
-        if userkey is None:
+                userkey = userkey[26:-ord(userkey[-1])]
                keys.append(userkey)
        if len(keys) == 0:
            raise ADEPTError('Could not locate privateLicenseKey')
-        userkey = userkey.decode('base64')
+        return keys
        aes = AES(keykey)
        userkey = aes.decrypt(userkey)
        userkey = userkey[26:-ord(userkey[-1])]
        with open(keypath, 'wb') as f:
            f.write(userkey)
        return True
-elif sys.platform.startswith('darwin'):
+
 elif isosx:
    import xml.etree.ElementTree as etree
-    import Carbon.File
+    import subprocess
    import Carbon.Folder
    import Carbon.Folders
    import MacOS
    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):
+    def findActivationDat():
-        try:
+        home = os.getenv('HOME')
-            fsref = Carbon.Folder.FSFindFolder(domain, dtype, False)
+        cmdline = 'find "' + home + '/Library/Application Support/Adobe/Digital Editions" -name "activation.dat"'
-            return Carbon.File.pathname(fsref)
+        cmdline = cmdline.encode(sys.getfilesystemencoding())
-        except MacOS.Error:
+        p2 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-            return None
+        out1, out2 = p2.communicate()
-
+        reslst = out1.split('\n')
-    def find_app_support_file(subpath):
+        cnt = len(reslst)
-        dtype = Carbon.Folders.kApplicationSupportFolderType
+        for j in xrange(cnt):
-        for domain in Carbon.Folders.kUserDomain, Carbon.Folders.kLocalDomain:
+            resline = reslst[j]
-            path = find_folder(domain, dtype)
+            pp = resline.find('activation.dat')
-            if path is None:
+            if pp >= 0:
-                continue
+                ActDatPath = resline
-            path = os.path.join(path, subpath)
+                break
-            if os.path.isfile(path):
+        if os.path.exists(ActDatPath):
-                return path
+            return ActDatPath
        return None
-    def retrieve_key(keypath):
+    def retrieve_keys():
-        actpath = find_app_support_file(ACTIVATION_PATH)
+        actpath = findActivationDat()
        if actpath is None:
            raise ADEPTError("Could not locate ADE activation")
        tree = etree.parse(actpath)
@@ -386,69 +433,65 @@ elif sys.platform.startswith('darwin'):
        userkey = tree.findtext(expr)
        userkey = userkey.decode('base64')
        userkey = userkey[26:]
-        with open(keypath, 'wb') as f:
+        return [userkey]
            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
 else:
-    def retrieve_key(keypath):
+    def retrieve_keys(keypath):
-        tkMessageBox.showerror(
+        raise ADEPTError("This script only supports Windows and Mac OS X.")
-            "ADEPT Key",
+        return []
            "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
 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)
        self.text.insert(Tkconstants.END, text)
 def retrieve_key(keypath):
    keys = retrieve_keys()
    with open(keypath, 'wb') as f:
        f.write(keys[0])
    return True
 def extractKeyfile(keypath):
    try:
        success = retrieve_key(keypath)
    except ADEPTError, e:
-        print "Key generation Error: " + str(e)
+        print u"Key generation Error: {0}".format(e.args[0])
        return 1
    except Exception, e:
-    	print "General Error: " + str(e)
+        print "General Error: {0}".format(e.args[0])
-    	return 1
+        return 1
    if not success:
        return 1
    return 0
-def cli_main(argv=sys.argv):
+def cli_main(argv=unicode_argv()):
    keypath = argv[1]
    return extractKeyfile(keypath)
-def main(argv=sys.argv):
+def gui_main(argv=unicode_argv()):
    import Tkinter
    import Tkconstants
    import tkMessageBox
    import traceback
    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)
    root = Tkinter.Tk()
    root.withdraw()
-    progname = os.path.basename(argv[0])
+    keypath, progname = os.path.split(argv[0])
-    keypath = 'adeptkey.der'
+    keypath = os.path.join(keypath, u"adeptkey.der")
    success = False
    try:
        success = retrieve_key(keypath)
    except ADEPTError, e:
-        tkMessageBox.showerror("ADEPT Key", "Error: " + str(e))
+        tkMessageBox.showerror(u"ADEPT Key", "Error: {0}".format(e.args[0]))
    except Exception:
        root.wm_state('normal')
        root.title('ADEPT Key')
@@ -458,10 +501,12 @@ def main(argv=sys.argv):
    if not success:
        return 1
    tkMessageBox.showinfo(
-        "ADEPT Key", "Key successfully retrieved to %s" % (keypath))
+        u"ADEPT Key", u"Key successfully retrieved to {0}".format(keypath))
    return 0
 if __name__ == '__main__':
    if len(sys.argv) > 1:
        sys.stdout=SafeUnbuffered(sys.stdout)
        sys.stderr=SafeUnbuffered(sys.stderr)
        sys.exit(cli_main())
-    sys.exit(main())
+    sys.exit(gui_main())
--- a/Calibre_Plugins/ineptepub_plugin/plugin-import-name-ineptepub.txt
+++ b/Calibre_Plugins/ineptepub_plugin/plugin-import-name-ineptepub.txt
--- a/Calibre_Plugins/ineptepub_plugin/zipfilerugged.py
+++ b/Calibre_Plugins/ineptepub_plugin/zipfilerugged.py
--- a/Calibre_Plugins/ineptepub_plugin/zipfix.py
+++ b/Calibre_Plugins/ineptepub_plugin/zipfix.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import sys
 import zlib
-import zipfile
+import zipfilerugged
 import os
 import os.path
 import getopt
@@ -15,7 +16,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,11 +28,11 @@ class fixZip:
        self.ztype = 'zip'
        if zinput.lower().find('.epub') >= 0 :
            self.ztype = 'epub'
-        self.inzip = zipfile.ZipFile(zinput,'r')
+        self.inzip = zipfilerugged.ZipFile(zinput,'r')
-        self.outzip = zipfile.ZipFile(zoutput,'w')
+        self.outzip = zipfilerugged.ZipFile(zoutput,'w')
        # open the input zip for reading only as a raw file
-	self.bzf = file(zinput,'rb')
+        self.bzf = file(zinput,'rb')
-        
+
    def getlocalname(self, zi):
        local_header_offset = zi.header_offset
        self.bzf.seek(local_header_offset + _FILENAME_LEN_OFFSET)
@@ -76,17 +77,17 @@ 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)
        return data
-        
+
    def fix(self):
        # get the zipinfo for each member of the input archive
@@ -95,7 +96,7 @@ class fixZip:
        # if epub write mimetype file first, with no compression
        if self.ztype == 'epub':
-            nzinfo = ZipInfo('mimetype', compress_type=zipfile.ZIP_STORED)
+            nzinfo = ZipInfo('mimetype', compress_type=zipfilerugged.ZIP_STORED)
            self.outzip.writestr(nzinfo, _MIMETYPE)
        # write the rest of the files
@@ -103,9 +104,9 @@ class fixZip:
            if zinfo.filename != "mimetype" or self.ztype == '.zip':
                data = None
                nzinfo = zinfo
-                try: 
+                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
@@ -126,7 +127,7 @@ def usage():
     inputzip is the source zipfile to fix
     outputzip is the fixed zip archive
    """
-    
+
 def repairBook(infile, outfile):
    if not os.path.exists(infile):
@@ -152,5 +153,3 @@ def main(argv=sys.argv):
 if __name__ == '__main__' :
    sys.exit(main())
--- a/Calibre_Plugins/ineptpdf_plugin.zip
+++ b/Calibre_Plugins/ineptpdf_plugin.zip
--- a/Calibre_Plugins/ineptpdf_plugin/init.py
+++ b/Calibre_Plugins/ineptpdf_plugin/init.py
@@ -0,0 +1,195 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 __license__   = 'GPL v3'
 # Released under the terms of the GNU General Public Licence, version 3
 # <http://www.gnu.org/licenses/>
 # 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
 # Requires Calibre version 0.7.55 or higher.
 #
 # 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 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 one or more
 # 'calibre-adeptkey<n>.der' files and save them in calibre's configuration directory.
 # It will use those files on subsequent runs. If there is already a 'calibre-adeptkey*.der'
 # file 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♥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 DeDRM plugin.
 #
 # Revision history:
 #   0.1   - Initial release
 #   0.1.1 - back port ineptpdf 8.4.X support for increased number of encryption methods
 #   0.1.2 - back port ineptpdf 8.4.X bug fixes
 #   0.1.3 - add in fix for improper rejection of session bookkeys with len(bookkey) = length + 1
 #   0.1.4 - update to the new calibre plugin interface
 #   0.1.5 - synced to ineptpdf 7.11
 #   0.1.6 - Fix for potential problem with PyCrypto
 #   0.1.7 - Fix for potential problem with ADE keys and fix possible output/unicode problem
 #   0.1.8 - Fix for code copying error
 #   0.1.9 - Major code change to use unaltered ineptepub.py
 """
 Decrypts Adobe ADEPT-encrypted PDF files.
 """
 PLUGIN_NAME = u"Inept PDF DeDRM"
 PLUGIN_VERSION_TUPLE = (0, 1, 9)
 PLUGIN_VERSION = u'.'.join([str(x) for x in PLUGIN_VERSION_TUPLE])
 import sys
 import os
 import re
 class ADEPTError(Exception):
    pass
 from calibre.customize import FileTypePlugin
 from calibre.constants import iswindows, isosx
 # Wrap a stream so that output gets flushed immediately
 # and also make sure that any unicode strings get
 # encoded using "replace" before writing them.
 class SafeUnbuffered:
    def __init__(self, stream):
        self.stream = stream
        self.encoding = stream.encoding
        if self.encoding == None:
            self.encoding = "utf-8"
    def write(self, data):
        if isinstance(data,unicode):
            data = data.encode(self.encoding,"replace")
        self.stream.write(data)
        self.stream.flush()
    def __getattr__(self, attr):
        return getattr(self.stream, attr)
 class ADEPTError(Exception):
    pass
 class IneptPDFDeDRM(FileTypePlugin):
    name                    = PLUGIN_NAME
    description             = u"Removes DRM from secure Adobe pdf files. Credit given to i♥cabbages for the original stand-alone scripts."
    supported_platforms     = ['linux', 'osx', 'windows']
    author                  = u"DiapDealer, Apprentice Alf and i♥cabbages"
    version                 = PLUGIN_VERSION_TUPLE
    minimum_calibre_version = (0, 7, 55)  # for the new plugin interface
    file_types              = set(['pdf'])
    on_import               = True
    priority                = 100
    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))
        # Load any keyfiles (*.der) included Calibre's config directory.
        userkeys = []
        # Find Calibre's configuration directory.
        # self.plugin_path is passed in unicode because we defined our name in unicode
        confpath = os.path.split(os.path.split(self.plugin_path)[0])[0]
        print u"{0} v{1}: Calibre configuration directory = {2}".format(PLUGIN_NAME, PLUGIN_VERSION, confpath)
        files = os.listdir(confpath)
        filefilter = re.compile(u"\.der$", re.IGNORECASE)
        files = filter(filefilter.search, files)
        foundDefault = False
        if files:
            try:
                for filename in files:
                    if filename[:16] == u"calibre-adeptkey":
                        foundDefault = True
                    fpath = os.path.join(confpath, filename)
                    with open(fpath, 'rb') as f:
                        userkeys.append([f.read(), filename])
                    print u"{0} v{1}: Keyfile {2} found in config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, filename)
            except IOError:
                print u"{0} v{1}: Error reading keyfiles from config directory.".format(PLUGIN_NAME, PLUGIN_VERSION)
                pass
        if not foundDefault:
            # Try to find key from ADE install and save the key in
            # Calibre's configuration directory for future use.
            if iswindows or isosx:
                #ignore annoying future warning from key generation
                import warnings
                warnings.filterwarnings('ignore', category=FutureWarning)
                # ADE key retrieval script included in respective OS folder.
                from calibre_plugins.ineptepub.ineptkey import retrieve_keys
                try:
                    keys = retrieve_keys()
                    for i,key in enumerate(keys):
                        keyname = u"calibre-adeptkey{0:d}.der".format(i)
                        userkeys.append([key,keyname])
                        keypath = os.path.join(confpath, keyname)
                        open(keypath, 'wb').write(key)
                        print u"{0} v{1}: Created keyfile {2} from ADE install.".format(PLUGIN_NAME, PLUGIN_VERSION, keyname)
                except:
                   print u"{0} v{1}: Couldn\'t Retrieve key from ADE install.".format(PLUGIN_NAME, PLUGIN_VERSION)
                   pass
        if not userkeys:
            # No user keys found... bail out.
            raise ADEPTError(u"{0} v{1}: No keys found. Check keyfile(s)/ADE install".format(PLUGIN_NAME, PLUGIN_VERSION))
            return
        # Attempt to decrypt pdf with each encryption key found.
        from calibre_plugins.ineptpdf import ineptpdf
        for userkeyinfo in userkeys:
            print u"{0} v{1}: Trying Encryption key {2:s}".format(PLUGIN_NAME, PLUGIN_VERSION, userkeyinfo[1])
            # Create a TemporaryPersistent file to work with.
            of = self.temporary_file('.pdf')
            # Give the user keyfile, ebook and TemporaryPersistent file to the decryptBook function.
            result = ineptpdf.decryptBook(userkeyinfo[0], path_to_ebook, of.name)
            # Decryption was successful return the modified PersistentTemporary
            # file to Calibre's import process.
            if  result == 0:
                print u"{0} v{1}: Encryption successfully removed.".format(PLUGIN_NAME, PLUGIN_VERSION)
                of.close()
                return of.name
                break
            print u"{0} v{1}: Encryption key incorrect.".format(PLUGIN_NAME, PLUGIN_VERSION)
            of.close()
        # Something went wrong with decryption.
        raise ADEPTError(u"{0} v{1}: Ultimately failed to decrypt".format(PLUGIN_NAME, PLUGIN_VERSION))
        return
--- a/Calibre_Plugins/ineptpdf_plugin/ade_key.py
+++ b/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
--- a/Calibre_Plugins/ineptpdf_plugin/ineptkey.py
+++ b/Calibre_Plugins/ineptpdf_plugin/ineptkey.py
@@ -3,11 +3,11 @@
 from __future__ import with_statement
-# ineptkey.pyw, version 5.4
+# ineptkey.pyw, version 5.6
 # Copyright © 2009-2010 i♥cabbages
-# Released under the terms of the GNU General Public Licence, version 3 or
+# Released under the terms of the GNU General Public Licence, version 3
-# later.  <http://www.gnu.org/licenses/>
+# <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
@@ -36,6 +36,8 @@ from __future__ import with_statement
 #   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
 """
 Retrieve Adobe ADEPT user key.
@@ -46,15 +48,70 @@ __license__ = 'GPL v3'
 import sys
 import os
 import struct
-import Tkinter
+
-import Tkconstants
+# Wrap a stream so that output gets flushed immediately
-import tkMessageBox
+# and also make sure that any unicode strings get
-import traceback
+# 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"ineptkey.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, \
@@ -76,13 +133,13 @@ if sys.platform.startswith('win'):
            _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',
@@ -110,7 +167,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 +349,9 @@ if sys.platform.startswith('win'):
        return CryptUnprotectData
    CryptUnprotectData = CryptUnprotectData()
-    def retrieve_key(keypath):
+    def retrieve_keys():
        if AES is None:
-            tkMessageBox.showerror(
+            raise ADEPTError("PyCrypto or OpenSSL must be installed")
                "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()
@@ -308,11 +361,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,50 +388,43 @@ if sys.platform.startswith('win'):
                if ktype != 'privateLicenseKey':
                    continue
                userkey = winreg.QueryValueEx(plkkey, 'value')[0]
-                break
+                userkey = userkey.decode('base64')
-            if userkey is not None:
+                aes = AES(keykey)
-                break
+                userkey = aes.decrypt(userkey)
-        if userkey is None:
+                userkey = userkey[26:-ord(userkey[-1])]
                keys.append(userkey)
        if len(keys) == 0:
            raise ADEPTError('Could not locate privateLicenseKey')
-        userkey = userkey.decode('base64')
+        return keys
        aes = AES(keykey)
        userkey = aes.decrypt(userkey)
        userkey = userkey[26:-ord(userkey[-1])]
        with open(keypath, 'wb') as f:
            f.write(userkey)
        return True
-elif sys.platform.startswith('darwin'):
+
 elif isosx:
    import xml.etree.ElementTree as etree
-    import Carbon.File
+    import subprocess
    import Carbon.Folder
    import Carbon.Folders
    import MacOS
    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):
+    def findActivationDat():
-        try:
+        home = os.getenv('HOME')
-            fsref = Carbon.Folder.FSFindFolder(domain, dtype, False)
+        cmdline = 'find "' + home + '/Library/Application Support/Adobe/Digital Editions" -name "activation.dat"'
-            return Carbon.File.pathname(fsref)
+        cmdline = cmdline.encode(sys.getfilesystemencoding())
-        except MacOS.Error:
+        p2 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-            return None
+        out1, out2 = p2.communicate()
-
+        reslst = out1.split('\n')
-    def find_app_support_file(subpath):
+        cnt = len(reslst)
-        dtype = Carbon.Folders.kApplicationSupportFolderType
+        for j in xrange(cnt):
-        for domain in Carbon.Folders.kUserDomain, Carbon.Folders.kLocalDomain:
+            resline = reslst[j]
-            path = find_folder(domain, dtype)
+            pp = resline.find('activation.dat')
-            if path is None:
+            if pp >= 0:
-                continue
+                ActDatPath = resline
-            path = os.path.join(path, subpath)
+                break
-            if os.path.isfile(path):
+        if os.path.exists(ActDatPath):
-                return path
+            return ActDatPath
        return None
-    def retrieve_key(keypath):
+    def retrieve_keys():
-        actpath = find_app_support_file(ACTIVATION_PATH)
+        actpath = findActivationDat()
        if actpath is None:
            raise ADEPTError("Could not locate ADE activation")
        tree = etree.parse(actpath)
@@ -386,69 +433,65 @@ elif sys.platform.startswith('darwin'):
        userkey = tree.findtext(expr)
        userkey = userkey.decode('base64')
        userkey = userkey[26:]
-        with open(keypath, 'wb') as f:
+        return [userkey]
            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
 else:
-    def retrieve_key(keypath):
+    def retrieve_keys(keypath):
-        tkMessageBox.showerror(
+        raise ADEPTError("This script only supports Windows and Mac OS X.")
-            "ADEPT Key",
+        return []
            "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
 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)
        self.text.insert(Tkconstants.END, text)
 def retrieve_key(keypath):
    keys = retrieve_keys()
    with open(keypath, 'wb') as f:
        f.write(keys[0])
    return True
 def extractKeyfile(keypath):
    try:
        success = retrieve_key(keypath)
    except ADEPTError, e:
-        print "Key generation Error: " + str(e)
+        print u"Key generation Error: {0}".format(e.args[0])
        return 1
    except Exception, e:
-    	print "General Error: " + str(e)
+        print "General Error: {0}".format(e.args[0])
-    	return 1
+        return 1
    if not success:
        return 1
    return 0
-def cli_main(argv=sys.argv):
+def cli_main(argv=unicode_argv()):
    keypath = argv[1]
    return extractKeyfile(keypath)
-def main(argv=sys.argv):
+def gui_main(argv=unicode_argv()):
    import Tkinter
    import Tkconstants
    import tkMessageBox
    import traceback
    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)
    root = Tkinter.Tk()
    root.withdraw()
-    progname = os.path.basename(argv[0])
+    keypath, progname = os.path.split(argv[0])
-    keypath = 'adeptkey.der'
+    keypath = os.path.join(keypath, u"adeptkey.der")
    success = False
    try:
        success = retrieve_key(keypath)
    except ADEPTError, e:
-        tkMessageBox.showerror("ADEPT Key", "Error: " + str(e))
+        tkMessageBox.showerror(u"ADEPT Key", "Error: {0}".format(e.args[0]))
    except Exception:
        root.wm_state('normal')
        root.title('ADEPT Key')
@@ -458,10 +501,12 @@ def main(argv=sys.argv):
    if not success:
        return 1
    tkMessageBox.showinfo(
-        "ADEPT Key", "Key successfully retrieved to %s" % (keypath))
+        u"ADEPT Key", u"Key successfully retrieved to {0}".format(keypath))
    return 0
 if __name__ == '__main__':
    if len(sys.argv) > 1:
        sys.stdout=SafeUnbuffered(sys.stdout)
        sys.stderr=SafeUnbuffered(sys.stderr)
        sys.exit(cli_main())
-    sys.exit(main())
+    sys.exit(gui_main())
--- a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptpdf.py
+++ b/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptpdf.py
@@ -1,13 +1,25 @@
-#! /usr/bin/env python
+#! /usr/bin/python
-# ineptpdf.pyw, version 7.9
+# -*- coding: utf-8 -*-
 from __future__ import with_statement
-# To run this program install Python 2.6 from http://www.python.org/download/
+# ineptpdf.pyw, version 7.11
-# and OpenSSL (already installed on Mac OS X and Linux) OR 
+# Copyright © 2009-2010 by i♥cabbages
-# 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
+# Released under the terms of the GNU General Public Licence, version 3
-# ineptpdf.pyw and double-click on it to run it.
+# <http://www.gnu.org/licenses/>
 # Modified 2010–2012 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
@@ -34,12 +46,16 @@ from __future__ import with_statement
 #   7.7 - On Windows try PyCrypto first and OpenSSL next
 #   7.8 - Modify interface to allow use of import
 #   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
 """
 Decrypts Adobe ADEPT-encrypted PDF files.
 """
 __license__ = 'GPL v3'
 __version__ = "7.12"
 import sys
 import os
@@ -49,10 +65,63 @@ import struct
 import hashlib
 from itertools import chain, islice
 import xml.etree.ElementTree as etree
-import Tkinter
+
-import Tkconstants
+# Wrap a stream so that output gets flushed immediately
-import tkFileDialog
+# and also make sure that any unicode strings get
-import tkMessageBox
+# 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"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
@@ -83,7 +152,7 @@ def _load_crypto_libcrypto():
    AES_MAXNR = 14
    RSA_NO_PADDING = 3
-    
+
    c_char_pp = POINTER(c_char_p)
    c_int_p = POINTER(c_int)
@@ -98,13 +167,13 @@ def _load_crypto_libcrypto():
    class RSA(Structure):
        pass
    RSA_p = POINTER(RSA)
-    
+
    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])
@@ -125,7 +194,7 @@ def _load_crypto_libcrypto():
            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))
@@ -134,7 +203,7 @@ def _load_crypto_libcrypto():
            if dlen < 0:
                raise ADEPTError('RSA decryption failed')
            return to[1:dlen]
-    
+
        def __del__(self):
            if self._rsa is not None:
                RSA_free(self._rsa)
@@ -157,6 +226,7 @@ def _load_crypto_libcrypto():
            return out.raw
    class AES(object):
        MODE_CBC = 0
        @classmethod
        def new(cls, userkey, mode, iv):
            self = AES()
@@ -195,13 +265,13 @@ def _load_crypto_pycrypto():
    # 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")
@@ -211,22 +281,22 @@ def _load_crypto_pycrypto():
                    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:
@@ -236,19 +306,19 @@ def _load_crypto_pycrypto():
                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
@@ -256,13 +326,13 @@ def _load_crypto_pycrypto():
                    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):
@@ -271,7 +341,7 @@ def _load_crypto_pycrypto():
                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:
@@ -292,6 +362,7 @@ def _load_crypto_pycrypto():
            return self._arc4.decrypt(data)
    class AES(object):
        MODE_CBC = _AES.MODE_CBC
        @classmethod
        def new(cls, userkey, mode, iv):
            self = AES()
@@ -314,7 +385,7 @@ def _load_crypto_pycrypto():
            for byte in bytes:
                total = (total << 8) + byte
            return total
-    
+
        def decrypt(self, data):
            return self._rsa.decrypt(data)
@@ -409,7 +480,7 @@ class PSLiteral(PSObject):
    def __init__(self, name):
        self.name = name
        return
-    
+
    def __repr__(self):
        name = []
        for char in self.name:
@@ -428,22 +499,22 @@ class PSKeyword(PSObject):
    def __init__(self, name):
        self.name = name
        return
-    
+
    def __repr__(self):
        return self.name
 # PSSymbolTable
 class PSSymbolTable(object):
-    
+
    '''
    Symbol table that stores PSLiteral or PSKeyword.
    '''
-    
+
    def __init__(self, classe):
        self.dic = {}
        self.classe = classe
        return
-    
+
    def intern(self, name):
        if name in self.dic:
            lit = self.dic[name]
@@ -513,11 +584,11 @@ class PSBaseParser(object):
    def flush(self):
        return
-    
+
    def close(self):
        self.flush()
        return
-    
+
    def tell(self):
        return self.bufpos+self.charpos
@@ -553,7 +624,7 @@ class PSBaseParser(object):
            raise PSEOF('Unexpected EOF')
        self.charpos = 0
        return
-    
+
    def parse_main(self, s, i):
        m = NONSPC.search(s, i)
        if not m:
@@ -588,11 +659,11 @@ class PSBaseParser(object):
            return (self.parse_wclose, j+1)
        self.add_token(KWD(c))
        return (self.parse_main, j+1)
-                            
+
    def add_token(self, obj):
        self.tokens.append((self.tokenstart, obj))
        return
-    
+
    def parse_comment(self, s, i):
        m = EOL.search(s, i)
        if not m:
@@ -603,7 +674,7 @@ class PSBaseParser(object):
        # We ignore comments.
        #self.tokens.append(self.token)
        return (self.parse_main, j)
-    
+
    def parse_literal(self, s, i):
        m = END_LITERAL.search(s, i)
        if not m:
@@ -617,7 +688,7 @@ class PSBaseParser(object):
            return (self.parse_literal_hex, j+1)
        self.add_token(LIT(self.token))
        return (self.parse_main, j)
-    
+
    def parse_literal_hex(self, s, i):
        c = s[i]
        if HEX.match(c) and len(self.hex) < 2:
@@ -652,7 +723,7 @@ class PSBaseParser(object):
        self.token += s[i:j]
        self.add_token(float(self.token))
        return (self.parse_main, j)
-    
+
    def parse_keyword(self, s, i):
        m = END_KEYWORD.search(s, i)
        if not m:
@@ -800,7 +871,7 @@ class PSStackParser(PSBaseParser):
        PSBaseParser.__init__(self, fp)
        self.reset()
        return
-    
+
    def reset(self):
        self.context = []
        self.curtype = None
@@ -841,10 +912,10 @@ class PSStackParser(PSBaseParser):
    def do_keyword(self, pos, token):
        return
-    
+
    def nextobject(self, direct=False):
        '''
-        Yields a list of objects: keywords, literals, strings, 
+        Yields a list of objects: keywords, literals, strings,
        numbers, arrays and dictionaries. Arrays and dictionaries
        are represented as Python sequence and dictionaries.
        '''
@@ -913,7 +984,7 @@ class PDFNotImplementedError(PSException): pass
 ##  PDFObjRef
 ##
 class PDFObjRef(PDFObject):
-    
+
    def __init__(self, doc, objid, genno):
        if objid == 0:
            if STRICT:
@@ -1028,25 +1099,25 @@ def stream_value(x):
 # ascii85decode(data)
 def ascii85decode(data):
-  n = b = 0
+    n = b = 0
-  out = ''
+    out = ''
-  for c in data:
+    for c in data:
-    if '!' <= c and c <= 'u':
+        if '!' <= c and c <= 'u':
-      n += 1
+            n += 1
-      b = b*85+(ord(c)-33)
+            b = b*85+(ord(c)-33)
-      if n == 5:
+            if n == 5:
-        out += struct.pack('>L',b)
+                out += struct.pack('>L',b)
-        n = b = 0
+                n = b = 0
-    elif c == 'z':
+        elif c == 'z':
-      assert n == 0
+            assert n == 0
-      out += '\0\0\0\0'
+            out += '\0\0\0\0'
-    elif c == '~':
+        elif c == '~':
-      if n:
+            if n:
-        for _ in range(5-n):
+                for _ in range(5-n):
-          b = b*85+84
+                    b = b*85+84
-        out += struct.pack('>L',b)[:n-1]
+                out += struct.pack('>L',b)[:n-1]
-      break
+            break
-  return out
+    return out
 ##  PDFStream type
@@ -1063,7 +1134,7 @@ class PDFStream(PDFObject):
        else:
            if eol in ('\r', '\n', '\r\n'):
                rawdata = rawdata[:length]
-                
+
        self.dic = dic
        self.rawdata = rawdata
        self.decipher = decipher
@@ -1077,7 +1148,7 @@ class PDFStream(PDFObject):
        self.objid = objid
        self.genno = genno
        return
-    
+
    def __repr__(self):
        if self.rawdata:
            return '<PDFStream(%r): raw=%d, %r>' % \
@@ -1161,7 +1232,7 @@ class PDFStream(PDFObject):
            data = self.decipher(self.objid, self.genno, data)
        return data
-        
+
 ##  PDF Exceptions
 ##
 class PDFSyntaxError(PDFException): pass
@@ -1226,7 +1297,7 @@ class PDFXRef(object):
                self.offsets[objid] = (int(genno), int(pos))
        self.load_trailer(parser)
        return
-    
+
    KEYWORD_TRAILER = PSKeywordTable.intern('trailer')
    def load_trailer(self, parser):
        try:
@@ -1267,7 +1338,7 @@ class PDFXRefStream(object):
        for first, size in self.index:
            for objid in xrange(first, first + size):
                yield objid
-    
+
    def load(self, parser, debug=0):
        (_,objid) = parser.nexttoken() # ignored
        (_,genno) = parser.nexttoken() # ignored
@@ -1285,7 +1356,7 @@ class PDFXRefStream(object):
        self.entlen = self.fl1+self.fl2+self.fl3
        self.trailer = stream.dic
        return
-    
+
    def getpos(self, objid):
        offset = 0
        for first, size in self.index:
@@ -1336,7 +1407,7 @@ class PDFDocument(object):
        self.parser = parser
        # The document is set to be temporarily ready during collecting
        # all the basic information about the document, e.g.
-        # the header, the encryption information, and the access rights 
+        # the header, the encryption information, and the access rights
        # for the document.
        self.ready = True
        # Retrieve the information of each header that was appended
@@ -1412,7 +1483,7 @@ class PDFDocument(object):
        length = int_value(param.get('Length', 0)) / 8
        edcdata = str_value(param.get('EDCData')).decode('base64')
        pdrllic = str_value(param.get('PDRLLic')).decode('base64')
-        pdrlpol = str_value(param.get('PDRLPol')).decode('base64')          
+        pdrlpol = str_value(param.get('PDRLPol')).decode('base64')
        edclist = []
        for pair in edcdata.split('\n'):
            edclist.append(pair)
@@ -1432,9 +1503,9 @@ class PDFDocument(object):
            raise ADEPTError('Could not decrypt PDRLPol, aborting ...')
        else:
            cutter = -1 * ord(pdrlpol[-1])
-            pdrlpol = pdrlpol[:cutter]            
+            pdrlpol = pdrlpol[:cutter]
        return plaintext[:16]
-    
+
    PASSWORD_PADDING = '(\xbfN^Nu\x8aAd\x00NV\xff\xfa\x01\x08..' \
                       '\x00\xb6\xd0h>\x80/\x0c\xa9\xfedSiz'
    # experimental aes pw support
@@ -1454,14 +1525,14 @@ class PDFDocument(object):
            EncMetadata = str_value(param['EncryptMetadata'])
        except:
            EncMetadata = 'True'
-        self.is_printable = bool(P & 4)        
+        self.is_printable = bool(P & 4)
        self.is_modifiable = bool(P & 8)
        self.is_extractable = bool(P & 16)
        self.is_annotationable = bool(P & 32)
        self.is_formsenabled = bool(P & 256)
        self.is_textextractable = bool(P & 512)
        self.is_assemblable = bool(P & 1024)
-        self.is_formprintable = bool(P & 2048) 
+        self.is_formprintable = bool(P & 2048)
        # Algorithm 3.2
        password = (password+self.PASSWORD_PADDING)[:32] # 1
        hash = hashlib.md5(password) # 2
@@ -1516,9 +1587,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:
+        rsa = RSA(password)
            keyder = f.read()
        rsa = RSA(keyder)
        length = int_value(param.get('Length', 0)) / 8
        rights = str_value(param.get('ADEPT_LICENSE')).decode('base64')
        rights = zlib.decompress(rights, -15)
@@ -1536,10 +1605,10 @@ class PDFDocument(object):
        if length > 0:
            if len(bookkey) == length:
                if ebx_V == 3:
-                    V = 3        
+                    V = 3
                else:
                    V = 2
-            elif len(bookkey) == length + 1:  
+            elif len(bookkey) == length + 1:
                V = ord(bookkey[0])
                bookkey = bookkey[1:]
            else:
@@ -1553,7 +1622,7 @@ class PDFDocument(object):
            print "length is %d and len(bookkey) is %d" % (length, len(bookkey))
            print "bookkey[0] is %d" % ord(bookkey[0])
            if ebx_V == 3:
-                V = 3        
+                V = 3
            else:
                V = 2
        self.decrypt_key = bookkey
@@ -1570,7 +1639,7 @@ class PDFDocument(object):
        hash = hashlib.md5(key)
        key = hash.digest()[:min(len(self.decrypt_key) + 5, 16)]
        return key
-    
+
    def genkey_v3(self, objid, genno):
        objid = struct.pack('<L', objid ^ 0x3569ac)
        genno = struct.pack('<L', genno ^ 0xca96)
@@ -1610,14 +1679,14 @@ class PDFDocument(object):
        #print cutter
        plaintext = plaintext[:cutter]
        return plaintext
-    
+
    def decrypt_rc4(self, objid, genno, data):
        key = self.genkey(objid, genno)
        return ARC4.new(key).decrypt(data)
    KEYWORD_OBJ = PSKeywordTable.intern('obj')
-    
+
    def getobj(self, objid):
        if not self.ready:
            raise PDFException('PDFDocument not initialized')
@@ -1687,7 +1756,7 @@ class PDFDocument(object):
 ##                    if x:
 ##                        objid1 = x[-2]
 ##                        genno = x[-1]
-##                
+##
                if kwd is not self.KEYWORD_OBJ:
                    raise PDFSyntaxError(
                        'Invalid object spec: offset=%r' % index)
@@ -1699,7 +1768,7 @@ class PDFDocument(object):
            self.objs[objid] = obj
        return obj
-                
+
 class PDFObjStmRef(object):
    maxindex = 0
    def __init__(self, objid, stmid, index):
@@ -1709,7 +1778,7 @@ class PDFObjStmRef(object):
        if index > PDFObjStmRef.maxindex:
            PDFObjStmRef.maxindex = index
-    
+
 ##  PDFParser
 ##
 class PDFParser(PSStackParser):
@@ -1735,7 +1804,7 @@ class PDFParser(PSStackParser):
        if token is self.KEYWORD_ENDOBJ:
            self.add_results(*self.pop(4))
            return
-        
+
        if token is self.KEYWORD_R:
            # reference to indirect object
            try:
@@ -1746,7 +1815,7 @@ class PDFParser(PSStackParser):
            except PSSyntaxError:
                pass
            return
-            
+
        if token is self.KEYWORD_STREAM:
            # stream object
            ((_,dic),) = self.pop(1)
@@ -1786,7 +1855,7 @@ class PDFParser(PSStackParser):
            obj = PDFStream(dic, data, self.doc.decipher)
            self.push((pos, obj))
            return
-        
+
        # others
        self.push((pos, token))
        return
@@ -1822,7 +1891,7 @@ class PDFParser(PSStackParser):
            xref.load(self)
        else:
            if token is not self.KEYWORD_XREF:
-                raise PDFNoValidXRef('xref not found: pos=%d, token=%r' % 
+                raise PDFNoValidXRef('xref not found: pos=%d, token=%r' %
                                     (pos, token))
            self.nextline()
            xref = PDFXRef()
@@ -1837,7 +1906,7 @@ class PDFParser(PSStackParser):
            pos = int_value(trailer['Prev'])
            self.read_xref_from(pos, xrefs)
        return
-        
+
    # read xref tables and trailers
    def read_xref(self):
        xrefs = []
@@ -1903,14 +1972,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
@@ -1956,7 +2025,7 @@ class PDFSerializer(object):
                    self.write("%010d 00000 n \n" % xrefs[objid][0])
                else:
                    self.write("%010d %05d f \n" % (0, 65535))
-            
+
            self.write('trailer\n')
            self.serialize_object(trailer)
            self.write('\nstartxref\n%d\n%%%%EOF' % startxref)
@@ -1976,7 +2045,7 @@ class PDFSerializer(object):
            while maxindex >= power:
                fl3 += 1
                power *= 256
-                    
+
            index = []
            first = None
            prev = None
@@ -2003,14 +2072,14 @@ class PDFSerializer(object):
                    # we force all generation numbers to be 0
                    # f3 = objref[1]
                    f3 = 0
-                
+
                data.append(struct.pack('>B', f1))
                data.append(struct.pack('>L', f2)[-fl2:])
                data.append(struct.pack('>L', f3)[-fl3:])
            index.extend((first, prev - first + 1))
            data = zlib.compress(''.join(data))
            dic = {'Type': LITERAL_XREF, 'Size': prev + 1, 'Index': index,
-                   'W': [1, fl2, fl3], 'Length': len(data), 
+                   'W': [1, fl2, fl3], 'Length': len(data),
                   'Filter': LITERALS_FLATE_DECODE[0],
                   'Root': trailer['Root'],}
            if 'Info' in trailer:
@@ -2032,9 +2101,9 @@ class PDFSerializer(object):
        string = string.replace(')', r'\)')
         # get rid of ciando id
        regularexp = re.compile(r'http://www.ciando.com/index.cfm/intRefererID/\d{5}')
-        if regularexp.match(string): return ('http://www.ciando.com') 
+        if regularexp.match(string): return ('http://www.ciando.com')
        return string
-    
+
    def serialize_object(self, obj):
        if isinstance(obj, dict):
            # Correct malformed Mac OS resource forks for Stanza
@@ -2058,21 +2127,21 @@ class PDFSerializer(object):
        elif isinstance(obj, bool):
            if self.last.isalnum():
                self.write(' ')
-            self.write(str(obj).lower())            
+            self.write(str(obj).lower())
        elif isinstance(obj, (int, long, float)):
            if self.last.isalnum():
                self.write(' ')
            self.write(str(obj))
        elif isinstance(obj, PDFObjRef):
            if self.last.isalnum():
-                self.write(' ')            
+                self.write(' ')
            self.write('%d %d R' % (obj.objid, 0))
        elif isinstance(obj, PDFStream):
            ### If we don't generate cross ref streams the object streams
            ### are no longer useful, as we have extracted all objects from
            ### them. Therefore leave them out from the output.
            if obj.dic.get('Type') == LITERAL_OBJSTM and not gen_xref_stm:
-                    self.write('(deleted)')
+                self.write('(deleted)')
            else:
                data = obj.get_decdata()
                self.serialize_object(obj.dic)
@@ -2084,7 +2153,7 @@ class PDFSerializer(object):
            if data[0].isalnum() and self.last.isalnum():
                self.write(' ')
            self.write(data)
-    
+
    def serialize_indirect(self, objid, obj):
        self.write('%d 0 obj' % (objid,))
        self.serialize_object(obj)
@@ -2093,134 +2162,144 @@ 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:
-        serializer = PDFSerializer(inf, keypath)
+        try:
            serializer = PDFSerializer(inf, userkey)
        except:
            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
-            serializer.dump(outf)
+            try:
                serializer.dump(outf)
            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(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():
    import Tkinter
    import Tkconstants
    import tkFileDialog
    import tkMessageBox
    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()
@@ -2229,7 +2308,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)
@@ -2239,5 +2318,7 @@ def gui_main():
 if __name__ == '__main__':
    if len(sys.argv) > 1:
        sys.stdout=SafeUnbuffered(sys.stdout)
        sys.stderr=SafeUnbuffered(sys.stderr)
        sys.exit(cli_main())
    sys.exit(gui_main())
--- a/Calibre_Plugins/ineptpdf_plugin/ineptpdf_plugin.py
+++ b/Calibre_Plugins/ineptpdf_plugin/ineptpdf_plugin.py
--- a/Calibre_Plugins/ineptpdf_plugin/plugin-import-name-ineptpdf.txt
+++ b/Calibre_Plugins/ineptpdf_plugin/plugin-import-name-ineptpdf.txt
--- a/Calibre_Plugins/k4mobidedrm_plugin.zip
+++ b/Calibre_Plugins/k4mobidedrm_plugin.zip
--- a/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py
+++ b/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py
@@ -1,374 +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
 # It can run standalone to convert K4M/K4PC/Mobi files, or it can be installed as a
 # plugin for Calibre (http://calibre-ebook.com/about) so that importing
 # K4 or Mobi with DRM is no londer a multi-step process.
 #
 # ***NOTE*** If you are using this script as a calibre plugin for a K4M or K4PC ebook
 # then calibre must be installed on the same machine and in the same account as K4PC or K4M
 # for the plugin version to function properly.
 #
 # To create a Calibre plugin, rename this file so that the filename
 # ends in '_plugin.py', put it into a ZIP file with all its supporting python routines
 # and import that ZIP into Calibre using its plugin configuration GUI.
 __version__ = '2.8'
 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 binascii
 import zlib
 import re
 import zlib, zipfile, tempfile, shutil
 from struct import pack, unpack, unpack_from
 class DrmException(Exception):
    pass
 if 'calibre' in sys.modules:
    inCalibre = True
 else:
    inCalibre = False
 def zipUpDir(myzip, tempdir,localname):
    currentdir = tempdir
    if localname != "":
        currentdir = os.path.join(currentdir,localname)
    list = os.listdir(currentdir)
    for file in list:
        afilename = file
        localfilePath = os.path.join(localname, afilename)
        realfilePath = os.path.join(currentdir,file)
        if os.path.isfile(realfilePath):
            myzip.write(realfilePath, localfilePath)
        elif os.path.isdir(realfilePath):
            zipUpDir(myzip, tempdir, localfilePath)
 # 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 spaces to underscores
 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):
    import mobidedrm
    import topazextract
    import kgenpids
    # handle the obvious cases at the beginning
    if not os.path.isfile(infile):
        print "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:
        tempdir = tempfile.mkdtemp()
        mb = topazextract.TopazBook(infile, tempdir)
    title = mb.getBookTitle()
    print "Processing Book: ", title
    filenametitle = cleanup_name(title)
    outfilename = bookname
    if len(bookname)>4 and len(filenametitle)>4 and bookname[:4] != filenametitle[:4]:
        outfilename = outfilename + "_" + filenametitle
    # build pid list
    md1, md2 = mb.getPIDMetaInfo()
    pidlst = kgenpids.getPidList(md1, md2, k4, pids, serials, kInfoFiles) 
    try:
        if mobi:
            unlocked_file = mb.processBook(pidlst)
        else:
            mb.processBook(pidlst)
    except mobidedrm.DrmException, e:
        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
        return 1
    except Exception, e:
        if not mobi:
            print "Error: " + str(e) + "\nDRM Removal Failed.\n"
            print "   Creating DeBug Full Zip Archive of Book"
            zipname = os.path.join(outdir, bookname + '_debug' + '.zip')
            myzip = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
            zipUpDir(myzip, tempdir, '')
            myzip.close()
            shutil.rmtree(tempdir, True)
            return 1
        pass
    if mobi:
        outfile = os.path.join(outdir,outfilename + '_nodrm' + '.mobi')
        file(outfile, 'wb').write(unlocked_file)
        return 0            
    # topaz:  build up zip archives of results
    print "   Creating HTML ZIP Archive"
    zipname = os.path.join(outdir, outfilename + '_nodrm' + '.zip')
    myzip1 = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
    myzip1.write(os.path.join(tempdir,'book.html'),'book.html')
    myzip1.write(os.path.join(tempdir,'book.opf'),'book.opf')
    if os.path.isfile(os.path.join(tempdir,'cover.jpg')):
        myzip1.write(os.path.join(tempdir,'cover.jpg'),'cover.jpg')
    myzip1.write(os.path.join(tempdir,'style.css'),'style.css')
    zipUpDir(myzip1, tempdir, 'img')
    myzip1.close()
    print "   Creating SVG ZIP Archive"
    zipname = os.path.join(outdir, outfilename + '_SVG' + '.zip')
    myzip2 = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
    myzip2.write(os.path.join(tempdir,'index_svg.xhtml'),'index_svg.xhtml')
    zipUpDir(myzip2, tempdir, 'svg')
    zipUpDir(myzip2, tempdir, 'img')
    myzip2.close()
    print "   Creating XML ZIP Archive"
    zipname = os.path.join(outdir, outfilename + '_XML' + '.zip')
    myzip3 = zipfile.ZipFile(zipname,'w',zipfile.ZIP_DEFLATED, False)
    targetdir = os.path.join(tempdir,'xml')
    zipUpDir(myzip3, targetdir, '')
    zipUpDir(myzip3, tempdir, 'img')
    myzip3.close()
    shutil.rmtree(tempdir, True)
    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())
    print ' '
    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())
 if not __name__ == "__main__" and inCalibre:
    from calibre.customize import FileTypePlugin
    class K4DeDRM(FileTypePlugin):
        name                = 'K4PC, K4Mac, Kindle Mobi and Topaz DeDRM' # Name of the plugin
        description         = 'Removes DRM from K4PC and Mac, Kindle Mobi and Topaz files. \
                                Provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, ApprenticeAlf, etc.'
        supported_platforms = ['osx', 'windows', 'linux'] # Platforms this plugin will run on
        author              = 'DiapDealer, SomeUpdates' # The author of this plugin
        version             = (0, 2, 8)   # The version number of this plugin
        file_types          = set(['prc','mobi','azw','azw1','tpz']) # The file types that this plugin will be applied to
        on_import           = True # Run this plugin during the import
        priority            = 210  # run this plugin before mobidedrm, k4pcdedrm, k4dedrm
        def run(self, path_to_ebook):
            from calibre.gui2 import is_ok_to_use_qt
            from PyQt4.Qt import QMessageBox
            from calibre.ptempfile import PersistentTemporaryDirectory
            import kgenpids
            import zlib
            import zipfile
            import topazextract
            import mobidedrm
            k4 = True
 	    if sys.platform.startswith('linux'):
 		k4 = False
            pids = []
            serials = []
            kInfoFiles = []
            # Get supplied list of PIDs to try from plugin customization.
            customvalues = self.site_customization.split(',')
            for customvalue in customvalues:
                customvalue = str(customvalue)
                customvalue = customvalue.strip()
            	if len(customvalue) == 10 or len(customvalue) == 8:
                    pids.append(customvalue)
            	else :
                    if len(customvalue) == 16 and customvalue[0] == 'B':
                        serials.append(customvalue)
                    else:
                        print "%s is not a valid Kindle serial number or PID." % str(customvalue)
            # Load any kindle info files (*.info) included Calibre's config directory.
            try:
                # Find Calibre's configuration directory.
                confpath = os.path.split(os.path.split(self.plugin_path)[0])[0]
                print 'K4MobiDeDRM: Calibre configuration directory = %s' % confpath
                files = os.listdir(confpath)
                filefilter = re.compile("\.info$", re.IGNORECASE)
                files = filter(filefilter.search, files)
                if files:
                    for filename in files:
                        fpath = os.path.join(confpath, filename)
                        kInfoFiles.append(fpath)
                        print 'K4MobiDeDRM: Kindle info file %s found in config folder.' % filename
            except IOError:
                print 'K4MobiDeDRM: Error reading kindle info files from config directory.'
                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:
                tempdir = PersistentTemporaryDirectory()
                mb = topazextract.TopazBook(path_to_ebook, tempdir)
            title = mb.getBookTitle()
            md1, md2 = mb.getPIDMetaInfo()
            pidlst = kgenpids.getPidList(md1, md2, k4, pids, serials, kInfoFiles) 
            try:
                if mobi:
                    unlocked_file = mb.processBook(pidlst)
                else:
                    mb.processBook(pidlst)
            except mobidedrm.DrmException:
                #if you reached here then no luck raise and exception
                if is_ok_to_use_qt():
                    d = QMessageBox(QMessageBox.Warning, "K4MobiDeDRM Plugin", "Error decoding: %s\n" % path_to_ebook)
                    d.show()
                    d.raise_()
                    d.exec_()
                raise Exception("K4MobiDeDRM plugin could not decode the file")
                return ""
            except topazextract.TpzDRMError:
                #if you reached here then no luck raise and exception
                if is_ok_to_use_qt():
                    d = QMessageBox(QMessageBox.Warning, "K4MobiDeDRM Plugin", "Error decoding: %s\n" % path_to_ebook)
                    d.show()
                    d.raise_()
                    d.exec_()
                raise Exception("K4MobiDeDRM plugin could not decode the file")
                return ""
            print "Success!"
            if mobi:
                of = self.temporary_file(bookname+'.mobi')
                of.write(unlocked_file)
                of.close()
                return of.name
            # topaz:  build up zip archives of results
            print "   Creating HTML ZIP Archive"
            of = self.temporary_file(bookname + '.zip')
            myzip = zipfile.ZipFile(of.name,'w',zipfile.ZIP_DEFLATED, False)
            myzip.write(os.path.join(tempdir,'book.html'),'book.html')
            myzip.write(os.path.join(tempdir,'book.opf'),'book.opf')
            if os.path.isfile(os.path.join(tempdir,'cover.jpg')):
                myzip.write(os.path.join(tempdir,'cover.jpg'),'cover.jpg')
            myzip.write(os.path.join(tempdir,'style.css'),'style.css')
            zipUpDir(myzip, tempdir, 'img')
            myzip.close()
            return of.name
        def customization_help(self, gui=False):
            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
--- a/Calibre_Plugins/k4mobidedrm_plugin/k4mutils.py
+++ b/Calibre_Plugins/k4mobidedrm_plugin/k4mutils.py
@@ -1,10 +1,17 @@
-# standlone set of Mac OSX specific routines needed for K4DeDRM
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # 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
@@ -18,9 +25,28 @@ def _load_crypto_libcrypto():
    libcrypto = find_library('crypto')
    if libcrypto is None:
-        raise DrmException('libcrypto not found')
+        raise DrmException(u"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)
@@ -28,50 +54,56 @@ def _load_crypto_libcrypto():
    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', 
+    # 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
+            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')
+                raise DrmException(u"AES improper key used")
                return
            keyctx = self._keyctx = AES_KEY()
-            self.iv = iv
+            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')
+                raise DrmException(u"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)
+            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')
+                raise DrmException(u"AES decryption failed")
            return out.raw
-        def keyivgen(self, passwd):
+        def keyivgen(self, passwd, salt, iter, keylen):
-            salt = '16743'
+            saltlen = len(salt)
            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
@@ -91,17 +123,87 @@ 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"
+charMap1 = 'n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M'
-charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM" 
+charMap2 = 'ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM'
 charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
 charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
 # 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"
+# returns with the serial number of drive whose BSD Name is 'disk0'
 def GetVolumeSerialNumber():
    sernum = os.getenv('MYSERIALNUMBER')
    if sernum != None:
@@ -117,11 +219,11 @@ def GetVolumeSerialNumber():
    foundIt = False
    for j in xrange(cnt):
        resline = reslst[j]
-        pp = resline.find('"Serial Number" = "')
+        pp = resline.find('\"Serial Number\" = \"')
        if pp >= 0:
            sernum = resline[pp+19:-1]
            sernum = sernum.strip()
-        bb = resline.find('"BSD Name" = "')
+        bb = resline.find('\"BSD Name\" = \"')
        if bb >= 0:
            bsdname = resline[bb+14:-1]
            bsdname = bsdname.strip()
@@ -129,38 +231,256 @@ def GetVolumeSerialNumber():
                foundIt = True
                break
    if not foundIt:
-        sernum = '9999999999'
+        sernum = ''
    return sernum
-# uses unix env to get username instead of using sysctlbyname 
+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 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
-import hashlib
+class Memoize:
    """Memoize(fn) - an instance which acts like fn but memoizes its arguments
       Will only work on functions with non-mutable arguments
    """
    def __init__(self, fn):
        self.fn = fn
        self.memo = {}
    def __call__(self, *args):
        if not self.memo.has_key(args):
            self.memo[args] = self.fn(*args)
        return self.memo[args]
@Memoize
 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'
 def SHA256(message):
    ctx = hashlib.sha256()
    ctx.update(message)
    return ctx.digest()
 # implements an Pseudo Mac Version of Windows built-in Crypto routine
-def CryptUnprotectData(encryptedData):
+# used by Kindle for Mac versions < 1.6.0
-    sp = GetVolumeSerialNumber() + '!@#' + GetUserName()
+class CryptUnprotectData(object):
-    passwdData = encode(SHA256(sp),charMap1)
+    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)
+    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
    key = key_iv[0:32]
    iv = key_iv[32:48]
    crp.set_decrypt_key(key,iv)
@@ -168,33 +488,260 @@ def CryptUnprotectData(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):
+def getKindleInfoFiles():
-    home = os.getenv('HOME')
+    # file searches can take a long time on some systems, so just look in known specific places.
-    cmdline = 'find "' + home + '/Library/Application Support" -name ".kindle-info"'
+    kInfoFiles=[]
    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
-    cnt = len(reslst)
+    home = os.getenv('HOME')
-    for resline in reslst:
+    # check for  .kinf2011 file in new location (App Store Kindle for Mac)
-        if os.path.isfile(resline):
+    testpath = home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support/Kindle/storage/.kinf2011'
-            kInfoFiles.append(resline)
+    if os.path.isfile(testpath):
-            found = True
+        kInfoFiles.append(testpath)
        print('Found k4Mac kinf2011 file: ' + testpath)
        found = True
    # check for  .kinf2011 files
    testpath = home + '/Library/Application Support/Kindle/storage/.kinf2011'
    if os.path.isfile(testpath):
        kInfoFiles.append(testpath)
        print('Found k4Mac kinf2011 file: ' + testpath)
        found = True
    # check for  .rainier-2.1.1-kinf files
    testpath = home + '/Library/Application Support/Kindle/storage/.rainier-2.1.1-kinf'
    if os.path.isfile(testpath):
        kInfoFiles.append(testpath)
        print('Found k4Mac rainier file: ' + testpath)
        found = True
    # check for  .rainier-2.1.1-kinf files
    testpath = home + '/Library/Application Support/Kindle/storage/.kindle-info'
    if os.path.isfile(testpath):
        kInfoFiles.append(testpath)
        print('Found k4Mac kindle-info file: ' + testpath)
        found = True
    if not found:
-        print('No .kindle-info files have been found.')
+        print('No k4Mac kindle-info/rainier/kinf2011 files have been found.')
    return kInfoFiles
-# Parse the Kindle.info file and return the records as a list of key-values
+# determine type of kindle info provided and return a
-def parseKindleInfo(kInfoFile):
+# 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')
-    infoReader.read(1)
+    hdr = infoReader.read(1)
    data = infoReader.read()
-    items = data.split('[')
+
-    for item in items:
+    if data.find('[') != -1 :
-        splito = item.split(':')
+
-        DB[splito[0]] =splito[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
--- a/Calibre_Plugins/k4mobidedrm_plugin/k4pcutils.py
+++ b/Calibre_Plugins/k4mobidedrm_plugin/k4pcutils.py
@@ -1,34 +1,127 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # K4PC Windows specific routines
 from __future__ import with_statement
-import sys, os
+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
 import traceback
 MAX_PATH = 255
 kernel32 = windll.kernel32
 advapi32 = windll.advapi32
 crypt32 = windll.crypt32
 import traceback
-# Various character maps used to decrypt books. Probably supposed to act as obfuscation
+# crypto digestroutines
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
+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_"
-charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
-charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
+# 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)]
@@ -59,59 +152,306 @@ def GetVolumeSerialNumber():
    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(32)
+        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):
+    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, 0, byref(outdata)):
+                                   None, None, flags, byref(outdata)):
-            raise DrmException("Failed to Unprotect Data")
+            # raise DrmException("Failed to Unprotect Data")
            return 'failed'
        return string_at(outdata.pbData, outdata.cbData)
    return CryptUnprotectData
 CryptUnprotectData = CryptUnprotectData()
-# Locate the .kindle-info files
+
-def getKindleInfoFiles(kInfoFiles):
+# Locate all of the kindle-info style files and return as list
-    regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+def getKindleInfoFiles():
-    path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+    kInfoFiles = []
-    kinfopath = path +'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info'
+    # some 64 bit machines do not have the proper registry key for some reason
-    if not os.path.isfile(kinfopath):
+    # or the pythonn interface to the 32 vs 64 bit registry is broken
-        print('The kindle.info files has not been found.')
+    path = ""
    if 'LOCALAPPDATA' in os.environ.keys():
        path = os.environ['LOCALAPPDATA']
    else:
-        kInfoFiles.append(kinfopath)
+        # 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 not os.path.isdir(path):
                path = ""
                try:
                    regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
                    path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
                    if not os.path.isdir(path):
                        path = ""
                except RegError:
                    pass
        except RegError:
            pass
    found = False
    if path == "":
        print ('Could not find the folder in which to look for kinfoFiles.')
    else:
        print('searching for kinfoFiles in ' + path)
        # 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
-# Parse the Kindle.info file and return the records as a list of key-values
+
-def parseKindleInfo(kInfoFile):
+# 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')
-    infoReader.read(1)
+    hdr = infoReader.read(1)
    data = infoReader.read()
-    items = data.split('{')
+
-    for item in items:
+    if data.find('{') != -1 :
-        splito = item.split(':')
+
-        DB[splito[0]] =splito[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
--- a/Calibre_Plugins/k4mobidedrm_plugin/mobidedrm.py
+++ b/Calibre_Plugins/k4mobidedrm_plugin/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.
 #
@@ -27,8 +33,8 @@
 #         files reveals that a confusion has arisen because trailing data entries
 #         are not encrypted, but it turns out that the multibyte entries
 #         in utf8 file are encrypted. (Although neither kind gets compressed.)
-#         This knowledge leads to a simplification of the test for the 
+#         This knowledge leads to a simplification of the test for the
-#         trailing data byte flags - version 5 and higher AND header size >= 0xE4. 
+#         trailing data byte flags - version 5 and higher AND header size >= 0xE4.
 #  0.15 - Now outputs 'heartbeat', and is also quicker for long files.
 #  0.16 - And reverts to 'done' not 'done.' at the end for unswindle compatibility.
 #  0.17 - added modifications to support its use as an imported python module
@@ -42,33 +48,95 @@
 #  0.20 - Correction: It seems that multibyte entries are encrypted in a v6 file.
 #  0.21 - Added support for multiple pids
 #  0.22 - revised structure to hold MobiBook as a class to allow an extended interface
-#  0.23 - fixed problem with older files with no EXTH section 
+#  0.23 - fixed problem with older files with no EXTH section
 #  0.24 - add support for type 1 encryption and 'TEXtREAd' books as well
 #  0.25 - Fixed support for 'BOOKMOBI' type 1 encryption
 #  0.26 - Now enables Text-To-Speech flag and sets clipping limit to 100%
 #  0.27 - Correct pid metadata token generation to match that used by skindle (Thank You Bart!)
 #  0.28 - slight additional changes to metadata token generation (None -> '')
 #  0.29 - It seems that the ideas about when multibyte trailing characters were
-#         included in the encryption were wrong. They aren't for DOC compressed
+#         included in the encryption were wrong. They are for DOC compressed
-#         files, but they are for HUFF/CDIC compress files!
+#         files, but they are not for HUFF/CDIC compress files!
 #  0.30 - Modified interface slightly to work better with new calibre plugin style
 #  0.31 - The multibyte encrytion info is true for version 7 files too.
 #  0.32 - Added support for "Print Replica" Kindle ebooks
 #  0.33 - Performance improvements for large files (concatenation)
 #  0.34 - Performance improvements in decryption (libalfcrypto)
 #  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
-__version__ = '0.29'
+
 __version__ = u"0.38"
 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
+iswindows = sys.platform.startswith('win')
-import struct
+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"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
@@ -80,12 +148,18 @@ class DrmException(Exception):
 # Implementation of Pukall Cipher 1
 def PC1(key, src, decryption=True):
    # if we can get it from alfcrypto, use that
    try:
        return Pukall_Cipher().PC1(key,src,decryption)
    except NameError:
        pass
    # use slow python version, since Pukall_Cipher didn't load
    sum1 = 0;
    sum2 = 0;
    keyXorVal = 0;
    if len(key)!=16:
-        print "Bad key length!"
+         DrmException (u"PC1: Bad key length")
        return None
    wkey = []
    for i in xrange(8):
        wkey.append(ord(key[i*2])<<8 | ord(key[i*2+1]))
@@ -112,7 +186,7 @@ def PC1(key, src, decryption=True):
    return dst
 def checksumPid(s):
-    letters = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
+    letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
    crc = (~binascii.crc32(s,-1))&0xFFFFFFFF
    crc = crc ^ (crc >> 16)
    res = s
@@ -160,12 +234,24 @@ class MobiBook:
        off = self.sections[section][0]
        return self.data_file[off:endoff]
    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
@@ -183,21 +269,23 @@ class MobiBook:
        self.compression, = struct.unpack('>H', self.sect[0x0:0x0+2])
        if self.magic == 'TEXtREAd':
-            print "Book has format: ", self.magic
+            print u"PalmDoc format book detected."
            self.extra_data_flags = 0
            self.mobi_length = 0
            self.mobi_codepage = 1252
            self.mobi_version = -1
            self.meta_array = {}
            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)
+        print u"MOBI header version {0:d}, header length {1:d}".format(self.mobi_version, self.mobi_length)
        self.extra_data_flags = 0
        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.mobi_version < 7) and (self.compression != 17480):
+        if (self.compression != 17480):
-            # multibyte utf8 data is included in the encryption for mobi_version 6 and below
+            # 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
@@ -205,10 +293,10 @@ class MobiBook:
        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):
@@ -218,28 +306,37 @@ 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 = {
            1252 : 'windows-1252',
            65001 : 'utf-8',
        }
        title = ''
-        if 503 in self.meta_array:
+        codec = 'windows-1252'
-            title = self.meta_array[503]
+        if self.magic == 'BOOKMOBI':
-        else :
+            if 503 in self.meta_array:
-            toff, tlen = struct.unpack('>II', self.sect[0x54:0x5c])
+                title = self.meta_array[503]
-            tend = toff + tlen
+            else:
-            title = self.sect[toff:tend]
+                toff, tlen = struct.unpack('>II', self.sect[0x54:0x5c])
                tend = toff + tlen
                title = self.sect[toff:tend]
            if self.mobi_codepage in codec_map.keys():
                codec = codec_map[self.mobi_codepage]
        if title == '':
            title = self.header[:32]
-            title = title.split("\0")[0]
+            title = title.split('\0')[0]
-        return title
+        return unicode(title, codec)
    def getPIDMetaInfo(self):
        rec209 = ''
@@ -270,7 +367,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)
@@ -288,7 +385,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):
@@ -301,109 +398,136 @@ class MobiBook:
                        break
        return [found_key,pid]
    def getFile(self, outpath):
        file(outpath,'wb').write(self.mobi_data)
    def getBookType(self):
        if self.print_replica:
            return u"Print Replica"
        if self.mobi_version >= 8:
            return u"Kindle Format 8"
        return u"Mobipocket"
    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."
-            return self.data_file
+            # 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(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)
        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] 
+                bookkey_data = self.sect[0x90:0x90+16]
            else:
-                bookkey_data = self.sect[self.mobi_length+16:self.mobi_length+32] 
+                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. Most likely the correct PID has not been given.")
+                raise DrmException(u"No key found in {0:d} keys tried. Read the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".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":
+        if pid=='00000000':
-            print "File has default encryption, no specific PID."
+            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 . . .",
-        new_data = self.data_file[:self.sections[1][0]]
+        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)
-            new_data += PC1(found_key, data[0:len(data) - extra_size])
+            decoded_data = PC1(found_key, data[0:len(data) - extra_size])
            if i==1:
                self.print_replica = (decoded_data[0:4] == '%MOP')
            mobidataList.append(decoded_data)
            if extra_size > 0:
-                new_data += data[-extra_size:]
+                mobidataList.append(data[-extra_size:])
        if self.num_sections > self.records+1:
-            new_data += self.data_file[self.sections[self.records+1][0]:]
+            mobidataList.append(self.data_file[self.sections[self.records+1][0]:])
-        self.data_file = new_data
+        self.mobi_data = "".join(mobidataList)
-        print "done"
+        print u"done"
-        return self.data_file
+        return
-def getUnencryptedBook(infile,pid):
+def getUnencryptedBook(infile,pidlist):
    if not os.path.isfile(infile):
-        raise DrmException('Input File Not Found')
+        raise DrmException(u"Input File Not Found.")
    book = MobiBook(infile)
-    return book.processBook([pid])
+    book.processBook(pidlist)
    return book.mobi_data
 def getUnencryptedBookWithList(infile,pidlist):
    if not os.path.isfile(infile):
        raise DrmException('Input File Not Found')
    book = MobiBook(infile)
    return book.processBook(pidlist)
-def main(argv=sys.argv):
+def cli_main(argv=unicode_argv()):
-    print ('MobiDeDrm v%(__version__)s. '
+    progname = os.path.basename(argv[0])
 	   'Copyright 2008-2010 The Dark Reverser.' % globals())
    if len(argv)<3 or len(argv)>4:
-        print "Removes protection from Mobipocket books"
+        print u"MobiDeDrm v{0}.\nCopyright © 2008-2012 The Dark Reverser et al.".format(__version__)
-        print "Usage:"
+        print u"Removes protection from Kindle/Mobipocket, Kindle/KF8 and Kindle/Print Replica ebooks"
-        print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
+        print u"Usage:"
        print u"    {0} <infile> <outfile> [<Comma separated list of PIDs to try>]".format(os.path.basename(sys.argv[0]))
        return 1
    else:
        infile = argv[1]
        outfile = argv[2]
        if len(argv) is 4:
-        	pidlist = argv[3].split(',')
+            pidlist = argv[3].split(',')
        else:
-        	pidlist = {}
+            pidlist = []
        try:
-            stripped_file = getUnencryptedBookWithList(infile, pidlist)
+            stripped_file = getUnencryptedBook(infile, pidlist)
            file(outfile, 'wb').write(stripped_file)
        except DrmException, e:
-            print "Error: %s" % e
+            print u"MobiDeDRM v{0} Error: {0:s}".format(__version__,e.args[0])
            return 1
    return 0
-if __name__ == "__main__":
+if __name__ == '__main__':
-    sys.exit(main())
+    sys.stdout=SafeUnbuffered(sys.stdout)
    sys.stderr=SafeUnbuffered(sys.stderr)
    sys.exit(cli_main())
--- a/DeDRM_Macintosh_Application/DeDRM
+++ b/DeDRM_Macintosh_Application/DeDRM
@@ -0,0 +1,58 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\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
 \f0\b\fs24 \cf0 DeDRM ReadMe
 \b0 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
 \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 dm-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&Noble ePubs, or Mobipocket ebooks, you must first run DeDRM application (by double-clicking it) and set some additional Preferences including:\
 \
 eInk Kindle (not Kindle Fire): 16 digit Serial Number\
 Kindle for iOS: 40 digit UDID, but this probably won't work anymore\
 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\
 \
 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.4 or above. It will not work on Mac OS X 10.3 or earlier.\
 \
 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
 \b \cf0 Installation
 \b0 \
 Mac OS X 10.4 
 \i only
 \i0 : You 
 \i must
 \i0  first install Python 2.7.3 from http://python.org/. At the time of writing, the direct download link is http://www.python.org/ftp/python/2.7.3/python-2.7.3-macosx10.3.dmg.\
 \
 Mac OS X 10.5 and above: You do 
 \i not
 \i0  need to install Python.\
 \
 Drag the DeDRM application from from tools_v5.5\\DeDRM_Applications\\Macintosh (the location of this ReadMe) to your Applications folder, or anywhere else you find convenient.\
 \
 \
 \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.\
 \
 \
 \b Troubleshooting\
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
 \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.}
--- a/DeDRM_Macintosh_Application/DeDRM.app.txt
+++ b/DeDRM_Macintosh_Application/DeDRM.app.txt
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
@@ -24,21 +24,19 @@
 	<key>CFBundleExecutable</key>
 	<string>droplet</string>
 	<key>CFBundleGetInfoString</key>
-	<string>DeDRM 2.6, Written 2010–2011 by Apprentice Alf and others.</string>
+	<string>DeDRM 5.5. AppleScript written 2010–2012 by Apprentice Alf and others.</string>
 	<key>CFBundleIconFile</key>
-	<string>droplet</string>
+	<string>DeDRM</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>DeDRM</string>
+	<string>DeDRM 5.5</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6</string>
+	<string>5.5</string>
 	<key>CFBundleSignature</key>
 	<string>dplt</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.5.0</string>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>WindowState</key>
@@ -52,7 +50,7 @@
 		<key>positionOfDivider</key>
 		<real>0</real>
 		<key>savedFrame</key>
-		<string>1578 27 862 788 1440 -150 1680 1050 </string>
+		<string>1846 -16 800 473 1440 -180 1920 1080 </string>
 		<key>selectedTabView</key>
 		<string>event log</string>
 	</dict>
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/MacOS/droplet
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/MacOS/droplet
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM
@@ -2,10 +2,16 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
 	<string>10K549</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>DeDRM Progress</string>
 	<key>CFBundleGetInfoString</key>
 	<string>DeDRM Progress 1.1, Written 2010, 2012 by Apprentice Alf and others.</string>
 	<key>CFBundleIconFile</key>
 	<string>DeDRM Progress</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.apprenticealf.DeDRMProgress</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +21,25 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>DTCompiler</key>
 	<string>4.0</string>
 	<key>DTPlatformBuild</key>
 	<string>10M2518</string>
 	<key>DTPlatformVersion</key>
 	<string>PG</string>
 	<key>DTSDKBuild</key>
 	<string>8S2167</string>
 	<key>DTSDKName</key>
 	<string>macosx10.4</string>
 	<key>DTXcode</key>
 	<string>0400</string>
 	<key>DTXcodeBuild</key>
 	<string>10M2518</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM
--- a/Progress.app/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/Progress.app/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
--- a/Progress.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/Progress.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -1,19 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>IBClasses</key>
 	<array>
 		<dict>
 			<key>CLASS</key>
 			<string>FirstResponder</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
 			<string>NSObject</string>
 		</dict>
 	</array>
 	<key>IBVersion</key>
 	<string>1</string>
 </dict>
 </plist>
--- a/Progress.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/Progress.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib
@@ -1,18 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>IBFramework Version</key>
 	<string>680</string>
 	<key>IBLastKnownRelativeProjectPath</key>
 	<string>../Display Panel.xcodeproj</string>
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array/>
 	<key>IBSystem Version</key>
 	<string>9L31a</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
 </plist>
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM.icns
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM.icns
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/Scripts/main.scpt
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/Scripts/main.scpt
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/aescbc.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/aescbc.py
@@ -0,0 +1,568 @@
 #! /usr/bin/env python
 """
    Routines for doing AES CBC in one file
    Modified by some_updates to extract
    and combine only those parts needed for AES CBC
    into one simple to add python file
    Original Version
    Copyright (c) 2002 by Paul A. Lambert
    Under:
    CryptoPy Artisitic License Version 1.0
    See the wonderful pure python package cryptopy-1.2.5
    and read its LICENSE.txt for complete license details.
 """
 class CryptoError(Exception):
    """ Base class for crypto exceptions """
    def __init__(self,errorMessage='Error!'):
        self.message = errorMessage
    def __str__(self):
        return self.message
 class InitCryptoError(CryptoError):
    """ Crypto errors during algorithm initialization """
 class BadKeySizeError(InitCryptoError):
    """ Bad key size error """
 class EncryptError(CryptoError):
    """ Error in encryption processing """
 class DecryptError(CryptoError):
    """ Error in decryption processing """
 class DecryptNotBlockAlignedError(DecryptError):
    """ Error in decryption processing """
 def xorS(a,b):
    """ XOR two strings """
    assert len(a)==len(b)
    x = []
    for i in range(len(a)):
        x.append( chr(ord(a[i])^ord(b[i])))
    return ''.join(x)
 def xor(a,b):
    """ XOR two strings """
    x = []
    for i in range(min(len(a),len(b))):
        x.append( chr(ord(a[i])^ord(b[i])))
    return ''.join(x)
 """
    Base 'BlockCipher' and Pad classes for cipher instances.
    BlockCipher supports automatic padding and type conversion. The BlockCipher
    class was written to make the actual algorithm code more readable and
    not for performance.
 """
 class BlockCipher:
    """ Block ciphers """
    def __init__(self):
        self.reset()
    def reset(self):
        self.resetEncrypt()
        self.resetDecrypt()
    def resetEncrypt(self):
        self.encryptBlockCount = 0
        self.bytesToEncrypt = ''
    def resetDecrypt(self):
        self.decryptBlockCount = 0
        self.bytesToDecrypt = ''
    def encrypt(self, plainText, more = None):
        """ Encrypt a string and return a binary string """
        self.bytesToEncrypt += plainText  # append plainText to any bytes from prior encrypt
        numBlocks, numExtraBytes = divmod(len(self.bytesToEncrypt), self.blockSize)
        cipherText = ''
        for i in range(numBlocks):
            bStart = i*self.blockSize
            ctBlock = self.encryptBlock(self.bytesToEncrypt[bStart:bStart+self.blockSize])
            self.encryptBlockCount += 1
            cipherText += ctBlock
        if numExtraBytes > 0:        # save any bytes that are not block aligned
            self.bytesToEncrypt = self.bytesToEncrypt[-numExtraBytes:]
        else:
            self.bytesToEncrypt = ''
        if more == None:   # no more data expected from caller
            finalBytes = self.padding.addPad(self.bytesToEncrypt,self.blockSize)
            if len(finalBytes) > 0:
                ctBlock = self.encryptBlock(finalBytes)
                self.encryptBlockCount += 1
                cipherText += ctBlock
            self.resetEncrypt()
        return cipherText
    def decrypt(self, cipherText, more = None):
        """ Decrypt a string and return a string """
        self.bytesToDecrypt += cipherText  # append to any bytes from prior decrypt
        numBlocks, numExtraBytes = divmod(len(self.bytesToDecrypt), self.blockSize)
        if more == None:  # no more calls to decrypt, should have all the data
            if numExtraBytes  != 0:
                raise DecryptNotBlockAlignedError, 'Data not block aligned on decrypt'
        # hold back some bytes in case last decrypt has zero len
        if (more != None) and (numExtraBytes == 0) and (numBlocks >0) :
            numBlocks -= 1
            numExtraBytes = self.blockSize
        plainText = ''
        for i in range(numBlocks):
            bStart = i*self.blockSize
            ptBlock = self.decryptBlock(self.bytesToDecrypt[bStart : bStart+self.blockSize])
            self.decryptBlockCount += 1
            plainText += ptBlock
        if numExtraBytes > 0:        # save any bytes that are not block aligned
            self.bytesToEncrypt = self.bytesToEncrypt[-numExtraBytes:]
        else:
            self.bytesToEncrypt = ''
        if more == None:         # last decrypt remove padding
            plainText = self.padding.removePad(plainText, self.blockSize)
            self.resetDecrypt()
        return plainText
 class Pad:
    def __init__(self):
        pass              # eventually could put in calculation of min and max size extension
 class padWithPadLen(Pad):
    """ Pad a binary string with the length of the padding """
    def addPad(self, extraBytes, blockSize):
        """ Add padding to a binary string to make it an even multiple
            of the block size """
        blocks, numExtraBytes = divmod(len(extraBytes), blockSize)
        padLength = blockSize - numExtraBytes
        return extraBytes + padLength*chr(padLength)
    def removePad(self, paddedBinaryString, blockSize):
        """ Remove padding from a binary string """
        if not(0<len(paddedBinaryString)):
            raise DecryptNotBlockAlignedError, 'Expected More Data'
        return paddedBinaryString[:-ord(paddedBinaryString[-1])]
 class noPadding(Pad):
    """ No padding. Use this to get ECB behavior from encrypt/decrypt """
    def addPad(self, extraBytes, blockSize):
        """ Add no padding """
        return extraBytes
    def removePad(self, paddedBinaryString, blockSize):
        """ Remove no padding """
        return paddedBinaryString
 """
    Rijndael encryption algorithm
    This byte oriented implementation is intended to closely
    match FIPS specification for readability.  It is not implemented
    for performance.
 """
 class Rijndael(BlockCipher):
    """ Rijndael encryption algorithm """
    def __init__(self, key = None, padding = padWithPadLen(), keySize=16, blockSize=16 ):
        self.name       = 'RIJNDAEL'
        self.keySize    = keySize
        self.strength   = keySize*8
        self.blockSize  = blockSize  # blockSize is in bytes
        self.padding    = padding    # change default to noPadding() to get normal ECB behavior
        assert( keySize%4==0 and NrTable[4].has_key(keySize/4)),'key size must be 16,20,24,29 or 32 bytes'
        assert( blockSize%4==0 and NrTable.has_key(blockSize/4)), 'block size must be 16,20,24,29 or 32 bytes'
        self.Nb = self.blockSize/4          # Nb is number of columns of 32 bit words
        self.Nk = keySize/4                 # Nk is the key length in 32-bit words
        self.Nr = NrTable[self.Nb][self.Nk] # The number of rounds (Nr) is a function of
                                            # the block (Nb) and key (Nk) sizes.
        if key != None:
            self.setKey(key)
    def setKey(self, key):
        """ Set a key and generate the expanded key """
        assert( len(key) == (self.Nk*4) ), 'Key length must be same as keySize parameter'
        self.__expandedKey = keyExpansion(self, key)
        self.reset()                   # BlockCipher.reset()
    def encryptBlock(self, plainTextBlock):
        """ Encrypt a block, plainTextBlock must be a array of bytes [Nb by 4] """
        self.state = self._toBlock(plainTextBlock)
        AddRoundKey(self, self.__expandedKey[0:self.Nb])
        for round in range(1,self.Nr):          #for round = 1 step 1 to Nr
            SubBytes(self)
            ShiftRows(self)
            MixColumns(self)
            AddRoundKey(self, self.__expandedKey[round*self.Nb:(round+1)*self.Nb])
        SubBytes(self)
        ShiftRows(self)
        AddRoundKey(self, self.__expandedKey[self.Nr*self.Nb:(self.Nr+1)*self.Nb])
        return self._toBString(self.state)
    def decryptBlock(self, encryptedBlock):
        """ decrypt a block (array of bytes) """
        self.state = self._toBlock(encryptedBlock)
        AddRoundKey(self, self.__expandedKey[self.Nr*self.Nb:(self.Nr+1)*self.Nb])
        for round in range(self.Nr-1,0,-1):
            InvShiftRows(self)
            InvSubBytes(self)
            AddRoundKey(self, self.__expandedKey[round*self.Nb:(round+1)*self.Nb])
            InvMixColumns(self)
        InvShiftRows(self)
        InvSubBytes(self)
        AddRoundKey(self, self.__expandedKey[0:self.Nb])
        return self._toBString(self.state)
    def _toBlock(self, bs):
        """ Convert binary string to array of bytes, state[col][row]"""
        assert ( len(bs) == 4*self.Nb ), 'Rijndarl blocks must be of size blockSize'
        return [[ord(bs[4*i]),ord(bs[4*i+1]),ord(bs[4*i+2]),ord(bs[4*i+3])] for i in range(self.Nb)]
    def _toBString(self, block):
        """ Convert block (array of bytes) to binary string """
        l = []
        for col in block:
            for rowElement in col:
                l.append(chr(rowElement))
        return ''.join(l)
 #-------------------------------------
 """    Number of rounds Nr = NrTable[Nb][Nk]
            Nb  Nk=4   Nk=5   Nk=6   Nk=7   Nk=8
            -------------------------------------   """
 NrTable =  {4: {4:10,  5:11,  6:12,  7:13,  8:14},
            5: {4:11,  5:11,  6:12,  7:13,  8:14},
            6: {4:12,  5:12,  6:12,  7:13,  8:14},
            7: {4:13,  5:13,  6:13,  7:13,  8:14},
            8: {4:14,  5:14,  6:14,  7:14,  8:14}}
 #-------------------------------------
 def keyExpansion(algInstance, keyString):
    """ Expand a string of size keySize into a larger array """
    Nk, Nb, Nr = algInstance.Nk, algInstance.Nb, algInstance.Nr # for readability
    key = [ord(byte) for byte in keyString]  # convert string to list
    w = [[key[4*i],key[4*i+1],key[4*i+2],key[4*i+3]] for i in range(Nk)]
    for i in range(Nk,Nb*(Nr+1)):
        temp = w[i-1]        # a four byte column
        if (i%Nk) == 0 :
            temp     = temp[1:]+[temp[0]]  # RotWord(temp)
            temp     = [ Sbox[byte] for byte in temp ]
            temp[0] ^= Rcon[i/Nk]
        elif Nk > 6 and  i%Nk == 4 :
            temp     = [ Sbox[byte] for byte in temp ]  # SubWord(temp)
        w.append( [ w[i-Nk][byte]^temp[byte] for byte in range(4) ] )
    return w
 Rcon = (0,0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x1b,0x36,     # note extra '0' !!!
        0x6c,0xd8,0xab,0x4d,0x9a,0x2f,0x5e,0xbc,0x63,0xc6,
        0x97,0x35,0x6a,0xd4,0xb3,0x7d,0xfa,0xef,0xc5,0x91)
 #-------------------------------------
 def AddRoundKey(algInstance, keyBlock):
    """ XOR the algorithm state with a block of key material """
    for column in range(algInstance.Nb):
        for row in range(4):
            algInstance.state[column][row] ^= keyBlock[column][row]
 #-------------------------------------
 def SubBytes(algInstance):
    for column in range(algInstance.Nb):
        for row in range(4):
            algInstance.state[column][row] = Sbox[algInstance.state[column][row]]
 def InvSubBytes(algInstance):
    for column in range(algInstance.Nb):
        for row in range(4):
            algInstance.state[column][row] = InvSbox[algInstance.state[column][row]]
 Sbox =    (0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,
           0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
           0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,
           0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
           0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,
           0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
           0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a,
           0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75,
           0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0,
           0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84,
           0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b,
           0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf,
           0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85,
           0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8,
           0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5,
           0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2,
           0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17,
           0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73,
           0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88,
           0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb,
           0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c,
           0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79,
           0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9,
           0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08,
           0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6,
           0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a,
           0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e,
           0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e,
           0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,
           0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
           0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,
           0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16)
 InvSbox = (0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38,
           0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb,
           0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87,
           0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb,
           0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d,
           0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e,
           0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2,
           0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25,
           0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16,
           0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92,
           0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda,
           0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84,
           0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a,
           0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06,
           0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02,
           0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b,
           0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea,
           0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73,
           0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85,
           0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e,
           0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89,
           0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b,
           0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20,
           0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4,
           0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31,
           0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f,
           0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d,
           0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef,
           0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0,
           0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61,
           0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26,
           0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d)
 #-------------------------------------
 """ For each block size (Nb), the ShiftRow operation shifts row i
    by the amount Ci.  Note that row 0 is not shifted.
                 Nb      C1 C2 C3
               -------------------  """
 shiftOffset  = { 4 : ( 0, 1, 2, 3),
                 5 : ( 0, 1, 2, 3),
                 6 : ( 0, 1, 2, 3),
                 7 : ( 0, 1, 2, 4),
                 8 : ( 0, 1, 3, 4) }
 def ShiftRows(algInstance):
    tmp = [0]*algInstance.Nb   # list of size Nb
    for r in range(1,4):       # row 0 reamains unchanged and can be skipped
        for c in range(algInstance.Nb):
            tmp[c] = algInstance.state[(c+shiftOffset[algInstance.Nb][r]) % algInstance.Nb][r]
        for c in range(algInstance.Nb):
            algInstance.state[c][r] = tmp[c]
 def InvShiftRows(algInstance):
    tmp = [0]*algInstance.Nb   # list of size Nb
    for r in range(1,4):       # row 0 reamains unchanged and can be skipped
        for c in range(algInstance.Nb):
            tmp[c] = algInstance.state[(c+algInstance.Nb-shiftOffset[algInstance.Nb][r]) % algInstance.Nb][r]
        for c in range(algInstance.Nb):
            algInstance.state[c][r] = tmp[c]
 #-------------------------------------
 def MixColumns(a):
    Sprime = [0,0,0,0]
    for j in range(a.Nb):    # for each column
        Sprime[0] = mul(2,a.state[j][0])^mul(3,a.state[j][1])^mul(1,a.state[j][2])^mul(1,a.state[j][3])
        Sprime[1] = mul(1,a.state[j][0])^mul(2,a.state[j][1])^mul(3,a.state[j][2])^mul(1,a.state[j][3])
        Sprime[2] = mul(1,a.state[j][0])^mul(1,a.state[j][1])^mul(2,a.state[j][2])^mul(3,a.state[j][3])
        Sprime[3] = mul(3,a.state[j][0])^mul(1,a.state[j][1])^mul(1,a.state[j][2])^mul(2,a.state[j][3])
        for i in range(4):
            a.state[j][i] = Sprime[i]
 def InvMixColumns(a):
    """ Mix the four bytes of every column in a linear way
        This is the opposite operation of Mixcolumn """
    Sprime = [0,0,0,0]
    for j in range(a.Nb):    # for each column
        Sprime[0] = mul(0x0E,a.state[j][0])^mul(0x0B,a.state[j][1])^mul(0x0D,a.state[j][2])^mul(0x09,a.state[j][3])
        Sprime[1] = mul(0x09,a.state[j][0])^mul(0x0E,a.state[j][1])^mul(0x0B,a.state[j][2])^mul(0x0D,a.state[j][3])
        Sprime[2] = mul(0x0D,a.state[j][0])^mul(0x09,a.state[j][1])^mul(0x0E,a.state[j][2])^mul(0x0B,a.state[j][3])
        Sprime[3] = mul(0x0B,a.state[j][0])^mul(0x0D,a.state[j][1])^mul(0x09,a.state[j][2])^mul(0x0E,a.state[j][3])
        for i in range(4):
            a.state[j][i] = Sprime[i]
 #-------------------------------------
 def mul(a, b):
    """ Multiply two elements of GF(2^m)
        needed for MixColumn and InvMixColumn """
    if (a !=0 and  b!=0):
        return Alogtable[(Logtable[a] + Logtable[b])%255]
    else:
        return 0
 Logtable = ( 0,   0,  25,   1,  50,   2,  26, 198,  75, 199,  27, 104,  51, 238, 223,   3,
           100,   4, 224,  14,  52, 141, 129, 239,  76, 113,   8, 200, 248, 105,  28, 193,
           125, 194,  29, 181, 249, 185,  39, 106,  77, 228, 166, 114, 154, 201,   9, 120,
           101,  47, 138,   5,  33,  15, 225,  36,  18, 240, 130,  69,  53, 147, 218, 142,
           150, 143, 219, 189,  54, 208, 206, 148,  19,  92, 210, 241,  64,  70, 131,  56,
           102, 221, 253,  48, 191,   6, 139,  98, 179,  37, 226, 152,  34, 136, 145,  16,
           126, 110,  72, 195, 163, 182,  30,  66,  58, 107,  40,  84, 250, 133,  61, 186,
            43, 121,  10,  21, 155, 159,  94, 202,  78, 212, 172, 229, 243, 115, 167,  87,
           175,  88, 168,  80, 244, 234, 214, 116,  79, 174, 233, 213, 231, 230, 173, 232,
            44, 215, 117, 122, 235,  22,  11, 245,  89, 203,  95, 176, 156, 169,  81, 160,
           127,  12, 246, 111,  23, 196,  73, 236, 216,  67,  31,  45, 164, 118, 123, 183,
           204, 187,  62,  90, 251,  96, 177, 134,  59,  82, 161, 108, 170,  85,  41, 157,
           151, 178, 135, 144,  97, 190, 220, 252, 188, 149, 207, 205,  55,  63,  91, 209,
            83,  57, 132,  60,  65, 162, 109,  71,  20,  42, 158,  93,  86, 242, 211, 171,
            68,  17, 146, 217,  35,  32,  46, 137, 180, 124, 184,  38, 119, 153, 227, 165,
           103,  74, 237, 222, 197,  49, 254,  24,  13,  99, 140, 128, 192, 247, 112,   7)
 Alogtable= ( 1,   3,   5,  15,  17,  51,  85, 255,  26,  46, 114, 150, 161, 248,  19,  53,
            95, 225,  56,  72, 216, 115, 149, 164, 247,   2,   6,  10,  30,  34, 102, 170,
           229,  52,  92, 228,  55,  89, 235,  38, 106, 190, 217, 112, 144, 171, 230,  49,
            83, 245,   4,  12,  20,  60,  68, 204,  79, 209, 104, 184, 211, 110, 178, 205,
            76, 212, 103, 169, 224,  59,  77, 215,  98, 166, 241,   8,  24,  40, 120, 136,
           131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206,  73, 219, 118, 154,
           181, 196,  87, 249,  16,  48,  80, 240,  11,  29,  39, 105, 187, 214,  97, 163,
           254,  25,  43, 125, 135, 146, 173, 236,  47, 113, 147, 174, 233,  32,  96, 160,
           251,  22,  58,  78, 210, 109, 183, 194,  93, 231,  50,  86, 250,  21,  63,  65,
           195,  94, 226,  61,  71, 201,  64, 192,  91, 237,  44, 116, 156, 191, 218, 117,
           159, 186, 213, 100, 172, 239,  42, 126, 130, 157, 188, 223, 122, 142, 137, 128,
           155, 182, 193,  88, 232,  35, 101, 175, 234,  37, 111, 177, 200,  67, 197,  84,
           252,  31,  33,  99, 165, 244,   7,   9,  27,  45, 119, 153, 176, 203,  70, 202,
            69, 207,  74, 222, 121, 139, 134, 145, 168, 227,  62,  66, 198,  81, 243,  14,
            18,  54,  90, 238,  41, 123, 141, 140, 143, 138, 133, 148, 167, 242,  13,  23,
            57,  75, 221, 124, 132, 151, 162, 253,  28,  36, 108, 180, 199,  82, 246,   1)
 """
    AES Encryption Algorithm
    The AES algorithm is just Rijndael algorithm restricted to the default
    blockSize of 128 bits.
 """
 class AES(Rijndael):
    """ The AES algorithm is the Rijndael block cipher restricted to block
        sizes of 128 bits and key sizes of 128, 192 or 256 bits
    """
    def __init__(self, key = None, padding = padWithPadLen(), keySize=16):
        """ Initialize AES, keySize is in bytes """
        if  not (keySize == 16 or keySize == 24 or keySize == 32) :
            raise BadKeySizeError, 'Illegal AES key size, must be 16, 24, or 32 bytes'
        Rijndael.__init__( self, key, padding=padding, keySize=keySize, blockSize=16 )
        self.name       = 'AES'
 """
    CBC mode of encryption for block ciphers.
    This algorithm mode wraps any BlockCipher to make a
    Cipher Block Chaining mode.
 """
 from random             import Random  # should change to crypto.random!!!
 class CBC(BlockCipher):
    """ The CBC class wraps block ciphers to make cipher block chaining (CBC) mode
        algorithms.  The initialization (IV) is automatic if set to None.  Padding
        is also automatic based on the Pad class used to initialize the algorithm
    """
    def __init__(self, blockCipherInstance, padding = padWithPadLen()):
        """ CBC algorithms are created by initializing with a BlockCipher instance """
        self.baseCipher = blockCipherInstance
        self.name       = self.baseCipher.name + '_CBC'
        self.blockSize  = self.baseCipher.blockSize
        self.keySize    = self.baseCipher.keySize
        self.padding    = padding
        self.baseCipher.padding = noPadding()   # baseCipher should NOT pad!!
        self.r          = Random()            # for IV generation, currently uses
                                              # mediocre standard distro version     <----------------
        import time
        newSeed = time.ctime()+str(self.r)    # seed with instance location
        self.r.seed(newSeed)                  # to make unique
        self.reset()
    def setKey(self, key):
        self.baseCipher.setKey(key)
    # Overload to reset both CBC state and the wrapped baseCipher
    def resetEncrypt(self):
        BlockCipher.resetEncrypt(self)  # reset CBC encrypt state (super class)
        self.baseCipher.resetEncrypt()  # reset base cipher encrypt state
    def resetDecrypt(self):
        BlockCipher.resetDecrypt(self)  # reset CBC state (super class)
        self.baseCipher.resetDecrypt()  # reset base cipher decrypt state
    def encrypt(self, plainText, iv=None, more=None):
        """ CBC encryption - overloads baseCipher to allow optional explicit IV
            when iv=None, iv is auto generated!
        """
        if self.encryptBlockCount == 0:
            self.iv = iv
        else:
            assert(iv==None), 'IV used only on first call to encrypt'
        return BlockCipher.encrypt(self,plainText, more=more)
    def decrypt(self, cipherText, iv=None, more=None):
        """ CBC decryption - overloads baseCipher to allow optional explicit IV
            when iv=None, iv is auto generated!
        """
        if self.decryptBlockCount == 0:
            self.iv = iv
        else:
            assert(iv==None), 'IV used only on first call to decrypt'
        return BlockCipher.decrypt(self, cipherText, more=more)
    def encryptBlock(self, plainTextBlock):
        """ CBC block encryption, IV is set with 'encrypt' """
        auto_IV = ''
        if self.encryptBlockCount == 0:
            if self.iv == None:
                # generate IV and use
                self.iv = ''.join([chr(self.r.randrange(256)) for i in range(self.blockSize)])
                self.prior_encr_CT_block = self.iv
                auto_IV = self.prior_encr_CT_block    # prepend IV if it's automatic
            else:                       # application provided IV
                assert(len(self.iv) == self.blockSize ),'IV must be same length as block'
                self.prior_encr_CT_block = self.iv
        """ encrypt the prior CT XORed with the PT """
        ct = self.baseCipher.encryptBlock( xor(self.prior_encr_CT_block, plainTextBlock) )
        self.prior_encr_CT_block = ct
        return auto_IV+ct
    def decryptBlock(self, encryptedBlock):
        """ Decrypt a single block """
        if self.decryptBlockCount == 0:   # first call, process IV
            if self.iv == None:    # auto decrypt IV?
                self.prior_CT_block = encryptedBlock
                return ''
            else:
                assert(len(self.iv)==self.blockSize),"Bad IV size on CBC decryption"
                self.prior_CT_block = self.iv
        dct = self.baseCipher.decryptBlock(encryptedBlock)
        """ XOR the prior decrypted CT with the prior CT """
        dct_XOR_priorCT = xor( self.prior_CT_block, dct )
        self.prior_CT_block = encryptedBlock
        return dct_XOR_priorCT
 """
    AES_CBC Encryption Algorithm
 """
 class AES_CBC(CBC):
    """ AES encryption in CBC feedback mode """
    def __init__(self, key=None, padding=padWithPadLen(), keySize=16):
        CBC.__init__( self, AES(key, noPadding(), keySize), padding)
        self.name       = 'AES_CBC'
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/alfcrypto.dll
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/alfcrypto.dll
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/alfcrypto.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/alfcrypto.py
@@ -0,0 +1,297 @@
 #!/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
    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, sizeof
    pointer_size = ctypes.sizeof(ctypes.c_voidp)
    name_of_lib = None
    if sys.platform.startswith('darwin'):
        name_of_lib = 'libalfcrypto.dylib'
    elif sys.platform.startswith('win'):
        if pointer_size == 4:
            name_of_lib = 'alfcrypto.dll'
        else:
            name_of_lib = 'alfcrypto64.dll'
    else:
        if pointer_size == 4:
            name_of_lib = 'libalfcrypto32.so'
        else:
            name_of_lib = 'libalfcrypto64.so'
    libalfcrypto = os.path.join(sys.path[0],name_of_lib)
    if not os.path.isfile(libalfcrypto):
        raise Exception('libalfcrypto not found')
    libalfcrypto = CDLL(libalfcrypto)
    c_char_pp = POINTER(c_char_p)
    c_int_p = POINTER(c_int)
    def F(restype, name, argtypes):
        func = getattr(libalfcrypto, name)
        func.restype = restype
        func.argtypes = argtypes
        return func
    # aes cbc decryption
    #
    # 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);
    #
    #
    # 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
    class AES_KEY(Structure):
        _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))), ('rounds', c_int)]
    AES_KEY_p = POINTER(AES_KEY)
    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])
    # Pukall 1 Cipher
    # unsigned char *PC1(const unsigned char *key, unsigned int klen, const unsigned char *src,
    #                unsigned char *dest, unsigned int len, int decryption);
    PC1 = F(c_char_p, 'PC1', [c_char_p, c_ulong, c_char_p, c_char_p, c_ulong, c_ulong])
    # Topaz Encryption
    # typedef struct _TpzCtx {
    #    unsigned int v[2];
    # } TpzCtx;
    #
    # void topazCryptoInit(TpzCtx *ctx, const unsigned char *key, int klen);
    # void topazCryptoDecrypt(const TpzCtx *ctx, const unsigned char *in, unsigned char *out, int len);
    class TPZ_CTX(Structure):
        _fields_ = [('v', c_long * 2)]
    TPZ_CTX_p = POINTER(TPZ_CTX)
    topazCryptoInit = F(None, 'topazCryptoInit', [TPZ_CTX_p, c_char_p, c_ulong])
    topazCryptoDecrypt = F(None, 'topazCryptoDecrypt', [TPZ_CTX_p, c_char_p, c_char_p, c_ulong])
    class AES_CBC(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 Exception('AES CBC 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 Exception('Failed to initialize AES CBC key')
        def decrypt(self, data):
            out = create_string_buffer(len(data))
            mutable_iv = create_string_buffer(self._iv, len(self._iv))
            rv = AES_cbc_encrypt(data, out, len(data), self._keyctx, mutable_iv, 0)
            if rv == 0:
                raise Exception('AES CBC decryption failed')
            return out.raw
    class Pukall_Cipher(object):
        def __init__(self):
            self.key = None
        def PC1(self, key, src, decryption=True):
            self.key = key
            out = create_string_buffer(len(src))
            de = 0
            if decryption:
                de = 1
            rv = PC1(key, len(key), src, out, len(src), de)
            return out.raw
    class Topaz_Cipher(object):
        def __init__(self):
            self._ctx = None
        def ctx_init(self, key):
            tpz_ctx = self._ctx = TPZ_CTX()
            topazCryptoInit(tpz_ctx, key, len(key))
            return tpz_ctx
        def decrypt(self, data,  ctx=None):
            if ctx == None:
                ctx = self._ctx
            out = create_string_buffer(len(data))
            topazCryptoDecrypt(ctx, data, out, len(data))
            return out.raw
    print u"Using Library AlfCrypto DLL/DYLIB/SO"
    return (AES_CBC, Pukall_Cipher, Topaz_Cipher)
 def _load_python_alfcrypto():
    import aescbc
    class Pukall_Cipher(object):
        def __init__(self):
            self.key = None
        def PC1(self, key, src, decryption=True):
            sum1 = 0;
            sum2 = 0;
            keyXorVal = 0;
            if len(key)!=16:
                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]))
            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
    class Topaz_Cipher(object):
        def __init__(self):
            self._ctx = None
        def ctx_init(self, key):
            ctx1 = 0x0CAFFE19E
            for keyChar in key:
                keyByte = ord(keyChar)
                ctx2 = ctx1
                ctx1 = ((((ctx1 >>2) * (ctx1 >>7))&0xFFFFFFFF) ^ (keyByte * keyByte * 0x0F902007)& 0xFFFFFFFF )
            self._ctx = [ctx1, ctx2]
            return [ctx1,ctx2]
        def decrypt(self, data,  ctx=None):
            if ctx == None:
                ctx = self._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
    class AES_CBC(object):
        def __init__(self):
            self._key = None
            self._iv = None
            self.aes = None
        def set_decrypt_key(self, userkey, iv):
            self._key = userkey
            self._iv = iv
            self.aes = aescbc.AES_CBC(userkey, aescbc.noPadding(), len(userkey))
        def decrypt(self, data):
            iv = self._iv
            cleartext = self.aes.decrypt(iv + data)
            return cleartext
    print u"Using Library AlfCrypto Python"
    return (AES_CBC, Pukall_Cipher, Topaz_Cipher)
 def _load_crypto():
    AES_CBC = Pukall_Cipher = Topaz_Cipher = None
    cryptolist = (_load_libalfcrypto, _load_python_alfcrypto)
    for loader in cryptolist:
        try:
            AES_CBC, Pukall_Cipher, Topaz_Cipher = loader()
            break
        except (ImportError, Exception):
            pass
    return AES_CBC, Pukall_Cipher, Topaz_Cipher
 AES_CBC, Pukall_Cipher, Topaz_Cipher = _load_crypto()
 class KeyIVGen(object):
    # this only exists in openssl so we will use pure python implementation instead
    # 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])
    def pbkdf2(self, passwd, salt, iter, keylen):
        def xorstr( a, b ):
            if len(a) != len(b):
                raise Exception("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()
        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
        sha = hashlib.sha1
        digest_size = sha().digest_size
        # l - number of output blocks to produce
        l = keylen / digest_size
        if keylen % digest_size != 0:
            l += 1
        h = hmac.new( passwd, None, sha )
        T = ""
        for i in range(1, l+1):
            T += pbkdf2_F( h, salt, iter, i )
        return T[0: keylen]
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/alfcrypto64.dll
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/alfcrypto64.dll
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/alfcrypto_src.zip
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/alfcrypto_src.zip
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Apprentice Alf	c010e3f77a	tools v5.5.2	2015-03-07 13:58:52 +00:00
Apprentice Alf	0c03820db7	tools v5.5.1	2015-03-07 13:55:45 +00:00
Apprentice Alf	9fda194391	tools v5.5 Plugins now include unaltered stand-alone scripts, so no longer need to keep separate copies.	2015-03-07 13:48:25 +00:00
Apprentice Alf	b661a6cdc5	tools v5.4.1	2015-03-07 13:28:34 +00:00
Apprentice Alf	0dcd18d524	tools v5.4	2015-03-07 13:14:37 +00:00
Apprentice Alf	0028027f71	Changed from DeDRM_WinApp to DeDRM_App	2015-03-07 13:05:48 +00:00
TetraChroma	4b3618246b	ineptpdf 8.4.51	2015-03-06 18:02:17 +00:00
Apprentice Alf	07ea87edf4	tools v5.3.1	2015-03-06 18:00:34 +00:00
Apprentice Alf	899fd419ae	tools v5.3	2015-03-06 17:57:20 +00:00
Apprentice Alf	f3f02adc98	tools v5.2	2015-03-06 17:43:57 +00:00
Apprentice Alf	0812438b9d	nib changed from folder to file, so must delete first	2015-03-06 17:41:42 +00:00
Apprentice Alf	26d9f7bd20	ReadMe names changed	2015-03-06 17:30:07 +00:00
Apprentice Alf	2c95633fcd	tools v5.1 alfcrypto added to DeDRM plugin	2015-03-06 17:15:59 +00:00
Apprentice Alf	07e532f59c	tools v5.0 Introduction of alfcrypto library for speed Reorganisation of archive plugins,apps,other	2015-03-06 07:43:33 +00:00
Apprentice Alf	882edb6c69	Re-arrange folders and files for 5.0 tools	2015-03-06 07:32:13 +00:00
Apprentice Alf	93f02c625a	tools v4.8	2015-03-06 07:24:30 +00:00
Apprentice Alf	e95ed1a8ed	tools v4.7	2015-03-06 07:18:01 +00:00
Apprentice Alf	ba5927a20d	tools v4.6	2015-03-06 07:13:06 +00:00
Apprentice Alf	297a9ddc66	tools v4.5	2015-03-06 07:08:24 +00:00
Apprentice Alf	4f34a9a196	tools v4.0 New calibre plugin interface (0.7.55) Dropped unswindle.pyw Added Android patch	2015-03-06 06:59:36 +00:00