tools v3.1

Adobe_EPUB_Tools/README_ineptepub.txt

@@ -1,6 +1,6 @@
 From Apprentice Alf's Blog
 
-Adobe Adept ePub and PDF, .epub, .pdf
+Adobe Adept ePub, .epub
 
 This directory includes modified versions of the I♥CABBAGES Adobe Adept inept scripts for epubs.  These scripts have been modified to work with OpenSSL on Windows as well as Linux and Mac OS X.  His original scripts can be found in the clearly labelled folder.  If a Windows User has OpenSSL installed, these scripts will make use of it in place of PyCrypto.
 
@@ -11,20 +11,8 @@ http://i-u2665-cabbages.blogspot.com/2009_02_01_archive.html
 
 There are two scripts:
 
-The first is called ineptkey_v5.1.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 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_v5.3.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 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,7 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
 
-# ineptepub.pyw, version 5.4
+# ineptepub.pyw, version 5.5
 # Copyright © 2009-2010 i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3 or
@@ -26,6 +26,7 @@
 #   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
 
 """
 Decrypt Adobe ADEPT-encrypted EPUB books.
@@ -259,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

Adobe_EPUB_Tools/ineptkey.pyw

@@ -1,7 +1,7 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
 
-# ineptkey.pyw, version 5
+# ineptkey.pyw, version 5.3
 # Copyright © 2009-2010 i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3 or
@@ -32,6 +32,7 @@
 #       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
 
 """
 Retrieve Adobe ADEPT user key.
@@ -115,7 +116,7 @@ if sys.platform.startswith('win'):
 
     def _load_crypto():
         AES = None
-        for loader in (_load_crypto_libcrypto, _load_crypto_pycrypto):
+        for loader in (_load_crypto_pycrypto, _load_crypto_libcrypto):
             try:
                 AES = loader()
                 break