Starting to move ignoblekeyfetch into all tools.

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

@@ -11,7 +11,9 @@ from __future__ import with_statement
 # Revision history:
 #  1.0   - AmazonSecureStorage.xml decryption to serial number
 #  1.1   - map_data_storage.db decryption to serial number
-#  1.2   - BugFix
+#  1.2   - Changed to be callable from AppleScript by returning only serial number
+#        - and changed name to androidkindlekey.py
+#        - and added in unicode command line support
 #  1.3   - added in TkInter interface, output to a file and attempt to get backup from a connected android device.
 
 """

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

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

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

@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 	"http://www.w3.org/TR/html4/strict.dtd">
 
 <html>
@@ -24,28 +24,17 @@ li {margin-top: 0.5em}
 
 <h3>Changes at Barnes & Noble</h3>
 
-<p>In mid-2014, Barnes & Noble changed the way they generated encryption keys. Instead of deriving the key from the user's name and credit card number, they started generating a random key themselves, sending that key through to devices when they connected to the Barnes & Noble servers. This means that some users will find that no combination of their name and CC# will work in decrypting their ebooks.</p>
+<p>In mid-2014, Barnes & Noble changed the way they generated encryption keys. Instead of deriving the key from the user's name and credit card number, they started generating a random key themselves, sending that key through to devices when they connected to the Barnes & Noble servers. This means that most users will now find that no combination of their name and CC# will work in decrypting their recently downloaded ebooks.</p>
 
-<p>There is a work-around. Barnes & Noble’s desktop app NOOK Study generates a log file that contains the encryption key. You can download NOOK Study from <a href="https://yuzu.com/nsdownload">https://yuzu.com/nsdownload</a>.</p>
+<p>Someone commenting at Apprentice Alf's blog detailed a way to retrieve a new account key using the account's email address and password. This method has now been incorporated into the plugin.
-<p>Once downloaded, install the application, register with your Barnes & Noble or nook account, and download at least one DRMed ebook through NOOK Study. It will be saved somewhere in a folder called "My Barnes & Noble eBooks" in your Documents folder.</p>
-<p>Now import that book into calibre. The log file and the key in the log should be automatically found by the plugin and used to decrypt the book.</p>
-<p>If the automatic process doesn't work for you, you can still find extract it manually and save it as a .b64 file for import into the plugin's preferences as follows:</p>
-<ol><li>In NOOK Study, select Settings/About (Windows) or NOOK Study/About NOOK Study (Mac) and in the dialog that appears click the link at the bottom to copy the log into the clipboard.</li>
-<li>Paste the copied log into a text editor</li>
-<li>Search for the text CCHashResponseV1</li>
-<li>On the line below which starts with ccHash, copy the text between the " marks after ccHash, but don't include the " marks.</li>
-<li>Save that text in a new <b>plain text</b> file, with file name extension .b64 (for example, key.b64)</li>
-<li>Import that file into the preferences through this dialog, using the "Import Existing Key Files" button.</li>
-</ol>
 
-
+<h3>Creating New Keys:</h3>
-<h3>Old instructions: Creating New Keys:</h3>
 
 <p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering the necessary data to generate a new key.</p>
 <ul>
-<li><span class="bold">Unique Key Name:</span> this is a unique name you choose to help you identify the key. This name will show in the list of configured keys. Choose something that will help you remember the data (name, cc#) it was created with.</li>
+<li><span class="bold">Unique Key Name:</span> this is a unique name you choose to help you identify the key. This name will show in the list of configured keys. Choose something that will help you remember the data (account email address) it was created with.</li>
-<li><span class="bold">Your Name:</span> This is the name used by Barnes and Noble to generate your encryption key. Seemingly at random, Barnes and Noble choose one of three places from which to take this name. Most commonly, it’s your name as set in your Barnes &amp; Noble account, My Account page, directly under PERSONAL INFORMATION.  Sometimes it is the the name used in the default shipping address, and sometimes it’s the name listed for the active credit card. If these names are different in your Barnes and Noble account preferences, I suggest creating one key for each version of your name. This name will not be stored anywhere on your computer or in calibre. It will only be used in the creation of the one-way hash/key that’s stored in the preferences.</li>
+<li><span class="bold">B&N/nook account email address:</span> This is the default email address for your Barnes and Noble/nook account. This email will not be stored anywhere on your computer or in calibre. It will only be used to fetch the account key that from the B&N server, and it is that key that will be stored in the preferences.</li>
-<li><span class="bold">Credit Card#:</span> this is the default credit card number that was on file with Barnes and Noble at the time of download of the ebook to be de-DRMed. Just enter the 16 (15 for American Express) digits. As with the name, this number will not be stored anywhere on your computer or in calibre. It will only be used in the creation of the one-way hash/key that’s stored in the preferences.</li>
+<li><span class="bold">B&N/nook account password:</span> this is the password for your Barnes and Noble/nook account. As with the email address, this will not be stored anywhere on your computer or in calibre. It will only be used to fetch the key from the B&N server.</li>
 </ul>
 
 <p>Click the OK button to create and store the generated key. Or Cancel if you don’t want to create a key.</p>
@@ -69,6 +58,11 @@ li {margin-top: 0.5em}
 
 <p>Once done creating/deleting/renaming/importing decryption keys, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
 
+<h3>NOOK Study</h3>
+<p>Books downloaded through NOOK Study may or may not use the key fetched using the above method. If a books is not decrypted successfully with any of the keys, the plugin will attempt to recover a key from the NOOK Study log file and use that.</p>
+
+
+
 </body>
 
 </html>

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/androidkindlekey.py

@@ -11,7 +11,9 @@ from __future__ import with_statement
 # Revision history:
 #  1.0   - AmazonSecureStorage.xml decryption to serial number
 #  1.1   - map_data_storage.db decryption to serial number
-#  1.2   - BugFix
+#  1.2   - Changed to be callable from AppleScript by returning only serial number
+#        - and changed name to androidkindlekey.py
+#        - and added in unicode command line support
 #  1.3   - added in TkInter interface, output to a file and attempt to get backup from a connected android device.
 
 """

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/config.py

