tools v3.2

First appearance of combined windows python app

.gitignore

@@ -1,6 +1,6 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
-*.py[cod]
+*.pyc
 
 # C extensions
 *.so

Adobe_EPUB_Tools/README_ineptepub.txt

@@ -1,29 +1,18 @@
 From Apprentice Alf's Blog
 
-Adobe Adept ePub and PDF, .epub, .pdf
+Adobe Adept ePub, .epub
 
-The wonderful I♥CABBAGES has produced scripts that will remove the DRM from ePubs and PDFs encryped with Adobe’s DRM. Installing these scripts is a little more complex that the Mobipocket and eReader decryption tools, as they require installation of the PyCrypto package for Windows Boxes.  For Mac OS X and Linux boxes, these scripts use the already installed OpenSSL libcrypto so there is no additional requirements for these platforms.
+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_v5.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_v5.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.
+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.
-
-The latest version of ineptpdf to use is version 8.4.42, which improves support for some PDF files. 
-
-ineptpdf version 8.4.42 can be found here: 
-
-http://pastebin.com/kuKMXXsC
-
-It is not included in the tools archive.
-
-If that link is down, please check out the following website for some of the latest releases of these tools:
-
-http://ainept.freewebspace.com/

Adobe_EPUB_Tools/ineptepub.pyw

@@ -1,7 +1,9 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
 
-# ineptepub.pyw, version 5.2
+from __future__ import with_statement
+
+# ineptepub.pyw, version 5.6
 # Copyright © 2009-2010 i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3 or
@@ -24,13 +26,14 @@
 #       Improve OS X support by using OpenSSL when available
 #   5.1 - Improve OpenSSL error checking
 #   5.2 - Fix ctypes error causing segfaults on some systems
-
+#   5.3 - add support for OpenSSL on Windows, fix bug with some versions of libcrypto 0.9.8 prior to path level o
+#   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
 """
 Decrypt Adobe ADEPT-encrypted EPUB books.
 """
 
-from __future__ import with_statement
-
 __license__ = 'GPL v3'
 
 import sys
@@ -53,7 +56,11 @@ def _load_crypto_libcrypto():
         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)
@@ -116,6 +123,9 @@ def _load_crypto_libcrypto():
     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:
@@ -250,7 +260,10 @@ def _load_crypto_pycrypto():
 
 def _load_crypto():
     AES = RSA = None
-    for loader in (_load_crypto_libcrypto, _load_crypto_pycrypto):
+    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
@@ -281,6 +294,7 @@ class Decryptor(object):
         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):
@@ -298,45 +312,6 @@ class Decryptor(object):
             data = self.decompress(data)
         return data
 
-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:]
-    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,))
-        for name in META_NAMES:
-            namelist.remove(name)
-        rights = etree.fromstring(inf.read('META-INF/rights.xml'))
-        adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
-        expr = './/%s' % (adept('encryptedKey'),)
-        bookkey = ''.join(rights.findtext(expr))
-        bookkey = rsa.decrypt(bookkey.decode('base64'))
-        # Padded as per RSAES-PKCS1-v1_5
-        if bookkey[-17] != '\x00':
-            raise ADEPTError('problem decrypting session key')
-        encryption = inf.read('META-INF/encryption.xml')
-        decryptor = Decryptor(bookkey[-16:], encryption)
-        kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
-        with closing(ZipFile(open(outpath, 'wb'), 'w', **kwds)) as outf:
-            zi = ZipInfo('mimetype', compress_type=ZIP_STORED)
-            outf.writestr(zi, inf.read('mimetype'))
-            for path in namelist:
-                data = inf.read(path)
-                outf.writestr(path, decryptor.decrypt(path, data))
-    return 0
 
 class DecryptionDialog(Tkinter.Frame):
     def __init__(self, root):
@@ -432,6 +407,52 @@ class DecryptionDialog(Tkinter.Frame):
             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,))
+        for name in META_NAMES:
+            namelist.remove(name)
+        rights = etree.fromstring(inf.read('META-INF/rights.xml'))
+        adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
+        expr = './/%s' % (adept('encryptedKey'),)
+        bookkey = ''.join(rights.findtext(expr))
+        bookkey = rsa.decrypt(bookkey.decode('base64'))
+        # Padded as per RSAES-PKCS1-v1_5
+        if bookkey[-17] != '\x00':
+            raise ADEPTError('problem decrypting session key')
+        encryption = inf.read('META-INF/encryption.xml')
+        decryptor = Decryptor(bookkey[-16:], encryption)
+        kwds = dict(compression=ZIP_DEFLATED, allowZip64=False)
+        with closing(ZipFile(open(outpath, 'wb'), 'w', **kwds)) as outf:
+            zi = ZipInfo('mimetype', compress_type=ZIP_STORED)
+            outf.writestr(zi, inf.read('mimetype'))
+            for path in namelist:
+                data = inf.read(path)
+                outf.writestr(path, decryptor.decrypt(path, data))
+    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:

Adobe_EPUB_Tools/ineptkey.pyw

@@ -1,7 +1,9 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
 
-# ineptkey.pyw, version 5
+from __future__ import with_statement
+
+# ineptkey.pyw, version 5.4
 # Copyright © 2009-2010 i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3 or
@@ -30,13 +32,15 @@
 #   4.4 - Make it working on 64-bit Python
 #   5 - Clean up and improve 4.x changes;
 #       Clean up and merge OS X support by unknown
+#   5.1 - add support for using OpenSSL on Windows in place of PyCrypto
+#   5.2 - added support for output of key to a particular file
+#   5.3 - On Windows try PyCrypto first, OpenSSL next
+#   5.4 - Modify interface to allow use of import
 
 """
 Retrieve Adobe ADEPT user key.
 """
 
-from __future__ import with_statement
-
 __license__ = 'GPL v3'
 
 import sys
@@ -53,14 +57,76 @@ class ADEPTError(Exception):
 if sys.platform.startswith('win'):
     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
+        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
 
-    try:
-        from Crypto.Cipher import AES
-    except ImportError:
+    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'
@@ -230,7 +296,7 @@ if sys.platform.startswith('win'):
         if AES is None:
             tkMessageBox.showerror(
                 "ADEPT Key",
-                "This script requires PyCrypto, which must be installed "
+                "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] + '\\'
@@ -274,7 +340,8 @@ if sys.platform.startswith('win'):
         if userkey is None:
             raise ADEPTError('Could not locate privateLicenseKey')
         userkey = userkey.decode('base64')
-        userkey = AES.new(keykey, AES.MODE_CBC).decrypt(userkey)
+        aes = AES(keykey)
+        userkey = aes.decrypt(userkey)
         userkey = userkey[26:-ord(userkey[-1])]
         with open(keypath, 'wb') as f:
             f.write(userkey)
@@ -349,8 +416,29 @@ class ExceptionDialog(Tkinter.Frame):
         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 extractKeyfile(keypath):
+    try:
+        success = retrieve_key(keypath)
+    except ADEPTError, e:
+        print "Key generation Error: " + str(e)
+        return 1
+    except Exception, e:
+    	print "General Error: " + str(e)
+    	return 1
+    if not success:
+        return 1
+    return 0
+
+
+def cli_main(argv=sys.argv):
+    keypath = argv[1]
+    return extractKeyfile(keypath)
+
+
 def main(argv=sys.argv):
     root = Tkinter.Tk()
     root.withdraw()
@@ -374,4 +462,6 @@ def main(argv=sys.argv):
     return 0
 
 if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
     sys.exit(main())

Adobe_PDF_Tools/README_ineptpdf.txt

@@ -0,0 +1,18 @@
+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.

Adobe_PDF_Tools/ineptkey.pyw

@@ -0,0 +1,467 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+# ineptkey.pyw, version 5.4
+# Copyright © 2009-2010 i♥cabbages
+
+# Released under the terms of the GNU General Public Licence, version 3 or
+# later.  <http://www.gnu.org/licenses/>
+
+# Windows users: Before running this program, you must first install Python 2.6
+#   from <http://www.python.org/download/> and PyCrypto from
+#   <http://www.voidspace.org.uk/python/modules.shtml#pycrypto> (make certain
+#   to install the version for Python 2.6).  Then save this script file as
+#   ineptkey.pyw and double-click on it to run it.  It will create a file named
+#   adeptkey.der in the same directory.  This is your ADEPT user key.
+#
+# Mac OS X users: Save this script file as ineptkey.pyw.  You can run this
+#   program from the command line (pythonw ineptkey.pyw) or by double-clicking
+#   it when it has been associated with PythonLauncher.  It will create a file
+#   named adeptkey.der in the same directory.  This is your ADEPT user key.
+
+# Revision history:
+#   1 - Initial release, for Adobe Digital Editions 1.7
+#   2 - Better algorithm for finding pLK; improved error handling
+#   3 - Rename to INEPT
+#   4 - Series of changes by joblack (and others?) --
+#   4.1 - quick beta fix for ADE 1.7.2 (anon)
+#   4.2 - added old 1.7.1 processing
+#   4.3 - better key search
+#   4.4 - Make it working on 64-bit Python
+#   5 - Clean up and improve 4.x changes;
+#       Clean up and merge OS X support by unknown
+#   5.1 - add support for using OpenSSL on Windows in place of PyCrypto
+#   5.2 - added support for output of key to a particular file
+#   5.3 - On Windows try PyCrypto first, OpenSSL next
+#   5.4 - Modify interface to allow use of import
+
+"""
+Retrieve Adobe ADEPT user key.
+"""
+
+__license__ = 'GPL v3'
+
+import sys
+import os
+import struct
+import Tkinter
+import Tkconstants
+import tkMessageBox
+import traceback
+
+class ADEPTError(Exception):
+    pass
+
+if sys.platform.startswith('win'):
+    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(keypath):
+        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])]
+        with open(keypath, 'wb') as f:
+            f.write(userkey)
+        return True
+
+elif sys.platform.startswith('darwin'):
+    import xml.etree.ElementTree as etree
+    import Carbon.File
+    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):
+        try:
+            fsref = Carbon.Folder.FSFindFolder(domain, dtype, False)
+            return Carbon.File.pathname(fsref)
+        except MacOS.Error:
+            return None
+
+    def find_app_support_file(subpath):
+        dtype = Carbon.Folders.kApplicationSupportFolderType
+        for domain in Carbon.Folders.kUserDomain, Carbon.Folders.kLocalDomain:
+            path = find_folder(domain, dtype)
+            if path is None:
+                continue
+            path = os.path.join(path, subpath)
+            if os.path.isfile(path):
+                return path
+        return None
+
+    def retrieve_key(keypath):
+        actpath = find_app_support_file(ACTIVATION_PATH)
+        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:]
+        with open(keypath, 'wb') as f:
+            f.write(userkey)
+        return True
+
+elif sys.platform.startswith('cygwin'):
+    def retrieve_key(keypath):
+        tkMessageBox.showerror(
+            "ADEPT Key",
+            "This script requires a Windows-native Python, and cannot be run "
+            "under Cygwin.  Please install a Windows-native Python and/or "
+            "check your file associations.")
+        return False
+
+else:
+    def retrieve_key(keypath):
+        tkMessageBox.showerror(
+            "ADEPT Key",
+            "This script only supports Windows and Mac OS X.  For Linux "
+            "you should be able to run ADE and this script under Wine (with "
+            "an appropriate version of Windows Python installed).")
+        return False
+
+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 extractKeyfile(keypath):
+    try:
+        success = retrieve_key(keypath)
+    except ADEPTError, e:
+        print "Key generation Error: " + str(e)
+        return 1
+    except Exception, e:
+    	print "General Error: " + str(e)
+    	return 1
+    if not success:
+        return 1
+    return 0
+
+
+def cli_main(argv=sys.argv):
+    keypath = argv[1]
+    return extractKeyfile(keypath)
+
+
+def main(argv=sys.argv):
+    root = Tkinter.Tk()
+    root.withdraw()
+    progname = os.path.basename(argv[0])
+    keypath = 'adeptkey.der'
+    success = False
+    try:
+        success = retrieve_key(keypath)
+    except ADEPTError, e:
+        tkMessageBox.showerror("ADEPT Key", "Error: " + str(e))
+    except Exception:
+        root.wm_state('normal')
+        root.title('ADEPT Key')
+        text = traceback.format_exc()
+        ExceptionDialog(root, text).pack(fill=Tkconstants.BOTH, expand=1)
+        root.mainloop()
+    if not success:
+        return 1
+    tkMessageBox.showinfo(
+        "ADEPT Key", "Key successfully retrieved to %s" % (keypath))
+    return 0
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
+    sys.exit(main())

Adobe_PDF_Tools/ineptpdf.pyw

@@ -1,10 +1,11 @@
-#! /usr/bin/python
+#! /usr/bin/env python
+# ineptpdf.pyw, version 7.7
 
-# ineptpdf74.pyw
-# ineptpdf, version 7.4
+from __future__ import with_statement
 
 # To run this program install Python 2.6 from http://www.python.org/download/
-# and PyCrypto from http://www.voidspace.org.uk/python/modules.shtml#pycrypto
+# and OpenSSL (already installed on Mac OS X and Linux) OR 
+# PyCrypto from http://www.voidspace.org.uk/python/modules.shtml#pycrypto
 # (make sure to install the version for Python 2.6).  Save this script file as
 # ineptpdf.pyw and double-click on it to run it.
 
@@ -12,26 +13,30 @@
 #   1 - Initial release
 #   2 - Improved determination of key-generation algorithm
 #   3 - Correctly handle PDF >=1.5 cross-reference streams
-#   4 - Removal of ciando's personal ID (anon)
-#   5 - removing small bug with V3 ebooks (anon)
-#   6 - changed to adeptkey4.der format for 1.7.2 support (anon)
+#   4 - Removal of ciando's personal ID
+#   5 - Automated decryption of a complete directory
 #   6.1 - backward compatibility for 1.7.1 and old adeptkey.der
 #   7 - Get cross reference streams and object streams working for input.
 #       Not yet supported on output but this only effects file size,
-#       not functionality. (by anon2)
+#       not functionality. (anon2)
 #   7.1 - Correct a problem when an old trailer is not followed by startxref
-#   7.2 - Correct malformed Mac OS resource forks for Stanza
+#   7.2 - Correct malformed Mac OS resource forks for Stanza (anon2)
 #       - Support for cross ref streams on output (decreases file size)
 #   7.3 - Correct bug in trailer with cross ref stream that caused the error
-#         "The root object is missing or invalid" in Adobe Reader.
+#         "The root object is missing or invalid" in Adobe Reader. (anon2)
 #   7.4 - Force all generation numbers in output file to be 0, like in v6.
 #         Fallback code for wrong xref improved (search till last trailer
-#         instead of first)
-"""
-Decrypt Adobe ADEPT-encrypted PDF files.
-"""
+#         instead of first) (anon2)
+#   7.5 - allow support for OpenSSL to replace pycrypto on all platforms
+#         implemented ARC4 interface to OpenSSL
+#         fixed minor typos
+#   7.6 - backported AES and other fixes from version 8.4.48
+#   7.7 - On Windows try PyCrypto first and OpenSSL next
+#   7.8 - Modify interface to allow use of import
 
-from __future__ import with_statement
+"""
+Decrypts Adobe ADEPT-encrypted PDF files.
+"""
 
 __license__ = 'GPL v3'
 
@@ -48,40 +53,145 @@ import Tkconstants
 import tkFileDialog
 import tkMessageBox
 
-try:
-    from Crypto.Cipher import ARC4
-    from Crypto.PublicKey import RSA
-except ImportError:
-    ARC4 = None
-    RSA = None
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
-
-
 class ADEPTError(Exception):
     pass
 
-# Do we generate cross reference streams on output?
-# 0 = never
-# 1 = only if present in input
-# 2 = always
 
-GEN_XREF_STM = 1
+import hashlib
 
-# This is the value for the current document
-gen_xref_stm = False # will be set in PDFSerializer
+def SHA256(message):
+    ctx = hashlib.sha256()
+    ctx.update(message)
+    return ctx.digest()
 
-### 
-### ASN.1 parsing code from tlslite
 
-def bytesToNumber(bytes):
-    total = 0L
-    for byte in bytes:
-        total = (total << 8) + byte
-    return total
+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)
+
+    AES_MAXNR = 14
+
+    RSA_NO_PADDING = 3
+    
+    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)
+
+    class RC4_KEY(Structure):
+        _fields_ = [('x', c_int), ('y', c_int), ('box', c_int * 256)]
+    RC4_KEY_p = POINTER(RC4_KEY)
+
+    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])
+
+    RC4_set_key = F(None,'RC4_set_key',[RC4_KEY_p, c_int, c_char_p])
+    RC4_crypt = F(None,'RC4',[RC4_KEY_p, c_int, c_char_p, c_char_p])
+
+    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])
+
+    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[1:dlen]
+    
+        def __del__(self):
+            if self._rsa is not None:
+                RSA_free(self._rsa)
+                self._rsa = None
+
+    class ARC4(object):
+        @classmethod
+        def new(cls, userkey):
+            self = ARC4()
+            self._blocksize = len(userkey)
+            key = self._key = RC4_KEY()
+            RC4_set_key(key, self._blocksize, userkey)
+            return self
+        def __init__(self):
+            self._blocksize = 0
+            self._key = None
+        def decrypt(self, data):
+            out = create_string_buffer(len(data))
+            RC4_crypt(self._key, len(data), data, out)
+            return out.raw
+
+    class AES(object):
+        @classmethod
+        def new(cls, userkey, mode, iv):
+            self = AES()
+            self._blocksize = len(userkey)
+            # mode is ignored since CBCMODE is only thing supported/used so far
+            self._mode = mode
+            if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
+                raise ADEPTError('AES improper key used')
+                return
+            keyctx = self._keyctx = AES_KEY()
+            self._iv = iv
+            rv = AES_set_decrypt_key(userkey, len(userkey) * 8, keyctx)
+            if rv < 0:
+                raise ADEPTError('Failed to initialize AES key')
+            return self
+        def __init__(self):
+            self._blocksize = 0
+            self._keyctx = None
+            self._iv = 0
+            self._mode = 0
+        def decrypt(self, data):
+            out = create_string_buffer(len(data))
+            rv = AES_cbc_encrypt(data, out, len(data), self._keyctx, self._iv, 0)
+            if rv == 0:
+                raise ADEPTError('AES decryption failed')
+            return out.raw
+
+    return (ARC4, RSA, AES)
+
+
+def _load_crypto_pycrypto():
+    from Crypto.PublicKey import RSA as _RSA
+    from Crypto.Cipher import ARC4 as _ARC4
+    from Crypto.Cipher import AES as _AES
+
+    # ASN.1 parsing code from tlslite
     class ASN1Error(Exception):
         pass
     
@@ -169,11 +279,81 @@ class ASN1Parser(object):
                 lengthLength = firstLength & 0x7F
                 return p.get(lengthLength)
 
-###
-### PDF parsing routines from pdfminer, with changes for EBX_HANDLER
+    class ARC4(object):
+        @classmethod
+        def new(cls, userkey):
+            self = ARC4()
+            self._arc4 = _ARC4.new(userkey)
+            return self
+        def __init__(self):
+            self._arc4 = None
+        def decrypt(self, data):
+            return self._arc4.decrypt(data)
+
+    class AES(object):
+        @classmethod
+        def new(cls, userkey, mode, iv):
+            self = AES()
+            self._aes = _AES.new(userkey, mode, iv)
+            return self
+        def __init__(self):
+            self._aes = None
+        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)
+
+    return (ARC4, RSA, AES)
+
+def _load_crypto():
+    ARC4 = RSA = 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:
+            ARC4, RSA, AES = loader()
+            break
+        except (ImportError, ADEPTError):
+            pass
+    return (ARC4, RSA, AES)
+ARC4, RSA, AES = _load_crypto()
+
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+
+
+# Do we generate cross reference streams on output?
+# 0 = never
+# 1 = only if present in input
+# 2 = always
+
+GEN_XREF_STM = 1
+
+# This is the value for the current document
+gen_xref_stm = False # will be set in PDFSerializer
+
+# PDF parsing routines from pdfminer, with changes for EBX_HANDLER
+
+#  Utilities
 
-##  Utilities
-##
 def choplist(n, seq):
     '''Groups every n elements of the list.'''
     r = []
@@ -201,11 +381,11 @@ def nunpack(s, default=0):
         return TypeError('invalid length: %d' % l)
 
 
-STRICT = 1
+STRICT = 0
 
 
-##  PS Exceptions
-##
+#  PS Exceptions
+
 class PSException(Exception): pass
 class PSEOF(PSException): pass
 class PSSyntaxError(PSException): pass
@@ -213,8 +393,8 @@ class PSTypeError(PSException): pass
 class PSValueError(PSException): pass
 
 
-##  Basic PostScript Types
-##
+#  Basic PostScript Types
+
 
 # PSLiteral
 class PSObject(object): pass
@@ -345,7 +525,7 @@ class PSBaseParser(object):
         if not pos:
             pos = self.bufpos+self.charpos
         self.fp.seek(pos)
-        print >>sys.stderr, 'poll(%d): %r' % (pos, self.fp.read(n))
+        ##print >>sys.stderr, 'poll(%d): %r' % (pos, self.fp.read(n))
         self.fp.seek(pos0)
         return
 