@@ -109,13 +109,14 @@ class ConfigWidget(QWidget):
         self.ereader_button.setToolTip(_(u"Click to manage keys for eReader ebooks"))
         self.ereader_button.setText(u"eReader ebooks")
         self.ereader_button.clicked.connect(self.ereader_keys)
+        
+        button_layout.addWidget(self.adept_button)
+        button_layout.addWidget(self.kindle_key_button)
         button_layout.addWidget(self.kindle_serial_button)
         button_layout.addWidget(self.kindle_android_button)
         button_layout.addWidget(self.bandn_button)
         button_layout.addWidget(self.mobi_button)
         button_layout.addWidget(self.ereader_button)
-        button_layout.addWidget(self.adept_button)
-        button_layout.addWidget(self.kindle_key_button)
         
         self.resize(self.sizeHint())
 
@@ -124,7 +125,7 @@ class ConfigWidget(QWidget):
         d.exec_()
         
     def kindle_android_serials(self):
-        d = ManageKeysDialog(self,u"Kindle for Andoid Serial Number",self.tempdedrmprefs['androidserials'], AddAndroidSerialDialog, 'ab')
+        d = ManageKeysDialog(self,u"Kindle for Andoid",self.tempdedrmprefs['androidserials'], AddAndroidSerialDialog, 'ab')
         d.exec_()
 
     def kindle_keys(self):
@@ -545,14 +546,14 @@ class AddBandNKeyDialog(QDialog):
 
         name_group = QHBoxLayout()
         data_group_box_layout.addLayout(name_group)
-        name_group.addWidget(QLabel(u"Your Name:", self))
+        name_group.addWidget(QLabel(u"B&N/nook account email address:", self))
         self.name_ledit = QLineEdit(u"", self)
-        self.name_ledit.setToolTip(_(u"<p>Enter your name as it appears in your B&N " +
+        self.name_ledit.setToolTip(_(u"<p>Enter your email address as it appears in your B&N " +
-                                u"account or on your credit card.</p>" +
+                                u"account.</p>" +
                                 u"<p>It will only be used to generate this " +
-                                u"one-time key and won\'t be stored anywhere " +
+                                u"key and won\'t be stored anywhere " +
                                 u"in calibre or on your computer.</p>" +
-                                u"<p>(ex: Jonathan Smith)"))
+                                u"<p>eg: apprenticeharper@gmail.com</p>"))
         name_group.addWidget(self.name_ledit)
         name_disclaimer_label = QLabel(_(u"(Will not be saved in configuration data)"), self)
         name_disclaimer_label.setAlignment(Qt.AlignHCenter)
@@ -560,13 +561,12 @@ class AddBandNKeyDialog(QDialog):
 
         ccn_group = QHBoxLayout()
         data_group_box_layout.addLayout(ccn_group)
-        ccn_group.addWidget(QLabel(u"Credit Card#:", self))
+        ccn_group.addWidget(QLabel(u"B&N/nook account password:", self))
         self.cc_ledit = QLineEdit(u"", self)
-        self.cc_ledit.setToolTip(_(u"<p>Enter the full credit card number on record " +
+        self.cc_ledit.setToolTip(_(u"<p>Enter the password " +
-                                u"in your B&N account.</p>" +
+                                u"for your B&N account.</p>" +
-                                u"<p>No spaces or dashes... just the numbers. " +
+                                u"<p>The password will only be used to generate this " +
-                                u"This number will only be used to generate this " +
+                                u"key and won\'t be stored anywhere in " +
-                                u"one-time key and won\'t be stored anywhere in " +
                                 u"calibre or on your computer."))
         ccn_group.addWidget(self.cc_ledit)
         ccn_disclaimer_label = QLabel(_('(Will not be saved in configuration data)'), self)
@@ -587,8 +587,8 @@ class AddBandNKeyDialog(QDialog):
 
     @property
     def key_value(self):
-        from calibre_plugins.dedrm.ignoblekeygen import generate_key as generate_bandn_key
+        from calibre_plugins.dedrm.ignoblekeyfetch import fetch_key as fetch_bandn_key
-        return generate_bandn_key(self.user_name,self.cc_number)
+        return fetch_bandn_key(self.user_name,self.cc_number)
 
     @property
     def user_name(self):
@@ -596,16 +596,13 @@ class AddBandNKeyDialog(QDialog):
 
     @property
     def cc_number(self):
-        return unicode(self.cc_ledit.text()).strip().replace(' ', '').replace('-','')
+        return unicode(self.cc_ledit.text()).strip()
 
 
     def accept(self):
         if len(self.key_name) == 0 or len(self.user_name) == 0 or len(self.cc_number) == 0 or self.key_name.isspace() or self.user_name.isspace() or self.cc_number.isspace():
             errmsg = u"All fields are required!"
             return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
-        if not self.cc_number.isdigit():
-            errmsg = u"Numbers only in the credit card number field!"
-            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
         if len(self.key_name) < 4:
             errmsg = u"Key name must be at <i>least</i> 4 characters long!"
             return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
@@ -904,7 +901,7 @@ class AddAndroidSerialDialog(QDialog):
         data_group_box_layout.addLayout(key_group)
         key_group.addWidget(QLabel(u"Kindle for Android Serial Number:", self))
         self.key_ledit = QLineEdit("", self)
-        self.key_ledit.setToolTip(u"Enter a Kindle for ANdroid serial number. These can be found using the androidkindlekey.py script.")
+        self.key_ledit.setToolTip(u"Enter a Kindle for Android serial number. These can be found using the androidkindlekey.py script.")
         key_group.addWidget(self.key_ledit)
         key_label = QLabel(_(''), self)
         key_label.setAlignment(Qt.AlignHCenter)

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ignoblekeyfetch.py

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

DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py

@@ -11,7 +11,9 @@ from __future__ import with_statement
 # Revision history:
 #  1.0   - AmazonSecureStorage.xml decryption to serial number
 #  1.1   - map_data_storage.db decryption to serial number
-#  1.2   - BugFix
+#  1.2   - Changed to be callable from AppleScript by returning only serial number
+#        - and changed name to androidkindlekey.py
+#        - and added in unicode command line support
 #  1.3   - added in TkInter interface, output to a file and attempt to get backup from a connected android device.
 
 """

DeDRM_calibre_plugin/DeDRM_plugin/ignoblekeyfetch.py

@@ -12,14 +12,11 @@ from __future__ import with_statement
 # Based on discoveries by "Nobody You Know"
 
 # Windows users: Before running this program, you must first install Python.
-#   We recommend ActiveState Python 2.7.X for Windows (x86) from
+#   We recommend ActiveState Python 2.7.X for Windows from
 #   http://www.activestate.com/activepython/downloads.
-#   You must also install PyCrypto from
+#   Then save this script file as ignoblekeyfetch.pyw and double-click on it to run it.
-#   http://www.voidspace.org.uk/python/modules.shtml#pycrypto
-#   (make certain to install the version for Python 2.7).
-#   Then save this script file as ignoblekeygen.pyw and double-click on it to run it.
 #
-# Mac OS X users: Save this script file as ignoblekeygen.pyw.  You can run this
+# Mac OS X users: Save this script file as ignoblekeyfetch.pyw.  You can run this
 #   program from the command line (python ignoblekeygen.pyw) or by double-clicking
 #   it when it has been associated with PythonLauncher.
 
@@ -122,6 +119,7 @@ def fetch_key(email, password):
         req = urllib2.Request(fetch_url)
         response = urllib2.urlopen(req)
         the_page = response.read()
+        #print the_page
         
         import re
         
@@ -221,8 +219,11 @@ def gui_main():
             except Exception, e:
                 self.status['text'] = u"Error: {0}".format(e.args[0])
                 return
-            open(keypath,'wb').write(userkey)
+            if len(userkey) == 28:
-            self.status['text'] = u"Keyfile successfully generated"
+                open(keypath,'wb').write(userkey)
+                self.status['text'] = u"Keyfile fetched successfully"
+            else:
+                self.status['text'] = u"Keyfile fetch failed."
 
     root = Tkinter.Tk()
     root.title(u"Barnes & Noble ePub Keyfile Fetch v.{0}".format(__version__))

Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeyfetch.pyw

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

Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw

@@ -4,13 +4,13 @@
 from __future__ import with_statement
 
 # androidkindlekey.py
-# Copyright © 2013-15 by Thom
+# Copyright © 2013-15 by Thom and Apprentice Harper
-# Some portions Copyright © 2010-15 by some_updates, Apprentice Alf and Apprentice Harper
+# Some portions Copyright © 2010-15 by some_updates and Apprentice Alf
 #
 
 # Revision history:
-#  1.0   - Android serial number extracted from AmazonSecureStorage.xml
+#  1.0   - AmazonSecureStorage.xml decryption to serial number
-#  1.1   - Fixes and enhancements of some kind
+#  1.1   - map_data_storage.db decryption to serial number
 #  1.2   - Changed to be callable from AppleScript by returning only serial number
 #        - and changed name to androidkindlekey.py
 #        - and added in unicode command line support

ReadMe_First.txt

@@ -6,7 +6,7 @@ This ReadMe_First.txt is meant to give users a quick overview of what is availab
 The is archive includes tools to remove DRM from:
 
  - Kindle ebooks (Mobi, Topaz, Print Replica and KF8).
- - Barnes and Noble ePubs downloaded through NOOK Study
+ - Barnes and Noble ePubs
  - Adobe Digital Editions ePubs (including Kobo and Google ePubs downloaded to ADE)
  - Kobo kePubs from the Kobo Desktop application
  - Adobe Digital Editions PDFs
@@ -19,7 +19,7 @@ These tools do NOT work with Apple's iBooks FairPlay DRM (see end of this file.)
 
 About the tools
 ---------------
-These tools are updated and maintained by Apprentice Alf and Apprentice Harper. You can find the latest updates and get support at Apprentice Alf's blog: http://www.apprenticealf.wordpress.com/
+These tools are updated and maintained by Apprentice Alf and Apprentice Harper. You can find links to the latest updates and get support at Apprentice Alf's blog: http://www.apprenticealf.wordpress.com/
 If you re-post these tools, a link to the blog would be appreciated.
 
 
@@ -60,13 +60,13 @@ For instructions, see the obok_plugin_ReadMe.txt file in the Obok_calibre_plugin
 
 Other_Tools
 -----------
-This is folder other tools that may be useful for DRMed ebooks from certain sources or for Linux users. Most users won't need any of these tools.
+This is a folder other tools that may be useful for DRMed ebooks from certain sources or for Linux users. Most users won't need any of these tools.
 
 B&N_Download_Helper
 A Javascript to enable a download button at the B&N website for ebooks that normally won't download to your PC. Another one only for the adventurous.
 
 DRM_Key_Scripts
-This folder contains python scripts that create or extract encryption keyfiles for Barnes and Noble ePubs, Adobe Digital Editions ePubs and Kindle for Mac/PC ebooks.
+This folder contains python scripts that create or extract or fetch encryption keyfiles for Barnes and Noble ePubs, Adobe Digital Editions ePubs, Kindle for Mac/PC and Kindle for Android ebooks.
 
 Kindle_for_Android_Patches
 Definitely only for the adventurous, this folder contains information on how to modify the Kindel for Android app to b able to get a PID for use with the other Kindle tools (DeDRM apps and calibre plugin).