@@ -669,7 +849,7 @@ class PSStackParser(PSBaseParser):
         '''
         while not self.results:
             (pos, token) = self.nexttoken()
-            #print (pos,token), (self.curtype, self.curstack)
+            ##print (pos,token), (self.curtype, self.curstack)
             if (isinstance(token, int) or
                     isinstance(token, float) or
                     isinstance(token, bool) or
@@ -787,6 +967,7 @@ def decipher_all(decipher, objid, genno, x):
         x = dict((k, decf(v)) for (k, v) in x.iteritems())
     return x
 
+
 # Type cheking
 def int_value(x):
     x = resolve1(x)
@@ -868,16 +1049,20 @@ def ascii85decode(data):
 
 
 ##  PDFStream type
-##
 class PDFStream(PDFObject):
-    
     def __init__(self, dic, rawdata, decipher=None):
         length = int_value(dic.get('Length', 0))
         eol = rawdata[length:]
+        # quick and dirty fix for false length attribute,
+        # might not work if the pdf stream parser has a problem
+        if decipher != None and decipher.__name__ == 'decrypt_aes':
+            if (len(rawdata) % 16) != 0:
+                cutdiv = len(rawdata) // 16
+                rawdata = rawdata[:16*cutdiv]
+        else:
             if eol in ('\r', '\n', '\r\n'):
                 rawdata = rawdata[:length]
-        if length != len(rawdata):
-            print >>sys.stderr, "[warning] data length mismatch"
+                
         self.dic = dic
         self.rawdata = rawdata
         self.decipher = decipher
@@ -911,6 +1096,7 @@ class PDFStream(PDFObject):
         if 'Filter' not in self.dic:
             self.data = data
             self.rawdata = None
+            ##print self.dict
             return
         filters = self.dic['Filter']
         if not isinstance(filters, list):
@@ -1140,7 +1326,6 @@ class PDFDocument(object):
         self.parser = None
         self.encryption = None
         self.decipher = None
-        self.ready = False
         return
 
     # set_parser(parser)
@@ -1163,8 +1348,13 @@ class PDFDocument(object):
             # If there's an encryption info, remember it.
             if 'Encrypt' in trailer:
                 #assert not self.encryption
+                try:
                     self.encryption = (list_value(trailer['ID']),
                                    dict_value(trailer['Encrypt']))
+                # fix for bad files
+                except:
+                    self.encryption = ('ffffffffffffffffffffffffffffffffffff',
+                                       dict_value(trailer['Encrypt']))
             if 'Root' in trailer:
                 self.set_root(dict_value(trailer['Root']))
                 break
@@ -1186,7 +1376,6 @@ class PDFDocument(object):
             if STRICT:
                 raise PDFSyntaxError('Catalog not found!')
         return
-    
     # initialize(password='')
     #   Perform the initialization with a given password.
     #   This step is mandatory even if there's no password associated
@@ -1198,19 +1387,137 @@ class PDFDocument(object):
             return
         (docid, param) = self.encryption
         type = literal_name(param['Filter'])
+        if type == 'Adobe.APS':
+            return self.initialize_adobe_ps(password, docid, param)
         if type == 'Standard':
             return self.initialize_standard(password, docid, param)
         if type == 'EBX_HANDLER':
             return self.initialize_ebx(password, docid, param)
         raise PDFEncryptionError('Unknown filter: param=%r' % param)
 
+    def initialize_adobe_ps(self, password, docid, param):
+        global KEYFILEPATH
+        self.decrypt_key = self.genkey_adobe_ps(param)
+        self.genkey = self.genkey_v4
+        self.decipher = self.decrypt_aes
+        self.ready = True
+        return
+
+    def genkey_adobe_ps(self, param):
+        # nice little offline principal keys dictionary
+        # global static principal key for German Onleihe / Bibliothek Digital
+        principalkeys = { 'bibliothek-digital.de': 'rRwGv2tbpKov1krvv7PO0ws9S436/lArPlfipz5Pqhw='.decode('base64')}
+        self.is_printable = self.is_modifiable = self.is_extractable = True
+        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')          
+        edclist = []
+        for pair in edcdata.split('\n'):
+            edclist.append(pair)
+        # principal key request
+        for key in principalkeys:
+            if key in pdrllic:
+                principalkey = principalkeys[key]
+            else:
+                raise ADEPTError('Cannot find principal key for this pdf')
+        shakey = SHA256(principalkey)
+        ivector = 16 * chr(0)
+        plaintext = AES.new(shakey,AES.MODE_CBC,ivector).decrypt(edclist[9].decode('base64'))
+        if plaintext[-16:] != 16 * chr(16):
+            raise ADEPTError('Offlinekey cannot be decrypted, aborting ...')
+        pdrlpol = AES.new(plaintext[16:32],AES.MODE_CBC,edclist[2].decode('base64')).decrypt(pdrlpol)
+        if ord(pdrlpol[-1]) < 1 or ord(pdrlpol[-1]) > 16:
+            raise ADEPTError('Could not decrypt PDRLPol, aborting ...')
+        else:
+            cutter = -1 * ord(pdrlpol[-1])
+            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
+    def initialize_standard(self, password, docid, param):
+        # copy from a global variable
+        V = int_value(param.get('V', 0))
+        if (V <=0 or V > 4):
+            raise PDFEncryptionError('Unknown algorithm: param=%r' % param)
+        length = int_value(param.get('Length', 40)) # Key length (bits)
+        O = str_value(param['O'])
+        R = int_value(param['R']) # Revision
+        if 5 <= R:
+            raise PDFEncryptionError('Unknown revision: %r' % R)
+        U = str_value(param['U'])
+        P = int_value(param['P'])
+        try:
+            EncMetadata = str_value(param['EncryptMetadata'])
+        except:
+            EncMetadata = 'True'
+        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) 
+        # Algorithm 3.2
+        password = (password+self.PASSWORD_PADDING)[:32] # 1
+        hash = hashlib.md5(password) # 2
+        hash.update(O) # 3
+        hash.update(struct.pack('<l', P)) # 4
+        hash.update(docid[0]) # 5
+        # aes special handling if metadata isn't encrypted
+        if EncMetadata == ('False' or 'false'):
+            hash.update('ffffffff'.decode('hex'))
+        if 5 <= R:
+            # 8
+            for _ in xrange(50):
+                hash = hashlib.md5(hash.digest()[:length/8])
+        key = hash.digest()[:length/8]
+        if R == 2:
+            # Algorithm 3.4
+            u1 = ARC4.new(key).decrypt(password)
+        elif R >= 3:
+            # Algorithm 3.5
+            hash = hashlib.md5(self.PASSWORD_PADDING) # 2
+            hash.update(docid[0]) # 3
+            x = ARC4.new(key).decrypt(hash.digest()[:16]) # 4
+            for i in xrange(1,19+1):
+                k = ''.join( chr(ord(c) ^ i) for c in key )
+                x = ARC4.new(k).decrypt(x)
+            u1 = x+x # 32bytes total
+        if R == 2:
+            is_authenticated = (u1 == U)
+        else:
+            is_authenticated = (u1[:16] == U[:16])
+        if not is_authenticated:
+            raise ADEPTError('Password is not correct.')
+        self.decrypt_key = key
+        # genkey method
+        if V == 1 or V == 2:
+            self.genkey = self.genkey_v2
+        elif V == 3:
+            self.genkey = self.genkey_v3
+        elif V == 4:
+            self.genkey = self.genkey_v2
+        #self.genkey = self.genkey_v3 if V == 3 else self.genkey_v2
+        # rc4
+        if V != 4:
+            self.decipher = self.decipher_rc4  # XXX may be AES
+        # aes
+        elif V == 4 and Length == 128:
+            elf.decipher = self.decipher_aes
+        elif V == 4 and Length == 256:
+            raise PDFNotImplementedError('AES256 encryption is currently unsupported')
+        self.ready = True
+        return
+
     def initialize_ebx(self, password, docid, param):
         self.is_printable = self.is_modifiable = self.is_extractable = True
         with open(password, 'rb') as f:
             keyder = f.read()
-        key = ASN1Parser([ord(x) for x in keyder])
-        key = [bytesToNumber(key.getChild(x).value) for x in xrange(1, 4)]
-        rsa = RSA.construct(key)
+        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)
@@ -1240,62 +1547,7 @@ class PDFDocument(object):
         self.ready = True
         return
 
-    
-    PASSWORD_PADDING = '(\xbfN^Nu\x8aAd\x00NV\xff\xfa\x01\x08..' \
-                       '\x00\xb6\xd0h>\x80/\x0c\xa9\xfedSiz'
-    def initialize_standard(self, password, docid, param):
-        V = int_value(param.get('V', 0))
-        if not (V == 1 or V == 2):
-            raise PDFEncryptionError('Unknown algorithm: param=%r' % param)
-        length = int_value(param.get('Length', 40)) # Key length (bits)
-        O = str_value(param['O'])
-        R = int_value(param['R']) # Revision
-        if 5 <= R:
-            raise PDFEncryptionError('Unknown revision: %r' % R)
-        U = str_value(param['U'])
-        P = int_value(param['P'])
-        self.is_printable = bool(P & 4)        
-        self.is_modifiable = bool(P & 8)
-        self.is_extractable = bool(P & 16)
-        # Algorithm 3.2
-        password = (password+self.PASSWORD_PADDING)[:32] # 1
-        hash = hashlib.md5(password) # 2
-        hash.update(O) # 3
-        hash.update(struct.pack('<l', P)) # 4
-        hash.update(docid[0]) # 5
-        if 4 <= R:
-            # 6
-            raise PDFNotImplementedError(
-                'Revision 4 encryption is currently unsupported')
-        if 3 <= R:
-            # 8
-            for _ in xrange(50):
-                hash = hashlib.md5(hash.digest()[:length/8])
-        key = hash.digest()[:length/8]
-        if R == 2:
-            # Algorithm 3.4
-            u1 = ARC4.new(key).decrypt(password)
-        elif R == 3:
-            # Algorithm 3.5
-            hash = hashlib.md5(self.PASSWORD_PADDING) # 2
-            hash.update(docid[0]) # 3
-            x = ARC4.new(key).decrypt(hash.digest()[:16]) # 4
-            for i in xrange(1,19+1):
-                k = ''.join( chr(ord(c) ^ i) for c in key )
-                x = ARC4.new(k).decrypt(x)
-            u1 = x+x # 32bytes total
-        if R == 2:
-            is_authenticated = (u1 == U)
-        else:
-            is_authenticated = (u1[:16] == U[:16])
-        if not is_authenticated:
-            raise PDFPasswordIncorrect
-        self.decrypt_key = key
-        self.genkey = self.genkey_v2
-        self.decipher = self.decipher_rc4  # XXX may be AES
-        self.ready = True
-        return
-
+    # genkey functions
     def genkey_v2(self, objid, genno):
         objid = struct.pack('<L', objid)[:3]
         genno = struct.pack('<L', genno)[:2]
@@ -1313,11 +1565,44 @@ class PDFDocument(object):
         key = hash.digest()[:min(len(self.decrypt_key) + 5, 16)]
         return key
 
+    # aes v2 and v4 algorithm
+    def genkey_v4(self, objid, genno):
+        objid = struct.pack('<L', objid)[:3]
+        genno = struct.pack('<L', genno)[:2]
+        key = self.decrypt_key + objid + genno + 'sAlT'
+        hash = hashlib.md5(key)
+        key = hash.digest()[:min(len(self.decrypt_key) + 5, 16)]
+        return key
+
+    def decrypt_aes(self, objid, genno, data):
+        key = self.genkey(objid, genno)
+        ivector = data[:16]
+        data = data[16:]
+        plaintext = AES.new(key,AES.MODE_CBC,ivector).decrypt(data)
+        # remove pkcs#5 aes padding
+        cutter = -1 * ord(plaintext[-1])
+        #print cutter
+        plaintext = plaintext[:cutter]
+        return plaintext
+
+    def decrypt_aes256(self, objid, genno, data):
+        key = self.genkey(objid, genno)
+        ivector = data[:16]
+        data = data[16:]
+        plaintext = AES.new(key,AES.MODE_CBC,ivector).decrypt(data)
+        # remove pkcs#5 aes padding
+        cutter = -1 * ord(plaintext[-1])
+        #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')
@@ -1371,13 +1656,23 @@ class PDFDocument(object):
                     raise PDFSyntaxError('Invalid object number: objid=%r' % (objid))
                 if isinstance(obj, PDFStream):
                     obj.set_objid(objid, 0)
-###
             else:
                 self.parser.seek(index)
                 (_,objid1) = self.parser.nexttoken() # objid
                 (_,genno) = self.parser.nexttoken() # genno
                 #assert objid1 == objid, (objid, objid1)
                 (_,kwd) = self.parser.nexttoken()
+        # #### hack around malformed pdf files
+        #        assert objid1 == objid, (objid, objid1)
+##                if objid1 != objid:
+##                    x = []
+##                    while kwd is not self.KEYWORD_OBJ:
+##                        (_,kwd) = self.parser.nexttoken()
+##                        x.append(kwd)
+##                    if x:
+##                        objid1 = x[-2]
+##                        genno = x[-1]
+##                
                 if kwd is not self.KEYWORD_OBJ:
                     raise PDFSyntaxError(
                         'Invalid object spec: offset=%r' % index)
@@ -1389,6 +1684,7 @@ class PDFDocument(object):
             self.objs[objid] = obj
         return obj
 
+                
 class PDFObjStmRef(object):
     maxindex = 0
     def __init__(self, objid, stmid, index):
@@ -1707,7 +2003,6 @@ class PDFSerializer(object):
             xrefstm = PDFStream(dic, data)
             self.serialize_indirect(maxobj, xrefstm)
             self.write('startxref\n%d\n%%%%EOF' % startxref)
-
     def write(self, data):
         self.outf.write(data)
         self.last = data[-1:]
@@ -1782,28 +2077,12 @@ class PDFSerializer(object):
             self.write('\n')
         self.write('endobj\n')
 
-def cli_main(argv=sys.argv):
-    progname = os.path.basename(argv[0])
-    if RSA is None:
-        print "%s: This script requires 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:]
-    with open(inpath, 'rb') as inf:
-        serializer = PDFSerializer(inf, keypath)
-        with open(outpath, 'wb') as outf:
-            serializer.dump(outf)
-    return 0
-
 
 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')
+        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)
@@ -1828,6 +2107,8 @@ class DecryptionDialog(Tkinter.Frame):
         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)
@@ -1836,24 +2117,25 @@ class DecryptionDialog(Tkinter.Frame):
             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)
+            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',
+            parent=None, title='Select ADEPT encrypted PDF file to decrypt',
             defaultextension='.pdf', filetypes=[('PDF files', '.pdf'),
                                                  ('All files', '.*')])
         if inpath:
-            inpath = os.path.normpath(inpath)
+            inpath = os.path.normpath(os.path.realpath(inpath))
             self.inpath.delete(0, Tkconstants.END)
             self.inpath.insert(0, inpath)
         return
@@ -1864,7 +2146,7 @@ class DecryptionDialog(Tkinter.Frame):
             defaultextension='.pdf', filetypes=[('PDF files', '.pdf'),
                                                  ('All files', '.*')])
         if outpath:
-            outpath = os.path.normpath(outpath)
+            outpath = os.path.normpath(os.path.realpath(outpath))
             self.outpath.delete(0, Tkconstants.END)
             self.outpath.insert(0, outpath)
         return
@@ -1874,7 +2156,8 @@ class DecryptionDialog(Tkinter.Frame):
         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'
+            # 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'
@@ -1885,27 +2168,55 @@ class DecryptionDialog(Tkinter.Frame):
         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'] = 'Decrypting...'
+        self.status['text'] = 'Processing ...'
         try:
             cli_main(argv)
-        except Exception, e:
-            self.status['text'] = 'Error: ' + str(e)
+        except Exception, a:
+            self.status['text'] = 'Error: ' + str(a)
             return
-        self.status['text'] = 'File successfully decrypted'
+        self.status['text'] = 'File successfully decrypted.\n'+\
+                              'Close this window or decrypt another pdf file.'
+        return
+
+
+def decryptBook(keypath, inpath, outpath):
+    with open(inpath, 'rb') as inf:
+        serializer = PDFSerializer(inf, keypath)
+        # 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
+            serializer.dump(outf)
+    return 0
+
+
+def cli_main(argv=sys.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,)
+        return 1
+    keypath, inpath, outpath = argv[1:]
+    return decryptBook(keypath, inpath, outpath)
+
 
 def gui_main():
     root = Tkinter.Tk()
     if RSA is None:
         root.withdraw()
         tkMessageBox.showerror(
-            "INEPT PDF Decrypter",
-            "This script requires PyCrypto, which must be installed "
+            "INEPT PDF",
+            "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.resizable(True, False)
-    root.minsize(300, 0)
+    root.minsize(370, 0)
     DecryptionDialog(root).pack(fill=Tkconstants.X, expand=1)
     root.mainloop()
     return 0

Barnes_and_Noble_EPUB_Tools/README_ignoble_epub.txt

@@ -5,13 +5,13 @@ Barnes and Noble EPUB ebooks use a form of Social DRM which requires information
 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. 
+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_v2.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 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_v3.pyw.  Double-click it and it will ask for your key file and the path to the book to remove the DRM from.
+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.
 

Barnes_and_Noble_EPUB_Tools/ignobleepub.pyw

@@ -1,6 +1,8 @@
 #! /usr/bin/python
 
-# ignobleepub.pyw, version 3
+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
@@ -11,8 +13,11 @@
 #   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
 
-from __future__ import with_statement
 
 __license__ = 'GPL v3'
 
@@ -36,6 +41,9 @@ def _load_crypto_libcrypto():
         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')
@@ -101,15 +109,18 @@ def _load_crypto_pycrypto():
 
 def _load_crypto():
     AES = None
-    for loader in (_load_crypto_libcrypto, _load_crypto_pycrypto):
+    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()
 
+AES = _load_crypto()
 
  
 
@@ -140,6 +151,7 @@ class Decryptor(object):
                                enc('CipherReference'))
         for elem in encryption.findall(expr):
             path = elem.get('URI', None)
+            path = path.encode('utf-8')
             if path is not None:
                 encrypted.add(path)
 
@@ -159,49 +171,6 @@ class Decryptor(object):
         return data
 
 
-
-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:]
-    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
-
-
 class DecryptionDialog(Tkinter.Frame):
     def __init__(self, root):
         Tkinter.Frame.__init__(self, root, border=5)
@@ -297,6 +266,53 @@ class DecryptionDialog(Tkinter.Frame):
             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:
@@ -313,6 +329,7 @@ def gui_main():
     root.mainloop()
     return 0
 
+
 if __name__ == '__main__':
     if len(sys.argv) > 1:
         sys.exit(cli_main())

Barnes_and_Noble_EPUB_Tools/ignoblekeygen.pyw

@@ -1,6 +1,8 @@
 #! /usr/bin/python
 
-# ignoblekeygen.pyw, version 2
+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
@@ -10,13 +12,14 @@
 # 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.
 """
 
-from __future__ import with_statement
-
 __license__ = 'GPL v3'
 
 import sys
@@ -40,6 +43,9 @@ def _load_crypto_libcrypto():
         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'
@@ -98,11 +104,12 @@ def _load_crypto_pycrypto():
 
     return AES
 
-
-
 def _load_crypto():
     AES = None
-    for loader in (_load_crypto_libcrypto, _load_crypto_pycrypto):
+    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
@@ -115,6 +122,7 @@ 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'
@@ -128,19 +136,6 @@ def generate_keyfile(name, ccn, outpath):
         f.write(userkey.encode('base64'))
     return userkey
 
-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
 
 class DecryptionDialog(Tkinter.Frame):
     def __init__(self, root):
@@ -206,6 +201,22 @@ class DecryptionDialog(Tkinter.Frame):
             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:

Calibre_Plugins/K4MobiDeDRM_plugin/convert2xml.py

@@ -235,6 +235,7 @@ class PageParser(object):
 
         'group'           : (1, 'snippets', 1, 0),
         'group.type'      : (1, 'scalar_text', 0, 0),
+        'group._tag'      : (1, 'scalar_text', 0, 0),
 
         'region'           : (1, 'snippets', 1, 0),
         'region.type'      : (1, 'scalar_text', 0, 0),
@@ -730,6 +731,19 @@ class PageParser(object):
         return xmlpage
 
 
+def fromData(dict, fname):
+    flat_xml = True
+    debug = False
+    pp = PageParser(fname, dict, debug, flat_xml)
+    xmlpage = pp.process()
+    return xmlpage
+
+def getXML(dict, fname):
+    flat_xml = False
+    debug = False
+    pp = PageParser(fname, dict, debug, flat_xml)
+    xmlpage = pp.process()
+    return xmlpage
 
 def usage():
     print 'Usage: '

Calibre_Plugins/K4MobiDeDRM_plugin/flatxml2html.py

@@ -12,15 +12,14 @@ from struct import unpack
 
 
 class DocParser(object):
-    def __init__(self, flatxml, classlst, fileid, bookDir, fixedimage):
+    def __init__(self, flatxml, classlst, fileid, bookDir, gdict, fixedimage):
         self.id = os.path.basename(fileid).replace('.dat','')
         self.svgcount = 0
         self.docList = flatxml.split('\n')
         self.docSize = len(self.docList)
         self.classList = {}
         self.bookDir = bookDir
-        self.glyphPaths = { }
-        self.numPaths = 0
+        self.gdict = gdict
         tmpList = classlst.split('\n')
         for pclass in tmpList:
             if pclass != '':
@@ -41,9 +40,8 @@ class DocParser(object):
 
     def getGlyph(self, gid):
         result = ''
-        id='gl%d' % gid
-        return self.glyphPaths[id]
-
+        id='id="gl%d"' % gid
+        return self.gdict.lookup(id)
 
     def glyphs_to_image(self, glyphList):
 
@@ -52,31 +50,12 @@ class DocParser(object):
             e = path.find(' ',b)
             return int(path[b:e])
 
-        def extractID(path, key):
-            b = path.find(key) + len(key)
-            e = path.find('"',b)
-            return path[b:e]
-            
-
         svgDir = os.path.join(self.bookDir,'svg')
-        glyfile = os.path.join(svgDir,'glyphs.svg')
 
         imgDir = os.path.join(self.bookDir,'img')
         imgname = self.id + '_%04d.svg' % self.svgcount
         imgfile = os.path.join(imgDir,imgname)
 
-        # build hashtable of glyph paths keyed by glyph id
-        if self.numPaths == 0:
-            gfile = open(glyfile, 'r')
-            while True:
-                path = gfile.readline()
-                if (path == ''): break
-                glyphid = extractID(path,'id="')
-                self.glyphPaths[glyphid] = path
-                self.numPaths += 1
-            gfile.close()
-
-
         # get glyph information
         gxList = self.getData('info.glyph.x',0,-1)
         gyList = self.getData('info.glyph.y',0,-1)
@@ -720,11 +699,8 @@ class DocParser(object):
 
 
 
-def convert2HTML(flatxml, classlst, fileid, bookDir, fixedimage):
-
+def convert2HTML(flatxml, classlst, fileid, bookDir, gdict, fixedimage):
     # create a document parser
-    dp = DocParser(flatxml, classlst, fileid, bookDir, fixedimage)
-
+    dp = DocParser(flatxml, classlst, fileid, bookDir, gdict, fixedimage)
     htmlpage = dp.process()
-
     return htmlpage

Calibre_Plugins/K4MobiDeDRM_plugin/flatxml2svg.py

@@ -0,0 +1,151 @@
+#! /usr/bin/python
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+import sys
+import csv
+import os
+import getopt
+from struct import pack
+from struct import unpack
+
+
+class PParser(object):
+    def __init__(self, gd, flatxml):
+        self.gd = gd
+        self.flatdoc = flatxml.split('\n')
+        self.temp = []
+        foo = self.getData('page.h') or self.getData('book.h')
+        self.ph = foo[0]
+        foo = self.getData('page.w') or self.getData('book.w')
+        self.pw = foo[0]
+        self.gx = self.getData('info.glyph.x')
+        self.gy = self.getData('info.glyph.y')
+        self.gid = self.getData('info.glyph.glyphID')
+    def getData(self, path):
+        result = None
+        cnt = len(self.flatdoc)
+        for j in xrange(cnt):
+            item = self.flatdoc[j]
+            if item.find('=') >= 0:
+                (name, argt) = item.split('=')
+                argres = argt.split('|')
+            else:
+                name = item
+                argres = []
+            if (name.endswith(path)):
+                result = argres
+                break
+        if (len(argres) > 0) :
+            for j in xrange(0,len(argres)):
+                argres[j] = int(argres[j])
+        return result
+    def getDataTemp(self, path):
+        result = None
+        cnt = len(self.temp)
+        for j in xrange(cnt):
+            item = self.temp[j]
+            if item.find('=') >= 0:
+                (name, argt) = item.split('=')
+                argres = argt.split('|')
+            else:
+                name = item
+                argres = []
+            if (name.endswith(path)):
+                result = argres
+                self.temp.pop(j)
+                break
+        if (len(argres) > 0) :
+            for j in xrange(0,len(argres)):
+                argres[j] = int(argres[j])
+        return result
+    def getImages(self):
+        result = []
+        self.temp = self.flatdoc
+        while (self.getDataTemp('img') != None):
+            h = self.getDataTemp('img.h')[0]
+            w = self.getDataTemp('img.w')[0]
+            x = self.getDataTemp('img.x')[0]
+            y = self.getDataTemp('img.y')[0]
+            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):
+            glyphs = []
+            for j in set(self.gid):
+                glyphs.append(j)
+            glyphs.sort()
+            for gid in glyphs:
+                id='id="gl%d"' % gid
+                path = self.gd.lookup(id)
+                if path:
+                    result.append(id + ' ' + path)
+        return result
+
+
+def convert2SVG(gdict, flat_xml, counter, numfiles, svgDir, raw, meta_array, scaledpi):
+    ml = ''
+    pp = PParser(gdict, flat_xml)
+    ml += '<?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'
+        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)
+        ml += '<title>Page %d - %s by %s</title>\n' % (counter, 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'
+        ml += '<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'])
+        ml += '<script><![CDATA[\n'
+        ml += 'function gd(){var p=window.location.href.replace(/^.*\?dpi=(\d+).*$/i,"$1");return p;}\n'
+        ml += 'var dpi=%d;\n' % scaledpi
+        if (counter) :
+            ml += 'var prevpage="page%04d.xhtml";\n' % (counter - 1)
+        if (counter < numfiles-1) :
+            ml += 'var nextpage="page%04d.xhtml";\n' % (counter + 1)
+        ml += 'var pw=%d;var ph=%d;' % (pp.pw, pp.ph)
+        ml += 'function zoomin(){dpi=dpi*(0.8);setsize();}\n'
+        ml += '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'
+        ml += 'function ppage(){window.location.href=prevpage+"?dpi="+Math.round(dpi);}\n'
+        ml += 'function npage(){window.location.href=nextpage+"?dpi="+Math.round(dpi);}\n'
+        ml += 'var gt=gd();if(gt>0){dpi=gt;}\n'
+        ml += 'window.onload=setsize;\n'
+        ml += ']]></script>\n'
+        ml += '</head>\n'
+        ml += '<body onLoad="setsize();" style="background-color:#777;text-align:center;">\n'
+        ml += '<div style="white-space:nowrap;">\n'
+        if (counter == 0) :
+            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'
+        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'
+        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): 
+        ml += '<defs>\n'
+        gdefs = pp.getGlyphs()
+        for j in xrange(0,len(gdefs)):
+            ml += gdefs[j]
+        ml += '</defs>\n'
+    img = pp.getImages()
+    if (img != None):
+        for j in xrange(0,len(img)):
+            ml += img[j]
+    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])
+    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'
+    if (raw) :
+        ml += '</svg>'
+    else :
+        ml += '</svg></a>\n'
+        if (counter == numfiles - 1) :
+            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'
+        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'
+        ml += '</div>\n'
+        ml += '<div><a href="javascript:zoomin();">zoom in</a> - <a href="javascript:zoomout();">zoom out</a></div>\n'
+        ml += '</body>\n'
+        ml += '</html>\n'
+    return ml
+

Calibre_Plugins/K4MobiDeDRM_plugin/genbook.py

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

Calibre_Plugins/K4MobiDeDRM_plugin/kgenpids.py

@@ -0,0 +1,316 @@
+#!/usr/bin/env python
+
+from __future__ import with_statement
+import sys
+import os, csv
+import binascii
+import zlib
+import re
+from struct import pack, unpack, unpack_from
+
+class DrmException(Exception):
+    pass
+
+global kindleDatabase
+global charMap1
+global charMap2
+global charMap3
+global charMap4
+
+if sys.platform.startswith('win'):
+    from k4pcutils import openKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap2
+if sys.platform.startswith('darwin'):
+    from k4mutils import openKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap2
+
+charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
+charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
+
+# crypto digestroutines
+import hashlib
+
+def MD5(message):
+    ctx = hashlib.md5()
+    ctx.update(message)
+    return ctx.digest()
+
+def SHA1(message):
+    ctx = hashlib.sha1()
+    ctx.update(message)
+    return ctx.digest()
+
+
+# Encode the bytes in data with the characters in map
+def encode(data, map):
+    result = ""
+    for char in data:
+        value = ord(char)
+        Q = (value ^ 0x80) // len(map)
+        R = value % len(map)
+        result += map[Q]
+        result += map[R]
+    return result
+  
+# Hash the bytes in data and then encode the digest with the characters in map
+def encodeHash(data,map):
+    return encode(MD5(data),map)
+
+# Decode the string in data with the characters in map. Returns the decoded bytes
+def decode(data,map):
+    result = ""
+    for i in range (0,len(data)-1,2):
+        high = map.find(data[i])
+        low = map.find(data[i+1])
+        if (high == -1) or (low == -1) :
+            break
+        value = (((high * len(map)) ^ 0x80) & 0xFF) + low
+        result += pack("B",value)
+    return result
+
+
+# Parse the Kindle.info file and return the records as a list of key-values
+def parseKindleInfo(kInfoFile):
+    DB = {}
+    infoReader = openKindleInfo(kInfoFile)
+    infoReader.read(1)
+    data = infoReader.read()
+    if sys.platform.startswith('win'):
+        items = data.split('{')
+    else :
+        items = data.split('[')
+    for item in items:
+        splito = item.split(':')
+        DB[splito[0]] =splito[1]
+    return DB
+
+# Get a record from the Kindle.info file for the key "hashedKey" (already hashed and encoded). 
+# Return the decoded and decrypted record
+def getKindleInfoValueForHash(hashedKey):
+    global kindleDatabase
+    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
+    bitPosition = 6 - 2*(offset % 4)
+    return ord(bitField[byteNumber]) >> bitPosition & 3
+
+# Returns the six bits at offset from a bit field
+def getSixBitsFromBitField(bitField,offset):
+     offset *= 3
+     value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
+     return value
+     
+# 8 bits to six bits encoding from hash to generate PID string
+def encodePID(hash):
+    global charMap3
+    PID = ""
+    for position in range (0,8):
+        PID += charMap3[getSixBitsFromBitField(hash,position)]
+    return PID
+
+# Encryption table used to generate the device PID
+def generatePidEncryptionTable() :
+    table = []
+    for counter1 in range (0,0x100):
+        value = counter1
+        for counter2 in range (0,8):
+            if (value & 1 == 0) :
+                value = value >> 1
+            else :
+                value = value >> 1
+                value = value ^ 0xEDB88320
+        table.append(value)
+    return table
+
+# Seed value used to generate the device PID
+def generatePidSeed(table,dsn) :
+    value = 0
+    for counter in range (0,4) :
+       index = (ord(dsn[counter]) ^ value) &0xFF
+       value = (value >> 8) ^ table[index]
+    return value
+
+# Generate the device PID
+def generateDevicePID(table,dsn,nbRoll):
+    global charMap4
+    seed = generatePidSeed(table,dsn)
+    pidAscii = ""
+    pid = [(seed >>24) &0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF,(seed>>24) & 0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF]
+    index = 0
+    for counter in range (0,nbRoll):
+        pid[index] = pid[index] ^ ord(dsn[counter])
+        index = (index+1) %8
+    for counter in range (0,8):
+        index = ((((pid[counter] >>5) & 3) ^ pid[counter]) & 0x1f) + (pid[counter] >> 7)
+        pidAscii += charMap4[index]
+    return pidAscii
+
+def crc32(s):
+  return (~binascii.crc32(s,-1))&0xFFFFFFFF 
+
+# convert from 8 digit PID to 10 digit PID with checksum
+def checksumPid(s):
+    global charMap4
+    crc = crc32(s)
+    crc = crc ^ (crc >> 16)
+    res = s
+    l = len(charMap4)
+    for i in (0,1):
+        b = crc & 0xff
+        pos = (b // l) ^ (b % l)
+        res += charMap4[pos%l]
+        crc >>= 8
+    return res
+
+
+# old kindle serial number to fixed pid
+def pidFromSerial(s, l):
+    global charMap4
+    crc = crc32(s)
+    arr1 = [0]*l
+    for i in xrange(len(s)):
+        arr1[i%l] ^= ord(s[i])
+    crc_bytes = [crc >> 24 & 0xff, crc >> 16 & 0xff, crc >> 8 & 0xff, crc & 0xff]
+    for i in xrange(l):
+        arr1[i] ^= crc_bytes[i&3]
+    pid = ""
+    for i in xrange(l):
+        b = arr1[i] & 0xff
+        pid+=charMap4[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]
+    return pid
+
+
+# Parse the EXTH header records and use the Kindle serial number to calculate the book pid.
+def getKindlePid(pidlst, rec209, token, serialnum):
+
+    if rec209 != None and token != None:
+        # Compute book PID
+        pidHash = SHA1(serialnum+rec209+token)
+        bookPID = encodePID(pidHash)
+        bookPID = checksumPid(bookPID)
+        pidlst.append(bookPID)
+
+    # compute fixed pid for old pre 2.5 firmware update pid as well
+    bookPID = pidFromSerial(serialnum, 7) + "*"
+    bookPID = checksumPid(bookPID)
+    pidlst.append(bookPID)
+
+    return pidlst
+
+
+# Parse the EXTH header records and parse the Kindleinfo
+# file to calculate the book pid.
+
+def getK4Pids(pidlst, rec209, token, kInfoFile=None):
+    global kindleDatabase
+    global charMap1
+    kindleDatabase = None
+    try:
+        kindleDatabase = parseKindleInfo(kInfoFile)
+    except Exception, message:
+        print(message)
+        kindleDatabase = None
+        pass
+    
+    if kindleDatabase == None :
+        return pidlst
+
+    # Get the Mazama Random number
+    MazamaRandomNumber = getKindleInfoValueForKey("MazamaRandomNumber")
+
+    # Get the HDD serial
+    encodedSystemVolumeSerialNumber = encodeHash(GetVolumeSerialNumber(),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)
+       
+    # Compute the device PID (for which I can tell, is used for nothing).
+    table =  generatePidEncryptionTable()
+    devicePID = generateDevicePID(table,DSN,4)
+    devicePID = checksumPid(devicePID)
+    pidlst.append(devicePID)
+
+    # Compute book PID
+    if rec209 == None or token == None:
+        print "\nNo EXTH record type 209 or token - Perhaps not a K4 file?"
+        return pidlst
+
+    # Get the kindle account token
+    kindleAccountToken = getKindleInfoValueForKey("kindle.account.tokens")
+
+    # book pid
+    pidHash = SHA1(DSN+kindleAccountToken+rec209+token)
+    bookPID = encodePID(pidHash)
+    bookPID = checksumPid(bookPID)
+    pidlst.append(bookPID)
+
+    # variant 1
+    pidHash = SHA1(kindleAccountToken+rec209+token)
+    bookPID = encodePID(pidHash)
+    bookPID = checksumPid(bookPID)
+    pidlst.append(bookPID)
+
+    # variant 2
+    pidHash = SHA1(DSN+rec209+token)
+    bookPID = encodePID(pidHash)
+    bookPID = checksumPid(bookPID)
+    pidlst.append(bookPID)
+
+    return pidlst
+
+def getPidList(md1, md2, k4, pids, serials, kInfoFiles):
+    pidlst = []
+    if k4:
+        pidlst = getK4Pids(pidlst, md1, md2)
+    for infoFile in kInfoFiles:
+        pidlst = getK4Pids(pidlst, md1, md2, infoFile)
+    for serialnum in serials:
+        pidlst = getKindlePid(pidlst, md1, md2, serialnum)
+    for pid in pids:
+        pidlst.append(pid)
+    return pidlst

Calibre_Plugins/K4MobiDeDRM_plugin/topazextract.py

@@ -0,0 +1,436 @@
+#!/usr/bin/env python
+
+class Unbuffered:
+    def __init__(self, stream):
+        self.stream = stream
+    def write(self, data):
+        self.stream.write(data)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+import sys
+sys.stdout=Unbuffered(sys.stdout)
+import os, csv, getopt
+import zlib, zipfile, tempfile, shutil
+from struct import pack
+from struct import unpack
+
+class TpzDRMError(Exception):
+    pass
+    
+# local support routines
+import kgenpids
+import genbook
+#
+# Utility routines
+#
+
+# Get a 7 bit encoded number from file
+def bookReadEncodedNumber(fo):
+    flag = False
+    data = ord(fo.read(1))
+    if data == 0xFF:
+       flag = True
+       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 
+    if flag:
+       data = -data
+    return data
+    
+# Get a length prefixed string from file 
+def bookReadString(fo):
+    stringLength = bookReadEncodedNumber(fo)
+    return unpack(str(stringLength)+"s",fo.read(stringLength))[0]  
+
+#
+# crypto routines
+#
+
+# Context initialisation for the Topaz Crypto
+def topazCryptoInit(key):
+    ctx1 = 0x0CAFFE19E
+    for keyChar in key:
+        keyByte = ord(keyChar)
+        ctx2 = ctx1 
+        ctx1 = ((((ctx1 >>2) * (ctx1 >>7))&0xFFFFFFFF) ^ (keyByte * keyByte * 0x0F902007)& 0xFFFFFFFF )
+    return [ctx1,ctx2]
+    
+# decrypt data with the context prepared by topazCryptoInit()
+def topazCryptoDecrypt(data, ctx):
+    ctx1 = ctx[0]
+    ctx2 = ctx[1]
+    plainText = ""
+    for dataChar in data:
+        dataByte = ord(dataChar)
+        m = (dataByte ^ ((ctx1 >> 3) &0xFF) ^ ((ctx2<<3) & 0xFF)) &0xFF
+        ctx2 = ctx1
+        ctx1 = (((ctx1 >> 2) * (ctx1 >> 7)) &0xFFFFFFFF) ^((m * m * 0x0F902007) &0xFFFFFFFF)
+        plainText += chr(m)
+    return plainText
+
+# Decrypt data with the PID
+def decryptRecord(data,PID):
+    ctx = topazCryptoInit(PID)
+    return topazCryptoDecrypt(data, ctx)
+
+# Try to decrypt a dkey record (contains the bookPID)
+def decryptDkeyRecord(data,PID):
+    record = decryptRecord(data,PID)
+    fields = unpack("3sB8sB8s3s",record)
+    if fields[0] != "PID" or fields[5] != "pid" :
+        raise TpzDRMError("Didn't find PID magic numbers in record")
+    elif fields[1] != 8 or fields[3] != 8 :
+        raise TpzDRMError("Record didn't contain correct length fields")
+    elif fields[2] != PID :
+        raise TpzDRMError("Record didn't contain PID")
+    return fields[4]
+
+# Decrypt all dkey records (contain the book PID)
+def decryptDkeyRecords(data,PID):
+    nbKeyRecords = ord(data[0])
+    records = []
+    data = data[1:]
+    for i in range (0,nbKeyRecords):
+        length = ord(data[0])
+        try:
+            key = decryptDkeyRecord(data[1:length+1],PID)
+            records.append(key)
+        except TpzDRMError:
+            pass
+        data = data[1+length:]
+    if len(records) == 0:
+        raise TpzDRMError("BookKey Not Found")
+    return records
+
+
+class TopazBook:
+    def __init__(self, filename, outdir):
+        self.fo = file(filename, 'rb')
+        self.outdir = outdir
+        self.bookPayloadOffset = 0
+        self.bookHeaderRecords = {}
+        self.bookMetadata = {}
+        self.bookKey = None
+        magic = unpack("4s",self.fo.read(4))[0]
+        if magic != 'TPZ0':
+            raise TpzDRMError("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 
+            # [[offset,decompressedLength,compressedLength],...]
+            nbValues = bookReadEncodedNumber(self.fo)
+            values = []
+            for i in range (0,nbValues):
+                values.append([bookReadEncodedNumber(self.fo),bookReadEncodedNumber(self.fo),bookReadEncodedNumber(self.fo)])
+            return values
+        def parseTopazHeaderRecord():
+            # 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")
+            tag = bookReadString(self.fo)
+            record = bookReadHeaderRecordData()
+            return [tag,record]
+        nbRecords = bookReadEncodedNumber(self.fo)
+        for i in range (0,nbRecords):
+            result = parseTopazHeaderRecord()
+            # print result[0], result[1]
+            self.bookHeaderRecords[result[0]] = result[1]
+        if ord(self.fo.read(1))  != 0x64 :
+            raise TpzDRMError("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])
+        tag = bookReadString(self.fo)
+        if tag != "metadata" :
+            raise TpzDRMError("Parse Error : Record Names Don't Match")
+        flags = ord(self.fo.read(1))
+        nbRecords = ord(self.fo.read(1))
+        for i in range (0,nbRecords) :
+            record = [bookReadString(self.fo), bookReadString(self.fo)]
+            self.bookMetadata[record[0]] = record[1]
+        return self.bookMetadata
+
+    def getPIDMetaInfo(self):
+        keysRecord = None
+        keysRecordRecord = None
+        if 'keys' in self.bookMetadata:
+            keysRecord = self.bookMetadata['keys']
+        if keysRecord in self.bookMetadata:
+            keysRecordRecord = self.bookMetadata[keysRecord]
+        return keysRecord, keysRecordRecord
+
+    def getBookTitle(self):
+        title = ''
+        if 'Title' in self.bookMetadata:
+            title = self.bookMetadata['Title']
+        return title
+
+    def setBookKey(self, key):
+        self.bookKey = key
+
+    def getBookPayloadRecord(self, name, index):
+        # Get a record in the book payload, given its name and index. 
+        # decrypted and decompressed if necessary 
+        encrypted = False
+        compressed = False
+        try: 
+            recordOffset = self.bookHeaderRecords[name][index][0]
+        except:
+            raise TpzDRMError("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")
+
+        recordIndex = bookReadEncodedNumber(self.fo)
+        if recordIndex < 0 :
+            encrypted = True
+            recordIndex = -recordIndex -1
+
+        if recordIndex != index :
+            raise TpzDRMError("Parse Error : Invalid Record, index doesn't match")
+
+        if (self.bookHeaderRecords[name][index][2] > 0):
+            compressed = True
+            record = self.fo.read(self.bookHeaderRecords[name][index][2])
+        else:
+            record = self.fo.read(self.bookHeaderRecords[name][index][1])
+
+        if encrypted:
+            if self.bookKey:
+                ctx = topazCryptoInit(self.bookKey)
+                record = topazCryptoDecrypt(record,ctx)
+            else :
+                raise TpzDRMError("Error: Attempt to decrypt without bookKey")
+
+        if compressed:
+            record = zlib.decompress(record)
+
+        return record
+
+    def processBook(self, pidlst):
+        raw = 0
+        fixedimage=True
+        try:
+            keydata = self.getBookPayloadRecord('dkey', 0)
+        except TpzDRMError, e:
+            print "no dkey record found, book may not be encrypted"
+            print "attempting to extrct files without a book key"
+            self.createBookDirectory()
+            self.extractFiles()
+            print "Successfully Extracted Topaz contents"
+            rv = genbook.generateBook(self.outdir, raw, fixedimage)
+            if rv == 0:
+                print "\nBook Successfully generated"
+            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
+            bookKeys = []
+            data = keydata
+            try:
+                bookKeys+=decryptDkeyRecords(data,pid)
+            except TpzDRMError, e:
+                pass
+            else:
+                bookKey = bookKeys[0]
+                print "Book Key Found!"
+                break
+
+        if not bookKey:
+            raise TpzDRMError('Decryption Unsucessful; No valid pid found')
+
+        self.setBookKey(bookKey)
+        self.createBookDirectory()
+        self.extractFiles()
+        print "Successfully Extracted Topaz contents"
+        rv = genbook.generateBook(self.outdir, raw, fixedimage)
+        if rv == 0:
+            print "\nBook Successfully generated"
+        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')
+        if not os.path.exists(destdir):
+            os.makedirs(destdir)
+        destdir =  os.path.join(outdir,'color_img')
+        if not os.path.exists(destdir):
+            os.makedirs(destdir)
+        destdir =  os.path.join(outdir,'page')
+        if not os.path.exists(destdir):
+            os.makedirs(destdir)
+        destdir =  os.path.join(outdir,'glyphs')
+        if not os.path.exists(destdir):
+            os.makedirs(destdir)
+
+    def extractFiles(self):
+        outdir = self.outdir
+        for headerRecord in self.bookHeaderRecords:
+            name = headerRecord
+            if name != "dkey" :
+                ext = '.dat'
+                if name == 'img' : ext = '.jpg'
+                if name == 'color' : ext = '.jpg'
+                print "\nProcessing Section: %s " % name
+                for index in range (0,len(self.bookHeaderRecords[name])) :
+                    fnum = "%04d" % index
+                    fname = name + fnum + ext
+                    destdir = outdir
+                    if name == 'img':
+                        destdir =  os.path.join(outdir,'img')
+                    if name == 'color':
+                        destdir =  os.path.join(outdir,'color_img')
+                    if name == 'page':
+                        destdir =  os.path.join(outdir,'page')
+                    if name == 'glyphs':
+                        destdir =  os.path.join(outdir,'glyphs')
+                    outputFile = os.path.join(destdir,fname)
+                    print ".",
+                    record = self.getBookPayloadRecord(name,index)
+                    if record != '':
+                        file(outputFile, 'wb').write(record)
+        print " "
+
+
+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)
+
+
+def usage(progname):
+    print "Removes DRM protection from Topaz ebooks and extract the contents"
+    print "Usage:"
+    print "    %s [-k <kindle.info>] [-p <pidnums>] [-s <kindleSerialNumbers>] <infile> <outdir>  " % progname
+    
+
+# Main
+def main(argv=sys.argv):
+    progname = os.path.basename(argv[0])
+    k4 = False
+    pids = []
+    serials = []
+    kInfoFiles = []
+    
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
+    except getopt.GetoptError, err:
+        print str(err)
+        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"
+        return 1
+
+    bookname = os.path.splitext(os.path.basename(infile))[0]
+    tempdir = tempfile.mkdtemp()
+
+    tb = TopazBook(infile, tempdir)
+    title = tb.getBookTitle()
+    print "Processing Book: ", title
+    keysRecord, keysRecordRecord = tb.getPIDMetaInfo()
+    pidlst = kgenpids.getPidList(keysRecord, keysRecordRecord, k4, pids, serials, kInfoFiles) 
+
+    try:
+        tb.processBook(pidlst)
+    except TpzDRMError, e:
+        print str(e)
+        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
+
+    print "   Creating HTML ZIP Archive"
+    zipname = os.path.join(outdir, bookname + '_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, 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())
+

Calibre_Plugins/README-Ineptpdf-plugin.txt

@@ -0,0 +1,39 @@
+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.

Calibre_Plugins/README-K4MobiDeDRM-plugin.txt

@@ -1,20 +1,20 @@
-Plugin for K4PC, K4Mac and Mobi Books
+Plugin for K4PC, K4Mac, standalone Kindles, Mobi Books, and for Devices with Fixed PIDs.
 
-Will work on Linux (standard DRM Mobi books only), Mac OS X (standard DRM Mobi books and "Kindle for Mac" books, and Windows (standard DRM Mobi books and "Kindle for PC" books.
+This plugin supersedes MobiDeDRM, K4DeDRM, and K4PCDeDRM and K4X plugins.  If you install this plugin, those plugins can be safely removed.
 
-This plugin supersedes MobiDeDRM, K4DeDRM, and K4PCDeDRM plugins.  If you install this plugin, those plugins can be safely removed.
-
-This plugin is meant to convert "Kindle for PC", "Kindle for Mac" and "Mobi" ebooks with DRM to unlocked Mobi files. 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.
+
 
 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.
-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.
+
+
+
 Installation:
 
-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. This is not needed if you only want to decode "Kindle for PC" or "Kindle for Mac" books. 
+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.
 
-If you find that it's not working for you (imported azw's are not converted to mobi format), you can save a lot of time and trouble by trying to add the azw file 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
+
 
 Configuration:
 

Calibre_Plugins/README-eReaderPDB2PML-plugin.txt

@@ -7,6 +7,8 @@ This plugin is meant to convert secure Ereader files (PDB) to unsecured PMLZ fil
 
 
 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:
 

Calibre_Plugins/README-ignobleepub-plugin.txt

@@ -12,6 +12,8 @@ Installation:
 
 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:

Calibre_Plugins/README-ineptepub-plugin.txt

@@ -10,6 +10,9 @@ Installation:
 
 
 
+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:
 

Calibre_Plugins/Win_OpenSSL_0.9.8o.txt

@@ -0,0 +1,26 @@
+Installing openssl on Windows 64-bit (Windows 2000 and higher)
+
+Win64 OpenSSL v0.9.8o (8Mb)
+http://www.slproweb.com/download/Win64OpenSSL-0_9_8o.exe
+(if you get an error message about missing Visual C++ redistributables... cancel the install and install the below support program from Microsoft, THEN install OpenSSL)
+
+Visual C++ 2008 Redistributables (x64) (1.7Mb)
+http://www.microsoft.com/downloads/details.aspx?familyid=bd2a6171-e2d6-4230-b809-9a8d7548c1b6
+
+
+
+Installing openssl on Windows 32-bit (Windows 2000 and higher)
+
+Win32 OpenSSL v0.9.8o (8Mb)
+http://www.slproweb.com/download/Win32OpenSSL-0_9_8o.exe
+(if you get an error message about missing Visual C++ redistributables... cancel the install and install the below support program from Microsoft, THEN install OpenSSL)
+
+Visual C++ 2008 Redistributables (1.7Mb)
+http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF
+
+
+
+Other versions of OpenSSL (and versions for Windows older than Windows 2000) can be found on the following website.
+
+Shining Light Productions
+http://www.slproweb.com/products/Win32OpenSSL.html

Calibre_Plugins/eReaderPDB2PML_plugin/eReaderPDB2PML-README.txt

@@ -1,21 +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.
-
-Configuration:
-Highlight the plugin (eReader PDB 2 PML under the "File type plugins" category) and click the "Customize Plugin" button on Calibre's Preferences->Plugins page. Enter your name and last 8 digits of the credit card number separated by a comma: Your Name,12341234
-
-If you've purchased books with more than one credit card, separate the info with a colon: Your Name,12341234:Other Name,23452345 (NOTE: Do NOT put quotes around your name like you do with the original script!!)
-
-Troubleshooting:
-If you find that it's not working for you (imported pdb's are not converted to pmlz format), you can save a lot of time and trouble by trying to add the pdb to Calibre with the command line tools. This will print out a lot of helpful debugging info that can be copied into any online help requests. I'm going to ask you to do it first, anyway, so you might
-as well get used to it. ;)
-
-Open a command prompt (terminal) and change to the directory where the ebook you're trying to import resides. Then type the command "calibredb add your_ebook.pdb". Don't type the quotes and obviously change the 'your_ebook.pdb' to whatever the filename of your book is. Copy the resulting output and paste it into any online help request you make.
-
-** Note: the Mac version of Calibre doesn't install the command line tools by default. If you go to the 'Preferences' page and click on the miscellaneous button, you'll see the option to install the command line tools.

Calibre_Plugins/eReaderPDB2PML_plugin/eReaderPDB2PML_plugin.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# eReaderPDB2PML_v01_plugin.py
+# eReaderPDB2PML_plugin.py
 # Released under the terms of the GNU General Public Licence, version 3 or
 # later.  <http://www.gnu.org/licenses/>
 #
@@ -10,9 +10,7 @@
 # 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.
+# other than having Calibre installed, of course. 
 #
 # Installation:
 # Go to Calibre's Preferences page... click on the Plugins button. Use the file
@@ -30,7 +28,9 @@
 # NOTE: Do NOT put quotes around your name like you do with the original script!!
 #
 # Revision history:
-#   0.1 - Initial release
+#   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
 
@@ -42,26 +42,17 @@ class eRdrDeDRM(FileTypePlugin):
                             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, 1)   # The version number 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
-        pdir = 'windows' if iswindows else 'osx' if isosx else 'linux'
-        ppath = os.path.join(self.sys_insertion_path, pdir)
-        sys.path.insert(0, ppath)
-        #sys.path.append(ppath)
         
         global bookname, erdr2pml
         import erdr2pml
         
-        if 'psyco' in sys.modules:
-            print 'Using psyco acceleration for %s.' % pdir
-        else:
-            print 'NOT using psyco acceleration for %s. Conversion may be slow.' % pdir
-        
         infile = path_to_ebook
         bookname = os.path.splitext(os.path.basename(infile))[0]
         outdir = PersistentTemporaryDirectory()
@@ -74,7 +65,6 @@ class eRdrDeDRM(FileTypePlugin):
                 try:
                     name, cc = i.split(',')
                 except ValueError:
-                    sys.path.remove(ppath)
                     print '   Error parsing user supplied data.'
                     return path_to_ebook
 
@@ -86,7 +76,6 @@ class eRdrDeDRM(FileTypePlugin):
                     
                     if pmlfilepath and pmlfilepath != 1:
                         import zipfile
-                        import shutil
                         print "   Creating PMLZ file"
                         myZipFile = zipfile.ZipFile(pmlzfile.name,'w',zipfile.ZIP_STORED, False)
                         list = os.listdir(outdir)

Calibre_Plugins/eReaderPDB2PML_plugin/erdr2pml.py

@@ -54,26 +54,11 @@
 #  0.13 - change to unbuffered stdout for use with gui front ends
 #  0.14 - contributed enhancement to support --make-pmlz switch
 #  0.15 - enabled high-ascii to pml character encoding. DropBook now works on Mac.
+#  0.16 - convert to use openssl DES (very very fast) or pure python DES if openssl's libcrypto is not available
+#  0.17 - added support for pycrypto's DES as well
+#  0.18 - on Windows try PyCrypto first and OpenSSL next
 
-__version__='0.15'
-
-# Import Psyco if available
-try:
-    # Dumb speed hack 1
-    # http://psyco.sourceforge.net
-    import psyco
-    psyco.full()
-    pass
-except ImportError:
-    pass
-try:
-    # Dumb speed hack 2
-    # All map() calls converted to list comprehension (some use zip)
-    # override zip with izip - saves memory and in rough testing
-    # appears to be faster zip() is only used in the converted map() calls
-    from itertools import izip as zip
-except ImportError:
-    pass
+__version__='0.18'
 
 class Unbuffered:
     def __init__(self, stream):
@@ -89,6 +74,37 @@ sys.stdout=Unbuffered(sys.stdout)
 
 import struct, binascii, getopt, zlib, os, os.path, urllib, tempfile
 
+Des = None
+if sys.platform.startswith('win'):
+    # first try with pycrypto
+    import pycrypto_des
+    Des = pycrypto_des.load_pycrypto()
+    if Des == None:
+        # they try with openssl
+        import openssl_des
+        Des = openssl_des.load_libcrypto()
+else:
+    # first try with openssl
+    import openssl_des
+    Des = openssl_des.load_libcrypto()
+    if Des == None:
+        # then try with pycrypto
+        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
+    Des = python_des.Des
+    # Import Psyco if available
+    try:
+        # http://psyco.sourceforge.net
+        import psyco
+        psyco.full()
+    except ImportError:
+        pass
+
 try:
     from hashlib import sha1
 except ImportError:
@@ -101,223 +117,6 @@ import logging
 logging.basicConfig()
 #logging.basicConfig(level=logging.DEBUG)
 
-ECB =	0
-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,
-         62, 54, 46, 38, 30, 22, 14,  6, 61, 53, 45, 37, 29, 21,
-         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,
-        40, 51, 30, 36, 46, 54,	29, 39, 50, 44, 32, 47,
-        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,
-        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,
-        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,
-        23, 24, 25, 26, 27, 28,27, 28, 29, 30, 31,  0]
-    __sbox = [[14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
-         0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
-         4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
-         15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13],
-        [15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
-         3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
-         0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
-         13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9],
-        [10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
-         13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
-         13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
-         1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12],
-        [7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
-         13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
-         10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
-         3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14],
-        [2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
-         14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
-         4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
-         11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3],
-        [12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
-         10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
-         9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
-         4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13],
-        [4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
-         13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
-         1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
-         6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12],
-        [13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
-         1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
-         7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
-         2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11],]
-    __p = [15, 6, 19, 20, 28, 11,27, 16, 0, 14, 22, 25,
-        4, 17, 30, 9, 1, 7,23,13, 31, 26, 2, 8,18, 12, 29, 5, 21, 10,3, 24]
-    __fp = [39,  7, 47, 15, 55, 23, 63, 31,38,  6, 46, 14, 54, 22, 62, 30,
-        37,  5, 45, 13, 53, 21, 61, 29,36,  4, 44, 12, 52, 20, 60, 28,
-        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
-    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.")
-        self.block_size = 8
-        self.key_size = 8
-        self.__padding = ''
-        self.setMode(mode)
-        if IV:
-            self.setIV(IV)
-        self.L = []
-        self.R = []
-        self.Kn = [ [0] * 48 ] * 16	# 16 48-bit keys (K1 - K16)
-        self.final = []
-        self.setKey(key)
-    def getKey(self):
-        return self.__key
-    def setKey(self, key):
-        self.__key = key
-        self.__create_sub_keys()
-    def getMode(self):
-        return self.__mode
-    def setMode(self, mode):
-        self.__mode = mode
-    def getIV(self):
-        return self.__iv
-    def setIV(self, IV):
-        if not IV or len(IV) != self.block_size:
-            raise ValueError("Invalid Initial Value (IV), must be a multiple of " + str(self.block_size) + " bytes")
-        self.__iv = IV
-    def getPadding(self):
-        return self.__padding
-    def __String_to_BitList(self, data):
-        l = len(data) * 8
-        result = [0] * l
-        pos = 0
-        for c in data:
-            i = 7
-            ch = ord(c)
-            while i >= 0:
-                if ch & (1 << i) != 0:
-                    result[pos] = 1
-                else:
-                    result[pos] = 0
-                pos += 1
-                i -= 1
-        return result
-    def __BitList_to_String(self, data):
-        result = ''
-        pos = 0
-        c = 0
-        while pos < len(data):
-            c += data[pos] << (7 - (pos % 8))
-            if (pos % 8) == 7:
-                result += chr(c)
-                c = 0
-            pos += 1
-        return result
-    def __permutate(self, table, block):
-        return [block[x] for x in table]
-    def __create_sub_keys(self):
-        key = self.__permutate(Des.__pc1, self.__String_to_BitList(self.getKey()))
-        i = 0
-        self.L = key[:28]
-        self.R = key[28:]
-        while i < 16:
-            j = 0
-            while j < Des.__left_rotations[i]:
-                self.L.append(self.L[0])
-                del self.L[0]
-                self.R.append(self.R[0])
-                del self.R[0]
-                j += 1
-            self.Kn[i] = self.__permutate(Des.__pc2, self.L + self.R)
-            i += 1
-    def __des_crypt(self, block, crypt_type):
-        block = self.__permutate(Des.__ip, block)
-        self.L = block[:32]
-        self.R = block[32:]
-        if crypt_type == Des.ENCRYPT:
-            iteration = 0
-            iteration_adjustment = 1
-        else:
-            iteration = 15
-            iteration_adjustment = -1
-        i = 0
-        while i < 16:
-            tempR = self.R[:]
-            self.R = self.__permutate(Des.__expansion_table, self.R)
-            self.R = [x ^ y for x,y in zip(self.R, self.Kn[iteration])]
-            B = [self.R[:6], self.R[6:12], self.R[12:18], self.R[18:24], self.R[24:30], self.R[30:36], self.R[36:42], self.R[42:]]
-            j = 0
-            Bn = [0] * 32
-            pos = 0
-            while j < 8:
-                m = (B[j][0] << 1) + B[j][5]
-                n = (B[j][1] << 3) + (B[j][2] << 2) + (B[j][3] << 1) + B[j][4]
-                v = Des.__sbox[j][(m << 4) + n]
-                Bn[pos] = (v & 8) >> 3
-                Bn[pos + 1] = (v & 4) >> 2
-                Bn[pos + 2] = (v & 2) >> 1
-                Bn[pos + 3] = v & 1
-                pos += 4
-                j += 1
-            self.R = self.__permutate(Des.__p, Bn)
-            self.R = [x ^ y for x, y in zip(self.R, self.L)]
-            self.L = tempR
-            i += 1
-            iteration += iteration_adjustment
-        self.final = self.__permutate(Des.__fp, self.R + self.L)
-        return self.final
-    def crypt(self, data, crypt_type):
-        if not data:
-            return ''
-        if len(data) % self.block_size != 0:
-            if crypt_type == Des.DECRYPT: # Decryption must work on 8 byte blocks
-                raise ValueError("Invalid data length, data must be a multiple of " + str(self.block_size) + " bytes\n.")
-            if not self.getPadding():
-                raise ValueError("Invalid data length, data must be a multiple of " + str(self.block_size) + " bytes\n. Try setting the optional padding character")
-            else:
-                data += (self.block_size - (len(data) % self.block_size)) * self.getPadding()
-        if self.getMode() == CBC:
-            if self.getIV():
-                iv = self.__String_to_BitList(self.getIV())
-            else:
-                raise ValueError("For CBC mode, you must supply the Initial Value (IV) for ciphering")
-        i = 0
-        dict = {}
-        result = []
-        while i < len(data):
-            block = self.__String_to_BitList(data[i:i+8])
-            if self.getMode() == CBC:
-                if crypt_type == Des.ENCRYPT:
-                    block = [x ^ y for x, y in zip(block, iv)]
-                processed_block = self.__des_crypt(block, crypt_type)
-                if crypt_type == Des.DECRYPT:
-                    processed_block = [x ^ y for x, y in zip(processed_block, iv)]
-                    iv = block
-                else:
-                    iv = processed_block
-            else:
-                processed_block = self.__des_crypt(block, crypt_type)
-            result.append(self.__BitList_to_String(processed_block))
-            i += 8
-        if crypt_type == Des.DECRYPT and self.getPadding():
-            s = result[-1]
-            while s[-1] == self.getPadding():
-                s = s[:-1]
-            result[-1] = s
-        return ''.join(result)
-    def encrypt(self, data, pad=''):
-        self.__padding = pad
-        return self.crypt(data, Des.ENCRYPT)
-    def decrypt(self, data, pad=''):
-        self.__padding = pad
-        return self.crypt(data, Des.DECRYPT)
-
 class Sectionizer(object):
     def __init__(self, filename, ident):
         self.contents = file(filename, 'rb').read()
@@ -669,7 +468,7 @@ def main(argv=None):
                                 myZipFile.write(imagePath, localname)
                 myZipFile.close()
                 # remove temporary directory
-                shutil.rmtree(outdir)
+                shutil.rmtree(outdir, True)
 
             end_time = time.time()
             search_time = end_time - start_time
@@ -685,8 +484,5 @@ def main(argv=None):
     return 0
 
 if __name__ == "__main__":
-    #import cProfile
-    #command = """sys.exit(main())"""
-    #cProfile.runctx( command, globals(), locals(), filename="cprofile.profile" )
-    
     sys.exit(main())
+

Calibre_Plugins/eReaderPDB2PML_plugin/openssl_des.py

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

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/all-wcprops

@@ -1,47 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 41
-/svn/!svn/ver/70200/psyco/dist/py-support
-END
-core.py
-K 25
-svn:wc:ra_dav:version-url
-V 49
-/svn/!svn/ver/70200/psyco/dist/py-support/core.py
-END
-support.py
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/49315/psyco/dist/py-support/support.py
-END
-classes.py
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/35003/psyco/dist/py-support/classes.py
-END
-__init__.py
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/35003/psyco/dist/py-support/__init__.py
-END
-logger.py
-K 25
-svn:wc:ra_dav:version-url
-V 51
-/svn/!svn/ver/23284/psyco/dist/py-support/logger.py
-END
-kdictproxy.py
-K 25
-svn:wc:ra_dav:version-url
-V 55
-/svn/!svn/ver/35003/psyco/dist/py-support/kdictproxy.py
-END
-profiler.py
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/70200/psyco/dist/py-support/profiler.py
-END

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/dir-prop-base

@@ -1,7 +0,0 @@
-K 10
-svn:ignore
-V 14
-*~
-*.pyc
-*.pyo
-END

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/entries

@@ -1,266 +0,0 @@
-10
-
-dir
-78269
-http://codespeak.net/svn/psyco/dist/py-support
-http://codespeak.net/svn
-
-
-
-2009-12-18T16:35:35.119276Z
-70200
-arigo
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-fd0d7bf2-dfb6-0310-8d31-b7ecfe96aada
-
-core.py
-file
-
-
-
-
-2010-10-25T15:10:42.000000Z
-3b362177a839893c9e867880b3a7cef3
-2009-12-18T16:35:35.119276Z
-70200
-arigo
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8144
-
-support.py
-file
-
-
-
-
-2010-10-25T15:10:42.000000Z
-b0551e975d774f2f7f58a29ed4b6b90e
-2007-12-03T12:27:25.632574Z
-49315
-arigo
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6043
-
-classes.py
-file
-
-
-
-
-2010-10-25T15:10:42.000000Z
-5932ed955198d16ec17285dfb195d341
-2006-11-26T13:03:26.949973Z
-35003
-arigo
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1440
-
-__init__.py
-file
-
-
-
-
-2010-10-25T15:10:42.000000Z
-219582b5182dfa38a9119d059a71965f
-2006-11-26T13:03:26.949973Z
-35003
-arigo
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1895
-
-logger.py
-file
-
-
-
-
-2010-10-25T15:10:42.000000Z
-aa21f905df036af43082e1ea2a2561ee
-2006-02-13T15:02:51.744168Z
-23284
-arigo
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2678
-
-kdictproxy.py
-file
-
-
-
-
-2010-10-25T15:10:42.000000Z
-1c8611748dcee5b29848bf25be3ec473
-2006-11-26T13:03:26.949973Z
-35003
-arigo
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4369
-
-profiler.py
-file
-
-
-
-
-2010-10-25T15:10:42.000000Z
-858162366cbc39cd9e249e35e6f510c4
-2009-12-18T16:35:35.119276Z
-70200
-arigo
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11238
-

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/prop-base/__init__.py.svn-base

@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 12
-svn:keywords
-V 23
-Author Date Id Revision
-END

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/prop-base/classes.py.svn-base

@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 12
-svn:keywords
-V 23
-Author Date Id Revision
-END

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/prop-base/core.py.svn-base

@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 12
-svn:keywords
-V 23
-Author Date Id Revision
-END

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/prop-base/kdictproxy.py.svn-base

@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 12
-svn:keywords
-V 23
-Author Date Id Revision
-END

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/prop-base/logger.py.svn-base

@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 12
-svn:keywords
-V 23
-Author Date Id Revision
-END

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/prop-base/profiler.py.svn-base

@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 12
-svn:keywords
-V 23
-Author Date Id Revision
-END

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/prop-base/support.py.svn-base

@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 12
-svn:keywords
-V 23
-Author Date Id Revision
-END

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/text-base/__init__.py.svn-base

@@ -1,54 +0,0 @@
-###########################################################################
-# 
-#  Psyco top-level file of the Psyco package.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco -- the Python Specializing Compiler.
-
-Typical usage: add the following lines to your application's main module,
-preferably after the other imports:
-
-try:
-    import psyco
-    psyco.full()
-except ImportError:
-    print 'Psyco not installed, the program will just run slower'
-"""
-###########################################################################
-
-
-#
-# This module is present to make 'psyco' a package and to
-# publish the main functions and variables.
-#
-# More documentation can be found in core.py.
-#
-
-
-# Try to import the dynamic-loading _psyco and report errors
-try:
-    import _psyco
-except ImportError, e:
-    extramsg = ''
-    import sys, imp
-    try:
-        file, filename, (suffix, mode, type) = imp.find_module('_psyco', __path__)
-    except ImportError:
-        ext = [suffix for suffix, mode, type in imp.get_suffixes()
-               if type == imp.C_EXTENSION]
-        if ext:
-            extramsg = (" (cannot locate the compiled extension '_psyco%s' "
-                        "in the package path '%s')" % (ext[0], '; '.join(__path__)))
-    else:
-        extramsg = (" (check that the compiled extension '%s' is for "
-                    "the correct Python version; this is Python %s)" %
-                    (filename, sys.version.split()[0]))
-    raise ImportError, str(e) + extramsg
-
-# Publish important data by importing them in the package
-from support import __version__, error, warning, _getrealframe, _getemulframe
-from support import version_info, __version__ as hexversion
-from core import full, profile, background, runonly, stop, cannotcompile
-from core import log, bind, unbind, proxy, unproxy, dumpcodebuf
-from _psyco import setfilter
-from _psyco import compact, compacttype

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/text-base/classes.py.svn-base

@@ -1,42 +0,0 @@
-###########################################################################
-# 
-#  Psyco class support module.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco class support module.
-
-'psyco.classes.psyobj' is an alternate Psyco-optimized root for classes.
-Any class inheriting from it or using the metaclass '__metaclass__' might
-get optimized specifically for Psyco. It is equivalent to call
-psyco.bind() on the class object after its creation.
-
-Importing everything from psyco.classes in a module will import the
-'__metaclass__' name, so all classes defined after a
-
-       from psyco.classes import *
-
-will automatically use the Psyco-optimized metaclass.
-"""
-###########################################################################
-
-__all__ = ['psyobj', 'psymetaclass', '__metaclass__']
-
-
-from _psyco import compacttype
-import core
-from types import FunctionType
-
-class psymetaclass(compacttype):
-    "Psyco-optimized meta-class. Turns all methods into Psyco proxies."
-
-    def __new__(cls, name, bases, dict):
-        bindlist = dict.get('__psyco__bind__')
-        if bindlist is None:
-            bindlist = [key for key, value in dict.items()
-                        if isinstance(value, FunctionType)]
-        for attr in bindlist:
-            dict[attr] = core.proxy(dict[attr])
-        return super(psymetaclass, cls).__new__(cls, name, bases, dict)
-
-psyobj = psymetaclass("psyobj", (), {})
-__metaclass__ = psymetaclass

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/text-base/core.py.svn-base

@@ -1,231 +0,0 @@
-###########################################################################
-# 
-#  Psyco main functions.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco main functions.
-
-Here are the routines that you can use from your applications.
-These are mostly interfaces to the C core, but they depend on
-the Python version.
-
-You can use these functions from the 'psyco' module instead of
-'psyco.core', e.g.
-
-    import psyco
-    psyco.log('/tmp/psyco.log')
-    psyco.profile()
-"""
-###########################################################################
-
-import _psyco
-import types
-from support import *
-
-newfunction = types.FunctionType
-newinstancemethod = types.MethodType
-
-
-# Default charge profiler values
-default_watermark     = 0.09     # between 0.0 (0%) and 1.0 (100%)
-default_halflife      = 0.5      # seconds
-default_pollfreq_profile    = 20       # Hz
-default_pollfreq_background = 100      # Hz -- a maximum for sleep's resolution
-default_parentframe   = 0.25     # should not be more than 0.5 (50%)
-
-
-def full(memory=None, time=None, memorymax=None, timemax=None):
-    """Compile as much as possible.
-
-Typical use is for small scripts performing intensive computations
-or string handling."""
-    import profiler
-    p = profiler.FullCompiler()
-    p.run(memory, time, memorymax, timemax)
-
-
-def profile(watermark   = default_watermark,
-            halflife    = default_halflife,
-            pollfreq    = default_pollfreq_profile,
-            parentframe = default_parentframe,
-            memory=None, time=None, memorymax=None, timemax=None):
-    """Turn on profiling.
-
-The 'watermark' parameter controls how easily running functions will
-be compiled. The smaller the value, the more functions are compiled."""
-    import profiler
-    p = profiler.ActivePassiveProfiler(watermark, halflife,
-                                       pollfreq, parentframe)
-    p.run(memory, time, memorymax, timemax)
-
-
-def background(watermark   = default_watermark,
-               halflife    = default_halflife,
-               pollfreq    = default_pollfreq_background,
-               parentframe = default_parentframe,
-               memory=None, time=None, memorymax=None, timemax=None):
-    """Turn on passive profiling.
-
-This is a very lightweight mode in which only intensively computing
-functions can be detected. The smaller the 'watermark', the more functions
-are compiled."""
-    import profiler
-    p = profiler.PassiveProfiler(watermark, halflife, pollfreq, parentframe)
-    p.run(memory, time, memorymax, timemax)
-
-
-def runonly(memory=None, time=None, memorymax=None, timemax=None):
-    """Nonprofiler.
-
-XXX check if this is useful and document."""
-    import profiler
-    p = profiler.RunOnly()
-    p.run(memory, time, memorymax, timemax)
-
-
-def stop():
-    """Turn off all automatic compilation.  bind() calls remain in effect."""
-    import profiler
-    profiler.go([])
-
-
-def log(logfile='', mode='w', top=10):
-    """Enable logging to the given file.
-
-If the file name is unspecified, a default name is built by appending
-a 'log-psyco' extension to the main script name.
-
-Mode is 'a' to append to a possibly existing file or 'w' to overwrite
-an existing file. Note that the log file may grow quickly in 'a' mode."""
-    import profiler, logger
-    if not logfile:
-        import os
-        logfile, dummy = os.path.splitext(sys.argv[0])
-        if os.path.basename(logfile):
-            logfile += '.'
-        logfile += 'log-psyco'
-    if hasattr(_psyco, 'VERBOSE_LEVEL'):
-        print >> sys.stderr, 'psyco: logging to', logfile
-    # logger.current should be a real file object; subtle problems
-    # will show up if its write() and flush() methods are written
-    # in Python, as Psyco will invoke them while compiling.
-    logger.current = open(logfile, mode)
-    logger.print_charges = top
-    profiler.logger = logger
-    logger.writedate('Logging started')
-    cannotcompile(logger.psycowrite)
-    _psyco.statwrite(logger=logger.psycowrite)
-
-
-def bind(x, rec=None):
-    """Enable compilation of the given function, method, or class object.
-
-If C is a class (or anything with a '__dict__' attribute), bind(C) will
-rebind all functions and methods found in C.__dict__ (which means, for
-classes, all methods defined in the class but not in its parents).
-
-The optional second argument specifies the number of recursive
-compilation levels: all functions called by func are compiled
-up to the given depth of indirection."""
-    if isinstance(x, types.MethodType):
-        x = x.im_func
-    if isinstance(x, types.FunctionType):
-        if rec is None:
-            x.func_code = _psyco.proxycode(x)
-        else:
-            x.func_code = _psyco.proxycode(x, rec)
-        return
-    if hasattr(x, '__dict__'):
-        funcs = [o for o in x.__dict__.values()
-                 if isinstance(o, types.MethodType)
-                 or isinstance(o, types.FunctionType)]
-        if not funcs:
-            raise error, ("nothing bindable found in %s object" %
-                          type(x).__name__)
-        for o in funcs:
-            bind(o, rec)
-        return
-    raise TypeError, "cannot bind %s objects" % type(x).__name__
-
-
-def unbind(x):
-    """Reverse of bind()."""
-    if isinstance(x, types.MethodType):
-        x = x.im_func
-    if isinstance(x, types.FunctionType):
-        try:
-            f = _psyco.unproxycode(x.func_code)
-        except error:
-            pass
-        else:
-            x.func_code = f.func_code
-        return
-    if hasattr(x, '__dict__'):
-        for o in x.__dict__.values():
-            if (isinstance(o, types.MethodType)
-             or isinstance(o, types.FunctionType)):
-                unbind(o)
-        return
-    raise TypeError, "cannot unbind %s objects" % type(x).__name__
-
-
-def proxy(x, rec=None):
-    """Return a Psyco-enabled copy of the function.
-
-The original function is still available for non-compiled calls.
-The optional second argument specifies the number of recursive
-compilation levels: all functions called by func are compiled
-up to the given depth of indirection."""
-    if isinstance(x, types.FunctionType):
-        if rec is None:
-            code = _psyco.proxycode(x)
-        else:
-            code = _psyco.proxycode(x, rec)
-        return newfunction(code, x.func_globals, x.func_name)
-    if isinstance(x, types.MethodType):
-        p = proxy(x.im_func, rec)
-        return newinstancemethod(p, x.im_self, x.im_class)
-    raise TypeError, "cannot proxy %s objects" % type(x).__name__
-
-
-def unproxy(proxy):
-    """Return a new copy of the original function of method behind a proxy.
-The result behaves like the original function in that calling it
-does not trigger compilation nor execution of any compiled code."""
-    if isinstance(proxy, types.FunctionType):
-        return _psyco.unproxycode(proxy.func_code)
-    if isinstance(proxy, types.MethodType):
-        f = unproxy(proxy.im_func)
-        return newinstancemethod(f, proxy.im_self, proxy.im_class)
-    raise TypeError, "%s objects cannot be proxies" % type(proxy).__name__
-
-
-def cannotcompile(x):
-    """Instruct Psyco never to compile the given function, method
-or code object."""
-    if isinstance(x, types.MethodType):
-        x = x.im_func
-    if isinstance(x, types.FunctionType):
-        x = x.func_code
-    if isinstance(x, types.CodeType):
-        _psyco.cannotcompile(x)
-    else:
-        raise TypeError, "unexpected %s object" % type(x).__name__
-
-
-def dumpcodebuf():
-    """Write in file psyco.dump a copy of the emitted machine code,
-provided Psyco was compiled with a non-zero CODE_DUMP.
-See py-utils/httpxam.py to examine psyco.dump."""
-    if hasattr(_psyco, 'dumpcodebuf'):
-        _psyco.dumpcodebuf()
-
-
-###########################################################################
-# Psyco variables
-#   error         * the error raised by Psyco
-#   warning       * the warning raised by Psyco
-#   __in_psyco__  * a new built-in variable which is always zero, but which
-#                     Psyco special-cases by returning 1 instead. So
-#                     __in_psyco__ can be used in a function to know if
-#                     that function is being executed by Psyco or not.

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/text-base/kdictproxy.py.svn-base

@@ -1,133 +0,0 @@
-###########################################################################
-#
-#  Support code for the 'psyco.compact' type.
-
-from __future__ import generators
-
-try:
-    from UserDict import DictMixin
-except ImportError:
-
-    # backported from Python 2.3 to Python 2.2
-    class DictMixin:
-        # Mixin defining all dictionary methods for classes that already have
-        # a minimum dictionary interface including getitem, setitem, delitem,
-        # and keys. Without knowledge of the subclass constructor, the mixin
-        # does not define __init__() or copy().  In addition to the four base
-        # methods, progressively more efficiency comes with defining
-        # __contains__(), __iter__(), and iteritems().
-
-        # second level definitions support higher levels
-        def __iter__(self):
-            for k in self.keys():
-                yield k
-        def has_key(self, key):
-            try:
-                value = self[key]
-            except KeyError:
-                return False
-            return True
-        def __contains__(self, key):
-            return self.has_key(key)
-
-        # third level takes advantage of second level definitions
-        def iteritems(self):
-            for k in self:
-                yield (k, self[k])
-        def iterkeys(self):
-            return self.__iter__()
-
-        # fourth level uses definitions from lower levels
-        def itervalues(self):
-            for _, v in self.iteritems():
-                yield v
-        def values(self):
-            return [v for _, v in self.iteritems()]
-        def items(self):
-            return list(self.iteritems())
-        def clear(self):
-            for key in self.keys():
-                del self[key]
-        def setdefault(self, key, default):
-            try:
-                return self[key]
-            except KeyError:
-                self[key] = default
-            return default
-        def pop(self, key, *args):
-            if len(args) > 1:
-                raise TypeError, "pop expected at most 2 arguments, got "\
-                                  + repr(1 + len(args))
-            try:
-                value = self[key]
-            except KeyError:
-                if args:
-                    return args[0]
-                raise
-            del self[key]
-            return value
-        def popitem(self):
-            try:
-                k, v = self.iteritems().next()
-            except StopIteration:
-                raise KeyError, 'container is empty'
-            del self[k]
-            return (k, v)
-        def update(self, other):
-            # Make progressively weaker assumptions about "other"
-            if hasattr(other, 'iteritems'):  # iteritems saves memory and lookups
-                for k, v in other.iteritems():
-                    self[k] = v
-            elif hasattr(other, '__iter__'): # iter saves memory
-                for k in other:
-                    self[k] = other[k]
-            else:
-                for k in other.keys():
-                    self[k] = other[k]
-        def get(self, key, default=None):
-            try:
-                return self[key]
-            except KeyError:
-                return default
-        def __repr__(self):
-            return repr(dict(self.iteritems()))
-        def __cmp__(self, other):
-            if other is None:
-                return 1
-            if isinstance(other, DictMixin):
-                other = dict(other.iteritems())
-            return cmp(dict(self.iteritems()), other)
-        def __len__(self):
-            return len(self.keys())
-
-###########################################################################
-
-from _psyco import compact
-
-
-class compactdictproxy(DictMixin):
-
-    def __init__(self, ko):
-        self._ko = ko    # compact object of which 'self' is the dict
-
-    def __getitem__(self, key):
-        return compact.__getslot__(self._ko, key)
-
-    def __setitem__(self, key, value):
-        compact.__setslot__(self._ko, key, value)
-
-    def __delitem__(self, key):
-        compact.__delslot__(self._ko, key)
-
-    def keys(self):
-        return compact.__members__.__get__(self._ko)
-
-    def clear(self):
-        keys = self.keys()
-        keys.reverse()
-        for key in keys:
-            del self[key]
-
-    def __repr__(self):
-        keys = ', '.join(self.keys())
-        return '<compactdictproxy object {%s}>' % (keys,)

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/text-base/logger.py.svn-base

@@ -1,96 +0,0 @@
-###########################################################################
-# 
-#  Psyco logger.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco logger.
-
-See log() in core.py.
-"""
-###########################################################################
-
-
-import _psyco
-from time import time, localtime, strftime
-
-
-current = None
-print_charges = 10
-dump_delay = 0.2
-dump_last = 0.0
-
-def write(s, level):
-    t = time()
-    f = t-int(t)
-    try:
-        current.write("%s.%02d  %-*s%s\n" % (
-            strftime("%X", localtime(int(t))),
-            int(f*100.0), 63-level, s,
-            "%"*level))
-        current.flush()
-    except (OSError, IOError):
-        pass
-
-def psycowrite(s):
-    t = time()
-    f = t-int(t)
-    try:
-        current.write("%s.%02d  %-*s%s\n" % (
-            strftime("%X", localtime(int(t))),
-            int(f*100.0), 60, s.strip(),
-            "% %"))
-        current.flush()
-    except (OSError, IOError):
-        pass
-
-##def writelines(lines, level=0):
-##    if lines:
-##        t = time()
-##        f = t-int(t)
-##        timedesc = strftime("%x %X", localtime(int(t)))
-##        print >> current, "%s.%03d  %-*s %s" % (
-##            timedesc, int(f*1000),
-##            50-level, lines[0],
-##            "+"*level)
-##        timedesc = " " * (len(timedesc)+5)
-##        for line in lines[1:]:
-##            print >> current, timedesc, line
-
-def writememory():
-    write("memory usage: %d+ kb" % _psyco.memory(), 1)
-
-def dumpcharges():
-    global dump_last
-    if print_charges:
-        t = time()
-        if not (dump_last <= t < dump_last+dump_delay):
-            if t <= dump_last+1.5*dump_delay:
-                dump_last += dump_delay
-            else:
-                dump_last = t
-            #write("%s: charges:" % who, 0)
-            lst = _psyco.stattop(print_charges)
-            if lst:
-                f = t-int(t)
-                lines = ["%s.%02d   ______\n" % (
-                    strftime("%X", localtime(int(t))),
-                    int(f*100.0))]
-                i = 1
-                for co, charge in lst:
-                    detail = co.co_filename
-                    if len(detail) > 19:
-                        detail = '...' + detail[-17:]
-                    lines.append("        #%-3d |%4.1f %%|  %-26s%20s:%d\n" %
-                                 (i, charge*100.0, co.co_name, detail,
-                                  co.co_firstlineno))
-                    i += 1
-                current.writelines(lines)
-                current.flush()
-
-def writefinalstats():
-    dumpcharges()
-    writememory()
-    writedate("program exit")
-
-def writedate(msg):
-    write('%s, %s' % (msg, strftime("%x")), 20)

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/text-base/profiler.py.svn-base

@@ -1,379 +0,0 @@
-###########################################################################
-# 
-#  Psyco profiler (Python part).
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco profiler (Python part).
-
-The implementation of the non-time-critical parts of the profiler.
-See profile() and full() in core.py for the easy interface.
-"""
-###########################################################################
-
-import _psyco
-from support import *
-import math, time, types, atexit
-now = time.time
-try:
-    import thread
-except ImportError:
-    import dummy_thread as thread
-
-
-# current profiler instance
-current = None
-
-# enabled profilers, in order of priority
-profilers = []
-
-# logger module (when enabled by core.log())
-logger = None
-
-# a lock for a thread-safe go()
-go_lock = thread.allocate_lock()
-
-def go(stop=0):
-    # run the highest-priority profiler in 'profilers'
-    global current
-    go_lock.acquire()
-    try:
-        prev = current
-        if stop:
-            del profilers[:]
-        if prev:
-            if profilers and profilers[0] is prev:
-                return    # best profiler already running
-            prev.stop()
-            current = None
-        for p in profilers[:]:
-            if p.start():
-                current = p
-                if logger: # and p is not prev:
-                    logger.write("%s: starting" % p.__class__.__name__, 5)
-                return
-    finally:
-        go_lock.release()
-    # no profiler is running now
-    if stop:
-        if logger:
-            logger.writefinalstats()
-    else:
-        tag2bind()
-
-atexit.register(go, 1)
-
-
-def buildfncache(globals, cache):
-    if hasattr(types.IntType, '__dict__'):
-        clstypes = (types.ClassType, types.TypeType)
-    else:
-        clstypes = types.ClassType
-    for x in globals.values():
-        if isinstance(x, types.MethodType):
-            x = x.im_func
-        if isinstance(x, types.FunctionType):
-            cache[x.func_code] = x, ''
-        elif isinstance(x, clstypes):
-            for y in x.__dict__.values():
-                if isinstance(y, types.MethodType):
-                    y = y.im_func
-                if isinstance(y, types.FunctionType):
-                    cache[y.func_code] = y, x.__name__
-
-# code-to-function mapping (cache)
-function_cache = {}
-
-def trytobind(co, globals, log=1):
-    try:
-        f, clsname = function_cache[co]
-    except KeyError:
-        buildfncache(globals, function_cache)
-        try:
-            f, clsname = function_cache[co]
-        except KeyError:
-            if logger:
-                logger.write('warning: cannot find function %s in %s' %
-                             (co.co_name, globals.get('__name__', '?')), 3)
-            return  # give up
-    if logger and log:
-        modulename = globals.get('__name__', '?')
-        if clsname:
-            modulename += '.' + clsname
-        logger.write('bind function: %s.%s' % (modulename, co.co_name), 1)
-    f.func_code = _psyco.proxycode(f)
-
-
-# the list of code objects that have been tagged
-tagged_codes = []
-
-def tag(co, globals):
-    if logger:
-        try:
-            f, clsname = function_cache[co]
-        except KeyError:
-            buildfncache(globals, function_cache)
-            try:
-                f, clsname = function_cache[co]
-            except KeyError:
-                clsname = ''  # give up
-        modulename = globals.get('__name__', '?')
-        if clsname:
-            modulename += '.' + clsname
-        logger.write('tag function: %s.%s' % (modulename, co.co_name), 1)
-    tagged_codes.append((co, globals))
-    _psyco.turbo_frame(co)
-    _psyco.turbo_code(co)
-
-def tag2bind():
-    if tagged_codes:
-        if logger:
-            logger.write('profiling stopped, binding %d functions' %
-                         len(tagged_codes), 2)
-        for co, globals in tagged_codes:
-            trytobind(co, globals, 0)
-        function_cache.clear()
-        del tagged_codes[:]
-
-
-class Profiler:
-    MemoryTimerResolution = 0.103
-
-    def run(self, memory, time, memorymax, timemax):
-        self.memory = memory
-        self.memorymax = memorymax
-        self.time = time
-        if timemax is None:
-            self.endtime = None
-        else:
-            self.endtime = now() + timemax
-        self.alarms = []
-        profilers.append(self)
-        go()
-    
-    def start(self):
-        curmem = _psyco.memory()
-        memlimits = []
-        if self.memorymax is not None:
-            if curmem >= self.memorymax:
-                if logger:
-                    logger.writememory()
-                return self.limitreached('memorymax')
-            memlimits.append(self.memorymax)
-        if self.memory is not None:
-            if self.memory <= 0:
-                if logger:
-                    logger.writememory()
-                return self.limitreached('memory')
-            memlimits.append(curmem + self.memory)
-            self.memory_at_start = curmem
-
-        curtime = now()
-        timelimits = []
-        if self.endtime is not None:
-            if curtime >= self.endtime:
-                return self.limitreached('timemax')
-            timelimits.append(self.endtime - curtime)
-        if self.time is not None:
-            if self.time <= 0.0:
-                return self.limitreached('time')
-            timelimits.append(self.time)
-            self.time_at_start = curtime
-        
-        try:
-            self.do_start()
-        except error, e:
-            if logger:
-                logger.write('%s: disabled by psyco.error:' % (
-                    self.__class__.__name__), 4)
-                logger.write('    %s' % str(e), 3)
-            return 0
-        
-        if memlimits:
-            self.memlimits_args = (time.sleep, (self.MemoryTimerResolution,),
-                                   self.check_memory, (min(memlimits),))
-            self.alarms.append(_psyco.alarm(*self.memlimits_args))
-        if timelimits:
-            self.alarms.append(_psyco.alarm(time.sleep, (min(timelimits),),
-                                            self.time_out))
-        return 1
-    
-    def stop(self):
-        for alarm in self.alarms:
-            alarm.stop(0)
-        for alarm in self.alarms:
-            alarm.stop(1)   # wait for parallel threads to stop
-        del self.alarms[:]
-        if self.time is not None:
-            self.time -= now() - self.time_at_start
-        if self.memory is not None:
-            self.memory -= _psyco.memory() - self.memory_at_start
-
-        try:
-            self.do_stop()
-        except error:
-            return 0
-        return 1
-
-    def check_memory(self, limit):
-        if _psyco.memory() < limit:
-            return self.memlimits_args
-        go()
-
-    def time_out(self):
-        self.time = 0.0
-        go()
-
-    def limitreached(self, limitname):
-        try:
-            profilers.remove(self)
-        except ValueError:
-            pass
-        if logger:
-            logger.write('%s: disabled (%s limit reached)' % (
-                self.__class__.__name__, limitname), 4)
-        return 0
-
-
-class FullCompiler(Profiler):
-
-    def do_start(self):
-        _psyco.profiling('f')
-
-    def do_stop(self):
-        _psyco.profiling('.')
-
-
-class RunOnly(Profiler):
-
-    def do_start(self):
-        _psyco.profiling('n')
-
-    def do_stop(self):
-        _psyco.profiling('.')
-
-
-class ChargeProfiler(Profiler):
-
-    def __init__(self, watermark, parentframe):
-        self.watermark = watermark
-        self.parent2 = parentframe * 2.0
-        self.lock = thread.allocate_lock()
-
-    def init_charges(self):
-        _psyco.statwrite(watermark = self.watermark,
-                         parent2   = self.parent2)
-
-    def do_stop(self):
-        _psyco.profiling('.')
-        _psyco.statwrite(callback = None)
-
-
-class ActiveProfiler(ChargeProfiler):
-
-    def active_start(self):
-        _psyco.profiling('p')
-
-    def do_start(self):
-        self.init_charges()
-        self.active_start()
-        _psyco.statwrite(callback = self.charge_callback)
-
-    def charge_callback(self, frame, charge):
-        tag(frame.f_code, frame.f_globals)
-
-
-class PassiveProfiler(ChargeProfiler):
-
-    initial_charge_unit   = _psyco.statread('unit')
-    reset_stats_after     = 120      # half-lives (maximum 200!)
-    reset_limit           = initial_charge_unit * (2.0 ** reset_stats_after)
-
-    def __init__(self, watermark, halflife, pollfreq, parentframe):
-        ChargeProfiler.__init__(self, watermark, parentframe)
-        self.pollfreq = pollfreq
-        # self.progress is slightly more than 1.0, and computed so that
-        # do_profile() will double the change_unit every 'halflife' seconds.
-        self.progress = 2.0 ** (1.0 / (halflife * pollfreq))
-
-    def reset(self):
-        _psyco.statwrite(unit = self.initial_charge_unit, callback = None)
-        _psyco.statreset()
-        if logger:
-            logger.write("%s: resetting stats" % self.__class__.__name__, 1)
-
-    def passive_start(self):
-        self.passivealarm_args = (time.sleep, (1.0 / self.pollfreq,),
-                                  self.do_profile)
-        self.alarms.append(_psyco.alarm(*self.passivealarm_args))
-
-    def do_start(self):
-        tag2bind()
-        self.init_charges()
-        self.passive_start()
-
-    def do_profile(self):
-        _psyco.statcollect()
-        if logger:
-            logger.dumpcharges()
-        nunit = _psyco.statread('unit') * self.progress
-        if nunit > self.reset_limit:
-            self.reset()
-        else:
-            _psyco.statwrite(unit = nunit, callback = self.charge_callback)
-        return self.passivealarm_args
-
-    def charge_callback(self, frame, charge):
-        trytobind(frame.f_code, frame.f_globals)
-
-
-class ActivePassiveProfiler(PassiveProfiler, ActiveProfiler):
-
-    def do_start(self):
-        self.init_charges()
-        self.active_start()
-        self.passive_start()
-
-    def charge_callback(self, frame, charge):
-        tag(frame.f_code, frame.f_globals)
-
-
-
-#
-# we register our own version of sys.settrace(), sys.setprofile()
-# and thread.start_new_thread().
-#
-
-def psyco_settrace(*args, **kw):
-    "This is the Psyco-aware version of sys.settrace()."
-    result = original_settrace(*args, **kw)
-    go()
-    return result
-
-def psyco_setprofile(*args, **kw):
-    "This is the Psyco-aware version of sys.setprofile()."
-    result = original_setprofile(*args, **kw)
-    go()
-    return result
-
-def psyco_thread_stub(callable, args, kw):
-    _psyco.statcollect()
-    if kw is None:
-        return callable(*args)
-    else:
-        return callable(*args, **kw)
-
-def psyco_start_new_thread(callable, args, kw=None):
-    "This is the Psyco-aware version of thread.start_new_thread()."
-    return original_start_new_thread(psyco_thread_stub, (callable, args, kw))
-
-original_settrace         = sys.settrace
-original_setprofile       = sys.setprofile
-original_start_new_thread = thread.start_new_thread
-sys.settrace            = psyco_settrace
-sys.setprofile          = psyco_setprofile
-thread.start_new_thread = psyco_start_new_thread
-# hack to patch threading._start_new_thread if the module is
-# already loaded
-if ('threading' in sys.modules and
-    hasattr(sys.modules['threading'], '_start_new_thread')):
-    sys.modules['threading']._start_new_thread = psyco_start_new_thread

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/.svn/text-base/support.py.svn-base

@@ -1,191 +0,0 @@
-###########################################################################
-# 
-#  Psyco general support module.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco general support module.
-
-For internal use.
-"""
-###########################################################################
-
-import sys, _psyco, __builtin__
-
-error = _psyco.error
-class warning(Warning):
-    pass
-
-_psyco.NoLocalsWarning = warning
-
-def warn(msg):
-    from warnings import warn
-    warn(msg, warning, stacklevel=2)
-
-#
-# Version checks
-#
-__version__ = 0x010600f0
-if _psyco.PSYVER != __version__:
-    raise error, "version mismatch between Psyco parts, reinstall it"
-
-version_info = (__version__ >> 24,
-                (__version__ >> 16) & 0xff,
-                (__version__ >> 8) & 0xff,
-                {0xa0: 'alpha',
-                 0xb0: 'beta',
-                 0xc0: 'candidate',
-                 0xf0: 'final'}[__version__ & 0xf0],
-                __version__ & 0xf)
-
-
-VERSION_LIMITS = [0x02020200,   # 2.2.2
-                  0x02030000,   # 2.3
-                  0x02040000]   # 2.4
-
-if ([v for v in VERSION_LIMITS if v <= sys.hexversion] !=
-    [v for v in VERSION_LIMITS if v <= _psyco.PYVER  ]):
-    if sys.hexversion < VERSION_LIMITS[0]:
-        warn("Psyco requires Python version 2.2.2 or later")
-    else:
-        warn("Psyco version does not match Python version. "
-             "Psyco must be updated or recompiled")
-
-
-if hasattr(_psyco, 'ALL_CHECKS') and hasattr(_psyco, 'VERBOSE_LEVEL'):
-    print >> sys.stderr, ('psyco: running in debugging mode on %s' %
-                          _psyco.PROCESSOR)
-
-
-###########################################################################
-# sys._getframe() gives strange results on a mixed Psyco- and Python-style
-# stack frame. Psyco provides a replacement that partially emulates Python
-# frames from Psyco frames. The new sys._getframe() may return objects of
-# a custom "Psyco frame" type, which is a subtype of the normal frame type.
-#
-# The same problems require some other built-in functions to be replaced
-# as well. Note that the local variables are not available in any
-# dictionary with Psyco.
-
-
-class Frame:
-    pass
-
-
-class PythonFrame(Frame):
-
-    def __init__(self, frame):
-        self.__dict__.update({
-            '_frame': frame,
-            })
-
-    def __getattr__(self, attr):
-        if attr == 'f_back':
-            try:
-                result = embedframe(_psyco.getframe(self._frame))
-            except ValueError:
-                result = None
-            except error:
-                warn("f_back is skipping dead Psyco frames")
-                result = self._frame.f_back
-            self.__dict__['f_back'] = result
-            return result
-        else:
-            return getattr(self._frame, attr)
-
-    def __setattr__(self, attr, value):
-        setattr(self._frame, attr, value)
-
-    def __delattr__(self, attr):
-        delattr(self._frame, attr)
-
-
-class PsycoFrame(Frame):
-
-    def __init__(self, tag):
-        self.__dict__.update({
-            '_tag'     : tag,
-            'f_code'   : tag[0],
-            'f_globals': tag[1],
-            })
-
-    def __getattr__(self, attr):
-        if attr == 'f_back':
-            try:
-                result = embedframe(_psyco.getframe(self._tag))
-            except ValueError:
-                result = None
-        elif attr == 'f_lineno':
-            result = self.f_code.co_firstlineno  # better than nothing
-        elif attr == 'f_builtins':
-            result = self.f_globals['__builtins__']
-        elif attr == 'f_restricted':
-            result = self.f_builtins is not __builtins__
-        elif attr == 'f_locals':
-            raise AttributeError, ("local variables of functions run by Psyco "
-                                   "cannot be accessed in any way, sorry")
-        else:
-            raise AttributeError, ("emulated Psyco frames have "
-                                   "no '%s' attribute" % attr)
-        self.__dict__[attr] = result
-        return result
-
-    def __setattr__(self, attr, value):
-        raise AttributeError, "Psyco frame objects are read-only"
-
-    def __delattr__(self, attr):
-        if attr == 'f_trace':
-            # for bdb which relies on CPython frames exhibiting a slightly
-            # buggy behavior: you can 'del f.f_trace' as often as you like
-            # even without having set it previously.
-            return
-        raise AttributeError, "Psyco frame objects are read-only"
-
-
-def embedframe(result):
-    if type(result) is type(()):
-        return PsycoFrame(result)
-    else:
-        return PythonFrame(result)
-
-def _getframe(depth=0):
-    """Return a frame object from the call stack. This is a replacement for
-sys._getframe() which is aware of Psyco frames.
-
-The returned objects are instances of either PythonFrame or PsycoFrame
-instead of being real Python-level frame object, so that they can emulate
-the common attributes of frame objects.
-
-The original sys._getframe() ignoring Psyco frames altogether is stored in
-psyco._getrealframe(). See also psyco._getemulframe()."""
-    # 'depth+1' to account for this _getframe() Python function
-    return embedframe(_psyco.getframe(depth+1))
-
-def _getemulframe(depth=0):
-    """As _getframe(), but the returned objects are real Python frame objects
-emulating Psyco frames. Some of their attributes can be wrong or missing,
-however."""
-    # 'depth+1' to account for this _getemulframe() Python function
-    return _psyco.getframe(depth+1, 1)
-
-def patch(name, module=__builtin__):
-    f = getattr(_psyco, name)
-    org = getattr(module, name)
-    if org is not f:
-        setattr(module, name, f)
-        setattr(_psyco, 'original_' + name, org)
-
-_getrealframe = sys._getframe
-sys._getframe = _getframe
-patch('globals')
-patch('eval')
-patch('execfile')
-patch('locals')
-patch('vars')
-patch('dir')
-patch('input')
-_psyco.original_raw_input = raw_input
-__builtin__.__in_psyco__ = 0==1   # False
-
-if hasattr(_psyco, 'compact'):
-    import kdictproxy
-    _psyco.compactdictproxy = kdictproxy.compactdictproxy

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/__init__.py

@@ -1,54 +0,0 @@
-###########################################################################
-# 
-#  Psyco top-level file of the Psyco package.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco -- the Python Specializing Compiler.
-
-Typical usage: add the following lines to your application's main module,
-preferably after the other imports:
-
-try:
-    import psyco
-    psyco.full()
-except ImportError:
-    print 'Psyco not installed, the program will just run slower'
-"""
-###########################################################################
-
-
-#
-# This module is present to make 'psyco' a package and to
-# publish the main functions and variables.
-#
-# More documentation can be found in core.py.
-#
-
-
-# Try to import the dynamic-loading _psyco and report errors
-try:
-    import _psyco
-except ImportError, e:
-    extramsg = ''
-    import sys, imp
-    try:
-        file, filename, (suffix, mode, type) = imp.find_module('_psyco', __path__)
-    except ImportError:
-        ext = [suffix for suffix, mode, type in imp.get_suffixes()
-               if type == imp.C_EXTENSION]
-        if ext:
-            extramsg = (" (cannot locate the compiled extension '_psyco%s' "
-                        "in the package path '%s')" % (ext[0], '; '.join(__path__)))
-    else:
-        extramsg = (" (check that the compiled extension '%s' is for "
-                    "the correct Python version; this is Python %s)" %
-                    (filename, sys.version.split()[0]))
-    raise ImportError, str(e) + extramsg
-
-# Publish important data by importing them in the package
-from support import __version__, error, warning, _getrealframe, _getemulframe
-from support import version_info, __version__ as hexversion
-from core import full, profile, background, runonly, stop, cannotcompile
-from core import log, bind, unbind, proxy, unproxy, dumpcodebuf
-from _psyco import setfilter
-from _psyco import compact, compacttype

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/classes.py

@@ -1,42 +0,0 @@
-###########################################################################
-# 
-#  Psyco class support module.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco class support module.
-
-'psyco.classes.psyobj' is an alternate Psyco-optimized root for classes.
-Any class inheriting from it or using the metaclass '__metaclass__' might
-get optimized specifically for Psyco. It is equivalent to call
-psyco.bind() on the class object after its creation.
-
-Importing everything from psyco.classes in a module will import the
-'__metaclass__' name, so all classes defined after a
-
-       from psyco.classes import *
-
-will automatically use the Psyco-optimized metaclass.
-"""
-###########################################################################
-
-__all__ = ['psyobj', 'psymetaclass', '__metaclass__']
-
-
-from _psyco import compacttype
-import core
-from types import FunctionType
-
-class psymetaclass(compacttype):
-    "Psyco-optimized meta-class. Turns all methods into Psyco proxies."
-
-    def __new__(cls, name, bases, dict):
-        bindlist = dict.get('__psyco__bind__')
-        if bindlist is None:
-            bindlist = [key for key, value in dict.items()
-                        if isinstance(value, FunctionType)]
-        for attr in bindlist:
-            dict[attr] = core.proxy(dict[attr])
-        return super(psymetaclass, cls).__new__(cls, name, bases, dict)
-
-psyobj = psymetaclass("psyobj", (), {})
-__metaclass__ = psymetaclass

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/core.py

@@ -1,231 +0,0 @@
-###########################################################################
-# 
-#  Psyco main functions.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco main functions.
-
-Here are the routines that you can use from your applications.
-These are mostly interfaces to the C core, but they depend on
-the Python version.
-
-You can use these functions from the 'psyco' module instead of
-'psyco.core', e.g.
-
-    import psyco
-    psyco.log('/tmp/psyco.log')
-    psyco.profile()
-"""
-###########################################################################
-
-import _psyco
-import types
-from support import *
-
-newfunction = types.FunctionType
-newinstancemethod = types.MethodType
-
-
-# Default charge profiler values
-default_watermark     = 0.09     # between 0.0 (0%) and 1.0 (100%)
-default_halflife      = 0.5      # seconds
-default_pollfreq_profile    = 20       # Hz
-default_pollfreq_background = 100      # Hz -- a maximum for sleep's resolution
-default_parentframe   = 0.25     # should not be more than 0.5 (50%)
-
-
-def full(memory=None, time=None, memorymax=None, timemax=None):
-    """Compile as much as possible.
-
-Typical use is for small scripts performing intensive computations
-or string handling."""
-    import profiler
-    p = profiler.FullCompiler()
-    p.run(memory, time, memorymax, timemax)
-
-
-def profile(watermark   = default_watermark,
-            halflife    = default_halflife,
-            pollfreq    = default_pollfreq_profile,
-            parentframe = default_parentframe,
-            memory=None, time=None, memorymax=None, timemax=None):
-    """Turn on profiling.
-
-The 'watermark' parameter controls how easily running functions will
-be compiled. The smaller the value, the more functions are compiled."""
-    import profiler
-    p = profiler.ActivePassiveProfiler(watermark, halflife,
-                                       pollfreq, parentframe)
-    p.run(memory, time, memorymax, timemax)
-
-
-def background(watermark   = default_watermark,
-               halflife    = default_halflife,
-               pollfreq    = default_pollfreq_background,
-               parentframe = default_parentframe,
-               memory=None, time=None, memorymax=None, timemax=None):
-    """Turn on passive profiling.
-
-This is a very lightweight mode in which only intensively computing
-functions can be detected. The smaller the 'watermark', the more functions
-are compiled."""
-    import profiler
-    p = profiler.PassiveProfiler(watermark, halflife, pollfreq, parentframe)
-    p.run(memory, time, memorymax, timemax)
-
-
-def runonly(memory=None, time=None, memorymax=None, timemax=None):
-    """Nonprofiler.
-
-XXX check if this is useful and document."""
-    import profiler
-    p = profiler.RunOnly()
-    p.run(memory, time, memorymax, timemax)
-
-
-def stop():
-    """Turn off all automatic compilation.  bind() calls remain in effect."""
-    import profiler
-    profiler.go([])
-
-
-def log(logfile='', mode='w', top=10):
-    """Enable logging to the given file.
-
-If the file name is unspecified, a default name is built by appending
-a 'log-psyco' extension to the main script name.
-
-Mode is 'a' to append to a possibly existing file or 'w' to overwrite
-an existing file. Note that the log file may grow quickly in 'a' mode."""
-    import profiler, logger
-    if not logfile:
-        import os
-        logfile, dummy = os.path.splitext(sys.argv[0])
-        if os.path.basename(logfile):
-            logfile += '.'
-        logfile += 'log-psyco'
-    if hasattr(_psyco, 'VERBOSE_LEVEL'):
-        print >> sys.stderr, 'psyco: logging to', logfile
-    # logger.current should be a real file object; subtle problems
-    # will show up if its write() and flush() methods are written
-    # in Python, as Psyco will invoke them while compiling.
-    logger.current = open(logfile, mode)
-    logger.print_charges = top
-    profiler.logger = logger
-    logger.writedate('Logging started')
-    cannotcompile(logger.psycowrite)
-    _psyco.statwrite(logger=logger.psycowrite)
-
-
-def bind(x, rec=None):
-    """Enable compilation of the given function, method, or class object.
-
-If C is a class (or anything with a '__dict__' attribute), bind(C) will
-rebind all functions and methods found in C.__dict__ (which means, for
-classes, all methods defined in the class but not in its parents).
-
-The optional second argument specifies the number of recursive
-compilation levels: all functions called by func are compiled
-up to the given depth of indirection."""
-    if isinstance(x, types.MethodType):
-        x = x.im_func
-    if isinstance(x, types.FunctionType):
-        if rec is None:
-            x.func_code = _psyco.proxycode(x)
-        else:
-            x.func_code = _psyco.proxycode(x, rec)
-        return
-    if hasattr(x, '__dict__'):
-        funcs = [o for o in x.__dict__.values()
-                 if isinstance(o, types.MethodType)
-                 or isinstance(o, types.FunctionType)]
-        if not funcs:
-            raise error, ("nothing bindable found in %s object" %
-                          type(x).__name__)
-        for o in funcs:
-            bind(o, rec)
-        return
-    raise TypeError, "cannot bind %s objects" % type(x).__name__
-
-
-def unbind(x):
-    """Reverse of bind()."""
-    if isinstance(x, types.MethodType):
-        x = x.im_func
-    if isinstance(x, types.FunctionType):
-        try:
-            f = _psyco.unproxycode(x.func_code)
-        except error:
-            pass
-        else:
-            x.func_code = f.func_code
-        return
-    if hasattr(x, '__dict__'):
-        for o in x.__dict__.values():
-            if (isinstance(o, types.MethodType)
-             or isinstance(o, types.FunctionType)):
-                unbind(o)
-        return
-    raise TypeError, "cannot unbind %s objects" % type(x).__name__
-
-
-def proxy(x, rec=None):
-    """Return a Psyco-enabled copy of the function.
-
-The original function is still available for non-compiled calls.
-The optional second argument specifies the number of recursive
-compilation levels: all functions called by func are compiled
-up to the given depth of indirection."""
-    if isinstance(x, types.FunctionType):
-        if rec is None:
-            code = _psyco.proxycode(x)
-        else:
-            code = _psyco.proxycode(x, rec)
-        return newfunction(code, x.func_globals, x.func_name)
-    if isinstance(x, types.MethodType):
-        p = proxy(x.im_func, rec)
-        return newinstancemethod(p, x.im_self, x.im_class)
-    raise TypeError, "cannot proxy %s objects" % type(x).__name__
-
-
-def unproxy(proxy):
-    """Return a new copy of the original function of method behind a proxy.
-The result behaves like the original function in that calling it
-does not trigger compilation nor execution of any compiled code."""
-    if isinstance(proxy, types.FunctionType):
-        return _psyco.unproxycode(proxy.func_code)
-    if isinstance(proxy, types.MethodType):
-        f = unproxy(proxy.im_func)
-        return newinstancemethod(f, proxy.im_self, proxy.im_class)
-    raise TypeError, "%s objects cannot be proxies" % type(proxy).__name__
-
-
-def cannotcompile(x):
-    """Instruct Psyco never to compile the given function, method
-or code object."""
-    if isinstance(x, types.MethodType):
-        x = x.im_func
-    if isinstance(x, types.FunctionType):
-        x = x.func_code
-    if isinstance(x, types.CodeType):
-        _psyco.cannotcompile(x)
-    else:
-        raise TypeError, "unexpected %s object" % type(x).__name__
-
-
-def dumpcodebuf():
-    """Write in file psyco.dump a copy of the emitted machine code,
-provided Psyco was compiled with a non-zero CODE_DUMP.
-See py-utils/httpxam.py to examine psyco.dump."""
-    if hasattr(_psyco, 'dumpcodebuf'):
-        _psyco.dumpcodebuf()
-
-
-###########################################################################
-# Psyco variables
-#   error         * the error raised by Psyco
-#   warning       * the warning raised by Psyco
-#   __in_psyco__  * a new built-in variable which is always zero, but which
-#                     Psyco special-cases by returning 1 instead. So
-#                     __in_psyco__ can be used in a function to know if
-#                     that function is being executed by Psyco or not.

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/kdictproxy.py

@@ -1,133 +0,0 @@
-###########################################################################
-#
-#  Support code for the 'psyco.compact' type.
-
-from __future__ import generators
-
-try:
-    from UserDict import DictMixin
-except ImportError:
-
-    # backported from Python 2.3 to Python 2.2
-    class DictMixin:
-        # Mixin defining all dictionary methods for classes that already have
-        # a minimum dictionary interface including getitem, setitem, delitem,
-        # and keys. Without knowledge of the subclass constructor, the mixin
-        # does not define __init__() or copy().  In addition to the four base
-        # methods, progressively more efficiency comes with defining
-        # __contains__(), __iter__(), and iteritems().
-
-        # second level definitions support higher levels
-        def __iter__(self):
-            for k in self.keys():
-                yield k
-        def has_key(self, key):
-            try:
-                value = self[key]
-            except KeyError:
-                return False
-            return True
-        def __contains__(self, key):
-            return self.has_key(key)
-
-        # third level takes advantage of second level definitions
-        def iteritems(self):
-            for k in self:
-                yield (k, self[k])
-        def iterkeys(self):
-            return self.__iter__()
-
-        # fourth level uses definitions from lower levels
-        def itervalues(self):
-            for _, v in self.iteritems():
-                yield v
-        def values(self):
-            return [v for _, v in self.iteritems()]
-        def items(self):
-            return list(self.iteritems())
-        def clear(self):
-            for key in self.keys():
-                del self[key]
-        def setdefault(self, key, default):
-            try:
-                return self[key]
-            except KeyError:
-                self[key] = default
-            return default
-        def pop(self, key, *args):
-            if len(args) > 1:
-                raise TypeError, "pop expected at most 2 arguments, got "\
-                                  + repr(1 + len(args))
-            try:
-                value = self[key]
-            except KeyError:
-                if args:
-                    return args[0]
-                raise
-            del self[key]
-            return value
-        def popitem(self):
-            try:
-                k, v = self.iteritems().next()
-            except StopIteration:
-                raise KeyError, 'container is empty'
-            del self[k]
-            return (k, v)
-        def update(self, other):
-            # Make progressively weaker assumptions about "other"
-            if hasattr(other, 'iteritems'):  # iteritems saves memory and lookups
-                for k, v in other.iteritems():
-                    self[k] = v
-            elif hasattr(other, '__iter__'): # iter saves memory
-                for k in other:
-                    self[k] = other[k]
-            else:
-                for k in other.keys():
-                    self[k] = other[k]
-        def get(self, key, default=None):
-            try:
-                return self[key]
-            except KeyError:
-                return default
-        def __repr__(self):
-            return repr(dict(self.iteritems()))
-        def __cmp__(self, other):
-            if other is None:
-                return 1
-            if isinstance(other, DictMixin):
-                other = dict(other.iteritems())
-            return cmp(dict(self.iteritems()), other)
-        def __len__(self):
-            return len(self.keys())
-
-###########################################################################
-
-from _psyco import compact
-
-
-class compactdictproxy(DictMixin):
-
-    def __init__(self, ko):
-        self._ko = ko    # compact object of which 'self' is the dict
-
-    def __getitem__(self, key):
-        return compact.__getslot__(self._ko, key)
-
-    def __setitem__(self, key, value):
-        compact.__setslot__(self._ko, key, value)
-
-    def __delitem__(self, key):
-        compact.__delslot__(self._ko, key)
-
-    def keys(self):
-        return compact.__members__.__get__(self._ko)
-
-    def clear(self):
-        keys = self.keys()
-        keys.reverse()
-        for key in keys:
-            del self[key]
-
-    def __repr__(self):
-        keys = ', '.join(self.keys())
-        return '<compactdictproxy object {%s}>' % (keys,)

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/logger.py

@@ -1,96 +0,0 @@
-###########################################################################
-# 
-#  Psyco logger.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco logger.
-
-See log() in core.py.
-"""
-###########################################################################
-
-
-import _psyco
-from time import time, localtime, strftime
-
-
-current = None
-print_charges = 10
-dump_delay = 0.2
-dump_last = 0.0
-
-def write(s, level):
-    t = time()
-    f = t-int(t)
-    try:
-        current.write("%s.%02d  %-*s%s\n" % (
-            strftime("%X", localtime(int(t))),
-            int(f*100.0), 63-level, s,
-            "%"*level))
-        current.flush()
-    except (OSError, IOError):
-        pass
-
-def psycowrite(s):
-    t = time()
-    f = t-int(t)
-    try:
-        current.write("%s.%02d  %-*s%s\n" % (
-            strftime("%X", localtime(int(t))),
-            int(f*100.0), 60, s.strip(),
-            "% %"))
-        current.flush()
-    except (OSError, IOError):
-        pass
-
-##def writelines(lines, level=0):
-##    if lines:
-##        t = time()
-##        f = t-int(t)
-##        timedesc = strftime("%x %X", localtime(int(t)))
-##        print >> current, "%s.%03d  %-*s %s" % (
-##            timedesc, int(f*1000),
-##            50-level, lines[0],
-##            "+"*level)
-##        timedesc = " " * (len(timedesc)+5)
-##        for line in lines[1:]:
-##            print >> current, timedesc, line
-
-def writememory():
-    write("memory usage: %d+ kb" % _psyco.memory(), 1)
-
-def dumpcharges():
-    global dump_last
-    if print_charges:
-        t = time()
-        if not (dump_last <= t < dump_last+dump_delay):
-            if t <= dump_last+1.5*dump_delay:
-                dump_last += dump_delay
-            else:
-                dump_last = t
-            #write("%s: charges:" % who, 0)
-            lst = _psyco.stattop(print_charges)
-            if lst:
-                f = t-int(t)
-                lines = ["%s.%02d   ______\n" % (
-                    strftime("%X", localtime(int(t))),
-                    int(f*100.0))]
-                i = 1
-                for co, charge in lst:
-                    detail = co.co_filename
-                    if len(detail) > 19:
-                        detail = '...' + detail[-17:]
-                    lines.append("        #%-3d |%4.1f %%|  %-26s%20s:%d\n" %
-                                 (i, charge*100.0, co.co_name, detail,
-                                  co.co_firstlineno))
-                    i += 1
-                current.writelines(lines)
-                current.flush()
-
-def writefinalstats():
-    dumpcharges()
-    writememory()
-    writedate("program exit")
-
-def writedate(msg):
-    write('%s, %s' % (msg, strftime("%x")), 20)

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/profiler.py

@@ -1,379 +0,0 @@
-###########################################################################
-# 
-#  Psyco profiler (Python part).
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco profiler (Python part).
-
-The implementation of the non-time-critical parts of the profiler.
-See profile() and full() in core.py for the easy interface.
-"""
-###########################################################################
-
-import _psyco
-from support import *
-import math, time, types, atexit
-now = time.time
-try:
-    import thread
-except ImportError:
-    import dummy_thread as thread
-
-
-# current profiler instance
-current = None
-
-# enabled profilers, in order of priority
-profilers = []
-
-# logger module (when enabled by core.log())
-logger = None
-
-# a lock for a thread-safe go()
-go_lock = thread.allocate_lock()
-
-def go(stop=0):
-    # run the highest-priority profiler in 'profilers'
-    global current
-    go_lock.acquire()
-    try:
-        prev = current
-        if stop:
-            del profilers[:]
-        if prev:
-            if profilers and profilers[0] is prev:
-                return    # best profiler already running
-            prev.stop()
-            current = None
-        for p in profilers[:]:
-            if p.start():
-                current = p
-                if logger: # and p is not prev:
-                    logger.write("%s: starting" % p.__class__.__name__, 5)
-                return
-    finally:
-        go_lock.release()
-    # no profiler is running now
-    if stop:
-        if logger:
-            logger.writefinalstats()
-    else:
-        tag2bind()
-
-atexit.register(go, 1)
-
-
-def buildfncache(globals, cache):
-    if hasattr(types.IntType, '__dict__'):
-        clstypes = (types.ClassType, types.TypeType)
-    else:
-        clstypes = types.ClassType
-    for x in globals.values():
-        if isinstance(x, types.MethodType):
-            x = x.im_func
-        if isinstance(x, types.FunctionType):
-            cache[x.func_code] = x, ''
-        elif isinstance(x, clstypes):
-            for y in x.__dict__.values():
-                if isinstance(y, types.MethodType):
-                    y = y.im_func
-                if isinstance(y, types.FunctionType):
-                    cache[y.func_code] = y, x.__name__
-
-# code-to-function mapping (cache)
-function_cache = {}
-
-def trytobind(co, globals, log=1):
-    try:
-        f, clsname = function_cache[co]
-    except KeyError:
-        buildfncache(globals, function_cache)
-        try:
-            f, clsname = function_cache[co]
-        except KeyError:
-            if logger:
-                logger.write('warning: cannot find function %s in %s' %
-                             (co.co_name, globals.get('__name__', '?')), 3)
-            return  # give up
-    if logger and log:
-        modulename = globals.get('__name__', '?')
-        if clsname:
-            modulename += '.' + clsname
-        logger.write('bind function: %s.%s' % (modulename, co.co_name), 1)
-    f.func_code = _psyco.proxycode(f)
-
-
-# the list of code objects that have been tagged
-tagged_codes = []
-
-def tag(co, globals):
-    if logger:
-        try:
-            f, clsname = function_cache[co]
-        except KeyError:
-            buildfncache(globals, function_cache)
-            try:
-                f, clsname = function_cache[co]
-            except KeyError:
-                clsname = ''  # give up
-        modulename = globals.get('__name__', '?')
-        if clsname:
-            modulename += '.' + clsname
-        logger.write('tag function: %s.%s' % (modulename, co.co_name), 1)
-    tagged_codes.append((co, globals))
-    _psyco.turbo_frame(co)
-    _psyco.turbo_code(co)
-
-def tag2bind():
-    if tagged_codes:
-        if logger:
-            logger.write('profiling stopped, binding %d functions' %
-                         len(tagged_codes), 2)
-        for co, globals in tagged_codes:
-            trytobind(co, globals, 0)
-        function_cache.clear()
-        del tagged_codes[:]
-
-
-class Profiler:
-    MemoryTimerResolution = 0.103
-
-    def run(self, memory, time, memorymax, timemax):
-        self.memory = memory
-        self.memorymax = memorymax
-        self.time = time
-        if timemax is None:
-            self.endtime = None
-        else:
-            self.endtime = now() + timemax
-        self.alarms = []
-        profilers.append(self)
-        go()
-    
-    def start(self):
-        curmem = _psyco.memory()
-        memlimits = []
-        if self.memorymax is not None:
-            if curmem >= self.memorymax:
-                if logger:
-                    logger.writememory()
-                return self.limitreached('memorymax')
-            memlimits.append(self.memorymax)
-        if self.memory is not None:
-            if self.memory <= 0:
-                if logger:
-                    logger.writememory()
-                return self.limitreached('memory')
-            memlimits.append(curmem + self.memory)
-            self.memory_at_start = curmem
-
-        curtime = now()
-        timelimits = []
-        if self.endtime is not None:
-            if curtime >= self.endtime:
-                return self.limitreached('timemax')
-            timelimits.append(self.endtime - curtime)
-        if self.time is not None:
-            if self.time <= 0.0:
-                return self.limitreached('time')
-            timelimits.append(self.time)
-            self.time_at_start = curtime
-        
-        try:
-            self.do_start()
-        except error, e:
-            if logger:
-                logger.write('%s: disabled by psyco.error:' % (
-                    self.__class__.__name__), 4)
-                logger.write('    %s' % str(e), 3)
-            return 0
-        
-        if memlimits:
-            self.memlimits_args = (time.sleep, (self.MemoryTimerResolution,),
-                                   self.check_memory, (min(memlimits),))
-            self.alarms.append(_psyco.alarm(*self.memlimits_args))
-        if timelimits:
-            self.alarms.append(_psyco.alarm(time.sleep, (min(timelimits),),
-                                            self.time_out))
-        return 1
-    
-    def stop(self):
-        for alarm in self.alarms:
-            alarm.stop(0)
-        for alarm in self.alarms:
-            alarm.stop(1)   # wait for parallel threads to stop
-        del self.alarms[:]
-        if self.time is not None:
-            self.time -= now() - self.time_at_start
-        if self.memory is not None:
-            self.memory -= _psyco.memory() - self.memory_at_start
-
-        try:
-            self.do_stop()
-        except error:
-            return 0
-        return 1
-
-    def check_memory(self, limit):
-        if _psyco.memory() < limit:
-            return self.memlimits_args
-        go()
-
-    def time_out(self):
-        self.time = 0.0
-        go()
-
-    def limitreached(self, limitname):
-        try:
-            profilers.remove(self)
-        except ValueError:
-            pass
-        if logger:
-            logger.write('%s: disabled (%s limit reached)' % (
-                self.__class__.__name__, limitname), 4)
-        return 0
-
-
-class FullCompiler(Profiler):
-
-    def do_start(self):
-        _psyco.profiling('f')
-
-    def do_stop(self):
-        _psyco.profiling('.')
-
-
-class RunOnly(Profiler):
-
-    def do_start(self):
-        _psyco.profiling('n')
-
-    def do_stop(self):
-        _psyco.profiling('.')
-
-
-class ChargeProfiler(Profiler):
-
-    def __init__(self, watermark, parentframe):
-        self.watermark = watermark
-        self.parent2 = parentframe * 2.0
-        self.lock = thread.allocate_lock()
-
-    def init_charges(self):
-        _psyco.statwrite(watermark = self.watermark,
-                         parent2   = self.parent2)
-
-    def do_stop(self):
-        _psyco.profiling('.')
-        _psyco.statwrite(callback = None)
-
-
-class ActiveProfiler(ChargeProfiler):
-
-    def active_start(self):
-        _psyco.profiling('p')
-
-    def do_start(self):
-        self.init_charges()
-        self.active_start()
-        _psyco.statwrite(callback = self.charge_callback)
-
-    def charge_callback(self, frame, charge):
-        tag(frame.f_code, frame.f_globals)
-
-
-class PassiveProfiler(ChargeProfiler):
-
-    initial_charge_unit   = _psyco.statread('unit')
-    reset_stats_after     = 120      # half-lives (maximum 200!)
-    reset_limit           = initial_charge_unit * (2.0 ** reset_stats_after)
-
-    def __init__(self, watermark, halflife, pollfreq, parentframe):
-        ChargeProfiler.__init__(self, watermark, parentframe)
-        self.pollfreq = pollfreq
-        # self.progress is slightly more than 1.0, and computed so that
-        # do_profile() will double the change_unit every 'halflife' seconds.
-        self.progress = 2.0 ** (1.0 / (halflife * pollfreq))
-
-    def reset(self):
-        _psyco.statwrite(unit = self.initial_charge_unit, callback = None)
-        _psyco.statreset()
-        if logger:
-            logger.write("%s: resetting stats" % self.__class__.__name__, 1)
-
-    def passive_start(self):
-        self.passivealarm_args = (time.sleep, (1.0 / self.pollfreq,),
-                                  self.do_profile)
-        self.alarms.append(_psyco.alarm(*self.passivealarm_args))
-
-    def do_start(self):
-        tag2bind()
-        self.init_charges()
-        self.passive_start()
-
-    def do_profile(self):
-        _psyco.statcollect()
-        if logger:
-            logger.dumpcharges()
-        nunit = _psyco.statread('unit') * self.progress
-        if nunit > self.reset_limit:
-            self.reset()
-        else:
-            _psyco.statwrite(unit = nunit, callback = self.charge_callback)
-        return self.passivealarm_args
-
-    def charge_callback(self, frame, charge):
-        trytobind(frame.f_code, frame.f_globals)
-
-
-class ActivePassiveProfiler(PassiveProfiler, ActiveProfiler):
-
-    def do_start(self):
-        self.init_charges()
-        self.active_start()
-        self.passive_start()
-
-    def charge_callback(self, frame, charge):
-        tag(frame.f_code, frame.f_globals)
-
-
-
-#
-# we register our own version of sys.settrace(), sys.setprofile()
-# and thread.start_new_thread().
-#
-
-def psyco_settrace(*args, **kw):
-    "This is the Psyco-aware version of sys.settrace()."
-    result = original_settrace(*args, **kw)
-    go()
-    return result
-
-def psyco_setprofile(*args, **kw):
-    "This is the Psyco-aware version of sys.setprofile()."
-    result = original_setprofile(*args, **kw)
-    go()
-    return result
-
-def psyco_thread_stub(callable, args, kw):
-    _psyco.statcollect()
-    if kw is None:
-        return callable(*args)
-    else:
-        return callable(*args, **kw)
-
-def psyco_start_new_thread(callable, args, kw=None):
-    "This is the Psyco-aware version of thread.start_new_thread()."
-    return original_start_new_thread(psyco_thread_stub, (callable, args, kw))
-
-original_settrace         = sys.settrace
-original_setprofile       = sys.setprofile
-original_start_new_thread = thread.start_new_thread
-sys.settrace            = psyco_settrace
-sys.setprofile          = psyco_setprofile
-thread.start_new_thread = psyco_start_new_thread
-# hack to patch threading._start_new_thread if the module is
-# already loaded
-if ('threading' in sys.modules and
-    hasattr(sys.modules['threading'], '_start_new_thread')):
-    sys.modules['threading']._start_new_thread = psyco_start_new_thread

Calibre_Plugins/eReaderPDB2PML_plugin/osx/psyco/support.py

@@ -1,191 +0,0 @@
-###########################################################################
-# 
-#  Psyco general support module.
-#   Copyright (C) 2001-2002  Armin Rigo et.al.
-
-"""Psyco general support module.
-
-For internal use.
-"""
-###########################################################################
-
-import sys, _psyco, __builtin__
-
-error = _psyco.error
-class warning(Warning):
-    pass
-
-_psyco.NoLocalsWarning = warning
-
-def warn(msg):
-    from warnings import warn
-    warn(msg, warning, stacklevel=2)
-
-#
-# Version checks
-#
-__version__ = 0x010600f0
-if _psyco.PSYVER != __version__:
-    raise error, "version mismatch between Psyco parts, reinstall it"
-
-version_info = (__version__ >> 24,
-                (__version__ >> 16) & 0xff,
-                (__version__ >> 8) & 0xff,
-                {0xa0: 'alpha',
-                 0xb0: 'beta',
-                 0xc0: 'candidate',
-                 0xf0: 'final'}[__version__ & 0xf0],
-                __version__ & 0xf)
-
-
-VERSION_LIMITS = [0x02020200,   # 2.2.2
-                  0x02030000,   # 2.3
-                  0x02040000]   # 2.4
-
-if ([v for v in VERSION_LIMITS if v <= sys.hexversion] !=
-    [v for v in VERSION_LIMITS if v <= _psyco.PYVER  ]):
-    if sys.hexversion < VERSION_LIMITS[0]:
-        warn("Psyco requires Python version 2.2.2 or later")
-    else:
-        warn("Psyco version does not match Python version. "
-             "Psyco must be updated or recompiled")
-
-
-if hasattr(_psyco, 'ALL_CHECKS') and hasattr(_psyco, 'VERBOSE_LEVEL'):
-    print >> sys.stderr, ('psyco: running in debugging mode on %s' %
-                          _psyco.PROCESSOR)
-
-
-###########################################################################
-# sys._getframe() gives strange results on a mixed Psyco- and Python-style
-# stack frame. Psyco provides a replacement that partially emulates Python
-# frames from Psyco frames. The new sys._getframe() may return objects of
-# a custom "Psyco frame" type, which is a subtype of the normal frame type.
-#
-# The same problems require some other built-in functions to be replaced
-# as well. Note that the local variables are not available in any
-# dictionary with Psyco.
-
-
-class Frame:
-    pass
-
-
-class PythonFrame(Frame):
-
-    def __init__(self, frame):
-        self.__dict__.update({
-            '_frame': frame,
-            })
-
-    def __getattr__(self, attr):
-        if attr == 'f_back':
-            try:
-                result = embedframe(_psyco.getframe(self._frame))
-            except ValueError:
-                result = None
-            except error:
-                warn("f_back is skipping dead Psyco frames")
-                result = self._frame.f_back
-            self.__dict__['f_back'] = result
-            return result
-        else:
-            return getattr(self._frame, attr)
-
-    def __setattr__(self, attr, value):
-        setattr(self._frame, attr, value)
-
-    def __delattr__(self, attr):
-        delattr(self._frame, attr)
-
-
-class PsycoFrame(Frame):
-
-    def __init__(self, tag):
-        self.__dict__.update({
-            '_tag'     : tag,
-            'f_code'   : tag[0],
-            'f_globals': tag[1],
-            })
-
-    def __getattr__(self, attr):
-        if attr == 'f_back':
-            try:
-                result = embedframe(_psyco.getframe(self._tag))
-            except ValueError:
-                result = None
-        elif attr == 'f_lineno':
-            result = self.f_code.co_firstlineno  # better than nothing
-        elif attr == 'f_builtins':
-            result = self.f_globals['__builtins__']
-        elif attr == 'f_restricted':
-            result = self.f_builtins is not __builtins__
-        elif attr == 'f_locals':
-            raise AttributeError, ("local variables of functions run by Psyco "
-                                   "cannot be accessed in any way, sorry")
-        else:
-            raise AttributeError, ("emulated Psyco frames have "
-                                   "no '%s' attribute" % attr)
-        self.__dict__[attr] = result
-        return result
-
-    def __setattr__(self, attr, value):
-        raise AttributeError, "Psyco frame objects are read-only"
-
-    def __delattr__(self, attr):
-        if attr == 'f_trace':
-            # for bdb which relies on CPython frames exhibiting a slightly
-            # buggy behavior: you can 'del f.f_trace' as often as you like
-            # even without having set it previously.
-            return
-        raise AttributeError, "Psyco frame objects are read-only"
-
-
-def embedframe(result):
-    if type(result) is type(()):
-        return PsycoFrame(result)
-    else:
-        return PythonFrame(result)
-
-def _getframe(depth=0):
-    """Return a frame object from the call stack. This is a replacement for
-sys._getframe() which is aware of Psyco frames.
-
-The returned objects are instances of either PythonFrame or PsycoFrame
-instead of being real Python-level frame object, so that they can emulate
-the common attributes of frame objects.
-
-The original sys._getframe() ignoring Psyco frames altogether is stored in
-psyco._getrealframe(). See also psyco._getemulframe()."""
-    # 'depth+1' to account for this _getframe() Python function
-    return embedframe(_psyco.getframe(depth+1))
-
-def _getemulframe(depth=0):
-    """As _getframe(), but the returned objects are real Python frame objects
-emulating Psyco frames. Some of their attributes can be wrong or missing,
-however."""
-    # 'depth+1' to account for this _getemulframe() Python function
-    return _psyco.getframe(depth+1, 1)
-
-def patch(name, module=__builtin__):
-    f = getattr(_psyco, name)
-    org = getattr(module, name)
-    if org is not f:
-        setattr(module, name, f)
-        setattr(_psyco, 'original_' + name, org)
-
-_getrealframe = sys._getframe
-sys._getframe = _getframe
-patch('globals')
-patch('eval')
-patch('execfile')
-patch('locals')
-patch('vars')
-patch('dir')
-patch('input')
-_psyco.original_raw_input = raw_input
-__builtin__.__in_psyco__ = 0==1   # False
-
-if hasattr(_psyco, 'compact'):
-    import kdictproxy
-    _psyco.compactdictproxy = kdictproxy.compactdictproxy

Calibre_Plugins/eReaderPDB2PML_plugin/pycrypto_des.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+
+def load_pycrypto():
+    try :
+        from Crypto.Cipher import DES as _DES
+    except:
+        return None
+
+    class DES(object):
+        def __init__(self, key):
+            if len(key) != 8 :
+                raise Error('DES improper key used')
+            self.key = key
+            self._des = _DES.new(key,_DES.MODE_ECB)
+        def desdecrypt(self, data):
+            return self._des.decrypt(data)
+        def decrypt(self, data):
+            if not data:
+                return ''
+            i = 0
+            result = []
+            while i < len(data):
+                block = data[i:i+8]
+                processed_block = self.desdecrypt(block)
+                result.append(processed_block)
+                i += 8
+            return ''.join(result)
+    return DES
+

Calibre_Plugins/eReaderPDB2PML_plugin/python_des.py

@@ -0,0 +1,220 @@
+#!/usr/bin/env python
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+import sys
+
+ECB =	0
+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,
+         62, 54, 46, 38, 30, 22, 14,  6, 61, 53, 45, 37, 29, 21,
+         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,
+        40, 51, 30, 36, 46, 54,	29, 39, 50, 44, 32, 47,
+        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,
+        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,
+        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,
+        23, 24, 25, 26, 27, 28,27, 28, 29, 30, 31,  0]
+    __sbox = [[14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
+         0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
+         4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
+         15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13],
+        [15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
+         3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
+         0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
+         13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9],
+        [10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
+         13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
+         13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
+         1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12],
+        [7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
+         13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
+         10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
+         3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14],
+        [2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
+         14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
+         4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
+         11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3],
+        [12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
+         10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
+         9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
+         4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13],
+        [4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
+         13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
+         1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
+         6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12],
+        [13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
+         1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
+         7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
+         2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11],]
+    __p = [15, 6, 19, 20, 28, 11,27, 16, 0, 14, 22, 25,
+        4, 17, 30, 9, 1, 7,23,13, 31, 26, 2, 8,18, 12, 29, 5, 21, 10,3, 24]
+    __fp = [39,  7, 47, 15, 55, 23, 63, 31,38,  6, 46, 14, 54, 22, 62, 30,
+        37,  5, 45, 13, 53, 21, 61, 29,36,  4, 44, 12, 52, 20, 60, 28,
+        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
+    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.")
+        self.block_size = 8
+        self.key_size = 8
+        self.__padding = ''
+        self.setMode(mode)
+        if IV:
+            self.setIV(IV)
+        self.L = []
+        self.R = []
+        self.Kn = [ [0] * 48 ] * 16	# 16 48-bit keys (K1 - K16)
+        self.final = []
+        self.setKey(key)
+    def getKey(self):
+        return self.__key
+    def setKey(self, key):
+        self.__key = key
+        self.__create_sub_keys()
+    def getMode(self):
+        return self.__mode
+    def setMode(self, mode):
+        self.__mode = mode
+    def getIV(self):
+        return self.__iv
+    def setIV(self, IV):
+        if not IV or len(IV) != self.block_size:
+            raise ValueError("Invalid Initial Value (IV), must be a multiple of " + str(self.block_size) + " bytes")
+        self.__iv = IV
+    def getPadding(self):
+        return self.__padding
+    def __String_to_BitList(self, data):
+        l = len(data) * 8
+        result = [0] * l
+        pos = 0
+        for c in data:
+            i = 7
+            ch = ord(c)
+            while i >= 0:
+                if ch & (1 << i) != 0:
+                    result[pos] = 1
+                else:
+                    result[pos] = 0
+                pos += 1
+                i -= 1
+        return result
+    def __BitList_to_String(self, data):
+        result = ''
+        pos = 0
+        c = 0
+        while pos < len(data):
+            c += data[pos] << (7 - (pos % 8))
+            if (pos % 8) == 7:
+                result += chr(c)
+                c = 0
+            pos += 1
+        return result
+    def __permutate(self, table, block):
+        return [block[x] for x in table]
+    def __create_sub_keys(self):
+        key = self.__permutate(Des.__pc1, self.__String_to_BitList(self.getKey()))
+        i = 0
+        self.L = key[:28]
+        self.R = key[28:]
+        while i < 16:
+            j = 0
+            while j < Des.__left_rotations[i]:
+                self.L.append(self.L[0])
+                del self.L[0]
+                self.R.append(self.R[0])
+                del self.R[0]
+                j += 1
+            self.Kn[i] = self.__permutate(Des.__pc2, self.L + self.R)
+            i += 1
+    def __des_crypt(self, block, crypt_type):
+        block = self.__permutate(Des.__ip, block)
+        self.L = block[:32]
+        self.R = block[32:]
+        if crypt_type == Des.ENCRYPT:
+            iteration = 0
+            iteration_adjustment = 1
+        else:
+            iteration = 15
+            iteration_adjustment = -1
+        i = 0
+        while i < 16:
+            tempR = self.R[:]
+            self.R = self.__permutate(Des.__expansion_table, self.R)
+            self.R = [x ^ y for x,y in zip(self.R, self.Kn[iteration])]
+            B = [self.R[:6], self.R[6:12], self.R[12:18], self.R[18:24], self.R[24:30], self.R[30:36], self.R[36:42], self.R[42:]]
+            j = 0
+            Bn = [0] * 32
+            pos = 0
+            while j < 8:
+                m = (B[j][0] << 1) + B[j][5]
+                n = (B[j][1] << 3) + (B[j][2] << 2) + (B[j][3] << 1) + B[j][4]
+                v = Des.__sbox[j][(m << 4) + n]
+                Bn[pos] = (v & 8) >> 3
+                Bn[pos + 1] = (v & 4) >> 2
+                Bn[pos + 2] = (v & 2) >> 1
+                Bn[pos + 3] = v & 1
+                pos += 4
+                j += 1
+            self.R = self.__permutate(Des.__p, Bn)
+            self.R = [x ^ y for x, y in zip(self.R, self.L)]
+            self.L = tempR
+            i += 1
+            iteration += iteration_adjustment
+        self.final = self.__permutate(Des.__fp, self.R + self.L)
+        return self.final
+    def crypt(self, data, crypt_type):
+        if not data:
+            return ''
+        if len(data) % self.block_size != 0:
+            if crypt_type == Des.DECRYPT: # Decryption must work on 8 byte blocks
+                raise ValueError("Invalid data length, data must be a multiple of " + str(self.block_size) + " bytes\n.")
+            if not self.getPadding():
+                raise ValueError("Invalid data length, data must be a multiple of " + str(self.block_size) + " bytes\n. Try setting the optional padding character")
+            else:
+                data += (self.block_size - (len(data) % self.block_size)) * self.getPadding()
+        if self.getMode() == CBC:
+            if self.getIV():
+                iv = self.__String_to_BitList(self.getIV())
+            else:
+                raise ValueError("For CBC mode, you must supply the Initial Value (IV) for ciphering")
+        i = 0
+        dict = {}
+        result = []
+        while i < len(data):
+            block = self.__String_to_BitList(data[i:i+8])
+            if self.getMode() == CBC:
+                if crypt_type == Des.ENCRYPT:
+                    block = [x ^ y for x, y in zip(block, iv)]
+                processed_block = self.__des_crypt(block, crypt_type)
+                if crypt_type == Des.DECRYPT:
+                    processed_block = [x ^ y for x, y in zip(processed_block, iv)]
+                    iv = block
+                else:
+                    iv = processed_block
+            else:
+                processed_block = self.__des_crypt(block, crypt_type)
+            result.append(self.__BitList_to_String(processed_block))
+            i += 8
+        if crypt_type == Des.DECRYPT and self.getPadding():
+            s = result[-1]
+            while s[-1] == self.getPadding():
+                s = s[:-1]
+            result[-1] = s
+        return ''.join(result)
+    def encrypt(self, data, pad=''):
+        self.__padding = pad
+        return self.crypt(data, Des.ENCRYPT)
+    def decrypt(self, data, pad=''):
+        self.__padding = pad
+        return self.crypt(data, Des.DECRYPT)

Calibre_Plugins/ignobleepub_plugin/Ignobleepub-README.txt

@@ -1,65 +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.
-
-Configuration:
-
-1) The easiest way to configure the plugin is to enter your name (Barnes & Noble account
-name) and credit card number (the one used to purchase the books) into the plugin's
-customization window. It's the same info you would enter into the ignoblekeygen script.
-Highlight the plugin (Ignoble Epub DeDRM) and click the "Customize Plugin" button on
-Calibre's Preferences->Plugins page. Enter the name and credit card number separated
-by a comma: Your Name,1234123412341234
-
-If you've purchased books with more than one credit card, separate that other info with
-a colon: Your Name,1234123412341234:Other Name,2345234523452345
-
-** NOTE ** The above method is your only option if you don't have/can't run the original
-I <3 Cabbages scripts on your particular machine.
-
-** NOTE ** Your credit card number will be on display in Calibre's Plugin configuration
-page when using the above method. If other people have access to your computer,
-you may want to use the second configuration method below.
-
-2) If you already have keyfiles generated with I <3 Cabbages' ignoblekeygen.pyw
-script, you can put those keyfiles into Calibre's configuration directory. The easiest
-way to find the correct directory is to go to Calibre's Preferences page... click
-on the 'Miscellaneous' button (looks like a gear),  and then click the 'Open Calibre
-configuration directory' button. Paste your keyfiles in there. Just make sure that
-they have different names and are saved with the '.b64' extension (like the ignoblekeygen
-script produces). This directory isn't touched when upgrading Calibre, so it's quite safe
-to leave then there.
-
-All keyfiles from method 2 and all data entered from method 1 will be used to attempt
-to decrypt a book. You can use method 1 or method 2, or a combination of both.
-
-Troubleshooting:
-
-If you find that it's not working for you (imported epubs still have DRM), you can
-save a lot of time and trouble by trying to add the epub to Calibre with the command
-line tools. This will print out a lot of helpful debugging info that can be copied into
-any online help requests. I'm going to ask you to do it first, anyway, so you might
-as well get used to it. ;)
-
-Open a command prompt (terminal) and change to the directory where the ebook you're
-trying to import resides. Then type the command "calibredb add your_ebook.epub".
-Don't type the quotes and obviously change the 'your_ebook.epub' to whatever the
-filename of your book is. Copy the resulting output and paste it into any online
-help request you make.
-
-** Note: the Mac version of Calibre doesn't install the command line tools by default.
-If you go to the 'Preferences' page and click on the miscellaneous button, you'll
-see the option to install the command line tools.

Calibre_Plugins/ignobleepub_plugin/ignobleepub_plugin.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# ignobleepub_v01_plugin.py
+# ignobleepub_plugin.py
 # Released under the terms of the GNU General Public Licence, version 3 or
 # later.  <http://www.gnu.org/licenses/>
 #
@@ -41,8 +41,11 @@
 #
 #
 # Revision history:
-#   0.1 - Initial release
-
+#   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
 
 """
 Decrypt Barnes & Noble ADEPT encrypted EPUB books.
@@ -77,6 +80,9 @@ def _load_crypto_libcrypto():
         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')
@@ -164,7 +170,10 @@ def _load_crypto_pycrypto():
     
 def _load_crypto():
     _aes = _aes2 = None
-    for loader in (_load_crypto_libcrypto, _load_crypto_pycrypto):
+    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
@@ -204,6 +213,7 @@ class Decryptor(object):
                                enc('CipherReference'))
         for elem in encryption.findall(expr):
             path = elem.get('URI', None)
+            path = path.encode('utf-8')
             if path is not None:
                 encrypted.add(path)
 
@@ -261,7 +271,7 @@ class IgnobleDeDRM(FileTypePlugin):
                                 Credit given to I <3 Cabbages for the original stand-alone scripts.'
     supported_platforms     = ['linux', 'osx', 'windows']
     author                  = 'DiapDealer'
-    version                 = (0, 1, 0)
+    version                 = (0, 1, 3)
     minimum_calibre_version = (0, 6, 44)  # Compiled python libraries cannot be imported in earlier versions.
     file_types              = set(['epub'])
     on_import               = True
@@ -274,17 +284,10 @@ class IgnobleDeDRM(FileTypePlugin):
         from PyQt4.Qt import QMessageBox
         from calibre.constants import iswindows, isosx
         
-        # Add the included pycrypto import directory for Windows users.
-        pdir = 'windows' if iswindows else 'osx' if isosx else 'linux'
-        ppath = os.path.join(self.sys_insertion_path, pdir)
-        #sys.path.insert(0, ppath)
-        sys.path.append(ppath)
-        
         AES, AES2 = _load_crypto()
         
         if AES == None or AES2 == None:
-            # Failed to load libcrypto or PyCrypto... Adobe Epubs can\'t be decrypted.'
-            sys.path.remove(ppath)
+            # Failed to load libcrypto or PyCrypto... Adobe Epubs can't be decrypted.'
             raise IGNOBLEError('IgnobleEpub - Failed to load crypto libs.')
             return
 
@@ -313,7 +316,6 @@ class IgnobleDeDRM(FileTypePlugin):
         # Get name and credit card number from Plugin Customization
         if not userkeys and not self.site_customization:
             # Plugin hasn't been configured... do nothing.
-            sys.path.remove(ppath)
             raise IGNOBLEError('IgnobleEpub - No keys found. Plugin not configured.')
             return
         
@@ -326,7 +328,6 @@ class IgnobleDeDRM(FileTypePlugin):
                     name, ccn = i.split(',')
                     keycount += 1
                 except ValueError:
-                    sys.path.remove(ppath)
                     raise IGNOBLEError('IgnobleEpub - Error parsing user supplied data.')
                     return
         
@@ -337,17 +338,25 @@ class IgnobleDeDRM(FileTypePlugin):
         # 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, path_to_ebook, of.name)
+            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()
-                sys.path.remove(ppath)
                 return path_to_ebook
                 break
         
@@ -356,7 +365,6 @@ class IgnobleDeDRM(FileTypePlugin):
             if  result == 0:
                 print 'IgnobleEpub: Encryption successfully removed.'
                 of.close()
-                sys.path.remove(ppath)
                 return of.name
                 break
             
@@ -366,7 +374,6 @@ class IgnobleDeDRM(FileTypePlugin):
         # Something went wrong with decryption.
         # Import the original unmolested epub.
         of.close
-        sys.path.remove(ppath)
         raise IGNOBLEError('IgnobleEpub - Ultimately failed to decrypt.')
         return
         

Calibre_Plugins/ignobleepub_plugin/windows/Crypto/Cipher/__init__.py

@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Secret-key encryption algorithms.
-
-Secret-key encryption algorithms transform plaintext in some way that
-is dependent on a key, producing ciphertext. This transformation can
-easily be reversed, if (and, hopefully, only if) one knows the key.
-
-The encryption modules here all support the interface described in PEP
-272, "API for Block Encryption Algorithms".
-
-If you don't know which algorithm to choose, use AES because it's
-standard and has undergone a fair bit of examination.
-
-Crypto.Cipher.AES         Advanced Encryption Standard
-Crypto.Cipher.ARC2        Alleged RC2
-Crypto.Cipher.ARC4        Alleged RC4
-Crypto.Cipher.Blowfish
-Crypto.Cipher.CAST
-Crypto.Cipher.DES         The Data Encryption Standard.  Very commonly used
-                          in the past, but today its 56-bit keys are too small.
-Crypto.Cipher.DES3        Triple DES.
-Crypto.Cipher.XOR         The simple XOR cipher.
-"""
-
-__all__ = ['AES', 'ARC2', 'ARC4',
-           'Blowfish', 'CAST', 'DES', 'DES3',
-           'XOR'
-           ]
-
-__revision__ = "$Id$"
-
-

Calibre_Plugins/ignobleepub_plugin/windows/Crypto/__init__.py

@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Python Cryptography Toolkit
-
-A collection of cryptographic modules implementing various algorithms
-and protocols.
-
-Subpackages:
-Crypto.Cipher             Secret-key encryption algorithms (AES, DES, ARC4)
-Crypto.Hash               Hashing algorithms (MD5, SHA, HMAC)
-Crypto.Protocol           Cryptographic protocols (Chaffing, all-or-nothing
-                          transform).   This package does not contain any
-                          network protocols.
-Crypto.PublicKey          Public-key encryption and signature algorithms
-                          (RSA, DSA)
-Crypto.Util               Various useful modules and functions (long-to-string
-                          conversion, random number generation, number
-                          theoretic functions)
-"""
-
-__all__ = ['Cipher', 'Hash', 'Protocol', 'PublicKey', 'Util']
-
-__version__ = '2.3'     # See also below and setup.py
-__revision__ = "$Id$"
-
-# New software should look at this instead of at __version__ above.
-version_info = (2, 1, 0, 'final', 0)    # See also above and setup.py
-

Calibre_Plugins/ignobleepub_plugin/windows/Crypto/pct_warnings.py

@@ -1,57 +0,0 @@
-# -*- coding: ascii -*-
-#
-#  pct_warnings.py : PyCrypto warnings file
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-#
-# Base classes.  All our warnings inherit from one of these in order to allow
-# the user to specifically filter them.
-#
-
-class CryptoWarning(Warning):
-    """Base class for PyCrypto warnings"""
-
-class CryptoDeprecationWarning(DeprecationWarning, CryptoWarning):
-    """Base PyCrypto DeprecationWarning class"""
-
-class CryptoRuntimeWarning(RuntimeWarning, CryptoWarning):
-    """Base PyCrypto RuntimeWarning class"""
-
-#
-# Warnings that we might actually use
-#
-
-class RandomPool_DeprecationWarning(CryptoDeprecationWarning):
-    """Issued when Crypto.Util.randpool.RandomPool is instantiated."""
-
-class ClockRewindWarning(CryptoRuntimeWarning):
-    """Warning for when the system clock moves backwards."""
-
-class GetRandomNumber_DeprecationWarning(CryptoDeprecationWarning):
-    """Issued when Crypto.Util.number.getRandomNumber is invoked."""
-
-# By default, we want this warning to be shown every time we compensate for
-# clock rewinding.
-import warnings as _warnings
-_warnings.filterwarnings('always', category=ClockRewindWarning, append=1)
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ignobleepub_plugin/zipfix.py

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

Calibre_Plugins/ineptepub_plugin/Ineptepub-README.txt

@@ -1,62 +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.
-
-Configuration:
-
-When first run, the plugin will attempt to find your Adobe Digital Editions installation
-(on Windows and Mac OS's). If successful, it will create an 'adeptkey.der' file and
-save it in Calibre's configuration directory. It will use that file on subsequent runs.
-If there are already '*.der' files in the directory, the plugin won't attempt to
-find the Adobe Digital Editions installation installation.
-
-So if you have Adobe Digital Editions installation installed on the same machine as Calibre...
-you are ready to go. If not... keep reading.
-
-If you already have keyfiles generated with I <3 Cabbages' ineptkey.pyw script,
-you can put those keyfiles in Calibre's configuration directory. The easiest
-way to find the correct directory is to go to Calibre's Preferences page... click
-on the 'Miscellaneous' button (looks like a gear),  and then click the 'Open Calibre
-configuration directory' button. Paste your keyfiles in there. Just make sure that
-they have different names and are saved with the '.der' extension (like the ineptkey
-script produces). This directory isn't touched when upgrading Calibre, so it's quite
-safe to leave them there.
-
-Since there is no Linux version of Adobe Digital Editions, Linux users will have to
-obtain a keyfile through other methods and put the file in Calibre's configuration directory.
-
-All keyfiles with a '.der' extension found in Calibre's configuration directory will
-be used to attempt to decrypt a book.
-
-** NOTE ** There is no plugin customization data for the Inept Epub DeDRM plugin.
-
-Troubleshooting:
-
-If you find that it's not working for you (imported epubs still have DRM), you can
-save a lot of time and trouble by trying to add the epub to Calibre with the command
-line tools. This will print out a lot of helpful debugging info that can be copied into
-any online help requests. I'm going to ask you to do it first, anyway, so you might
-as well get used to it. ;)
-
-Open a command prompt (terminal) and change to the directory where the ebook you're
-trying to import resides. Then type the command "calibredb add your_ebook.epub".
-Don't type the quotes and obviously change the 'your_ebook.epub' to whatever the
-filename of your book is. Copy the resulting output and paste it into any online
-help request you make.
-
-** Note: the Mac version of Calibre doesn't install the command line tools by default.
-If you go to the 'Preferences' page and click on the miscellaneous button, you'll
-see the option to install the command line tools.

Calibre_Plugins/ineptepub_plugin/ade_key.py

@@ -19,14 +19,76 @@ class ADEPTError(Exception):
 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
+        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:
-        from Crypto.Cipher import AES as _aes
-    except ImportError:
-        _aes = None
+                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'
@@ -193,8 +255,12 @@ if iswindows:
     CryptUnprotectData = CryptUnprotectData()
 
     def retrieve_key():
-        if _aes is None:
-            raise ADEPTError("Couldn\'t load PyCrypto")
+        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()
@@ -236,42 +302,39 @@ if iswindows:
         if userkey is None:
             raise ADEPTError('Could not locate privateLicenseKey')
         userkey = userkey.decode('base64')
-        userkey = _aes.new(keykey, _aes.MODE_CBC).decrypt(userkey)
+        aes = AES(keykey)
+        userkey = aes.decrypt(userkey)
         userkey = userkey[26:-ord(userkey[-1])]
         return userkey
 
 else:
 
     import xml.etree.ElementTree as etree
-    import Carbon.File
-    import Carbon.Folder
-    import Carbon.Folders
-    import MacOS
+    import subprocess
 
-    ACTIVATION_PATH = 'Adobe/Digital Editions/activation.dat'
     NSMAP = {'adept': 'http://ns.adobe.com/adept',
              'enc': 'http://www.w3.org/2001/04/xmlenc#'}
 
-    def find_folder(domain, dtype):
-        try:
-            fsref = Carbon.Folder.FSFindFolder(domain, dtype, False)
-            return Carbon.File.pathname(fsref)
-        except MacOS.Error:
-            return None
-    
-    def find_app_support_file(subpath):
-        dtype = Carbon.Folders.kApplicationSupportFolderType
-        for domain in Carbon.Folders.kUserDomain, Carbon.Folders.kLocalDomain:
-            path = find_folder(domain, dtype)
-            if path is None:
-                continue
-            path = os.path.join(path, subpath)
-            if os.path.isfile(path):
-                return path
+    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 = find_app_support_file(ACTIVATION_PATH)
+        actpath = findActivationDat()
         if actpath is None:
             raise ADEPTError("Could not locate ADE activation")
         tree = etree.parse(actpath)

Calibre_Plugins/ineptepub_plugin/ineptepub_plugin.py

@@ -1,6 +1,6 @@
 #! /usr/bin/python
 
-# ineptepub_v01_plugin.py
+# ineptepub_plugin.py
 # Released under the terms of the GNU General Public Licence, version 3 or
 # later.  <http://www.gnu.org/licenses/>
 #
@@ -41,6 +41,12 @@
 #
 # 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
 
 
 """
@@ -76,6 +82,9 @@ def _load_crypto_libcrypto():
         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')
@@ -276,7 +285,10 @@ def _load_crypto_pycrypto():
 
 def _load_crypto():
     _aes = _rsa = None
-    for loader in (_load_crypto_libcrypto, _load_crypto_pycrypto):
+    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
@@ -301,6 +313,7 @@ class Decryptor(object):
                                enc('CipherReference'))
         for elem in encryption.findall(expr):
             path = elem.get('URI', None)
+            path = path.encode('utf-8')
             if path is not None:
                 encrypted.add(path)
 
@@ -358,7 +371,7 @@ class IneptDeDRM(FileTypePlugin):
                                 Credit given to I <3 Cabbages for the original stand-alone scripts.'
     supported_platforms     = ['linux', 'osx', 'windows']
     author                  = 'DiapDealer'
-    version                 = (0, 1, 0)
+    version                 = (0, 1, 4)
     minimum_calibre_version = (0, 6, 44)  # Compiled python libraries cannot be imported in earlier versions.
     file_types              = set(['epub'])
     on_import               = True
@@ -372,18 +385,10 @@ class IneptDeDRM(FileTypePlugin):
         from PyQt4.Qt import QMessageBox
         from calibre.constants import iswindows, isosx
         
-        # Add the included pycrypto import directory for Windows users.
-        # Add the included Carbon import directory for Mac users.
-        pdir = 'windows' if iswindows else 'osx' if isosx else 'linux'
-        ppath = os.path.join(self.sys_insertion_path, pdir)
-        #sys.path.insert(0, ppath)
-        sys.path.append(ppath)
-            
         AES, RSA = _load_crypto()
         
         if AES == None or RSA == None:
             # Failed to load libcrypto or PyCrypto... Adobe Epubs can\'t be decrypted.'
-            sys.path.remove(ppath)
             raise ADEPTError('IneptEpub: Failed to load crypto libs... Adobe Epubs can\'t be decrypted.')
             return
         
@@ -416,7 +421,7 @@ class IneptDeDRM(FileTypePlugin):
                 try:
                     keydata = retrieve_key()
                     userkeys.append(keydata)
-                    keypath = os.path.join(confpath, 'adeptkey.der')
+                    keypath = os.path.join(confpath, 'calibre-adeptkey.der')
                     with open(keypath, 'wb') as f:
                         f.write(keydata)
                     print 'IneptEpub: Created keyfile from ADE install.'    
@@ -426,24 +431,31 @@ class IneptDeDRM(FileTypePlugin):
 
         if not userkeys:
             # No user keys found... bail out.
-            sys.path.remove(ppath)
             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, path_to_ebook, of.name)
+            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()
-                sys.path.remove(ppath)
                 return path_to_ebook
                 break
         
@@ -452,7 +464,6 @@ class IneptDeDRM(FileTypePlugin):
             if  result == 0:
                 print 'IneptEpub: Encryption successfully removed.'
                 of.close
-                sys.path.remove(ppath)
                 return of.name
                 break
             
@@ -462,7 +473,6 @@ class IneptDeDRM(FileTypePlugin):
         # Something went wrong with decryption.
         # Import the original unmolested epub.
         of.close
-        sys.path.remove(ppath)
         raise ADEPTError('IneptEpub - Ultimately failed to decrypt')
         return
 

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Cipher/__init__.py

@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Secret-key encryption algorithms.
-
-Secret-key encryption algorithms transform plaintext in some way that
-is dependent on a key, producing ciphertext. This transformation can
-easily be reversed, if (and, hopefully, only if) one knows the key.
-
-The encryption modules here all support the interface described in PEP
-272, "API for Block Encryption Algorithms".
-
-If you don't know which algorithm to choose, use AES because it's
-standard and has undergone a fair bit of examination.
-
-Crypto.Cipher.AES         Advanced Encryption Standard
-Crypto.Cipher.ARC2        Alleged RC2
-Crypto.Cipher.ARC4        Alleged RC4
-Crypto.Cipher.Blowfish
-Crypto.Cipher.CAST
-Crypto.Cipher.DES         The Data Encryption Standard.  Very commonly used
-                          in the past, but today its 56-bit keys are too small.
-Crypto.Cipher.DES3        Triple DES.
-Crypto.Cipher.XOR         The simple XOR cipher.
-"""
-
-__all__ = ['AES', 'ARC2', 'ARC4',
-           'Blowfish', 'CAST', 'DES', 'DES3',
-           'XOR'
-           ]
-
-__revision__ = "$Id$"
-
-

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Hash/__init__.py

@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Hashing algorithms
-
-Hash functions take arbitrary strings as input, and produce an output
-of fixed size that is dependent on the input; it should never be
-possible to derive the input data given only the hash function's
-output.  Hash functions can be used simply as a checksum, or, in
-association with a public-key algorithm, can be used to implement
-digital signatures.
-
-The hashing modules here all support the interface described in PEP
-247, "API for Cryptographic Hash Functions".
-
-Submodules:
-Crypto.Hash.HMAC          RFC 2104: Keyed-Hashing for Message Authentication
-Crypto.Hash.MD2
-Crypto.Hash.MD4
-Crypto.Hash.MD5
-Crypto.Hash.RIPEMD160
-Crypto.Hash.SHA
-"""
-
-__all__ = ['HMAC', 'MD2', 'MD4', 'MD5', 'RIPEMD', 'RIPEMD160', 'SHA', 'SHA256']
-__revision__ = "$Id$"
-

Calibre_Plugins/ineptepub_plugin/windows/Crypto/PublicKey/RSA.py

@@ -1,184 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#  PublicKey/RSA.py : RSA public key primitive
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""RSA public-key cryptography algorithm."""
-
-__revision__ = "$Id$"
-
-__all__ = ['generate', 'construct', 'error']
-
-from Crypto.Util.python_compat import *
-
-from Crypto.PublicKey import _RSA, _slowmath, pubkey
-from Crypto import Random
-
-try:
-    from Crypto.PublicKey import _fastmath
-except ImportError:
-    _fastmath = None
-
-class _RSAobj(pubkey.pubkey):
-    keydata = ['n', 'e', 'd', 'p', 'q', 'u']
-
-    def __init__(self, implementation, key):
-        self.implementation = implementation
-        self.key = key
-
-    def __getattr__(self, attrname):
-        if attrname in self.keydata:
-            # For backward compatibility, allow the user to get (not set) the
-            # RSA key parameters directly from this object.
-            return getattr(self.key, attrname)
-        else:
-            raise AttributeError("%s object has no %r attribute" % (self.__class__.__name__, attrname,))
-
-    def _encrypt(self, c, K):
-        return (self.key._encrypt(c),)
-
-    def _decrypt(self, c):
-        #(ciphertext,) = c
-        (ciphertext,) = c[:1]  # HACK - We should use the previous line
-                               # instead, but this is more compatible and we're
-                               # going to replace the Crypto.PublicKey API soon
-                               # anyway.
-        return self.key._decrypt(ciphertext)
-
-    def _blind(self, m, r):
-        return self.key._blind(m, r)
-
-    def _unblind(self, m, r):
-        return self.key._unblind(m, r)
-
-    def _sign(self, m, K=None):
-        return (self.key._sign(m),)
-
-    def _verify(self, m, sig):
-        #(s,) = sig
-        (s,) = sig[:1]  # HACK - We should use the previous line instead, but
-                        # this is more compatible and we're going to replace
-                        # the Crypto.PublicKey API soon anyway.
-        return self.key._verify(m, s)
-
-    def has_private(self):
-        return self.key.has_private()
-
-    def size(self):
-        return self.key.size()
-
-    def can_blind(self):
-        return True
-
-    def can_encrypt(self):
-        return True
-
-    def can_sign(self):
-        return True
-
-    def publickey(self):
-        return self.implementation.construct((self.key.n, self.key.e))
-
-    def __getstate__(self):
-        d = {}
-        for k in self.keydata:
-            try:
-                d[k] = getattr(self.key, k)
-            except AttributeError:
-                pass
-        return d
-
-    def __setstate__(self, d):
-        if not hasattr(self, 'implementation'):
-            self.implementation = RSAImplementation()
-        t = []
-        for k in self.keydata:
-            if not d.has_key(k):
-                break
-            t.append(d[k])
-        self.key = self.implementation._math.rsa_construct(*tuple(t))
-
-    def __repr__(self):
-        attrs = []
-        for k in self.keydata:
-            if k == 'n':
-                attrs.append("n(%d)" % (self.size()+1,))
-            elif hasattr(self.key, k):
-                attrs.append(k)
-        if self.has_private():
-            attrs.append("private")
-        return "<%s @0x%x %s>" % (self.__class__.__name__, id(self), ",".join(attrs))
-
-class RSAImplementation(object):
-    def __init__(self, **kwargs):
-        # 'use_fast_math' parameter:
-        #   None (default) - Use fast math if available; Use slow math if not.
-        #   True - Use fast math, and raise RuntimeError if it's not available.
-        #   False - Use slow math.
-        use_fast_math = kwargs.get('use_fast_math', None)
-        if use_fast_math is None:   # Automatic
-            if _fastmath is not None:
-                self._math = _fastmath
-            else:
-                self._math = _slowmath
-
-        elif use_fast_math:     # Explicitly select fast math
-            if _fastmath is not None:
-                self._math = _fastmath
-            else:
-                raise RuntimeError("fast math module not available")
-
-        else:   # Explicitly select slow math
-            self._math = _slowmath
-
-        self.error = self._math.error
-
-        # 'default_randfunc' parameter:
-        #   None (default) - use Random.new().read
-        #   not None       - use the specified function
-        self._default_randfunc = kwargs.get('default_randfunc', None)
-        self._current_randfunc = None
-
-    def _get_randfunc(self, randfunc):
-        if randfunc is not None:
-            return randfunc
-        elif self._current_randfunc is None:
-            self._current_randfunc = Random.new().read
-        return self._current_randfunc
-
-    def generate(self, bits, randfunc=None, progress_func=None):
-        rf = self._get_randfunc(randfunc)
-        obj = _RSA.generate_py(bits, rf, progress_func)    # TODO: Don't use legacy _RSA module
-        key = self._math.rsa_construct(obj.n, obj.e, obj.d, obj.p, obj.q, obj.u)
-        return _RSAobj(self, key)
-
-    def construct(self, tup):
-        key = self._math.rsa_construct(*tup)
-        return _RSAobj(self, key)
-
-_impl = RSAImplementation()
-generate = _impl.generate
-construct = _impl.construct
-error = _impl.error
-
-# vim:set ts=4 sw=4 sts=4 expandtab:
-

Calibre_Plugins/ineptepub_plugin/windows/Crypto/PublicKey/_RSA.py

@@ -1,95 +0,0 @@
-#
-#   RSA.py : RSA encryption/decryption
-#
-#  Part of the Python Cryptography Toolkit
-#
-#  Written by Andrew Kuchling, Paul Swartz, and others
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-#
-
-__revision__ = "$Id$"
-
-from Crypto.PublicKey import pubkey
-from Crypto.Util import number
-
-def generate_py(bits, randfunc, progress_func=None):
-    """generate(bits:int, randfunc:callable, progress_func:callable)
-
-    Generate an RSA key of length 'bits', using 'randfunc' to get
-    random data and 'progress_func', if present, to display
-    the progress of the key generation.
-    """
-    obj=RSAobj()
-    obj.e = 65537L
-
-    # Generate the prime factors of n
-    if progress_func:
-        progress_func('p,q\n')
-    p = q = 1L
-    while number.size(p*q) < bits:
-        # Note that q might be one bit longer than p if somebody specifies an odd
-        # number of bits for the key. (Why would anyone do that?  You don't get
-        # more security.)
-        #
-        # Note also that we ensure that e is coprime to (p-1) and (q-1).
-        # This is needed for encryption to work properly, according to the 1997
-        # paper by Robert D. Silverman of RSA Labs, "Fast generation of random,
-        # strong RSA primes", available at
-        #   http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.17.2713&rep=rep1&type=pdf
-        # Since e=65537 is prime, it is sufficient to check that e divides
-        # neither (p-1) nor (q-1).
-        p = 1L
-        while (p - 1) % obj.e == 0:
-            if progress_func:
-                progress_func('p\n')
-            p = pubkey.getPrime(bits/2, randfunc)
-        q = 1L
-        while (q - 1) % obj.e == 0:
-            if progress_func:
-                progress_func('q\n')
-            q = pubkey.getPrime(bits - (bits/2), randfunc)
-
-    # p shall be smaller than q (for calc of u)
-    if p > q:
-        (p, q)=(q, p)
-    obj.p = p
-    obj.q = q
-
-    if progress_func:
-        progress_func('u\n')
-    obj.u = pubkey.inverse(obj.p, obj.q)
-    obj.n = obj.p*obj.q
-
-    if progress_func:
-        progress_func('d\n')
-    obj.d=pubkey.inverse(obj.e, (obj.p-1)*(obj.q-1))
-
-    assert bits <= 1+obj.size(), "Generated key is too small"
-
-    return obj
-
-class RSAobj(pubkey.pubkey):
-
-    def size(self):
-        """size() : int
-        Return the maximum number of bits that can be handled by this key.
-        """
-        return number.size(self.n) - 1
-

Calibre_Plugins/ineptepub_plugin/windows/Crypto/PublicKey/__init__.py

@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Public-key encryption and signature algorithms.
-
-Public-key encryption uses two different keys, one for encryption and
-one for decryption.  The encryption key can be made public, and the
-decryption key is kept private.  Many public-key algorithms can also
-be used to sign messages, and some can *only* be used for signatures.
-
-Crypto.PublicKey.DSA      Digital Signature Algorithm. (Signature only)
-Crypto.PublicKey.ElGamal  (Signing and encryption)
-Crypto.PublicKey.RSA      (Signing, encryption, and blinding)
-Crypto.PublicKey.qNEW     (Signature only)
-
-"""
-
-__all__ = ['RSA', 'DSA', 'ElGamal', 'qNEW']
-__revision__ = "$Id$"
-

Calibre_Plugins/ineptepub_plugin/windows/Crypto/PublicKey/_slowmath.py

@@ -1,134 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#  PubKey/RSA/_slowmath.py : Pure Python implementation of the RSA portions of _fastmath
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Pure Python implementation of the RSA-related portions of Crypto.PublicKey._fastmath."""
-
-__revision__ = "$Id$"
-
-__all__ = ['rsa_construct']
-
-from Crypto.Util.python_compat import *
-
-from Crypto.Util.number import size, inverse
-
-class error(Exception):
-    pass
-
-class _RSAKey(object):
-    def _blind(self, m, r):
-        # compute r**e * m (mod n)
-        return m * pow(r, self.e, self.n)
-
-    def _unblind(self, m, r):
-        # compute m / r (mod n)
-        return inverse(r, self.n) * m % self.n
-
-    def _decrypt(self, c):
-        # compute c**d (mod n)
-        if not self.has_private():
-            raise TypeError("No private key")
-        return pow(c, self.d, self.n) # TODO: CRT exponentiation
-
-    def _encrypt(self, m):
-        # compute m**d (mod n)
-        return pow(m, self.e, self.n)
-
-    def _sign(self, m):   # alias for _decrypt
-        if not self.has_private():
-            raise TypeError("No private key")
-        return self._decrypt(m)
-
-    def _verify(self, m, sig):
-        return self._encrypt(sig) == m
-
-    def has_private(self):
-        return hasattr(self, 'd')
-
-    def size(self):
-        """Return the maximum number of bits that can be encrypted"""
-        return size(self.n) - 1
-
-def rsa_construct(n, e, d=None, p=None, q=None, u=None):
-    """Construct an RSAKey object"""
-    assert isinstance(n, long)
-    assert isinstance(e, long)
-    assert isinstance(d, (long, type(None)))
-    assert isinstance(p, (long, type(None)))
-    assert isinstance(q, (long, type(None)))
-    assert isinstance(u, (long, type(None)))
-    obj = _RSAKey()
-    obj.n = n
-    obj.e = e
-    if d is not None: obj.d = d
-    if p is not None: obj.p = p
-    if q is not None: obj.q = q
-    if u is not None: obj.u = u
-    return obj
-
-class _DSAKey(object):
-    def size(self):
-        """Return the maximum number of bits that can be encrypted"""
-        return size(self.p) - 1
-
-    def has_private(self):
-        return hasattr(self, 'x')
-
-    def _sign(self, m, k):   # alias for _decrypt
-        # SECURITY TODO - We _should_ be computing SHA1(m), but we don't because that's the API.
-        if not self.has_private():
-            raise TypeError("No private key")
-        if not (1L < k < self.q):
-            raise ValueError("k is not between 2 and q-1")
-        inv_k = inverse(k, self.q)   # Compute k**-1 mod q
-        r = pow(self.g, k, self.p) % self.q  # r = (g**k mod p) mod q
-        s = (inv_k * (m + self.x * r)) % self.q
-        return (r, s)
-
-    def _verify(self, m, r, s):
-        # SECURITY TODO - We _should_ be computing SHA1(m), but we don't because that's the API.
-        if not (0 < r < self.q) or not (0 < s < self.q):
-            return False
-        w = inverse(s, self.q)
-        u1 = (m*w) % self.q
-        u2 = (r*w) % self.q
-        v = (pow(self.g, u1, self.p) * pow(self.y, u2, self.p) % self.p) % self.q
-        return v == r
-
-def dsa_construct(y, g, p, q, x=None):
-    assert isinstance(y, long)
-    assert isinstance(g, long)
-    assert isinstance(p, long)
-    assert isinstance(q, long)
-    assert isinstance(x, (long, type(None)))
-    obj = _DSAKey()
-    obj.y = y
-    obj.g = g
-    obj.p = p
-    obj.q = q
-    if x is not None: obj.x = x
-    return obj
-
-
-# vim:set ts=4 sw=4 sts=4 expandtab:
-

Calibre_Plugins/ineptepub_plugin/windows/Crypto/PublicKey/pubkey.py

@@ -1,192 +0,0 @@
-#
-#   pubkey.py : Internal functions for public key operations
-#
-#  Part of the Python Cryptography Toolkit
-#
-#  Written by Andrew Kuchling, Paul Swartz, and others
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-#
-
-__revision__ = "$Id$"
-
-import types, warnings
-from Crypto.Util.number import *
-
-# Basic public key class
-class pubkey:
-    def __init__(self):
-        pass
-
-    def __getstate__(self):
-        """To keep key objects platform-independent, the key data is
-        converted to standard Python long integers before being
-        written out.  It will then be reconverted as necessary on
-        restoration."""
-        d=self.__dict__
-        for key in self.keydata:
-            if d.has_key(key): d[key]=long(d[key])
-        return d
-
-    def __setstate__(self, d):
-        """On unpickling a key object, the key data is converted to the big
-number representation being used, whether that is Python long
-integers, MPZ objects, or whatever."""
-        for key in self.keydata:
-            if d.has_key(key): self.__dict__[key]=bignum(d[key])
-
-    def encrypt(self, plaintext, K):
-        """encrypt(plaintext:string|long, K:string|long) : tuple
-        Encrypt the string or integer plaintext.  K is a random
-        parameter required by some algorithms.
-        """
-        wasString=0
-        if isinstance(plaintext, types.StringType):
-            plaintext=bytes_to_long(plaintext) ; wasString=1
-        if isinstance(K, types.StringType):
-            K=bytes_to_long(K)
-        ciphertext=self._encrypt(plaintext, K)
-        if wasString: return tuple(map(long_to_bytes, ciphertext))
-        else: return ciphertext
-
-    def decrypt(self, ciphertext):
-        """decrypt(ciphertext:tuple|string|long): string
-        Decrypt 'ciphertext' using this key.
-        """
-        wasString=0
-        if not isinstance(ciphertext, types.TupleType):
-            ciphertext=(ciphertext,)
-        if isinstance(ciphertext[0], types.StringType):
-            ciphertext=tuple(map(bytes_to_long, ciphertext)) ; wasString=1
-        plaintext=self._decrypt(ciphertext)
-        if wasString: return long_to_bytes(plaintext)
-        else: return plaintext
-
-    def sign(self, M, K):
-        """sign(M : string|long, K:string|long) : tuple
-        Return a tuple containing the signature for the message M.
-        K is a random parameter required by some algorithms.
-        """
-        if (not self.has_private()):
-            raise TypeError('Private key not available in this object')
-        if isinstance(M, types.StringType): M=bytes_to_long(M)
-        if isinstance(K, types.StringType): K=bytes_to_long(K)
-        return self._sign(M, K)
-
-    def verify (self, M, signature):
-        """verify(M:string|long, signature:tuple) : bool
-        Verify that the signature is valid for the message M;
-        returns true if the signature checks out.
-        """
-        if isinstance(M, types.StringType): M=bytes_to_long(M)
-        return self._verify(M, signature)
-
-    # alias to compensate for the old validate() name
-    def validate (self, M, signature):
-        warnings.warn("validate() method name is obsolete; use verify()",
-                      DeprecationWarning)
-
-    def blind(self, M, B):
-        """blind(M : string|long, B : string|long) : string|long
-        Blind message M using blinding factor B.
-        """
-        wasString=0
-        if isinstance(M, types.StringType):
-            M=bytes_to_long(M) ; wasString=1
-        if isinstance(B, types.StringType): B=bytes_to_long(B)
-        blindedmessage=self._blind(M, B)
-        if wasString: return long_to_bytes(blindedmessage)
-        else: return blindedmessage
-
-    def unblind(self, M, B):
-        """unblind(M : string|long, B : string|long) : string|long
-        Unblind message M using blinding factor B.
-        """
-        wasString=0
-        if isinstance(M, types.StringType):
-            M=bytes_to_long(M) ; wasString=1
-        if isinstance(B, types.StringType): B=bytes_to_long(B)
-        unblindedmessage=self._unblind(M, B)
-        if wasString: return long_to_bytes(unblindedmessage)
-        else: return unblindedmessage
-
-
-    # The following methods will usually be left alone, except for
-    # signature-only algorithms.  They both return Boolean values
-    # recording whether this key's algorithm can sign and encrypt.
-    def can_sign (self):
-        """can_sign() : bool
-        Return a Boolean value recording whether this algorithm can
-        generate signatures.  (This does not imply that this
-        particular key object has the private information required to
-        to generate a signature.)
-        """
-        return 1
-
-    def can_encrypt (self):
-        """can_encrypt() : bool
-        Return a Boolean value recording whether this algorithm can
-        encrypt data.  (This does not imply that this
-        particular key object has the private information required to
-        to decrypt a message.)
-        """
-        return 1
-
-    def can_blind (self):
-        """can_blind() : bool
-        Return a Boolean value recording whether this algorithm can
-        blind data.  (This does not imply that this
-        particular key object has the private information required to
-        to blind a message.)
-        """
-        return 0
-
-    # The following methods will certainly be overridden by
-    # subclasses.
-
-    def size (self):
-        """size() : int
-        Return the maximum number of bits that can be handled by this key.
-        """
-        return 0
-
-    def has_private (self):
-        """has_private() : bool
-        Return a Boolean denoting whether the object contains
-        private components.
-        """
-        return 0
-
-    def publickey (self):
-        """publickey(): object
-        Return a new key object containing only the public information.
-        """
-        return self
-
-    def __eq__ (self, other):
-        """__eq__(other): 0, 1
-        Compare us to other for equality.
-        """
-        return self.__getstate__() == other.__getstate__()
-
-    def __ne__ (self, other):
-        """__ne__(other): 0, 1
-        Compare us to other for inequality.
-        """
-        return not self.__eq__(other)

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/Fortuna/FortunaAccumulator.py

@@ -1,139 +0,0 @@
-# -*- coding: ascii -*-
-#
-#  FortunaAccumulator.py : Fortuna's internal accumulator
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-__revision__ = "$Id$"
-
-from Crypto.Util.python_compat import *
-
-from binascii import b2a_hex
-import time
-import warnings
-
-from Crypto.pct_warnings import ClockRewindWarning
-import SHAd256
-
-import FortunaGenerator
-
-class FortunaPool(object):
-    """Fortuna pool type
-
-    This object acts like a hash object, with the following differences:
-
-        - It keeps a count (the .length attribute) of the number of bytes that
-          have been added to the pool
-        - It supports a .reset() method for in-place reinitialization
-        - The method to add bytes to the pool is .append(), not .update().
-    """
-
-    digest_size = SHAd256.digest_size
-
-    def __init__(self):
-        self.reset()
-
-    def append(self, data):
-        self._h.update(data)
-        self.length += len(data)
-
-    def digest(self):
-        return self._h.digest()
-
-    def hexdigest(self):
-        return b2a_hex(self.digest())
-
-    def reset(self):
-        self._h = SHAd256.new()
-        self.length = 0
-
-def which_pools(r):
-    """Return a list of pools indexes (in range(32)) that are to be included during reseed number r.
-
-    According to _Practical Cryptography_, chapter 10.5.2 "Pools":
-
-        "Pool P_i is included if 2**i is a divisor of r.  Thus P_0 is used
-        every reseed, P_1 every other reseed, P_2 every fourth reseed, etc."
-    """
-    # This is a separate function so that it can be unit-tested.
-    assert r >= 1
-    retval = []
-    mask = 0
-    for i in range(32):
-        # "Pool P_i is included if 2**i is a divisor of [reseed_count]"
-        if (r & mask) == 0:
-            retval.append(i)
-        else:
-            break   # optimization.  once this fails, it always fails
-        mask = (mask << 1) | 1L
-    return retval
-
-class FortunaAccumulator(object):
-
-    min_pool_size = 64      # TODO: explain why
-    reseed_interval = 0.100   # 100 ms    TODO: explain why
-
-    def __init__(self):
-        self.reseed_count = 0
-        self.generator = FortunaGenerator.AESGenerator()
-        self.last_reseed = None
-
-        # Initialize 32 FortunaPool instances.
-        # NB: This is _not_ equivalent to [FortunaPool()]*32, which would give
-        # us 32 references to the _same_ FortunaPool instance (and cause the
-        # assertion below to fail).
-        self.pools = [FortunaPool() for i in range(32)]     # 32 pools
-        assert(self.pools[0] is not self.pools[1])
-
-    def random_data(self, bytes):
-        current_time = time.time()
-        if self.last_reseed > current_time:
-            warnings.warn("Clock rewind detected. Resetting last_reseed.", ClockRewindWarning)
-            self.last_reseed = None
-        if (self.pools[0].length >= self.min_pool_size and
-            (self.last_reseed is None or
-             current_time > self.last_reseed + self.reseed_interval)):
-            self._reseed(current_time)
-        # The following should fail if we haven't seeded the pool yet.
-        return self.generator.pseudo_random_data(bytes)
-
-    def _reseed(self, current_time=None):
-        if current_time is None:
-            current_time = time.time()
-        seed = []
-        self.reseed_count += 1
-        self.last_reseed = current_time
-        for i in which_pools(self.reseed_count):
-            seed.append(self.pools[i].digest())
-            self.pools[i].reset()
-
-        seed = "".join(seed)
-        self.generator.reseed(seed)
-
-    def add_random_event(self, source_number, pool_number, data):
-        assert 1 <= len(data) <= 32
-        assert 0 <= source_number <= 255
-        assert 0 <= pool_number <= 31
-        self.pools[pool_number].append(chr(source_number))
-        self.pools[pool_number].append(chr(len(data)))
-        self.pools[pool_number].append(data)
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/Fortuna/FortunaGenerator.py

@@ -1,128 +0,0 @@
-# -*- coding: ascii -*-
-#
-#  FortunaGenerator.py : Fortuna's internal PRNG
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-__revision__ = "$Id$"
-
-from Crypto.Util.python_compat import *
-
-import struct
-
-from Crypto.Util.number import ceil_shift, exact_log2, exact_div
-from Crypto.Util import Counter
-from Crypto.Cipher import AES
-
-import SHAd256
-
-class AESGenerator(object):
-    """The Fortuna "generator"
-
-    This is used internally by the Fortuna PRNG to generate arbitrary amounts
-    of pseudorandom data from a smaller amount of seed data.
-
-    The output is generated by running AES-256 in counter mode and re-keying
-    after every mebibyte (2**16 blocks) of output.
-    """
-
-    block_size = AES.block_size     # output block size in octets (128 bits)
-    key_size = 32                   # key size in octets (256 bits)
-
-    # Because of the birthday paradox, we expect to find approximately one
-    # collision for every 2**64 blocks of output from a real random source.
-    # However, this code generates pseudorandom data by running AES in
-    # counter mode, so there will be no collisions until the counter
-    # (theoretically) wraps around at 2**128 blocks.  Thus, in order to prevent
-    # Fortuna's pseudorandom output from deviating perceptibly from a true
-    # random source, Ferguson and Schneier specify a limit of 2**16 blocks
-    # without rekeying.
-    max_blocks_per_request = 2**16  # Allow no more than this number of blocks per _pseudo_random_data request
-
-    _four_kiblocks_of_zeros = "\0" * block_size * 4096
-
-    def __init__(self):
-        self.counter = Counter.new(nbits=self.block_size*8, initial_value=0, little_endian=True)
-        self.key = None
-
-        # Set some helper constants
-        self.block_size_shift = exact_log2(self.block_size)
-        assert (1 << self.block_size_shift) == self.block_size
-
-        self.blocks_per_key = exact_div(self.key_size, self.block_size)
-        assert self.key_size == self.blocks_per_key * self.block_size
-
-        self.max_bytes_per_request = self.max_blocks_per_request * self.block_size
-
-    def reseed(self, seed):
-        if self.key is None:
-            self.key = "\0" * self.key_size
-        self._set_key(SHAd256.new(self.key + seed).digest())
-        self.counter()  # increment counter
-        assert len(self.key) == self.key_size
-
-    def pseudo_random_data(self, bytes):
-        assert bytes >= 0
-
-        num_full_blocks = bytes >> 20
-        remainder = bytes & ((1<<20)-1)
-
-        retval = []
-        for i in xrange(num_full_blocks):
-            retval.append(self._pseudo_random_data(1<<20))
-        retval.append(self._pseudo_random_data(remainder))
-
-        return "".join(retval)
-
-    def _set_key(self, key):
-        self.key = key
-        self._cipher = AES.new(key, AES.MODE_CTR, counter=self.counter)
-
-    def _pseudo_random_data(self, bytes):
-        if not (0 <= bytes <= self.max_bytes_per_request):
-            raise AssertionError("You cannot ask for more than 1 MiB of data per request")
-
-        num_blocks = ceil_shift(bytes, self.block_size_shift)   # num_blocks = ceil(bytes / self.block_size)
-
-        # Compute the output
-        retval = self._generate_blocks(num_blocks)[:bytes]
-
-        # Switch to a new key to avoid later compromises of this output (i.e.
-        # state compromise extension attacks)
-        self._set_key(self._generate_blocks(self.blocks_per_key))
-
-        assert len(retval) == bytes
-        assert len(self.key) == self.key_size
-
-        return retval
-
-    def _generate_blocks(self, num_blocks):
-        if self.key is None:
-            raise AssertionError("generator must be seeded before use")
-        assert 0 <= num_blocks <= self.max_blocks_per_request
-        retval = []
-        for i in xrange(num_blocks >> 12):      # xrange(num_blocks / 4096)
-            retval.append(self._cipher.encrypt(self._four_kiblocks_of_zeros))
-        remaining_bytes = (num_blocks & 4095) << self.block_size_shift  # (num_blocks % 4095) * self.block_size
-        retval.append(self._cipher.encrypt(self._four_kiblocks_of_zeros[:remaining_bytes]))
-        return "".join(retval)
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/Fortuna/SHAd256.py

@@ -1,88 +0,0 @@
-# -*- coding: ascii -*-
-#
-#  Random/Fortuna/SHAd256.py : SHA_d-256 hash function implementation
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""\
-SHA_d-256 hash function implementation.
-
-This module should comply with PEP 247.
-"""
-
-__revision__ = "$Id$"
-__all__ = ['new', 'digest_size']
-
-from Crypto.Util.python_compat import *
-
-from binascii import b2a_hex
-
-from Crypto.Hash import SHA256
-
-assert SHA256.digest_size == 32
-
-class _SHAd256(object):
-    """SHA-256, doubled.
-
-    Returns SHA-256(SHA-256(data)).
-    """
-
-    digest_size = SHA256.digest_size
-
-    _internal = object()
-
-    def __init__(self, internal_api_check, sha256_hash_obj):
-        if internal_api_check is not self._internal:
-            raise AssertionError("Do not instantiate this class directly.  Use %s.new()" % (__name__,))
-        self._h = sha256_hash_obj
-
-    # PEP 247 "copy" method
-    def copy(self):
-        """Return a copy of this hashing object"""
-        return _SHAd256(SHAd256._internal, self._h.copy())
-
-    # PEP 247 "digest" method
-    def digest(self):
-        """Return the hash value of this object as a binary string"""
-        retval = SHA256.new(self._h.digest()).digest()
-        assert len(retval) == 32
-        return retval
-
-    # PEP 247 "hexdigest" method
-    def hexdigest(self):
-        """Return the hash value of this object as a (lowercase) hexadecimal string"""
-        retval = b2a_hex(self.digest())
-        assert len(retval) == 64
-        return retval
-
-    # PEP 247 "update" method
-    def update(self, data):
-        self._h.update(data)
-
-# PEP 247 module-level "digest_size" variable
-digest_size = _SHAd256.digest_size
-
-# PEP 247 module-level "new" function
-def new(data=""):
-    """Return a new SHAd256 hashing object"""
-    return _SHAd256(_SHAd256._internal, SHA256.new(data))
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/OSRNG/__init__.py

@@ -1,40 +0,0 @@
-#
-#  Random/OSRNG/__init__.py : Platform-independent OS RNG API
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Provides a platform-independent interface to the random number generators
-supplied by various operating systems."""
-
-__revision__ = "$Id$"
-
-import os
-
-if os.name == 'posix':
-    from Crypto.Random.OSRNG.posix import new
-elif os.name == 'nt':
-    from Crypto.Random.OSRNG.nt import new
-elif hasattr(os, 'urandom'):
-    from Crypto.Random.OSRNG.fallback import new
-else:
-    raise ImportError("Not implemented")
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/OSRNG/fallback.py

@@ -1,46 +0,0 @@
-#
-#  Random/OSRNG/fallback.py : Fallback entropy source for systems with os.urandom
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-
-__revision__ = "$Id$"
-__all__ = ['PythonOSURandomRNG']
-
-import os
-
-from rng_base import BaseRNG
-
-class PythonOSURandomRNG(BaseRNG):
-
-    name = "<os.urandom>"
-
-    def __init__(self):
-        self._read = os.urandom
-        BaseRNG.__init__(self)
-
-    def _close(self):
-        self._read = None
-
-def new(*args, **kwargs):
-    return PythonOSURandomRNG(*args, **kwargs)
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/OSRNG/nt.py

@@ -1,74 +0,0 @@
-#
-#  Random/OSRNG/nt.py : OS entropy source for MS Windows
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-
-__revision__ = "$Id$"
-__all__ = ['WindowsRNG']
-
-import winrandom
-from rng_base import BaseRNG
-
-class WindowsRNG(BaseRNG):
-
-    name = "<CryptGenRandom>"
-
-    def __init__(self):
-        self.__winrand = winrandom.new()
-        BaseRNG.__init__(self)
-
-    def flush(self):
-        """Work around weakness in Windows RNG.
-
-        The CryptGenRandom mechanism in some versions of Windows allows an
-        attacker to learn 128 KiB of past and future output.  As a workaround,
-        this function reads 128 KiB of 'random' data from Windows and discards
-        it.
-
-        For more information about the weaknesses in CryptGenRandom, see
-        _Cryptanalysis of the Random Number Generator of the Windows Operating
-        System_, by Leo Dorrendorf and Zvi Gutterman and Benny Pinkas
-        http://eprint.iacr.org/2007/419
-        """
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-        data = self.__winrand.get_bytes(128*1024)
-        assert (len(data) == 128*1024)
-        BaseRNG.flush(self)
-
-    def _close(self):
-        self.__winrand = None
-
-    def _read(self, N):
-        # Unfortunately, research shows that CryptGenRandom doesn't provide
-        # forward secrecy and fails the next-bit test unless we apply a
-        # workaround, which we do here.  See http://eprint.iacr.org/2007/419
-        # for information on the vulnerability.
-        self.flush()
-        data = self.__winrand.get_bytes(N)
-        self.flush()
-        return data
-
-def new(*args, **kwargs):
-    return WindowsRNG(*args, **kwargs)
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/OSRNG/rng_base.py

@@ -1,86 +0,0 @@
-#
-#  Random/OSRNG/rng_base.py : Base class for OSRNG
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-__revision__ = "$Id$"
-
-from Crypto.Util.python_compat import *
-
-class BaseRNG(object):
-
-    def __init__(self):
-        self.closed = False
-        self._selftest()
-
-    def __del__(self):
-        self.close()
-
-    def _selftest(self):
-        # Test that urandom can return data
-        data = self.read(16)
-        if len(data) != 16:
-            raise AssertionError("read truncated")
-
-        # Test that we get different data every time (if we don't, the RNG is
-        # probably malfunctioning)
-        data2 = self.read(16)
-        if data == data2:
-            raise AssertionError("OS RNG returned duplicate data")
-
-    # PEP 343: Support for the "with" statement
-    def __enter__(self):
-        pass
-    def __exit__(self):
-        """PEP 343 support"""
-        self.close()
-
-    def close(self):
-        if not self.closed:
-            self._close()
-        self.closed = True
-
-    def flush(self):
-        pass
-
-    def read(self, N=-1):
-        """Return N bytes from the RNG."""
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-        if not isinstance(N, (long, int)):
-            raise TypeError("an integer is required")
-        if N < 0:
-            raise ValueError("cannot read to end of infinite stream")
-        elif N == 0:
-            return ""
-        data = self._read(N)
-        if len(data) != N:
-            raise AssertionError("%s produced truncated output (requested %d, got %d)" % (self.name, N, len(data)))
-        return data
-
-    def _close(self):
-        raise NotImplementedError("child class must implement this")
-
-    def _read(self, N):
-        raise NotImplementedError("child class must implement this")
-
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/_UserFriendlyRNG.py

@@ -1,213 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#  Random/_UserFriendlyRNG.py : A user-friendly random number generator
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-__revision__ = "$Id$"
-
-from Crypto.Util.python_compat import *
-
-import os
-import threading
-import struct
-import time
-from math import floor
-
-from Crypto.Random import OSRNG
-from Crypto.Random.Fortuna import FortunaAccumulator
-
-class _EntropySource(object):
-    def __init__(self, accumulator, src_num):
-        self._fortuna = accumulator
-        self._src_num = src_num
-        self._pool_num = 0
-
-    def feed(self, data):
-        self._fortuna.add_random_event(self._src_num, self._pool_num, data)
-        self._pool_num = (self._pool_num + 1) & 31
-
-class _EntropyCollector(object):
-
-    def __init__(self, accumulator):
-        self._osrng = OSRNG.new()
-        self._osrng_es = _EntropySource(accumulator, 255)
-        self._time_es = _EntropySource(accumulator, 254)
-        self._clock_es = _EntropySource(accumulator, 253)
-
-    def reinit(self):
-        # Add 256 bits to each of the 32 pools, twice.  (For a total of 16384
-        # bits collected from the operating system.)
-        for i in range(2):
-            block = self._osrng.read(32*32)
-            for p in range(32):
-                self._osrng_es.feed(block[p*32:(p+1)*32])
-            block = None
-        self._osrng.flush()
-
-    def collect(self):
-        # Collect 64 bits of entropy from the operating system and feed it to Fortuna.
-        self._osrng_es.feed(self._osrng.read(8))
-
-        # Add the fractional part of time.time()
-        t = time.time()
-        self._time_es.feed(struct.pack("@I", int(2**30 * (t - floor(t)))))
-
-        # Add the fractional part of time.clock()
-        t = time.clock()
-        self._clock_es.feed(struct.pack("@I", int(2**30 * (t - floor(t)))))
-
-
-class _UserFriendlyRNG(object):
-
-    def __init__(self):
-        self.closed = False
-        self._fa = FortunaAccumulator.FortunaAccumulator()
-        self._ec = _EntropyCollector(self._fa)
-        self.reinit()
-
-    def reinit(self):
-        """Initialize the random number generator and seed it with entropy from
-        the operating system.
-        """
-        self._pid = os.getpid()
-        self._ec.reinit()
-
-    def close(self):
-        self.closed = True
-        self._osrng = None
-        self._fa = None
-
-    def flush(self):
-        pass
-
-    def read(self, N):
-        """Return N bytes from the RNG."""
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-        if not isinstance(N, (long, int)):
-            raise TypeError("an integer is required")
-        if N < 0:
-            raise ValueError("cannot read to end of infinite stream")
-
-        # Collect some entropy and feed it to Fortuna
-        self._ec.collect()
-
-        # Ask Fortuna to generate some bytes
-        retval = self._fa.random_data(N)
-
-        # Check that we haven't forked in the meantime.  (If we have, we don't
-        # want to use the data, because it might have been duplicated in the
-        # parent process.
-        self._check_pid()
-
-        # Return the random data.
-        return retval
-
-    def _check_pid(self):
-        # Lame fork detection to remind developers to invoke Random.atfork()
-        # after every call to os.fork().  Note that this check is not reliable,
-        # since process IDs can be reused on most operating systems.
-        #
-        # You need to do Random.atfork() in the child process after every call
-        # to os.fork() to avoid reusing PRNG state.  If you want to avoid
-        # leaking PRNG state to child processes (for example, if you are using
-        # os.setuid()) then you should also invoke Random.atfork() in the
-        # *parent* process.
-        if os.getpid() != self._pid:
-            raise AssertionError("PID check failed. RNG must be re-initialized after fork(). Hint: Try Random.atfork()")
-
-
-class _LockingUserFriendlyRNG(_UserFriendlyRNG):
-    def __init__(self):
-        self._lock = threading.Lock()
-        _UserFriendlyRNG.__init__(self)
-
-    def close(self):
-        self._lock.acquire()
-        try:
-            return _UserFriendlyRNG.close(self)
-        finally:
-            self._lock.release()
-
-    def reinit(self):
-        self._lock.acquire()
-        try:
-            return _UserFriendlyRNG.reinit(self)
-        finally:
-            self._lock.release()
-
-    def read(self, bytes):
-        self._lock.acquire()
-        try:
-            return _UserFriendlyRNG.read(self, bytes)
-        finally:
-            self._lock.release()
-
-class RNGFile(object):
-    def __init__(self, singleton):
-        self.closed = False
-        self._singleton = singleton
-
-    # PEP 343: Support for the "with" statement
-    def __enter__(self):
-        """PEP 343 support"""
-    def __exit__(self):
-        """PEP 343 support"""
-        self.close()
-
-    def close(self):
-        # Don't actually close the singleton, just close this RNGFile instance.
-        self.closed = True
-        self._singleton = None
-
-    def read(self, bytes):
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-        return self._singleton.read(bytes)
-
-    def flush(self):
-        if self.closed:
-            raise ValueError("I/O operation on closed file")
-
-_singleton_lock = threading.Lock()
-_singleton = None
-def _get_singleton():
-    global _singleton
-    _singleton_lock.acquire()
-    try:
-        if _singleton is None:
-            _singleton = _LockingUserFriendlyRNG()
-        return _singleton
-    finally:
-        _singleton_lock.release()
-
-def new():
-    return RNGFile(_get_singleton())
-
-def reinit():
-    _get_singleton().reinit()
-
-def get_random_bytes(n):
-    """Return the specified number of cryptographically-strong random bytes."""
-    return _get_singleton().read(n)
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/__init__.py

@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#  Random/__init__.py : PyCrypto random number generation
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-__revision__ = "$Id$"
-__all__ = ['new']
-
-import OSRNG
-import _UserFriendlyRNG
-
-def new(*args, **kwargs):
-    """Return a file-like object that outputs cryptographically random bytes."""
-    return _UserFriendlyRNG.new(*args, **kwargs)
-
-def atfork():
-    """Call this whenever you call os.fork()"""
-    _UserFriendlyRNG.reinit()
-
-def get_random_bytes(n):
-    """Return the specified number of cryptographically-strong random bytes."""
-    return _UserFriendlyRNG.get_random_bytes(n)
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Random/random.py

@@ -1,143 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#  Random/random.py : Strong alternative for the standard 'random' module
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""A cryptographically strong version of Python's standard "random" module."""
-
-__revision__ = "$Id$"
-__all__ = ['StrongRandom', 'getrandbits', 'randrange', 'randint', 'choice', 'shuffle', 'sample']
-
-from Crypto import Random
-
-from Crypto.Util.python_compat import *
-
-class StrongRandom(object):
-    def __init__(self, rng=None, randfunc=None):
-        if randfunc is None and rng is None:
-            self._randfunc = None
-        elif randfunc is not None and rng is None:
-            self._randfunc = randfunc
-        elif randfunc is None and rng is not None:
-            self._randfunc = rng.read
-        else:
-            raise ValueError("Cannot specify both 'rng' and 'randfunc'")
-
-    def getrandbits(self, k):
-        """Return a python long integer with k random bits."""
-        if self._randfunc is None:
-            self._randfunc = Random.new().read
-        mask = (1L << k) - 1
-        return mask & bytes_to_long(self._randfunc(ceil_div(k, 8)))
-
-    def randrange(self, *args):
-        """randrange([start,] stop[, step]):
-        Return a randomly-selected element from range(start, stop, step)."""
-        if len(args) == 3:
-            (start, stop, step) = args
-        elif len(args) == 2:
-            (start, stop) = args
-            step = 1
-        elif len(args) == 1:
-            (stop,) = args
-            start = 0
-            step = 1
-        else:
-            raise TypeError("randrange expected at most 3 arguments, got %d" % (len(args),))
-        if (not isinstance(start, (int, long))
-                or not isinstance(stop, (int, long))
-                or not isinstance(step, (int, long))):
-            raise TypeError("randrange requires integer arguments")
-        if step == 0:
-            raise ValueError("randrange step argument must not be zero")
-
-        num_choices = ceil_div(stop - start, step)
-        if num_choices < 0:
-            num_choices = 0
-        if num_choices < 1:
-            raise ValueError("empty range for randrange(%r, %r, %r)" % (start, stop, step))
-
-        # Pick a random number in the range of possible numbers
-        r = num_choices
-        while r >= num_choices:
-            r = self.getrandbits(size(num_choices))
-
-        return start + (step * r)
-
-    def randint(self, a, b):
-        """Return a random integer N such that a <= N <= b."""
-        if not isinstance(a, (int, long)) or not isinstance(b, (int, long)):
-            raise TypeError("randint requires integer arguments")
-        N = self.randrange(a, b+1)
-        assert a <= N <= b
-        return N
-
-    def choice(self, seq):
-        """Return a random element from a (non-empty) sequence.
-
-        If the seqence is empty, raises IndexError.
-        """
-        if len(seq) == 0:
-            raise IndexError("empty sequence")
-        return seq[self.randrange(len(seq))]
-
-    def shuffle(self, x):
-        """Shuffle the sequence in place."""
-        # Make a (copy) of the list of objects we want to shuffle
-        items = list(x)
-
-        # Choose a random item (without replacement) until all the items have been
-        # chosen.
-        for i in xrange(len(x)):
-            p = self.randint(len(items))
-            x[i] = items[p]
-            del items[p]
-
-    def sample(self, population, k):
-        """Return a k-length list of unique elements chosen from the population sequence."""
-
-        num_choices = len(population)
-        if k > num_choices:
-            raise ValueError("sample larger than population")
-
-        retval = []
-        selected = {}  # we emulate a set using a dict here
-        for i in xrange(k):
-            r = None
-            while r is None or r in selected:
-                r = self.randrange(num_choices)
-            retval.append(population[r])
-            selected[r] = 1
-        return retval
-
-_r = StrongRandom()
-getrandbits = _r.getrandbits
-randrange = _r.randrange
-randint = _r.randint
-choice = _r.choice
-shuffle = _r.shuffle
-sample = _r.sample
-
-# These are at the bottom to avoid problems with recursive imports
-from Crypto.Util.number import ceil_div, bytes_to_long, long_to_bytes, size
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Util/Counter.py

@@ -1,61 +0,0 @@
-# -*- coding: ascii -*-
-#
-#  Util/Counter.py : Fast counter for use with CTR-mode ciphers
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-from Crypto.Util.python_compat import *
-
-from Crypto.Util import _counter
-import struct
-
-# Factory function
-def new(nbits, prefix="", suffix="", initial_value=1, overflow=0, little_endian=False, allow_wraparound=False, disable_shortcut=False):
-    # TODO: Document this
-
-    # Sanity-check the message size
-    (nbytes, remainder) = divmod(nbits, 8)
-    if remainder != 0:
-        # In the future, we might support arbitrary bit lengths, but for now we don't.
-        raise ValueError("nbits must be a multiple of 8; got %d" % (nbits,))
-    if nbytes < 1:
-        raise ValueError("nbits too small")
-    elif nbytes > 0xffff:
-        raise ValueError("nbits too large")
-
-    initval = _encode(initial_value, nbytes, little_endian)
-    if little_endian:
-        return _counter._newLE(str(prefix), str(suffix), initval, allow_wraparound=allow_wraparound, disable_shortcut=disable_shortcut)
-    else:
-        return _counter._newBE(str(prefix), str(suffix), initval, allow_wraparound=allow_wraparound, disable_shortcut=disable_shortcut)
-
-def _encode(n, nbytes, little_endian=False):
-    retval = []
-    n = long(n)
-    for i in range(nbytes):
-        if little_endian:
-            retval.append(chr(n & 0xff))
-        else:
-            retval.insert(0, chr(n & 0xff))
-        n >>= 8
-    return "".join(retval)
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Util/__init__.py

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Miscellaneous modules
-
-Contains useful modules that don't belong into any of the
-other Crypto.* subpackages.
-
-Crypto.Util.number        Number-theoretic functions (primality testing, etc.)
-Crypto.Util.randpool      Random number generation
-Crypto.Util.RFC1751       Converts between 128-bit keys and human-readable
-                          strings of words.
-
-"""
-
-__all__ = ['randpool', 'RFC1751', 'number', 'strxor']
-
-__revision__ = "$Id$"
-

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Util/_number_new.py

@@ -1,117 +0,0 @@
-# -*- coding: ascii -*-
-#
-#  Util/_number_new.py : utility functions
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-## NOTE: Do not import this module directly.  Import these functions from Crypto.Util.number.
-
-__revision__ = "$Id$"
-__all__ = ['ceil_shift', 'ceil_div', 'floor_div', 'exact_log2', 'exact_div']
-
-from Crypto.Util.python_compat import *
-
-def ceil_shift(n, b):
-    """Return ceil(n / 2**b) without performing any floating-point or division operations.
-
-    This is done by right-shifting n by b bits and incrementing the result by 1
-    if any '1' bits were shifted out.
-    """
-    if not isinstance(n, (int, long)) or not isinstance(b, (int, long)):
-        raise TypeError("unsupported operand type(s): %r and %r" % (type(n).__name__, type(b).__name__))
-
-    assert n >= 0 and b >= 0    # I haven't tested or even thought about negative values
-    mask = (1L << b) - 1
-    if n & mask:
-        return (n >> b) + 1
-    else:
-        return n >> b
-
-def ceil_div(a, b):
-    """Return ceil(a / b) without performing any floating-point operations."""
-
-    if not isinstance(a, (int, long)) or not isinstance(b, (int, long)):
-        raise TypeError("unsupported operand type(s): %r and %r" % (type(a).__name__, type(b).__name__))
-
-    (q, r) = divmod(a, b)
-    if r:
-        return q + 1
-    else:
-        return q
-
-def floor_div(a, b):
-    if not isinstance(a, (int, long)) or not isinstance(b, (int, long)):
-        raise TypeError("unsupported operand type(s): %r and %r" % (type(a).__name__, type(b).__name__))
-
-    (q, r) = divmod(a, b)
-    return q
-
-def exact_log2(num):
-    """Find and return an integer i >= 0 such that num == 2**i.
-
-    If no such integer exists, this function raises ValueError.
-    """
-
-    if not isinstance(num, (int, long)):
-        raise TypeError("unsupported operand type: %r" % (type(num).__name__,))
-
-    n = long(num)
-    if n <= 0:
-        raise ValueError("cannot compute logarithm of non-positive number")
-
-    i = 0
-    while n != 0:
-        if (n & 1) and n != 1:
-            raise ValueError("No solution could be found")
-        i += 1
-        n >>= 1
-    i -= 1
-
-    assert num == (1L << i)
-    return i
-
-def exact_div(p, d, allow_divzero=False):
-    """Find and return an integer n such that p == n * d
-
-    If no such integer exists, this function raises ValueError.
-
-    Both operands must be integers.
-
-    If the second operand is zero, this function will raise ZeroDivisionError
-    unless allow_divzero is true (default: False).
-    """
-
-    if not isinstance(p, (int, long)) or not isinstance(d, (int, long)):
-        raise TypeError("unsupported operand type(s): %r and %r" % (type(p).__name__, type(d).__name__))
-
-    if d == 0 and allow_divzero:
-        n = 0
-        if p != n * d:
-            raise ValueError("No solution could be found")
-    else:
-        (n, r) = divmod(p, d)
-        if r != 0:
-            raise ValueError("No solution could be found")
-
-    assert p == n * d
-    return n
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Util/number.py

@@ -1,250 +0,0 @@
-#
-#   number.py : Number-theoretic functions
-#
-#  Part of the Python Cryptography Toolkit
-#
-#  Written by Andrew M. Kuchling, Barry A. Warsaw, and others
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-#
-
-__revision__ = "$Id$"
-
-bignum = long
-try:
-    from Crypto.PublicKey import _fastmath
-except ImportError:
-    _fastmath = None
-
-# New functions
-from _number_new import *
-
-# Commented out and replaced with faster versions below
-## def long2str(n):
-##     s=''
-##     while n>0:
-##         s=chr(n & 255)+s
-##         n=n>>8
-##     return s
-
-## import types
-## def str2long(s):
-##     if type(s)!=types.StringType: return s   # Integers will be left alone
-##     return reduce(lambda x,y : x*256+ord(y), s, 0L)
-
-def size (N):
-    """size(N:long) : int
-    Returns the size of the number N in bits.
-    """
-    bits, power = 0,1L
-    while N >= power:
-        bits += 1
-        power = power << 1
-    return bits
-
-def getRandomNumber(N, randfunc=None):
-    """getRandomNumber(N:int, randfunc:callable):long
-    Return a random N-bit number.
-
-    If randfunc is omitted, then Random.new().read is used.
-
-    NOTE: Confusingly, this function does NOT return N random bits; It returns
-    a random N-bit number, i.e. a random number between 2**(N-1) and (2**N)-1.
-
-    This function is for internal use only and may be renamed or removed in
-    the future.
-    """
-    if randfunc is None:
-        _import_Random()
-        randfunc = Random.new().read
-
-    S = randfunc(N/8)
-    odd_bits = N % 8
-    if odd_bits != 0:
-        char = ord(randfunc(1)) >> (8-odd_bits)
-        S = chr(char) + S
-    value = bytes_to_long(S)
-    value |= 2L ** (N-1)                # Ensure high bit is set
-    assert size(value) >= N
-    return value
-
-def GCD(x,y):
-    """GCD(x:long, y:long): long
-    Return the GCD of x and y.
-    """
-    x = abs(x) ; y = abs(y)
-    while x > 0:
-        x, y = y % x, x
-    return y
-
-def inverse(u, v):
-    """inverse(u:long, u:long):long
-    Return the inverse of u mod v.
-    """
-    u3, v3 = long(u), long(v)
-    u1, v1 = 1L, 0L
-    while v3 > 0:
-        q=u3 / v3
-        u1, v1 = v1, u1 - v1*q
-        u3, v3 = v3, u3 - v3*q
-    while u1<0:
-        u1 = u1 + v
-    return u1
-
-# Given a number of bits to generate and a random generation function,
-# find a prime number of the appropriate size.
-
-def getPrime(N, randfunc=None):
-    """getPrime(N:int, randfunc:callable):long
-    Return a random N-bit prime number.
-
-    If randfunc is omitted, then Random.new().read is used.
-    """
-    if randfunc is None:
-        _import_Random()
-        randfunc = Random.new().read
-
-    number=getRandomNumber(N, randfunc) | 1
-    while (not isPrime(number, randfunc=randfunc)):
-        number=number+2
-    return number
-
-def isPrime(N, randfunc=None):
-    """isPrime(N:long, randfunc:callable):bool
-    Return true if N is prime.
-
-    If randfunc is omitted, then Random.new().read is used.
-    """
-    _import_Random()
-    if randfunc is None:
-        randfunc = Random.new().read
-
-    randint = StrongRandom(randfunc=randfunc).randint
-
-    if N == 1:
-        return 0
-    if N in sieve:
-        return 1
-    for i in sieve:
-        if (N % i)==0:
-            return 0
-
-    # Use the accelerator if available
-    if _fastmath is not None:
-        return _fastmath.isPrime(N)
-
-    # Compute the highest bit that's set in N
-    N1 = N - 1L
-    n = 1L
-    while (n<N):
-        n=n<<1L
-    n = n >> 1L
-
-    # Rabin-Miller test
-    for c in sieve[:7]:
-        a=long(c) ; d=1L ; t=n
-        while (t):  # Iterate over the bits in N1
-            x=(d*d) % N
-            if x==1L and d!=1L and d!=N1:
-                return 0  # Square root of 1 found
-            if N1 & t:
-                d=(x*a) % N
-            else:
-                d=x
-            t = t >> 1L
-        if d!=1L:
-            return 0
-    return 1
-
-# Small primes used for checking primality; these are all the primes
-# less than 256.  This should be enough to eliminate most of the odd
-# numbers before needing to do a Rabin-Miller test at all.
-
-sieve=[2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59,
-       61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127,
-       131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193,
-       197, 199, 211, 223, 227, 229, 233, 239, 241, 251]
-
-# Improved conversion functions contributed by Barry Warsaw, after
-# careful benchmarking
-
-import struct
-
-def long_to_bytes(n, blocksize=0):
-    """long_to_bytes(n:long, blocksize:int) : string
-    Convert a long integer to a byte string.
-
-    If optional blocksize is given and greater than zero, pad the front of the
-    byte string with binary zeros so that the length is a multiple of
-    blocksize.
-    """
-    # after much testing, this algorithm was deemed to be the fastest
-    s = ''
-    n = long(n)
-    pack = struct.pack
-    while n > 0:
-        s = pack('>I', n & 0xffffffffL) + s
-        n = n >> 32
-    # strip off leading zeros
-    for i in range(len(s)):
-        if s[i] != '\000':
-            break
-    else:
-        # only happens when n == 0
-        s = '\000'
-        i = 0
-    s = s[i:]
-    # add back some pad bytes.  this could be done more efficiently w.r.t. the
-    # de-padding being done above, but sigh...
-    if blocksize > 0 and len(s) % blocksize:
-        s = (blocksize - len(s) % blocksize) * '\000' + s
-    return s
-
-def bytes_to_long(s):
-    """bytes_to_long(string) : long
-    Convert a byte string to a long integer.
-
-    This is (essentially) the inverse of long_to_bytes().
-    """
-    acc = 0L
-    unpack = struct.unpack
-    length = len(s)
-    if length % 4:
-        extra = (4 - length % 4)
-        s = '\000' * extra + s
-        length = length + extra
-    for i in range(0, length, 4):
-        acc = (acc << 32) + unpack('>I', s[i:i+4])[0]
-    return acc
-
-# For backwards compatibility...
-import warnings
-def long2str(n, blocksize=0):
-    warnings.warn("long2str() has been replaced by long_to_bytes()")
-    return long_to_bytes(n, blocksize)
-def str2long(s):
-    warnings.warn("str2long() has been replaced by bytes_to_long()")
-    return bytes_to_long(s)
-
-def _import_Random():
-    # This is called in a function instead of at the module level in order to avoid problems with recursive imports
-    global Random, StrongRandom
-    from Crypto import Random
-    from Crypto.Random.random import StrongRandom
-

Calibre_Plugins/ineptepub_plugin/windows/Crypto/Util/python_compat.py

@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#  Util/python_compat.py : Compatibility code for old versions of Python
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Compatibility code for old versions of Python
-
-Currently, this just defines:
-    - True and False
-    - object
-    - isinstance
-"""
-
-__revision__ = "$Id$"
-__all__ = []
-
-import sys
-import __builtin__
-
-# 'True' and 'False' aren't defined in Python 2.1.  Define them.
-try:
-    True, False
-except NameError:
-    (True, False) = (1, 0)
-    __all__ += ['True', 'False']
-
-# New-style classes were introduced in Python 2.2.  Defining "object" in Python
-# 2.1 lets us use new-style classes in versions of Python that support them,
-# while still maintaining backward compatibility with old-style classes
-try:
-    object
-except NameError:
-    class object: pass
-    __all__ += ['object']
-
-# Starting with Python 2.2, isinstance allows a tuple for the second argument.
-# Also, builtins like "tuple", "list", "str", "unicode", "int", and "long"
-# became first-class types, rather than functions.  We want to support
-# constructs like:
-#   isinstance(x, (int, long))
-# So we hack it for Python 2.1.
-try:
-    isinstance(5, (int, long))
-except TypeError:
-    __all__ += ['isinstance']
-    _builtin_type_map = {
-        tuple: type(()),
-        list: type([]),
-        str: type(""),
-        unicode: type(u""),
-        int: type(0),
-        long: type(0L),
-    }
-    def isinstance(obj, t):
-        if not __builtin__.isinstance(t, type(())):
-            # t is not a tuple
-            return __builtin__.isinstance(obj, _builtin_type_map.get(t, t))
-        else:
-            # t is a tuple
-            for typ in t:
-                if __builtin__.isinstance(obj, _builtin_type_map.get(typ, typ)):
-                    return True
-            return False
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/windows/Crypto/__init__.py

@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-"""Python Cryptography Toolkit
-
-A collection of cryptographic modules implementing various algorithms
-and protocols.
-
-Subpackages:
-Crypto.Cipher             Secret-key encryption algorithms (AES, DES, ARC4)
-Crypto.Hash               Hashing algorithms (MD5, SHA, HMAC)
-Crypto.Protocol           Cryptographic protocols (Chaffing, all-or-nothing
-                          transform).   This package does not contain any
-                          network protocols.
-Crypto.PublicKey          Public-key encryption and signature algorithms
-                          (RSA, DSA)
-Crypto.Util               Various useful modules and functions (long-to-string
-                          conversion, random number generation, number
-                          theoretic functions)
-"""
-
-__all__ = ['Cipher', 'Hash', 'Protocol', 'PublicKey', 'Util']
-
-__version__ = '2.3'     # See also below and setup.py
-__revision__ = "$Id$"
-
-# New software should look at this instead of at __version__ above.
-version_info = (2, 1, 0, 'final', 0)    # See also above and setup.py
-

Calibre_Plugins/ineptepub_plugin/windows/Crypto/pct_warnings.py

@@ -1,57 +0,0 @@
-# -*- coding: ascii -*-
-#
-#  pct_warnings.py : PyCrypto warnings file
-#
-# Written in 2008 by Dwayne C. Litzenberger <dlitz@dlitz.net>
-#
-# ===================================================================
-# The contents of this file are dedicated to the public domain.  To
-# the extent that dedication to the public domain is not available,
-# everyone is granted a worldwide, perpetual, royalty-free,
-# non-exclusive license to exercise all rights associated with the
-# contents of this file for any purpose whatsoever.
-# No rights are reserved.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# ===================================================================
-
-#
-# Base classes.  All our warnings inherit from one of these in order to allow
-# the user to specifically filter them.
-#
-
-class CryptoWarning(Warning):
-    """Base class for PyCrypto warnings"""
-
-class CryptoDeprecationWarning(DeprecationWarning, CryptoWarning):
-    """Base PyCrypto DeprecationWarning class"""
-
-class CryptoRuntimeWarning(RuntimeWarning, CryptoWarning):
-    """Base PyCrypto RuntimeWarning class"""
-
-#
-# Warnings that we might actually use
-#
-
-class RandomPool_DeprecationWarning(CryptoDeprecationWarning):
-    """Issued when Crypto.Util.randpool.RandomPool is instantiated."""
-
-class ClockRewindWarning(CryptoRuntimeWarning):
-    """Warning for when the system clock moves backwards."""
-
-class GetRandomNumber_DeprecationWarning(CryptoDeprecationWarning):
-    """Issued when Crypto.Util.number.getRandomNumber is invoked."""
-
-# By default, we want this warning to be shown every time we compensate for
-# clock rewinding.
-import warnings as _warnings
-_warnings.filterwarnings('always', category=ClockRewindWarning, append=1)
-
-# vim:set ts=4 sw=4 sts=4 expandtab:

Calibre_Plugins/ineptepub_plugin/zipfix.py

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

Calibre_Plugins/ineptpdf_plugin/ade_key.py

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

Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py

@@ -1,5 +1,7 @@
 #!/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
 
@@ -26,9 +28,8 @@
 # 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.
 
-from __future__ import with_statement
 
-__version__ = '1.1'
+__version__ = '2.1'
 
 class Unbuffered:
     def __init__(self, stream):
@@ -41,442 +42,298 @@ class Unbuffered:
 
 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
 
-
-#Exception Handling
 class DrmException(Exception):
     pass
 
-#
-# 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()
-
-# determine if we are running as a calibre plugin
 if 'calibre' in sys.modules:
     inCalibre = True
-    global openKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap1, charMap2, charMap3, charMap4
 else:
     inCalibre = False
 
-#
-# start of Kindle specific routines
-#
+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)
 
-if not inCalibre:
+# cleanup bytestring filenames
+# borrowed from calibre from calibre/src/calibre/__init__.py
+# added in removal of non-printing chars
+# and removal of . at start
+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:]
+    return one
+
+def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
     import mobidedrm
-    if sys.platform.startswith('win'):
-        from k4pcutils import openKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap1, charMap2, charMap3, charMap4
-    if sys.platform.startswith('darwin'):
-        from k4mutils import openKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap1, charMap2, charMap3, charMap4
+    import topazextract
+    import kgenpids
 
-global kindleDatabase
+    # handle the obvious cases at the beginning
+    if not os.path.isfile(infile):
+        print "Error: Input file does not exist"
+        return 1
 
-# 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
+    mobi = True
+    magic3 = file(infile,'rb').read(3)
+    if magic3 == 'TPZ':
+        mobi = False
 
-# Hash the bytes in data and then encode the digest with the characters in map
-def encodeHash(data,map):
-    return encode(MD5(data),map)
+    bookname = os.path.splitext(os.path.basename(infile))[0]
 
-# 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
-
-
-# Parse the Kindle.info file and return the records as a list of key-values
-def parseKindleInfo():
-    DB = {}
-    infoReader = openKindleInfo()
-    infoReader.read(1)
-    data = infoReader.read()
-    if sys.platform.startswith('win'):
-        items = data.split('{')
+    if mobi:
+        mb = mobidedrm.MobiBook(infile)
     else:
-        items = data.split('[')
-    for item in items:
-        splito = item.split(':')
-        DB[splito[0]] =splito[1]
-    return DB
+        tempdir = tempfile.mkdtemp()
+        mb = topazextract.TopazBook(infile, tempdir)
 
-# Get a record from the Kindle.info file for the key "hashedKey" (already hashed and encoded). Return the decoded and decrypted record
-def getKindleInfoValueForHash(hashedKey):
-    global kindleDatabase
-    encryptedValue = decode(kindleDatabase[hashedKey],charMap2)
-    if sys.platform.startswith('win'):
-        return CryptUnprotectData(encryptedValue,"")
-    else:
-        cleartext = CryptUnprotectData(encryptedValue)
-        return decode(cleartext, charMap1)
+    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
 
-#  Get a record from the Kindle.info file for the string in "key" (plaintext). Return the decoded and decrypted record
-def getKindleInfoValueForKey(key):
-    return getKindleInfoValueForHash(encodeHash(key,charMap2))
+    # build pid list
+    md1, md2 = mb.getPIDMetaInfo()
+    pidlst = kgenpids.getPidList(md1, md2, k4, pids, serials, kInfoFiles) 
 
-# Find if the original string for a hashed/encoded string is known. If so return the original string othwise return an empty string.
-def findNameForHash(hash):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
-    result = ""
-    for name in names:
-        if hash == encodeHash(name, charMap2):
-           result = name
-           break
-    return result
-    
-# Print all the records from the kindle.info file (option -i)
-def printKindleInfo():
-    for record in kindleDatabase:
-        name = findNameForHash(record)
-        if name != "" :
-            print (name)
-            print ("--------------------------")
-        else :
-            print ("Unknown Record")
-        print getKindleInfoValueForHash(record)
-        print "\n"
-
-#
-# PID generation routines
-#
-  
-# Returns two bit at offset from a bit field
-def getTwoBitsFromBitField(bitField,offset):
-    byteNumber = offset // 4
-    bitPosition = 6 - 2*(offset % 4)
-    return ord(bitField[byteNumber]) >> bitPosition & 3
-
-# Returns the six bits at offset from a bit field
-def getSixBitsFromBitField(bitField,offset):
-     offset *= 3
-     value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
-     return value
-     
-# 8 bits to six bits encoding from hash to generate PID string
-def encodePID(hash):
-    global charMap3
-    PID = ""
-    for position in range (0,8):
-        PID += charMap3[getSixBitsFromBitField(hash,position)]
-    return PID
-
-# Encryption table used to generate the device PID
-def generatePidEncryptionTable() :
-    table = []
-    for counter1 in range (0,0x100):
-        value = counter1
-        for counter2 in range (0,8):
-            if (value & 1 == 0) :
-                value = value >> 1
-            else :
-                value = value >> 1
-                value = value ^ 0xEDB88320
-        table.append(value)
-    return table
-
-# Seed value used to generate the device PID
-def generatePidSeed(table,dsn) :
-    value = 0
-    for counter in range (0,4) :
-       index = (ord(dsn[counter]) ^ value) &0xFF
-       value = (value >> 8) ^ table[index]
-    return value
-
-# Generate the device PID
-def generateDevicePID(table,dsn,nbRoll):
-    seed = generatePidSeed(table,dsn)
-    pidAscii = ""
-    pid = [(seed >>24) &0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF,(seed>>24) & 0xFF,(seed >> 16) &0xff,(seed >> 8) &0xFF,(seed) & 0xFF]
-    index = 0
-    for counter in range (0,nbRoll):
-        pid[index] = pid[index] ^ ord(dsn[counter])
-        index = (index+1) %8
-    for counter in range (0,8):
-        index = ((((pid[counter] >>5) & 3) ^ pid[counter]) & 0x1f) + (pid[counter] >> 7)
-        pidAscii += charMap4[index]
-    return pidAscii
-
-# convert from 8 digit PID to 10 digit PID with checksum
-def checksumPid(s):
-    letters = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
-    crc = (~binascii.crc32(s,-1))&0xFFFFFFFF
-    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
-
-
-class MobiPeek:
-    def loadSection(self, section):
-        before, after = self.sections[section:section+2]
-        self.f.seek(before)
-        return self.f.read(after - before)
-    def __init__(self, filename):
-        self.f = file(filename, 'rb')
-        self.header = self.f.read(78)
-        self.ident = self.header[0x3C:0x3C+8]
-        if self.ident != 'BOOKMOBI' and self.ident != 'TEXtREAd':
-            raise DrmException('invalid file format')
-        self.num_sections, = unpack_from('>H', self.header, 76)
-        sections = self.f.read(self.num_sections*8)
-        self.sections = unpack_from('>%dL' % (self.num_sections*2), sections, 0)[::2] + (0xfffffff, )
-        self.sect0 = self.loadSection(0)
-        self.f.close()
-    def getBookTitle(self):
-        # get book title
-        toff, tlen = unpack('>II', self.sect0[0x54:0x5c])
-        tend = toff + tlen
-        title = self.sect0[toff:tend]
-        return title
-    def getexthData(self):
-        # if exth region exists then grab it
-        # get length of this header
-        length, type, codepage, unique_id, version = unpack('>LLLLL', self.sect0[20:40])
-        exth_flag, = unpack('>L', self.sect0[0x80:0x84])
-        exth = ''
-        if exth_flag & 0x40:
-            exth = self.sect0[16 + length:]
-        return exth
-    def isNotEncrypted(self):
-        lock_type, = unpack('>H', self.sect0[0xC:0xC+2])
-        if lock_type == 0:
-            return True
-        return False
-
-# DiapDealer's stuff: Parse the EXTH header records and parse the Kindleinfo
-# file to calculate the book pid.
-def getK4Pids(exth, title):
-    global kindleDatabase
     try:
-        kindleDatabase = parseKindleInfo()
-    except Exception as message:
-        print(message)
-    
-    if kindleDatabase != None :
-        # Get the Mazama Random number
-        MazamaRandomNumber = getKindleInfoValueForKey("MazamaRandomNumber")
-
-        # Get the HDD serial
-        encodedSystemVolumeSerialNumber = encodeHash(GetVolumeSerialNumber(),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)
-       
-        print("\nDSN: " + DSN)
-
-        # Compute the device PID (for which I can tell, is used for nothing).
-        # But hey, stuff being printed out is apparently cool.
-        table =  generatePidEncryptionTable()
-        devicePID = generateDevicePID(table,DSN,4)
-            
-        print("Device PID: " + checksumPid(devicePID))
-            
-        # Compute book PID
-        exth_records = {}
-        nitems, = unpack('>I', exth[8:12])
-        pos = 12
-        # Parse the exth records, storing data indexed by type
-        for i in xrange(nitems):
-            type, size = unpack('>II', exth[pos: pos + 8])
-            content = exth[pos + 8: pos + size]
-
-            exth_records[type] = content
-            pos += size
-
-        # Grab the contents of the type 209 exth record
-        if exth_records[209] != None:
-            data = exth_records[209]
+        if mobi:
+            unlocked_file = mb.processBook(pidlst)
         else:
-            raise DrmException("\nNo EXTH record type 209 - Perhaps not a K4 file?")
+            mb.processBook(pidlst)
 
-        # Parse the 209 data to find the the exth record with the token data.
-        # The last character of the 209 data points to the record with the token.
-        # Always 208 from my experience, but I'll leave the logic in case that changes.
-        for i in xrange(len(data)):
-            if ord(data[i]) != 0:
-                if exth_records[ord(data[i])] != None:
-                    token = exth_records[ord(data[i])]
+    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
 
-        # Get the kindle account token
-        kindleAccountToken = getKindleInfoValueForKey("kindle.account.tokens")
+    if mobi:
+        outfile = os.path.join(outdir,outfilename + '_nodrm' + '.mobi')
+        file(outfile, 'wb').write(unlocked_file)
+        return 0            
 
-        print("Account Token: " + kindleAccountToken)
+    # 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()
 
-        pidHash = SHA1(DSN+kindleAccountToken+exth_records[209]+token)
+    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()
 
-        bookPID = encodePID(pidHash)
-        bookPID = checksumPid(bookPID)
+    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()
 
-        if exth_records[503] != None:
-            print "Pid for " + exth_records[503] + ": " + bookPID
-        else:
-            print "Pid for " + title + ":" + bookPID
-        return bookPID
+    shutil.rmtree(tempdir, True)
+    return 0
 
-    raise DrmException("\nCould not access K4 data - Perhaps K4 is not installed/configured?")
-    return null
+
+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):
-    global kindleDatabase
-    import mobidedrm
+    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())
 
-    if len(argv)<3:
-        print "Removes DRM protection from K4PC, K4M, and Mobi ebooks"
-        print "Usage:"
-        print "    %s <infile> <outfile> [<pidnums>]" % argv[0]
-        return 1
-
-    if len(argv) == 4:
-        pidnums = argv[3]
-
-    if len(argv) == 3:
-        pidnums = "" 
-
-    kindleDatabase = None
-    infile = argv[1]
-    outfile = argv[2]
+    print ' '
     try:
-        # first try with K4PC/K4M
-        ex = MobiPeek(infile)
-        if ex.isNotEncrypted():
-            print "File was Not Encrypted"
-            return 2
-        title = ex.getBookTitle()
-        exth = ex.getexthData()
-        pid = getK4Pids(exth, title)
-        unlocked_file = mobidedrm.getUnencryptedBook(infile, pid)
-    except DrmException:
-        pass
-    except mobidedrm.DrmException:
-        pass
-    else:
-        file(outfile, 'wb').write(unlocked_file)
-        return 0
+        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)
         
-    # now try from the pid list
-    pids = pidnums.split(',')
-    for pid in pids:
-        try:
-            print 'Trying: "'+ pid + '"'
-            unlocked_file = mobidedrm.getUnencryptedBook(infile, pid)
-        except mobidedrm.DrmException:
-            pass
-        else:
-            file(outfile, 'wb').write(unlocked_file)
-            return 0
+    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(',')
 
-    # we could not unencrypt book
-    print "Error: Could Not Unencrypt Book"
-    return 1
+    # try with built in Kindle Info files
+    k4 = True
+    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, Mobi DeDRM' # Name of the plugin
-        description         = 'Removes DRM from K4PC, K4Mac, and Mobi files. \
+        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, 0, 1)   # The version number of this plugin
-        file_types          = set(['prc','mobi','azw']) # The file types that this plugin will be applied to
+        version             = (0, 2, 1)   # 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            = 200  # run this plugin before mobidedrm, k4pcdedrm, k4dedrm
+        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
-            global kindleDatabase
-            global openKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap1, charMap2, charMap3, charMap4
-            if sys.platform.startswith('win'):
-                from k4pcutils import openKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap1, charMap2, charMap3, charMap4
-            if sys.platform.startswith('darwin'):
-                from k4mutils import openKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap1, charMap2, charMap3, charMap4
+            from calibre.ptempfile import PersistentTemporaryDirectory
+
+            import kgenpids
+            import zlib
+            import zipfile
+            import topazextract
             import mobidedrm
 
-            pidnums = self.site_customization
+            k4 = True
+            pids = []
+            serials = []
+            kInfoFiles = []
 
-            # first try with book specifc pid from K4PC or K4M
-            try:
-                kindleDatabase = None
-                ex = MobiPeek(path_to_ebook)
-                if ex.isNotEncrypted():
-                    return path_to_ebook
-                title = ex.getBookTitle()
-                exth = ex.getexthData()
-                pid = getK4Pids(exth, title)
-                unlocked_file = mobidedrm.getUnencryptedBook(path_to_ebook,pid)
-            except DrmException:
-                pass
-            except mobidedrm.DrmException:
-                pass
+            # 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 :
-                of = self.temporary_file('.mobi')
-                of.write(unlocked_file)
-                of.close()
-                return of.name
-
-            # now try from the pid list
-            pids = pidnums.split(',')
-            for pid in pids:
-                try:
-                    unlocked_file = mobidedrm.getUnencryptedBook(path_to_ebook, pid)
-                except mobidedrm.DrmException:
-                    pass
+                    if len(customvalue) == 16 and customvalue[0] == 'B':
+                        serials.append(customvalue)
                     else:
-                    of = self.temporary_file('.mobi')
-                    of.write(unlocked_file)
-                    of.close()
-                    return of.name
+                        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)
@@ -486,5 +343,25 @@ if not __name__ == "__main__" and inCalibre:
                 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 each 10 character PID separated by a comma (no spaces).'
+            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'

Calibre_Plugins/k4mobidedrm_plugin/k4mutils.py

@@ -1,158 +1,13 @@
 # standlone set of Mac OSX specific routines needed for K4DeDRM
 
 from __future__ import with_statement
-
 import sys
 import os
-
-#Exception Handling
-class K4MDrmException(Exception):
-    pass
-
-import signal
-import threading
 import subprocess
-from subprocess import Popen, PIPE, STDOUT
 
-# **heavily** chopped up and modfied version of asyncproc.py
-# to make it actually work on Windows as well as Mac/Linux
-# For the original see:
-# "http://www.lysator.liu.se/~bellman/download/"
-# author is  "Thomas Bellman <bellman@lysator.liu.se>"
-# available under GPL version 3 or Later
 
-# create an asynchronous subprocess whose output can be collected in
-# a non-blocking manner
-
-# What a mess!  Have to use threads just to get non-blocking io
-# in a cross-platform manner
-
-# luckily all thread use is hidden within this class
-
-class Process(object):
-    def __init__(self, *params, **kwparams):
-        if len(params) <= 3:
-            kwparams.setdefault('stdin', subprocess.PIPE)
-        if len(params) <= 4:
-            kwparams.setdefault('stdout', subprocess.PIPE)
-        if len(params) <= 5:
-            kwparams.setdefault('stderr', subprocess.PIPE)
-        self.__pending_input = []
-        self.__collected_outdata = []
-        self.__collected_errdata = []
-        self.__exitstatus = None
-        self.__lock = threading.Lock()
-        self.__inputsem = threading.Semaphore(0)
-        self.__quit = False
-
-        self.__process = subprocess.Popen(*params, **kwparams)
-
-        if self.__process.stdin:
-            self.__stdin_thread = threading.Thread(
-                name="stdin-thread",
-                target=self.__feeder, args=(self.__pending_input,
-                                            self.__process.stdin))
-            self.__stdin_thread.setDaemon(True)
-            self.__stdin_thread.start()
-
-        if self.__process.stdout:
-            self.__stdout_thread = threading.Thread(
-                name="stdout-thread",
-                target=self.__reader, args=(self.__collected_outdata,
-					    self.__process.stdout))
-            self.__stdout_thread.setDaemon(True)
-            self.__stdout_thread.start()
-
-        if self.__process.stderr:
-            self.__stderr_thread = threading.Thread(
-                name="stderr-thread",
-                target=self.__reader, args=(self.__collected_errdata,
-					    self.__process.stderr))
-            self.__stderr_thread.setDaemon(True)
-            self.__stderr_thread.start()
-
-    def pid(self):
-        return self.__process.pid
-
-    def kill(self, signal):
-        self.__process.send_signal(signal)
-
-    # check on subprocess (pass in 'nowait') to act like poll
-    def wait(self, flag):
-        if flag.lower() == 'nowait':
-            rc = self.__process.poll()
-        else:
-            rc = self.__process.wait()
-        if rc != None:
-            if self.__process.stdin:
-                self.closeinput()
-            if self.__process.stdout:
-                self.__stdout_thread.join()
-            if self.__process.stderr:
-                self.__stderr_thread.join()
-        return self.__process.returncode
-
-    def terminate(self):
-        if self.__process.stdin:
-            self.closeinput()
-        self.__process.terminate()
-
-    # thread gets data from subprocess stdout
-    def __reader(self, collector, source):
-        while True:
-            data = os.read(source.fileno(), 65536)
-            self.__lock.acquire()
-            collector.append(data)
-            self.__lock.release()
-            if data == "":
-                source.close()
-                break
-        return
-
-    # thread feeds data to subprocess stdin
-    def __feeder(self, pending, drain):
-        while True:
-            self.__inputsem.acquire()
-            self.__lock.acquire()
-            if not pending  and self.__quit:
-                drain.close()
-                self.__lock.release()
-                break
-            data = pending.pop(0)
-            self.__lock.release()
-            drain.write(data)
-
-    # non-blocking read of data from subprocess stdout
-    def read(self):
-        self.__lock.acquire()
-        outdata = "".join(self.__collected_outdata)
-        del self.__collected_outdata[:]
-        self.__lock.release()
-        return outdata
-
-    # non-blocking read of data from subprocess stderr
-    def readerr(self):
-        self.__lock.acquire()
-        errdata = "".join(self.__collected_errdata)
-        del self.__collected_errdata[:]
-        self.__lock.release()
-        return errdata
-
-    # non-blocking write to stdin of subprocess
-    def write(self, data):
-        if self.__process.stdin is None:
-            raise ValueError("Writing to process with stdin not a pipe")
-        self.__lock.acquire()
-        self.__pending_input.append(data)
-        self.__inputsem.release()
-        self.__lock.release()
-
-    # close stdinput of subprocess
-    def closeinput(self):
-        self.__lock.acquire()
-        self.__quit = True
-        self.__inputsem.release()
-        self.__lock.release()
+class DrmException(Exception):
+    pass
 
 
 # interface to needed routines in openssl's libcrypto
@@ -163,7 +18,7 @@ def _load_crypto_libcrypto():
 
     libcrypto = find_library('crypto')
     if libcrypto is None:
-        raise K4MDrmException('libcrypto not found')
+        raise DrmException('libcrypto not found')
     libcrypto = CDLL(libcrypto)
 
     AES_MAXNR = 14
@@ -196,19 +51,19 @@ def _load_crypto_libcrypto():
         def set_decrypt_key(self, userkey, iv):
             self._blocksize = len(userkey)
             if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
-                raise K4MDrmException('AES improper key used')
+                raise DrmException('AES improper key used')
                 return
             keyctx = self._keyctx = AES_KEY()
             self.iv = iv
             rv = AES_set_decrypt_key(userkey, len(userkey) * 8, keyctx)
             if rv < 0:
-                raise K4MDrmException('Failed to initialize AES key')
+                raise DrmException('Failed to initialize AES key')
 
         def decrypt(self, data):
             out = create_string_buffer(len(data))
             rv = AES_cbc_encrypt(data, out, len(data), self._keyctx, self.iv, 0)
             if rv == 0:
-                raise K4MDrmException('AES decryption failed')
+                raise DrmException('AES decryption failed')
             return out.raw
 
         def keyivgen(self, passwd):
@@ -226,7 +81,7 @@ def _load_crypto():
     LibCrypto = None
     try:
         LibCrypto = _load_crypto_libcrypto()
-    except (ImportError, K4MDrmException):
+    except (ImportError, DrmException):
         pass
     return LibCrypto
 
@@ -236,25 +91,45 @@ LibCrypto = _load_crypto()
 # Utility Routines
 #
 
+
+# Various character maps used to decrypt books. Probably supposed to act as obfuscation
+charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
+charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM" 
+charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
+
+
+
 # uses a sub process to get the Hard Drive Serial Number using ioreg
-# returns with the first found serial number in that class
+# returns with the serial number of drive whose BSD Name is "disk0"
 def GetVolumeSerialNumber():
-    cmdline = '/usr/sbin/ioreg -r -c AppleAHCIDiskDriver'
+    sernum = os.getenv('MYSERIALNUMBER')
+    if sernum != None:
+        return sernum
+    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
     cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p = Process(cmdline, shell=True, bufsize=1, stdin=None, stdout=PIPE, stderr=PIPE, close_fds=False)
-    poll = p.wait('wait')
-    results = p.read()
-    reslst = results.split('\n')
-    sernum = '9999999999'
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
     cnt = len(reslst)
+    bsdname = None
+    sernum = None
+    foundIt = False
     for j in xrange(cnt):
         resline = reslst[j]
         pp = resline.find('"Serial Number" = "')
         if pp >= 0:
-            sernum = resline[pp+19:]
-            sernum = sernum[:-1]
-            sernum = sernum.lstrip()
+            sernum = resline[pp+19:-1]
+            sernum = sernum.strip()
+        bb = resline.find('"BSD Name" = "')
+        if bb >= 0:
+            bsdname = resline[bb+14:-1]
+            bsdname = bsdname.strip()
+            if (bsdname == 'disk0') and (sernum != None):
+                foundIt = True
                 break
+    if not foundIt:
+        sernum = '9999999999'
     return sernum
 
 # uses unix env to get username instead of using sysctlbyname 
@@ -262,11 +137,6 @@ def GetUserName():
     username = os.getenv('USER')
     return username
 
-# Various character maps used to decrypt books. Probably supposed to act as obfuscation
-charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
-charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM" 
-charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
 
 def encode(data, map):
     result = ""
@@ -297,15 +167,16 @@ def CryptUnprotectData(encryptedData):
     cleartext = crp.decrypt(encryptedData)
     return cleartext
 
+
 # Locate and open the .kindle-info file
-def openKindleInfo():
+def openKindleInfo(kInfoFile=None):
+    if kInfoFile == None:
 	home = os.getenv('HOME')
 	cmdline = 'find "' + home + '/Library/Application Support" -name ".kindle-info"'
 	cmdline = cmdline.encode(sys.getfilesystemencoding())
-    p1 = Process(cmdline, shell=True, bufsize=1, stdin=None, stdout=PIPE, stderr=PIPE, close_fds=False)
-    poll = p1.wait('wait')
-    results = p1.read()
-    reslst = results.split('\n')
+	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'
 	cnt = len(reslst)
 	for j in xrange(cnt):
@@ -314,6 +185,10 @@ def openKindleInfo():
 	    if pp >= 0:
 		kinfopath = resline
 		break
-    if not os.path.exists(kinfopath):
-        raise K4MDrmException('Error: .kindle-info file can not be found')
+	if not os.path.isfile(kinfopath):
+	    raise DrmException('Error: .kindle-info file can not be found')
 	return open(kinfopath,'r')
+    else:
+	if not os.path.isfile(kinfoFile):
+	    raise DrmException('Error: kindle-info file can not be found')
+        return open(kInfoFile, 'r')

Calibre_Plugins/k4mobidedrm_plugin/k4pcutils.py

@@ -19,17 +19,12 @@ advapi32 = windll.advapi32
 crypt32 = windll.crypt32
 
 
-#
 # Various character maps used to decrypt books. Probably supposed to act as obfuscation
-#
 charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
 charMap2 = "AaZzB0bYyCc1XxDdW2wEeVv3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_"
 charMap3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
 charMap4 = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
 
-#
-# Exceptions for all the problems that might happen during the script
-#
 class DrmException(Exception):
     pass
     
@@ -101,7 +96,15 @@ CryptUnprotectData = CryptUnprotectData()
 #
 # Locate and open the Kindle.info file.
 #
-def openKindleInfo():
+def openKindleInfo(kInfoFile=None):
+    if kInfoFile == None:
         regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
         path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
-    return open(path+'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info','r')
+        kinfopath = path +'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info'
+        if not os.path.isfile(kinfopath):
+            raise DrmException('Error: kindle.info file can not be found')
+        return open(kinfopath,'r')
+    else:
+        if not os.path.isfile(kInfoFile):
+            raise DrmException('Error: kindle.info file can not be found')
+        return open(kInfoFile, 'r')

Calibre_Plugins/k4mobidedrm_plugin/mobidedrm.py

@@ -3,14 +3,6 @@
 # This is a python script. You need a Python interpreter to run it.
 # For example, ActiveState Python, which exists for windows.
 #
-# It can run standalone to convert files, or it can be installed as a
-# plugin for Calibre (http://calibre-ebook.com/about) so that
-# importing files with DRM 'Just Works'.
-#
-# To create a Calibre plugin, rename this file so that the filename
-# ends in '_plugin.py', put it into a ZIP file and import that Calibre
-# using its plugin configuration GUI.
-#
 # Changelog
 #  0.01 - Initial version
 #  0.02 - Huffdic compressed books were not properly decrypted
@@ -32,23 +24,32 @@
 #  0.14 - Working out when the extra data flags are present has been problematic
 #         Versions 7 through 9 have tried to tweak the conditions, but have been
 #         only partially successful. Closer examination of lots of sample
-#         files reveals that a confusin has arisen because trailing data entries
+#         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 
 #         trailing data byte flags - version 5 and higher AND header size >= 0xE4. 
-#  0.15 - Now outputs 'hearbeat', and is also quicker for long files.
+#  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
 #         both inside calibre and also in other places (ie K4DeDRM tools)
 #  0.17a- disabled the standalone plugin feature since a plugin can not import
 #         a plugin
+#  0.18 - It seems that multibyte entries aren't encrypted in a v7 file...
+#         Removed the disabled Calibre plug-in code
+#         Permit use of 8-digit PIDs
+#  0.19 - It seems that multibyte entries aren't encrypted in a v6 file either.
+#  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.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%
 
-__version__ = '0.17'
+__version__ = '0.26'
 
 import sys
-import struct
-import binascii
 
 class Unbuffered:
     def __init__(self, stream):
@@ -58,10 +59,20 @@ class Unbuffered:
         self.stream.flush()
     def __getattr__(self, attr):
         return getattr(self.stream, attr)
+sys.stdout=Unbuffered(sys.stdout)
+
+import os
+import struct
+import binascii
 
 class DrmException(Exception):
     pass
 
+
+#
+# MobiBook Utility Routines
+#
+
 # Implementation of Pukall Cipher 1
 def PC1(key, src, decryption=True):
     sum1 = 0;
@@ -73,7 +84,6 @@ def PC1(key, src, decryption=True):
     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;
@@ -127,13 +137,16 @@ def getSizeOfTrailingDataEntries(ptr, size, flags):
         if testflags & 1:
             num += getSizeOfTrailingDataEntry(ptr, size - num)
         testflags >>= 1
-    # Multibyte data, if present, is included in the encryption, so
-    # we do not need to check the low bit.
-    # if flags & 1:
-    #    num += (ord(ptr[size - num - 1]) & 0x3) + 1
+    # Check the low bit to see if there's multibyte data present.
+    # if multibyte data is included in the encryped data, we'll
+    # have already cleared this flag.
+    if flags & 1:
+        num += (ord(ptr[size - num - 1]) & 0x3) + 1
     return num
 
-class DrmStripper:
+
+
+class MobiBook:
     def loadSection(self, section):
         if (section + 1 == self.num_sections):
             endoff = len(self.data_file)
@@ -142,6 +155,104 @@ class DrmStripper:
         off = self.sections[section][0]
         return self.data_file[off:endoff]
 
+    def __init__(self, infile):
+        # initial sanity check on file
+        self.data_file = file(infile, 'rb').read()
+        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")
+        self.magic = self.header[0x3C:0x3C+8]
+        self.crypto_type = -1
+
+        # build up section offset and flag info
+        self.num_sections, = struct.unpack('>H', self.header[76:78])
+        self.sections = []
+        for i in xrange(self.num_sections):
+            offset, a1,a2,a3,a4 = struct.unpack('>LBBBB', self.data_file[78+i*8:78+i*8+8])
+            flags, val = a1, a2<<16|a3<<8|a4
+            self.sections.append( (offset, flags, val) )
+
+        # parse information from section 0
+        self.sect = self.loadSection(0)
+        self.records, = struct.unpack('>H', self.sect[0x8:0x8+2])
+
+        if self.magic == 'TEXtREAd':
+            print "Book has format: ", self.magic
+            self.extra_data_flags = 0
+            self.mobi_length = 0
+            self.mobi_version = -1
+            self.meta_array = {}
+            return
+        self.mobi_length, = struct.unpack('>L',self.sect[0x14:0x18])
+        self.mobi_version, = struct.unpack('>L',self.sect[0x68:0x6C])
+        print "MOBI header version = %d, length = %d" %(self.mobi_version, self.mobi_length)
+        self.extra_data_flags = 0
+        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
+        if self.mobi_version < 7:
+            # multibyte utf8 data is included in the encryption for mobi_version 6 and below
+            # so clear that byte so that we leave it to be decrypted.
+            self.extra_data_flags &= 0xFFFE
+
+        # if exth region exists parse it for metadata array
+        self.meta_array = {}
+        try:
+            exth_flag, = struct.unpack('>L', self.sect[0x80:0x84])
+            exth = 'NONE'
+            if exth_flag & 0x40:
+                exth = self.sect[16 + self.mobi_length:]
+            if (len(exth) >= 4) and (exth[:4] == 'EXTH'):
+                nitems, = struct.unpack('>I', exth[8:12])
+                pos = 12
+                for i in xrange(nitems):
+                    type, size = struct.unpack('>II', exth[pos: pos + 8])
+                    # 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)
+                        content = "\144"
+                    elif type == 404 and size == 9:
+                        # make sure text to speech is enabled
+                        self.patchSection(0, "\0", 16 + self.mobi_length + pos + 8)
+                        content = "\0"
+                    else:
+                        content = exth[pos + 8: pos + size]
+                    #print type, size, content
+                    self.meta_array[type] = content
+                    pos += size
+        except:
+            self.meta_array = {}
+            pass
+            
+    def getBookTitle(self):
+        title = ''
+        if 503 in self.meta_array:
+            title = self.meta_array[503]
+        else :
+            toff, tlen = struct.unpack('>II', self.sect[0x54:0x5c])
+            tend = toff + tlen
+            title = self.sect[toff:tend]
+        if title == '':
+            title = self.header[:32]
+            title = title.split("\0")[0]
+        return title
+
+    def getPIDMetaInfo(self):
+        rec209 = None
+        token = None
+        if 209 in self.meta_array:
+            rec209 = self.meta_array[209]
+            data = rec209
+            # Parse the 209 data to find the the exth record with the token data.
+            # The last character of the 209 data points to the record with the token.
+            # Always 208 from my experience, but I'll leave the logic in case that changes.
+            for i in xrange(len(data)):
+                if ord(data[i]) != 0:
+                    if self.meta_array[ord(data[i])] != None:
+                        token = self.meta_array[ord(data[i])]
+        return rec209, token
+
     def patch(self, off, new):
         self.data_file = self.data_file[:off] + new + self.data_file[off+len(new):]
 
@@ -154,125 +265,136 @@ class DrmStripper:
         assert off + in_off + len(new) <= endoff
         self.patch(off + in_off, new)
 
-    def parseDRM(self, data, count, pid):
-        pid = pid.ljust(16,'\0')
+    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"
-        temp_key = PC1(keyvec1, pid, False)
+        for pid in pidlist:
+            bigpid = pid.ljust(16,'\0')
+            temp_key = PC1(keyvec1, bigpid, False)
             temp_key_sum = sum(map(ord,temp_key)) & 0xff
             found_key = None
             for i in xrange(count):
                 verification, size, type, cksum, cookie = struct.unpack('>LLLBxxx32s', data[i*0x30:i*0x30+0x30])
+                if cksum == temp_key_sum:
                     cookie = PC1(temp_key, cookie)
                     ver,flags,finalkey,expiry,expiry2 = struct.unpack('>LL16sLL', cookie)
-            if verification == ver and cksum == temp_key_sum and (flags & 0x1F) == 1:
+                    if verification == ver and (flags & 0x1F) == 1:
                         found_key = finalkey
                         break
+            if found_key != None:
+                break
         if not found_key:
             # Then try the default encoding that doesn't require a PID
+            pid = "00000000"
             temp_key = keyvec1
             temp_key_sum = sum(map(ord,temp_key)) & 0xff
             for i in xrange(count):
                 verification, size, type, cksum, cookie = struct.unpack('>LLLBxxx32s', data[i*0x30:i*0x30+0x30])
+                if cksum == temp_key_sum:
                     cookie = PC1(temp_key, cookie)
                     ver,flags,finalkey,expiry,expiry2 = struct.unpack('>LL16sLL', cookie)
-                if verification == ver and cksum == temp_key_sum:
+                    if verification == ver:
                         found_key = finalkey
                         break
-        return found_key
+        return [found_key,pid]
 
-    def __init__(self, data_file, pid):
-        if checksumPid(pid[0:-2]) != pid:
-            raise DrmException("invalid PID checksum")
-        pid = pid[0:-2]
-
-        self.data_file = data_file
-        header = data_file[0:72]
-        if header[0x3C:0x3C+8] != 'BOOKMOBI':
-            raise DrmException("invalid file format")
-        self.num_sections, = struct.unpack('>H', data_file[76:78])
-
-        self.sections = []
-        for i in xrange(self.num_sections):
-            offset, a1,a2,a3,a4 = struct.unpack('>LBBBB', data_file[78+i*8:78+i*8+8])
-            flags, val = a1, a2<<16|a3<<8|a4
-            self.sections.append( (offset, flags, val) )
-
-        sect = self.loadSection(0)
-        records, = struct.unpack('>H', sect[0x8:0x8+2])
-        mobi_length, = struct.unpack('>L',sect[0x14:0x18])
-        mobi_version, = struct.unpack('>L',sect[0x68:0x6C])
-        extra_data_flags = 0
-        print "MOBI header version = %d, length = %d" %(mobi_version, mobi_length)
-        if (mobi_length >= 0xE4) and (mobi_version >= 5):
-            extra_data_flags, = struct.unpack('>H', sect[0xF2:0xF4])
-            print "Extra Data Flags = %d" %extra_data_flags
-
-        crypto_type, = struct.unpack('>H', sect[0xC:0xC+2])
+    def processBook(self, pidlist):
+        crypto_type, = struct.unpack('>H', self.sect[0xC:0xC+2])
+        print 'Crypto Type is: ', crypto_type
+        self.crypto_type = crypto_type
         if crypto_type == 0:
             print "This book is not encrypted."
+            return self.data_file
+        if crypto_type != 2 and crypto_type != 1:
+            raise DrmException("Cannot decode unknown Mobipocket encryption type %d" % crypto_type)
+
+        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])
+                goodpids.append(pid[0:-2])
+            elif len(pid)==8:
+                goodpids.append(pid)
+
+        if self.crypto_type == 1:
+            t1_keyvec = "QDCVEPMU675RUBSZ"
+            if self.magic == 'TEXtREAd':
+                bookkey_data = self.sect[0x0E:0x0E+16]
+            elif self.mobi_version < 0:
+                bookkey_data = self.sect[0x90:0x90+16] 
+            else:
+                bookkey_data = self.sect[self.mobi_length+16:self.mobi_length+32] 
+            pid = "00000000"
+            found_key = PC1(t1_keyvec, bookkey_data)
         else :
-            if crypto_type == 1:
-                raise DrmException("cannot decode Mobipocket encryption type 1")
-            if crypto_type != 2:
-                raise DrmException("unknown encryption type: %d" % crypto_type)
-
             # calculate the keys
-            drm_ptr, drm_count, drm_size, drm_flags = struct.unpack('>LLLL', sect[0xA8:0xA8+16])
+            drm_ptr, drm_count, drm_size, drm_flags = struct.unpack('>LLLL', self.sect[0xA8:0xA8+16])
             if drm_count == 0:
-                raise DrmException("no PIDs found in this file")
-            found_key = self.parseDRM(sect[drm_ptr:drm_ptr+drm_size], drm_count, pid)
+                raise DrmException("Not yet initialised with PID. 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. maybe the PID is incorrect")
-
+                raise DrmException("No key found. Most likely the correct PID has not been given.")
             # kill the drm keys
             self.patchSection(0, "\0" * drm_size, drm_ptr)
             # kill the drm pointers
             self.patchSection(0, "\xff" * 4 + "\0" * 12, 0xA8)
+            
+        if pid=="00000000":
+            print "File has default encryption, no specific PID."
+        else:
+            print "File is encoded with PID "+checksumPid(pid)+"."
+
         # clear the crypto type
         self.patchSection(0, "\0" * 2, 0xC)
 
         # decrypt sections
         print "Decrypting. Please wait . . .",
         new_data = self.data_file[:self.sections[1][0]]
-            for i in xrange(1, records+1):
+        for i in xrange(1, self.records+1):
             data = self.loadSection(i)
-                extra_size = getSizeOfTrailingDataEntries(data, len(data), extra_data_flags)
+            extra_size = getSizeOfTrailingDataEntries(data, len(data), self.extra_data_flags)
             if i%100 == 0:
                 print ".",
             # print "record %d, extra_size %d" %(i,extra_size)
             new_data += PC1(found_key, data[0:len(data) - extra_size])
             if extra_size > 0:
                 new_data += data[-extra_size:]
-                #self.patchSection(i, PC1(found_key, data[0:len(data) - extra_size]))
-            if self.num_sections > records+1:
-                new_data += self.data_file[self.sections[records+1][0]:]
+        if self.num_sections > self.records+1:
+            new_data += self.data_file[self.sections[self.records+1][0]:]
         self.data_file = new_data
         print "done"
-
-    def getResult(self):
         return self.data_file
 
 def getUnencryptedBook(infile,pid):
-    sys.stdout=Unbuffered(sys.stdout)
-    data_file = file(infile, 'rb').read()
-    strippedFile = DrmStripper(data_file, pid)
-    return strippedFile.getResult()
+    if not os.path.isfile(infile):
+        raise DrmException('Input File Not Found')
+    book = MobiBook(infile)
+    return book.processBook([pid])
+
+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):
-    sys.stdout=Unbuffered(sys.stdout)
     print ('MobiDeDrm v%(__version__)s. '
 	   'Copyright 2008-2010 The Dark Reverser.' % globals())
-    if len(argv)<4:
+    if len(argv)<3 or len(argv)>4:
         print "Removes protection from Mobipocket books"
         print "Usage:"
-        print "    %s <infile> <outfile> <PID>" % sys.argv[0]
+        print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
         return 1
     else:
         infile = argv[1]
         outfile = argv[2]
-        pid = argv[3]
+        if len(argv) is 4:
+        	pidlist = argv[3].split(',')
+        else:
+        	pidlist = {}
         try:
-            stripped_file = getUnencryptedBook(infile, pid)
+            stripped_file = getUnencryptedBookWithList(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)
         except DrmException, e:
             print "Error: %s" % e
@@ -282,44 +404,3 @@ def main(argv=sys.argv):
 
 if __name__ == "__main__":
     sys.exit(main())
-
-#if not __name__ == "__main__":
-if False:
-
-    # note a calibre plugin can not import code with another calibre plugin
-    # in it as it ends up registering two different plugins 
-    from calibre.customize import FileTypePlugin
-
-    class MobiDeDRM(FileTypePlugin):
-        name                = 'MobiDeDRM' # Name of the plugin
-        description         = 'Removes DRM from secure Mobi files'
-        supported_platforms = ['linux', 'osx', 'windows'] # Platforms this plugin will run on
-        author              = 'The Dark Reverser' # The author of this plugin
-        version             = (0, 1, 7)   # The version number of this plugin
-        file_types          = set(['prc','mobi','azw']) # 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.gui2 import is_ok_to_use_qt
-            from PyQt4.Qt import QMessageBox
-            PID = self.site_customization
-            data_file = file(path_to_ebook, 'rb').read()
-            ar = PID.split(',')
-            for i in ar:
-                try:
-                    unlocked_file = DrmStripper(data_file, i).getResult()
-                except DrmException:
-                    if is_ok_to_use_qt():
-                        d = QMessageBox(QMessageBox.Warning, "MobiDeDRM Plugin", "Error decoding: %s\n" % path_to_ebook)
-                        d.show()
-                        d.raise_()
-                        d.exec_()
-                    raise Exception("MobiDeDRM Plugin: Error decoding ebook")
-                else:
-                    of = self.temporary_file('.mobi')
-                    of.write(unlocked_file)
-                    of.close()
-                    return of.name
-
-        def customization_help(self, gui=False):
-            return 'Enter PID (separate multiple PIDs with comma)'