tools v4.7

Calibre_Plugins/K4MobiDeDRM_plugin/__init__.py

@@ -16,24 +16,23 @@ import re
 
 class K4DeDRM(FileTypePlugin):
     name                = 'K4PC, K4Mac, Kindle Mobi and Topaz DeDRM' # Name of the plugin
-    description         = 'Removes DRM from K4PC and Mac, Kindle Mobi and Topaz files.  Provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, ApprenticeAlf, etc.'
+    description         = 'Removes DRM from Mobipocket, Kindle/Mobi, Kindle/Topaz and Kindle/Print Replica 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, 3, 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
+    version             = (0, 3, 7)   # The version number of this plugin
+    file_types          = set(['prc','mobi','azw','azw1','azw4','tpz']) # The file types that this plugin will be applied to
     on_import           = True # Run this plugin during the import
     priority            = 210  # run this plugin before mobidedrm, k4pcdedrm, k4dedrm
     minimum_calibre_version = (0, 7, 55)
 
     def run(self, path_to_ebook):
-
+        plug_ver = '.'.join(str(self.version).strip('()').replace(' ', '').split(','))
         k4 = True
         if sys.platform.startswith('linux'):
             k4 = False
         pids = []
         serials = []
         kInfoFiles = []
-
         # Get supplied list of PIDs to try from plugin customization.
         customvalues = self.site_customization.split(',')
         for customvalue in customvalues:
@@ -46,12 +45,12 @@ class K4DeDRM(FileTypePlugin):
                     serials.append(customvalue)
                 else:
                     print "%s is not a valid Kindle serial number or PID." % str(customvalue)
-            		
+                        
         # Load any kindle info files (*.info) included Calibre's config directory.
         try:
             # Find Calibre's configuration directory.
             confpath = os.path.split(os.path.split(self.plugin_path)[0])[0]
-            print 'K4MobiDeDRM: Calibre configuration directory = %s' % confpath
+            print 'K4MobiDeDRM v%s: Calibre configuration directory = %s' % (plug_ver, confpath)
             files = os.listdir(confpath)
             filefilter = re.compile("\.info$|\.kinf$", re.IGNORECASE)
             files = filter(filefilter.search, files)
@@ -59,9 +58,9 @@ class K4DeDRM(FileTypePlugin):
                 for filename in files:
                     fpath = os.path.join(confpath, filename)
                     kInfoFiles.append(fpath)
-                print 'K4MobiDeDRM: Kindle info/kinf file %s found in config folder.' % filename
+                print 'K4MobiDeDRM v%s: Kindle info/kinf file %s found in config folder.' % (plug_ver, filename)
         except IOError:
-            print 'K4MobiDeDRM: Error reading kindle info/kinf files from config directory.'
+            print 'K4MobiDeDRM v%s: Error reading kindle info/kinf files from config directory.' % plug_ver
             pass
 
         mobi = True
@@ -83,30 +82,34 @@ class K4DeDRM(FileTypePlugin):
         try:
             mb.processBook(pidlst)
 
-        except mobidedrm.DrmException:
+        except mobidedrm.DrmException, e:
             #if you reached here then no luck raise and exception
             if is_ok_to_use_qt():
                 from PyQt4.Qt import QMessageBox
-                d = QMessageBox(QMessageBox.Warning, "K4MobiDeDRM Plugin", "Error decoding: %s\n" % path_to_ebook)
+                d = QMessageBox(QMessageBox.Warning, "K4MobiDeDRM v%s Plugin" % plug_ver, "Error: " + str(e) + "... %s\n" %  path_to_ebook)
                 d.show()
                 d.raise_()
                 d.exec_()
-            raise Exception("K4MobiDeDRM plugin could not decode the file")
-        except topazextract.TpzDRMError:
+            raise Exception("K4MobiDeDRM plugin v%s Error: %s" % (plug_ver, str(e)))
+        except topazextract.TpzDRMError, e:
             #if you reached here then no luck raise and exception
             if is_ok_to_use_qt():
                     from PyQt4.Qt import QMessageBox
-                    d = QMessageBox(QMessageBox.Warning, "K4MobiDeDRM Plugin", "Error decoding: %s\n" % path_to_ebook)
+                    d = QMessageBox(QMessageBox.Warning, "K4MobiDeDRM v%s Plugin" % plug_ver, "Error: " + str(e) + "... %s\n" % path_to_ebook)
                     d.show()
                     d.raise_()
                     d.exec_()
-            raise Exception("K4MobiDeDRM plugin could not decode the file")
+            raise Exception("K4MobiDeDRM plugin v%s Error: %s" % (plug_ver, str(e)))
 
         print "Success!"
         if mobi:
-            of = self.temporary_file(bookname+'.mobi')
+            if mb.getPrintReplica():
+                of = self.temporary_file(bookname+'.azw4')
+                print 'K4MobiDeDRM v%s: Print Replica format detected.' % plug_ver
+            else:
+                of = self.temporary_file(bookname+'.mobi')
             mb.getMobiFile(of.name)
-        else :
+        else:
             of = self.temporary_file(bookname+'.htmlz')
             mb.getHTMLZip(of.name)
             mb.cleanup()

Calibre_Plugins/K4MobiDeDRM_plugin/k4mobidedrm_orig.py

@@ -17,7 +17,7 @@ from __future__ import with_statement
 #    and many many others
 
 
-__version__ = '3.1'
+__version__ = '3.7'
 
 class Unbuffered:
     def __init__(self, stream):
@@ -76,7 +76,7 @@ def cleanup_name(name):
 def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
     # handle the obvious cases at the beginning
     if not os.path.isfile(infile):
-        print "Error: Input file does not exist"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: Input file does not exist"
         return 1
 
     mobi = True
@@ -106,17 +106,20 @@ def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
         mb.processBook(pidlst)
 
     except mobidedrm.DrmException, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
     except topazextract.TpzDRMError, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
     except Exception, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
 
     if mobi:
-        outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
+        if mb.getPrintReplica():
+            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.azw4')
+        else:
+            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
         mb.getMobiFile(outfile)
         return 0            
 
@@ -158,7 +161,6 @@ def main(argv=sys.argv):
     print ('K4MobiDeDrm v%(__version__)s '
 	   'provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, ApprenticeAlf, etc .' % globals())
 
-    print ' '
     try:
         opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
     except getopt.GetoptError, err:

Calibre_Plugins/K4MobiDeDRM_plugin/kgenpids.py

@@ -22,16 +22,16 @@ else:
 
 if inCalibre:
     if sys.platform.startswith('win'):
-        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
     if sys.platform.startswith('darwin'):
-        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 else:
     if sys.platform.startswith('win'):
-        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
     if sys.platform.startswith('darwin'):
-        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
 
 charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
@@ -218,14 +218,14 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):
         print "Keys not found in " + kInfoFile
         return pidlst
         
-    # Get the HDD serial
-    encodedSystemVolumeSerialNumber = encodeHash(GetVolumeSerialNumber(),charMap1)
+    # Get the ID string used
+    encodedIDString = encodeHash(GetIDString(),charMap1)
 
     # Get the current user name
     encodedUsername = encodeHash(GetUserName(),charMap1)
 
     # concat, hash and encode to calculate the DSN
-    DSN = encode(SHA1(MazamaRandomNumber+encodedSystemVolumeSerialNumber+encodedUsername),charMap1)
+    DSN = encode(SHA1(MazamaRandomNumber+encodedIDString+encodedUsername),charMap1)
        
     # Compute the device PID (for which I can tell, is used for nothing).
     table =  generatePidEncryptionTable()

Calibre_Plugins/README-Ineptpdf-plugin.txt

@@ -8,7 +8,7 @@ This plugin is meant to decrypt Adobe Digital Edition PDFs that are protected wi
 
 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.
 

Calibre_Plugins/README-K4MobiDeDRM-plugin.txt

@@ -5,7 +5,7 @@ This plugin supersedes MobiDeDRM, K4DeDRM, and K4PCDeDRM and K4X plugins.  If yo
 
 
 This plugin is meant to remove the DRM from .prc, .azw, .azw1, and .tpz ebooks.   Calibre can then convert them to whatever format you desire. It is meant to function without having to install any  dependencies except for Calibre being on your same machine and in the same account as your "Kindle for PC" or "Kindle for Mac" application if you are going to remove the DRM from those types of books.
-
+
 
 
 Installation:

Calibre_Plugins/README-eReaderPDB2PML-plugin.txt

@@ -5,7 +5,7 @@ All credit given to The Dark Reverser for the original standalone script. I had
 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.
 
 

Calibre_Plugins/README-ignobleepub-plugin.txt

@@ -9,7 +9,7 @@ with Adobe's Adept encryption. It is meant to function without having to install
 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.

Calibre_Plugins/README-ineptepub-plugin.txt

@@ -8,7 +8,7 @@ This plugin is meant to decrypt Adobe Digital Edition Epubs that are protected w
 
 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.
 

Calibre_Plugins/k4mobidedrm_plugin/k4mutils.py

@@ -1,11 +1,12 @@
-# standlone set of Mac OSX specific routines needed for K4DeDRM
+# standlone set of Mac OSX specific routines needed for KindleBooks
 
 from __future__ import with_statement
 
 import sys
 import os
-import subprocess
+import os.path
 
+import subprocess
 from struct import pack, unpack, unpack_from
 
 class DrmException(Exception):
@@ -68,11 +69,9 @@ def _load_crypto_libcrypto():
                 raise DrmException('AES decryption failed')
             return out.raw
 
-        def keyivgen(self, passwd, salt):
+        def keyivgen(self, passwd, salt, iter, keylen):
             saltlen = len(salt)
             passlen = len(passwd)
-            iter = 0x3e8
-            keylen = 80
             out = create_string_buffer(keylen)
             rv = PKCS5_PBKDF2_HMAC_SHA1(passwd, passlen, salt, saltlen, iter, keylen, out)
             return out.raw
@@ -114,9 +113,10 @@ def SHA256(message):
 charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
 charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM" 
 
-# For Future Reference from .kinf approach of K4PC
-charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
-
+# For kinf approach of K4PC/K4Mac
+# On K4PC charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
+# For Mac they seem to re-use charMap2 here
+charMap5 = charMap2
 
 def encode(data, map):
     result = ""
@@ -144,7 +144,7 @@ def decode(data,map):
         result += pack("B",value)
     return result
 
-# For Future Reference from .kinf approach of K4PC
+# For .kinf approach of K4PC and now K4Mac
 # generate table of prime number less than or equal to int n
 def primes(n):
     if n==2: return [2]
@@ -166,7 +166,6 @@ def primes(n):
     return [2]+[x for x in s if x]
 
 
-
 # uses a sub process to get the Hard Drive Serial Number using ioreg
 # returns with the serial number of drive whose BSD Name is "disk0"
 def GetVolumeSerialNumber():
@@ -196,24 +195,217 @@ def GetVolumeSerialNumber():
                 foundIt = True
                 break
     if not foundIt:
-        sernum = '9999999999'
+        sernum = ''
     return sernum
 
+def GetUserHomeAppSupKindleDirParitionName():
+    home = os.getenv('HOME')
+    dpath =  home + '/Library/Application Support/Kindle'
+    cmdline = '/sbin/mount'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    disk = ''
+    foundIt = False
+    for j in xrange(cnt):
+        resline = reslst[j]
+        if resline.startswith('/dev'):
+            (devpart, mpath) = resline.split(' on ')
+            dpart = devpart[5:]
+            pp = mpath.find('(')
+            if pp >= 0:
+                mpath = mpath[:pp-1]
+            if dpath.startswith(mpath):
+                disk = dpart
+    return disk
+
+# uses a sub process to get the UUID of the specified disk partition using ioreg
+def GetDiskPartitionUUID(diskpart):
+    uuidnum = os.getenv('MYUUIDNUMBER')
+    if uuidnum != None:
+        return uuidnum
+    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    bsdname = None
+    uuidnum = None
+    foundIt = False
+    nest = 0
+    uuidnest = -1
+    partnest = -2
+    for j in xrange(cnt):
+        resline = reslst[j]
+        if resline.find('{') >= 0:
+            nest += 1
+        if resline.find('}') >= 0:
+            nest -= 1
+        pp = resline.find('"UUID" = "')
+        if pp >= 0:
+            uuidnum = resline[pp+10:-1]
+            uuidnum = uuidnum.strip()
+            uuidnest = nest
+            if partnest == uuidnest and uuidnest > 0:
+                foundIt = True
+                break
+        bb = resline.find('"BSD Name" = "')
+        if bb >= 0:
+            bsdname = resline[bb+14:-1]
+            bsdname = bsdname.strip()
+            if (bsdname == diskpart):
+                partnest = nest
+            else :
+                partnest = -2
+            if partnest == uuidnest and partnest > 0:
+                foundIt = True
+                break
+        if nest == 0:
+            partnest = -2
+            uuidnest = -1
+            uuidnum = None
+            bsdname = None
+    if not foundIt:
+        uuidnum = ''
+    return uuidnum
+    
+def GetMACAddressMunged():
+    macnum = os.getenv('MYMACNUM')
+    if macnum != None:
+        return macnum
+    cmdline = '/sbin/ifconfig en0'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    macnum = None
+    foundIt = False
+    for j in xrange(cnt):
+        resline = reslst[j]
+        pp = resline.find('ether ')
+        if pp >= 0:
+            macnum = resline[pp+6:-1]
+            macnum = macnum.strip()
+            # print "original mac", macnum
+            # now munge it up the way Kindle app does
+            # by xoring it with 0xa5 and swapping elements 3 and 4
+            maclst = macnum.split(':')
+            n = len(maclst)
+            if n != 6:
+                fountIt = False
+                break
+            for i in range(6):
+                maclst[i] = int('0x' + maclst[i], 0)
+            mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+            mlst[5] = maclst[5] ^ 0xa5
+            mlst[4] = maclst[3] ^ 0xa5
+            mlst[3] = maclst[4] ^ 0xa5
+            mlst[2] = maclst[2] ^ 0xa5
+            mlst[1] = maclst[1] ^ 0xa5
+            mlst[0] = maclst[0] ^ 0xa5
+            macnum = "%0.2x%0.2x%0.2x%0.2x%0.2x%0.2x" % (mlst[0], mlst[1], mlst[2], mlst[3], mlst[4], mlst[5])
+            foundIt = True
+            break
+    if not foundIt:
+        macnum = ''
+    return macnum
+
+
 # uses unix env to get username instead of using sysctlbyname 
 def GetUserName():
     username = os.getenv('USER')
     return username
 
+
 # implements an Pseudo Mac Version of Windows built-in Crypto routine
-def CryptUnprotectData(encryptedData, salt):
-    sp = GetVolumeSerialNumber() + '!@#' + GetUserName()
+# used by Kindle for Mac versions < 1.6.0
+def CryptUnprotectData(encryptedData):
+    sernum = GetVolumeSerialNumber()
+    if sernum == '':
+        sernum = '9999999999'
+    sp = sernum + '!@#' + GetUserName()
     passwdData = encode(SHA256(sp),charMap1)
+    salt = '16743'
+    iter = 0x3e8
+    keylen = 0x80
     crp = LibCrypto()
-    key_iv = crp.keyivgen(passwdData, salt)
+    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
     key = key_iv[0:32]
     iv = key_iv[32:48]
     crp.set_decrypt_key(key,iv)
     cleartext = crp.decrypt(encryptedData)
+    cleartext = decode(cleartext,charMap1)
+    return cleartext
+
+
+def isNewInstall():
+    home = os.getenv('HOME')
+    # soccer game fan anyone
+    dpath = home + '/Library/Application Support/Kindle/storage/.pes2011'
+    # print dpath, os.path.exists(dpath)
+    if os.path.exists(dpath):
+        return True
+    return False
+    
+
+def GetIDString():
+    # K4Mac now has an extensive set of ids strings it uses
+    # in encoding pids and in creating unique passwords
+    # for use in its own version of CryptUnprotectDataV2
+
+    # BUT Amazon has now become nasty enough to detect when its app
+    # is being run under a debugger and actually changes code paths
+    # including which one of these strings is chosen, all to try 
+    # to prevent reverse engineering
+
+    # Sad really ... they will only hurt their own sales ...
+    # true book lovers really want to keep their books forever
+    # and move them to their devices and DRM prevents that so they 
+    # will just buy from someplace else that they can remove 
+    # the DRM from
+
+    # Amazon should know by now that true book lover's are not like
+    # penniless kids that pirate music, we do not pirate books
+
+    if isNewInstall():
+        mungedmac = GetMACAddressMunged()
+        if len(mungedmac) > 7:
+            return mungedmac
+    sernum = GetVolumeSerialNumber()
+    if len(sernum) > 7:
+        return sernum
+    diskpart = GetUserHomeAppSupKindleDirParitionName()
+    uuidnum = GetDiskPartitionUUID(diskpart)
+    if len(uuidnum) > 7:
+        return uuidnum
+    mungedmac = GetMACAddressMunged()
+    if len(mungedmac) > 7:
+        return mungedmac
+    return '9999999999'
+
+
+# implements an Pseudo Mac Version of Windows built-in Crypto routine
+# used for Kindle for Mac Versions >= 1.6.0
+def CryptUnprotectDataV2(encryptedData):
+    sp = GetUserName() + ':&%:' + GetIDString()
+    passwdData = encode(SHA256(sp),charMap5)
+    # salt generation as per the code
+    salt = 0x0512981d * 2 * 1 * 1
+    salt = str(salt) + GetUserName()
+    salt = encode(salt,charMap5)
+    crp = LibCrypto()
+    iter = 0x800
+    keylen = 0x400
+    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
+    key = key_iv[0:32]
+    iv = key_iv[32:48]
+    crp.set_decrypt_key(key,iv)
+    cleartext = crp.decrypt(encryptedData)
+    cleartext = decode(cleartext, charMap5)
     return cleartext
 
 
@@ -232,18 +424,16 @@ def getKindleInfoFiles(kInfoFiles):
         if os.path.isfile(resline):
             kInfoFiles.append(resline)
             found = True
-    # For Future Reference
-    # 
-    # # add any .kinf files 
-    # cmdline = 'find "' + home + '/Library/Application Support" -name "rainier*.kinf"'
-    # cmdline = cmdline.encode(sys.getfilesystemencoding())
-    # p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    # out1, out2 = p1.communicate()
-    # reslst = out1.split('\n')
-    # for resline in reslst:
-    #     if os.path.isfile(resline):
-    #         kInfoFiles.append(resline)
-    #         found = True
+    # add any .kinf files 
+    cmdline = 'find "' + home + '/Library/Application Support" -name ".rainier*-kinf"'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p1.communicate()
+    reslst = out1.split('\n')
+    for resline in reslst:
+        if os.path.isfile(resline):
+            kInfoFiles.append(resline)
+            found = True
     if not found:
         print('No kindle-info files have been found.')
     return kInfoFiles
@@ -251,7 +441,7 @@ def getKindleInfoFiles(kInfoFiles):
 # determine type of kindle info provided and return a 
 # database of keynames and values
 def getDBfromFile(kInfoFile):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
+    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber", "max_date", "SIGVERIF"]
     DB = {}
     cnt = 0
     infoReader = open(kInfoFile, 'r')
@@ -259,7 +449,6 @@ def getDBfromFile(kInfoFile):
     data = infoReader.read()
 
     if data.find('[') != -1 :
-
         # older style kindle-info file
         items = data.split('[')
         for item in items:
@@ -273,84 +462,89 @@ def getDBfromFile(kInfoFile):
                 if keyname == "unknown":
                     keyname = keyhash
                 encryptedValue = decode(rawdata,charMap2)
-                salt = '16743'
-                cleartext = CryptUnprotectData(encryptedValue, salt)
-                DB[keyname] = decode(cleartext,charMap1)
+                cleartext = CryptUnprotectData(encryptedValue)
+                DB[keyname] = cleartext
                 cnt = cnt + 1
         if cnt == 0:
             DB = None
         return DB
 
-    # For Future Reference taken from K4PC 1.5.0 .kinf
-    # 
-    # # else newer style .kinf file
-    # # the .kinf file uses "/" to separate it into records
-    # # so remove the trailing "/" to make it easy to use split
-    # data = data[:-1]
-    # items = data.split('/')
-    # 
-    # # loop through the item records until all are processed
-    # while len(items) > 0:
-    # 
-    #     # get the first item record
-    #     item = items.pop(0)
-    # 
-    #     # the first 32 chars of the first record of a group
-    #     # is the MD5 hash of the key name encoded by charMap5
-    #     keyhash = item[0:32]
-    # 
-    #     # the raw keyhash string is also used to create entropy for the actual
-    #     # CryptProtectData Blob that represents that keys contents
-    #     entropy = SHA1(keyhash)
-    # 
-    #     # the remainder of the first record when decoded with charMap5 
-    #     # has the ':' split char followed by the string representation
-    #     # of the number of records that follow
-    #     # and make up the contents
-    #     srcnt = decode(item[34:],charMap5)
-    #     rcnt = int(srcnt)
-    # 
-    #     # read and store in rcnt records of data
-    #     # that make up the contents value
-    #     edlst = []
-    #     for i in xrange(rcnt):
-    #         item = items.pop(0)
-    #         edlst.append(item)
-    # 
-    #     keyname = "unknown"
-    #     for name in names:
-    #         if encodeHash(name,charMap5) == keyhash:
-    #             keyname = name
-    #             break
-    #     if keyname == "unknown":
-    #         keyname = keyhash
-    # 
-    #     # the charMap5 encoded contents data has had a length 
-    #     # of chars (always odd) cut off of the front and moved
-    #     # to the end to prevent decoding using charMap5 from 
-    #     # working properly, and thereby preventing the ensuing 
-    #     # CryptUnprotectData call from succeeding.
-    # 
-    #     # The offset into the charMap5 encoded contents seems to be:
-    #     # len(contents) - largest prime number less than or equal to int(len(content)/3)
-    #     # (in other words split "about" 2/3rds of the way through)
-    # 
-    #     # move first offsets chars to end to align for decode by charMap5
-    #     encdata = "".join(edlst)
-    #     contlen = len(encdata)
-    #     noffset = contlen - primes(int(contlen/3))[-1]
-    # 
-    #     # now properly split and recombine 
-    #     # by moving noffset chars from the start of the 
-    #     # string to the end of the string 
-    #     pfx = encdata[0:noffset]
-    #     encdata = encdata[noffset:]
-    #     encdata = encdata + pfx
-    # 
-    #     # decode using Map5 to get the CryptProtect Data
-    #     encryptedValue = decode(encdata,charMap5)
-    #     DB[keyname] = CryptUnprotectData(encryptedValue, entropy, 1)
-    #     cnt = cnt + 1
+    # else newer style .kinf file used by K4Mac >= 1.6.0
+    # the .kinf file uses "/" to separate it into records
+    # so remove the trailing "/" to make it easy to use split
+    data = data[:-1]
+    items = data.split('/')
+
+    # loop through the item records until all are processed
+    while len(items) > 0:
+    
+        # get the first item record
+        item = items.pop(0)
+    
+        # the first 32 chars of the first record of a group
+        # is the MD5 hash of the key name encoded by charMap5
+        keyhash = item[0:32]
+        keyname = "unknown"
+
+        # the raw keyhash string is also used to create entropy for the actual
+        # CryptProtectData Blob that represents that keys contents
+        # "entropy" not used for K4Mac only K4PC
+        # entropy = SHA1(keyhash)
+    
+        # the remainder of the first record when decoded with charMap5 
+        # has the ':' split char followed by the string representation
+        # of the number of records that follow
+        # and make up the contents
+        srcnt = decode(item[34:],charMap5)
+        rcnt = int(srcnt)
+    
+        # read and store in rcnt records of data
+        # that make up the contents value
+        edlst = []
+        for i in xrange(rcnt):
+            item = items.pop(0)
+            edlst.append(item)
+    
+        keyname = "unknown"
+        for name in names:
+            if encodeHash(name,charMap5) == keyhash:
+                keyname = name
+                break
+        if keyname == "unknown":
+            keyname = keyhash
+    
+        # the charMap5 encoded contents data has had a length 
+        # of chars (always odd) cut off of the front and moved
+        # to the end to prevent decoding using charMap5 from 
+        # working properly, and thereby preventing the ensuing 
+        # CryptUnprotectData call from succeeding.
+    
+        # The offset into the charMap5 encoded contents seems to be:
+        # len(contents) - largest prime number less than or equal to int(len(content)/3)
+        # (in other words split "about" 2/3rds of the way through)
+    
+        # move first offsets chars to end to align for decode by charMap5
+        encdata = "".join(edlst)
+        contlen = len(encdata)
+
+        # now properly split and recombine 
+        # by moving noffset chars from the start of the 
+        # string to the end of the string 
+        noffset = contlen - primes(int(contlen/3))[-1]
+        pfx = encdata[0:noffset]
+        encdata = encdata[noffset:]
+        encdata = encdata + pfx
+    
+        # decode using charMap5 to get the CryptProtect Data
+        encryptedValue = decode(encdata,charMap5)
+        cleartext = CryptUnprotectDataV2(encryptedValue)
+        # Debugging
+        # print keyname
+        # print cleartext
+        # print cleartext.encode('hex')
+        # print
+        DB[keyname] = cleartext
+        cnt = cnt + 1
 
     if cnt == 0:
         DB = None

Calibre_Plugins/k4mobidedrm_plugin/k4pcutils.py

@@ -122,6 +122,9 @@ def GetVolumeSerialNumber():
     return GetVolumeSerialNumber
 GetVolumeSerialNumber = GetVolumeSerialNumber()
 
+def GetIDString():
+    return GetVolumeSerialNumber()
+
 def getLastError():
     GetLastError = kernel32.GetLastError
     GetLastError.argtypes = None
@@ -181,18 +184,27 @@ def getKindleInfoFiles(kInfoFiles):
         kInfoFiles.append(kinfopath)
 
     # now look for newer (K4PC 1.5.0 and later rainier.2.1.1.kinf file
+
     kinfopath = path +'\\Amazon\\Kindle For PC\\storage\\rainier.2.1.1.kinf'
     if not os.path.isfile(kinfopath):
-        print('No .kinf files have not been found.')
+        print('No K4PC 1.5.X .kinf files have not been found.')
     else:
         kInfoFiles.append(kinfopath)
+
+    # now look for even newer (K4PC 1.6.0 and later) rainier.2.1.1.kinf file
+    kinfopath = path +'\\Amazon\\Kindle\\storage\\rainier.2.1.1.kinf'
+    if not os.path.isfile(kinfopath):
+        print('No K4PC 1.6.X .kinf files have not been found.')
+    else:
+        kInfoFiles.append(kinfopath)
+
     return kInfoFiles
 
 
 # determine type of kindle info provided and return a 
 # database of keynames and values
 def getDBfromFile(kInfoFile):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
+    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber", "max_date", "SIGVERIF"]
     DB = {}
     cnt = 0
     infoReader = open(kInfoFile, 'r')

Calibre_Plugins/k4mobidedrm_plugin/mobidedrm.py

@@ -49,11 +49,13 @@
 #  0.27 - Correct pid metadata token generation to match that used by skindle (Thank You Bart!)
 #  0.28 - slight additional changes to metadata token generation (None -> '')
 #  0.29 - It seems that the ideas about when multibyte trailing characters were
-#         included in the encryption were wrong. They aren't for DOC compressed
-#         files, but they are for HUFF/CDIC compress files!
+#         included in the encryption were wrong. They are for DOC compressed
+#         files, but they are not for HUFF/CDIC compress files!
 #  0.30 - Modified interface slightly to work better with new calibre plugin style
+#  0.31 - The multibyte encrytion info is true for version 7 files too.
+#  0.32 - Added support for "Print Replica" Kindle ebooks
 
-__version__ = '0.30'
+__version__ = '0.32'
 
 import sys
 
@@ -162,6 +164,9 @@ class MobiBook:
         return self.data_file[off:endoff]
 
     def __init__(self, infile):
+        print ('MobiDeDrm v%(__version__)s. '
+           'Copyright 2008-2011 The Dark Reverser et al.' % globals())
+
         # initial sanity check on file
         self.data_file = file(infile, 'rb').read()
         self.mobi_data = ''
@@ -192,14 +197,15 @@ class MobiBook:
             self.meta_array = {}
             return
         self.mobi_length, = struct.unpack('>L',self.sect[0x14:0x18])
+        self.mobi_codepage, = struct.unpack('>L',self.sect[0x1c:0x20])
         self.mobi_version, = struct.unpack('>L',self.sect[0x68:0x6C])
         print "MOBI header version = %d, length = %d" %(self.mobi_version, self.mobi_length)
         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) and (self.compression != 17480):
-            # multibyte utf8 data is included in the encryption for mobi_version 6 and below
+        if (self.compression != 17480):
+            # multibyte utf8 data is included in the encryption for PalmDoc compression
             # so clear that byte so that we leave it to be decrypted.
             self.extra_data_flags &= 0xFFFE
 
@@ -229,8 +235,13 @@ class MobiBook:
         except:
             self.meta_array = {}
             pass
+        self.print_replica = False
             
     def getBookTitle(self):
+        codec_map = {
+            1252 : 'windows-1252',
+            65001 : 'utf-8',
+        }
         title = ''
         if 503 in self.meta_array:
             title = self.meta_array[503]
@@ -241,7 +252,10 @@ class MobiBook:
         if title == '':
             title = self.header[:32]
             title = title.split("\0")[0]
-        return title
+        codec = 'windows-1252'
+        if self.mobi_codepage in codec_map.keys():
+            codec = codec_map[self.mobi_codepage]
+        return unicode(title, codec).encode('utf-8')
 
     def getPIDMetaInfo(self):
         rec209 = ''
@@ -305,6 +319,9 @@ class MobiBook:
 
     def getMobiFile(self, outpath):
         file(outpath,'wb').write(self.mobi_data)
+        
+    def getPrintReplica(self):
+        return self.print_replica
 
     def processBook(self, pidlist):
         crypto_type, = struct.unpack('>H', self.sect[0xC:0xC+2])
@@ -312,10 +329,17 @@ class MobiBook:
         self.crypto_type = crypto_type
         if crypto_type == 0:
             print "This book is not encrypted."
+            # we must still check for Print Replica
+            self.print_replica = (self.loadSection(1)[0:4] == '%MOP')
             self.mobi_data = self.data_file
             return
         if crypto_type != 2 and crypto_type != 1:
             raise DrmException("Cannot decode unknown Mobipocket encryption type %d" % crypto_type)
+        if 406 in self.meta_array:
+            data406 = self.meta_array[406]
+            val406, = struct.unpack('>Q',data406)
+            if val406 != 0:
+                raise DrmException("Cannot decode library or rented ebooks.")
 
         goodpids = []
         for pid in pidlist:
@@ -366,7 +390,10 @@ class MobiBook:
             if i%100 == 0:
                 print ".",
             # print "record %d, extra_size %d" %(i,extra_size)
-            self.mobi_data += PC1(found_key, data[0:len(data) - extra_size])
+            decoded_data = PC1(found_key, data[0:len(data) - extra_size])
+            if i==1:
+                self.print_replica = (decoded_data[0:4] == '%MOP')
+            self.mobi_data += decoded_data
             if extra_size > 0:
                 self.mobi_data += data[-extra_size:]
         if self.num_sections > self.records+1:
@@ -391,9 +418,9 @@ def getUnencryptedBookWithList(infile,pidlist):
 
 def main(argv=sys.argv):
     print ('MobiDeDrm v%(__version__)s. '
-	   'Copyright 2008-2010 The Dark Reverser.' % globals())
+        'Copyright 2008-2011 The Dark Reverser et al.' % globals())
     if len(argv)<3 or len(argv)>4:
-        print "Removes protection from Mobipocket books"
+        print "Removes protection from Kindle/Mobipocket and Kindle/Print Replica ebooks"
         print "Usage:"
         print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
         return 1
@@ -401,9 +428,9 @@ def main(argv=sys.argv):
         infile = argv[1]
         outfile = argv[2]
         if len(argv) is 4:
-        	pidlist = argv[3].split(',')
+            pidlist = argv[3].split(',')
         else:
-        	pidlist = {}
+            pidlist = {}
         try:
             stripped_file = getUnencryptedBookWithList(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)

DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist

@@ -24,17 +24,17 @@
 	<key>CFBundleExecutable</key>
 	<string>droplet</string>
 	<key>CFBundleGetInfoString</key>
-	<string>DeDRM 2.7, Written 2010–2011 by Apprentice Alf and others.</string>
+	<string>DeDRM 3.0, Written 2010–2011 by Apprentice Alf and others.</string>
 	<key>CFBundleIconFile</key>
 	<string>droplet</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>DeDRM</string>
+	<string>DeDRM 3.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7</string>
+	<string>3.0</string>
 	<key>CFBundleSignature</key>
 	<string>dplt</string>
 	<key>LSMinimumSystemVersion</key>
@@ -43,18 +43,14 @@
 	<true/>
 	<key>WindowState</key>
 	<dict>
-		<key>dividerCollapsed</key>
-		<true/>
-		<key>eventLogLevel</key>
-		<integer>-1</integer>
 		<key>name</key>
 		<string>ScriptWindowState</string>
 		<key>positionOfDivider</key>
-		<real>0</real>
+		<real>274</real>
 		<key>savedFrame</key>
-		<string>1578 27 862 788 1440 -150 1680 1050 </string>
+		<string>39 376 439 476 0 0 1440 878 </string>
 		<key>selectedTabView</key>
-		<string>event log</string>
+		<string>result</string>
 	</dict>
 </dict>
 </plist>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf

@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl}
 {\colortbl;\red255\green255\blue255;}
 }

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

@@ -17,7 +17,7 @@ from __future__ import with_statement
 #    and many many others
 
 
-__version__ = '3.1'
+__version__ = '3.7'
 
 class Unbuffered:
     def __init__(self, stream):
@@ -76,7 +76,7 @@ def cleanup_name(name):
 def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
     # handle the obvious cases at the beginning
     if not os.path.isfile(infile):
-        print "Error: Input file does not exist"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: Input file does not exist"
         return 1
 
     mobi = True
@@ -106,17 +106,20 @@ def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
         mb.processBook(pidlst)
 
     except mobidedrm.DrmException, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
     except topazextract.TpzDRMError, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
     except Exception, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
 
     if mobi:
-        outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
+        if mb.getPrintReplica():
+            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.azw4')
+        else:
+            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
         mb.getMobiFile(outfile)
         return 0            
 
@@ -158,7 +161,6 @@ def main(argv=sys.argv):
     print ('K4MobiDeDrm v%(__version__)s '
 	   'provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, ApprenticeAlf, etc .' % globals())
 
-    print ' '
     try:
         opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
     except getopt.GetoptError, err:

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

@@ -1,11 +1,12 @@
-# standlone set of Mac OSX specific routines needed for K4DeDRM
+# standlone set of Mac OSX specific routines needed for KindleBooks
 
 from __future__ import with_statement
 
 import sys
 import os
-import subprocess
+import os.path
 
+import subprocess
 from struct import pack, unpack, unpack_from
 
 class DrmException(Exception):
@@ -68,11 +69,9 @@ def _load_crypto_libcrypto():
                 raise DrmException('AES decryption failed')
             return out.raw
 
-        def keyivgen(self, passwd, salt):
+        def keyivgen(self, passwd, salt, iter, keylen):
             saltlen = len(salt)
             passlen = len(passwd)
-            iter = 0x3e8
-            keylen = 80
             out = create_string_buffer(keylen)
             rv = PKCS5_PBKDF2_HMAC_SHA1(passwd, passlen, salt, saltlen, iter, keylen, out)
             return out.raw
@@ -114,9 +113,10 @@ def SHA256(message):
 charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
 charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM" 
 
-# For Future Reference from .kinf approach of K4PC
-charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
-
+# For kinf approach of K4PC/K4Mac
+# On K4PC charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
+# For Mac they seem to re-use charMap2 here
+charMap5 = charMap2
 
 def encode(data, map):
     result = ""
@@ -144,7 +144,7 @@ def decode(data,map):
         result += pack("B",value)
     return result
 
-# For Future Reference from .kinf approach of K4PC
+# For .kinf approach of K4PC and now K4Mac
 # generate table of prime number less than or equal to int n
 def primes(n):
     if n==2: return [2]
@@ -166,7 +166,6 @@ def primes(n):
     return [2]+[x for x in s if x]
 
 
-
 # uses a sub process to get the Hard Drive Serial Number using ioreg
 # returns with the serial number of drive whose BSD Name is "disk0"
 def GetVolumeSerialNumber():
@@ -196,24 +195,217 @@ def GetVolumeSerialNumber():
                 foundIt = True
                 break
     if not foundIt:
-        sernum = '9999999999'
+        sernum = ''
     return sernum
 
+def GetUserHomeAppSupKindleDirParitionName():
+    home = os.getenv('HOME')
+    dpath =  home + '/Library/Application Support/Kindle'
+    cmdline = '/sbin/mount'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    disk = ''
+    foundIt = False
+    for j in xrange(cnt):
+        resline = reslst[j]
+        if resline.startswith('/dev'):
+            (devpart, mpath) = resline.split(' on ')
+            dpart = devpart[5:]
+            pp = mpath.find('(')
+            if pp >= 0:
+                mpath = mpath[:pp-1]
+            if dpath.startswith(mpath):
+                disk = dpart
+    return disk
+
+# uses a sub process to get the UUID of the specified disk partition using ioreg
+def GetDiskPartitionUUID(diskpart):
+    uuidnum = os.getenv('MYUUIDNUMBER')
+    if uuidnum != None:
+        return uuidnum
+    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    bsdname = None
+    uuidnum = None
+    foundIt = False
+    nest = 0
+    uuidnest = -1
+    partnest = -2
+    for j in xrange(cnt):
+        resline = reslst[j]
+        if resline.find('{') >= 0:
+            nest += 1
+        if resline.find('}') >= 0:
+            nest -= 1
+        pp = resline.find('"UUID" = "')
+        if pp >= 0:
+            uuidnum = resline[pp+10:-1]
+            uuidnum = uuidnum.strip()
+            uuidnest = nest
+            if partnest == uuidnest and uuidnest > 0:
+                foundIt = True
+                break
+        bb = resline.find('"BSD Name" = "')
+        if bb >= 0:
+            bsdname = resline[bb+14:-1]
+            bsdname = bsdname.strip()
+            if (bsdname == diskpart):
+                partnest = nest
+            else :
+                partnest = -2
+            if partnest == uuidnest and partnest > 0:
+                foundIt = True
+                break
+        if nest == 0:
+            partnest = -2
+            uuidnest = -1
+            uuidnum = None
+            bsdname = None
+    if not foundIt:
+        uuidnum = ''
+    return uuidnum
+    
+def GetMACAddressMunged():
+    macnum = os.getenv('MYMACNUM')
+    if macnum != None:
+        return macnum
+    cmdline = '/sbin/ifconfig en0'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    macnum = None
+    foundIt = False
+    for j in xrange(cnt):
+        resline = reslst[j]
+        pp = resline.find('ether ')
+        if pp >= 0:
+            macnum = resline[pp+6:-1]
+            macnum = macnum.strip()
+            # print "original mac", macnum
+            # now munge it up the way Kindle app does
+            # by xoring it with 0xa5 and swapping elements 3 and 4
+            maclst = macnum.split(':')
+            n = len(maclst)
+            if n != 6:
+                fountIt = False
+                break
+            for i in range(6):
+                maclst[i] = int('0x' + maclst[i], 0)
+            mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+            mlst[5] = maclst[5] ^ 0xa5
+            mlst[4] = maclst[3] ^ 0xa5
+            mlst[3] = maclst[4] ^ 0xa5
+            mlst[2] = maclst[2] ^ 0xa5
+            mlst[1] = maclst[1] ^ 0xa5
+            mlst[0] = maclst[0] ^ 0xa5
+            macnum = "%0.2x%0.2x%0.2x%0.2x%0.2x%0.2x" % (mlst[0], mlst[1], mlst[2], mlst[3], mlst[4], mlst[5])
+            foundIt = True
+            break
+    if not foundIt:
+        macnum = ''
+    return macnum
+
+
 # uses unix env to get username instead of using sysctlbyname 
 def GetUserName():
     username = os.getenv('USER')
     return username
 
+
 # implements an Pseudo Mac Version of Windows built-in Crypto routine
-def CryptUnprotectData(encryptedData, salt):
-    sp = GetVolumeSerialNumber() + '!@#' + GetUserName()
+# used by Kindle for Mac versions < 1.6.0
+def CryptUnprotectData(encryptedData):
+    sernum = GetVolumeSerialNumber()
+    if sernum == '':
+        sernum = '9999999999'
+    sp = sernum + '!@#' + GetUserName()
     passwdData = encode(SHA256(sp),charMap1)
+    salt = '16743'
+    iter = 0x3e8
+    keylen = 0x80
     crp = LibCrypto()
-    key_iv = crp.keyivgen(passwdData, salt)
+    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
     key = key_iv[0:32]
     iv = key_iv[32:48]
     crp.set_decrypt_key(key,iv)
     cleartext = crp.decrypt(encryptedData)
+    cleartext = decode(cleartext,charMap1)
+    return cleartext
+
+
+def isNewInstall():
+    home = os.getenv('HOME')
+    # soccer game fan anyone
+    dpath = home + '/Library/Application Support/Kindle/storage/.pes2011'
+    # print dpath, os.path.exists(dpath)
+    if os.path.exists(dpath):
+        return True
+    return False
+    
+
+def GetIDString():
+    # K4Mac now has an extensive set of ids strings it uses
+    # in encoding pids and in creating unique passwords
+    # for use in its own version of CryptUnprotectDataV2
+
+    # BUT Amazon has now become nasty enough to detect when its app
+    # is being run under a debugger and actually changes code paths
+    # including which one of these strings is chosen, all to try 
+    # to prevent reverse engineering
+
+    # Sad really ... they will only hurt their own sales ...
+    # true book lovers really want to keep their books forever
+    # and move them to their devices and DRM prevents that so they 
+    # will just buy from someplace else that they can remove 
+    # the DRM from
+
+    # Amazon should know by now that true book lover's are not like
+    # penniless kids that pirate music, we do not pirate books
+
+    if isNewInstall():
+        mungedmac = GetMACAddressMunged()
+        if len(mungedmac) > 7:
+            return mungedmac
+    sernum = GetVolumeSerialNumber()
+    if len(sernum) > 7:
+        return sernum
+    diskpart = GetUserHomeAppSupKindleDirParitionName()
+    uuidnum = GetDiskPartitionUUID(diskpart)
+    if len(uuidnum) > 7:
+        return uuidnum
+    mungedmac = GetMACAddressMunged()
+    if len(mungedmac) > 7:
+        return mungedmac
+    return '9999999999'
+
+
+# implements an Pseudo Mac Version of Windows built-in Crypto routine
+# used for Kindle for Mac Versions >= 1.6.0
+def CryptUnprotectDataV2(encryptedData):
+    sp = GetUserName() + ':&%:' + GetIDString()
+    passwdData = encode(SHA256(sp),charMap5)
+    # salt generation as per the code
+    salt = 0x0512981d * 2 * 1 * 1
+    salt = str(salt) + GetUserName()
+    salt = encode(salt,charMap5)
+    crp = LibCrypto()
+    iter = 0x800
+    keylen = 0x400
+    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
+    key = key_iv[0:32]
+    iv = key_iv[32:48]
+    crp.set_decrypt_key(key,iv)
+    cleartext = crp.decrypt(encryptedData)
+    cleartext = decode(cleartext, charMap5)
     return cleartext
 
 
@@ -232,18 +424,16 @@ def getKindleInfoFiles(kInfoFiles):
         if os.path.isfile(resline):
             kInfoFiles.append(resline)
             found = True
-    # For Future Reference
-    # 
-    # # add any .kinf files 
-    # cmdline = 'find "' + home + '/Library/Application Support" -name "rainier*.kinf"'
-    # cmdline = cmdline.encode(sys.getfilesystemencoding())
-    # p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    # out1, out2 = p1.communicate()
-    # reslst = out1.split('\n')
-    # for resline in reslst:
-    #     if os.path.isfile(resline):
-    #         kInfoFiles.append(resline)
-    #         found = True
+    # add any .kinf files 
+    cmdline = 'find "' + home + '/Library/Application Support" -name ".rainier*-kinf"'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p1.communicate()
+    reslst = out1.split('\n')
+    for resline in reslst:
+        if os.path.isfile(resline):
+            kInfoFiles.append(resline)
+            found = True
     if not found:
         print('No kindle-info files have been found.')
     return kInfoFiles
@@ -251,7 +441,7 @@ def getKindleInfoFiles(kInfoFiles):
 # determine type of kindle info provided and return a 
 # database of keynames and values
 def getDBfromFile(kInfoFile):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
+    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber", "max_date", "SIGVERIF"]
     DB = {}
     cnt = 0
     infoReader = open(kInfoFile, 'r')
@@ -259,7 +449,6 @@ def getDBfromFile(kInfoFile):
     data = infoReader.read()
 
     if data.find('[') != -1 :
-
         # older style kindle-info file
         items = data.split('[')
         for item in items:
@@ -273,84 +462,89 @@ def getDBfromFile(kInfoFile):
                 if keyname == "unknown":
                     keyname = keyhash
                 encryptedValue = decode(rawdata,charMap2)
-                salt = '16743'
-                cleartext = CryptUnprotectData(encryptedValue, salt)
-                DB[keyname] = decode(cleartext,charMap1)
+                cleartext = CryptUnprotectData(encryptedValue)
+                DB[keyname] = cleartext
                 cnt = cnt + 1
         if cnt == 0:
             DB = None
         return DB
 
-    # For Future Reference taken from K4PC 1.5.0 .kinf
-    # 
-    # # else newer style .kinf file
-    # # the .kinf file uses "/" to separate it into records
-    # # so remove the trailing "/" to make it easy to use split
-    # data = data[:-1]
-    # items = data.split('/')
-    # 
-    # # loop through the item records until all are processed
-    # while len(items) > 0:
-    # 
-    #     # get the first item record
-    #     item = items.pop(0)
-    # 
-    #     # the first 32 chars of the first record of a group
-    #     # is the MD5 hash of the key name encoded by charMap5
-    #     keyhash = item[0:32]
-    # 
-    #     # the raw keyhash string is also used to create entropy for the actual
-    #     # CryptProtectData Blob that represents that keys contents
-    #     entropy = SHA1(keyhash)
-    # 
-    #     # the remainder of the first record when decoded with charMap5 
-    #     # has the ':' split char followed by the string representation
-    #     # of the number of records that follow
-    #     # and make up the contents
-    #     srcnt = decode(item[34:],charMap5)
-    #     rcnt = int(srcnt)
-    # 
-    #     # read and store in rcnt records of data
-    #     # that make up the contents value
-    #     edlst = []
-    #     for i in xrange(rcnt):
-    #         item = items.pop(0)
-    #         edlst.append(item)
-    # 
-    #     keyname = "unknown"
-    #     for name in names:
-    #         if encodeHash(name,charMap5) == keyhash:
-    #             keyname = name
-    #             break
-    #     if keyname == "unknown":
-    #         keyname = keyhash
-    # 
-    #     # the charMap5 encoded contents data has had a length 
-    #     # of chars (always odd) cut off of the front and moved
-    #     # to the end to prevent decoding using charMap5 from 
-    #     # working properly, and thereby preventing the ensuing 
-    #     # CryptUnprotectData call from succeeding.
-    # 
-    #     # The offset into the charMap5 encoded contents seems to be:
-    #     # len(contents) - largest prime number less than or equal to int(len(content)/3)
-    #     # (in other words split "about" 2/3rds of the way through)
-    # 
-    #     # move first offsets chars to end to align for decode by charMap5
-    #     encdata = "".join(edlst)
-    #     contlen = len(encdata)
-    #     noffset = contlen - primes(int(contlen/3))[-1]
-    # 
-    #     # now properly split and recombine 
-    #     # by moving noffset chars from the start of the 
-    #     # string to the end of the string 
-    #     pfx = encdata[0:noffset]
-    #     encdata = encdata[noffset:]
-    #     encdata = encdata + pfx
-    # 
-    #     # decode using Map5 to get the CryptProtect Data
-    #     encryptedValue = decode(encdata,charMap5)
-    #     DB[keyname] = CryptUnprotectData(encryptedValue, entropy, 1)
-    #     cnt = cnt + 1
+    # else newer style .kinf file used by K4Mac >= 1.6.0
+    # the .kinf file uses "/" to separate it into records
+    # so remove the trailing "/" to make it easy to use split
+    data = data[:-1]
+    items = data.split('/')
+
+    # loop through the item records until all are processed
+    while len(items) > 0:
+    
+        # get the first item record
+        item = items.pop(0)
+    
+        # the first 32 chars of the first record of a group
+        # is the MD5 hash of the key name encoded by charMap5
+        keyhash = item[0:32]
+        keyname = "unknown"
+
+        # the raw keyhash string is also used to create entropy for the actual
+        # CryptProtectData Blob that represents that keys contents
+        # "entropy" not used for K4Mac only K4PC
+        # entropy = SHA1(keyhash)
+    
+        # the remainder of the first record when decoded with charMap5 
+        # has the ':' split char followed by the string representation
+        # of the number of records that follow
+        # and make up the contents
+        srcnt = decode(item[34:],charMap5)
+        rcnt = int(srcnt)
+    
+        # read and store in rcnt records of data
+        # that make up the contents value
+        edlst = []
+        for i in xrange(rcnt):
+            item = items.pop(0)
+            edlst.append(item)
+    
+        keyname = "unknown"
+        for name in names:
+            if encodeHash(name,charMap5) == keyhash:
+                keyname = name
+                break
+        if keyname == "unknown":
+            keyname = keyhash
+    
+        # the charMap5 encoded contents data has had a length 
+        # of chars (always odd) cut off of the front and moved
+        # to the end to prevent decoding using charMap5 from 
+        # working properly, and thereby preventing the ensuing 
+        # CryptUnprotectData call from succeeding.
+    
+        # The offset into the charMap5 encoded contents seems to be:
+        # len(contents) - largest prime number less than or equal to int(len(content)/3)
+        # (in other words split "about" 2/3rds of the way through)
+    
+        # move first offsets chars to end to align for decode by charMap5
+        encdata = "".join(edlst)
+        contlen = len(encdata)
+
+        # now properly split and recombine 
+        # by moving noffset chars from the start of the 
+        # string to the end of the string 
+        noffset = contlen - primes(int(contlen/3))[-1]
+        pfx = encdata[0:noffset]
+        encdata = encdata[noffset:]
+        encdata = encdata + pfx
+    
+        # decode using charMap5 to get the CryptProtect Data
+        encryptedValue = decode(encdata,charMap5)
+        cleartext = CryptUnprotectDataV2(encryptedValue)
+        # Debugging
+        # print keyname
+        # print cleartext
+        # print cleartext.encode('hex')
+        # print
+        DB[keyname] = cleartext
+        cnt = cnt + 1
 
     if cnt == 0:
         DB = None

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

@@ -122,6 +122,9 @@ def GetVolumeSerialNumber():
     return GetVolumeSerialNumber
 GetVolumeSerialNumber = GetVolumeSerialNumber()
 
+def GetIDString():
+    return GetVolumeSerialNumber()
+
 def getLastError():
     GetLastError = kernel32.GetLastError
     GetLastError.argtypes = None
@@ -181,18 +184,27 @@ def getKindleInfoFiles(kInfoFiles):
         kInfoFiles.append(kinfopath)
 
     # now look for newer (K4PC 1.5.0 and later rainier.2.1.1.kinf file
+
     kinfopath = path +'\\Amazon\\Kindle For PC\\storage\\rainier.2.1.1.kinf'
     if not os.path.isfile(kinfopath):
-        print('No .kinf files have not been found.')
+        print('No K4PC 1.5.X .kinf files have not been found.')
     else:
         kInfoFiles.append(kinfopath)
+
+    # now look for even newer (K4PC 1.6.0 and later) rainier.2.1.1.kinf file
+    kinfopath = path +'\\Amazon\\Kindle\\storage\\rainier.2.1.1.kinf'
+    if not os.path.isfile(kinfopath):
+        print('No K4PC 1.6.X .kinf files have not been found.')
+    else:
+        kInfoFiles.append(kinfopath)
+
     return kInfoFiles
 
 
 # determine type of kindle info provided and return a 
 # database of keynames and values
 def getDBfromFile(kInfoFile):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
+    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber", "max_date", "SIGVERIF"]
     DB = {}
     cnt = 0
     infoReader = open(kInfoFile, 'r')

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

@@ -22,16 +22,16 @@ else:
 
 if inCalibre:
     if sys.platform.startswith('win'):
-        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
     if sys.platform.startswith('darwin'):
-        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 else:
     if sys.platform.startswith('win'):
-        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
     if sys.platform.startswith('darwin'):
-        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
 
 charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
@@ -218,14 +218,14 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):
         print "Keys not found in " + kInfoFile
         return pidlst
         
-    # Get the HDD serial
-    encodedSystemVolumeSerialNumber = encodeHash(GetVolumeSerialNumber(),charMap1)
+    # Get the ID string used
+    encodedIDString = encodeHash(GetIDString(),charMap1)
 
     # Get the current user name
     encodedUsername = encodeHash(GetUserName(),charMap1)
 
     # concat, hash and encode to calculate the DSN
-    DSN = encode(SHA1(MazamaRandomNumber+encodedSystemVolumeSerialNumber+encodedUsername),charMap1)
+    DSN = encode(SHA1(MazamaRandomNumber+encodedIDString+encodedUsername),charMap1)
        
     # Compute the device PID (for which I can tell, is used for nothing).
     table =  generatePidEncryptionTable()

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

@@ -49,11 +49,13 @@
 #  0.27 - Correct pid metadata token generation to match that used by skindle (Thank You Bart!)
 #  0.28 - slight additional changes to metadata token generation (None -> '')
 #  0.29 - It seems that the ideas about when multibyte trailing characters were
-#         included in the encryption were wrong. They aren't for DOC compressed
-#         files, but they are for HUFF/CDIC compress files!
+#         included in the encryption were wrong. They are for DOC compressed
+#         files, but they are not for HUFF/CDIC compress files!
 #  0.30 - Modified interface slightly to work better with new calibre plugin style
+#  0.31 - The multibyte encrytion info is true for version 7 files too.
+#  0.32 - Added support for "Print Replica" Kindle ebooks
 
-__version__ = '0.30'
+__version__ = '0.32'
 
 import sys
 
@@ -162,6 +164,9 @@ class MobiBook:
         return self.data_file[off:endoff]
 
     def __init__(self, infile):
+        print ('MobiDeDrm v%(__version__)s. '
+           'Copyright 2008-2011 The Dark Reverser et al.' % globals())
+
         # initial sanity check on file
         self.data_file = file(infile, 'rb').read()
         self.mobi_data = ''
@@ -192,14 +197,15 @@ class MobiBook:
             self.meta_array = {}
             return
         self.mobi_length, = struct.unpack('>L',self.sect[0x14:0x18])
+        self.mobi_codepage, = struct.unpack('>L',self.sect[0x1c:0x20])
         self.mobi_version, = struct.unpack('>L',self.sect[0x68:0x6C])
         print "MOBI header version = %d, length = %d" %(self.mobi_version, self.mobi_length)
         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) and (self.compression != 17480):
-            # multibyte utf8 data is included in the encryption for mobi_version 6 and below
+        if (self.compression != 17480):
+            # multibyte utf8 data is included in the encryption for PalmDoc compression
             # so clear that byte so that we leave it to be decrypted.
             self.extra_data_flags &= 0xFFFE
 
@@ -229,8 +235,13 @@ class MobiBook:
         except:
             self.meta_array = {}
             pass
+        self.print_replica = False
             
     def getBookTitle(self):
+        codec_map = {
+            1252 : 'windows-1252',
+            65001 : 'utf-8',
+        }
         title = ''
         if 503 in self.meta_array:
             title = self.meta_array[503]
@@ -241,7 +252,10 @@ class MobiBook:
         if title == '':
             title = self.header[:32]
             title = title.split("\0")[0]
-        return title
+        codec = 'windows-1252'
+        if self.mobi_codepage in codec_map.keys():
+            codec = codec_map[self.mobi_codepage]
+        return unicode(title, codec).encode('utf-8')
 
     def getPIDMetaInfo(self):
         rec209 = ''
@@ -305,6 +319,9 @@ class MobiBook:
 
     def getMobiFile(self, outpath):
         file(outpath,'wb').write(self.mobi_data)
+        
+    def getPrintReplica(self):
+        return self.print_replica
 
     def processBook(self, pidlist):
         crypto_type, = struct.unpack('>H', self.sect[0xC:0xC+2])
@@ -312,10 +329,17 @@ class MobiBook:
         self.crypto_type = crypto_type
         if crypto_type == 0:
             print "This book is not encrypted."
+            # we must still check for Print Replica
+            self.print_replica = (self.loadSection(1)[0:4] == '%MOP')
             self.mobi_data = self.data_file
             return
         if crypto_type != 2 and crypto_type != 1:
             raise DrmException("Cannot decode unknown Mobipocket encryption type %d" % crypto_type)
+        if 406 in self.meta_array:
+            data406 = self.meta_array[406]
+            val406, = struct.unpack('>Q',data406)
+            if val406 != 0:
+                raise DrmException("Cannot decode library or rented ebooks.")
 
         goodpids = []
         for pid in pidlist:
@@ -366,7 +390,10 @@ class MobiBook:
             if i%100 == 0:
                 print ".",
             # print "record %d, extra_size %d" %(i,extra_size)
-            self.mobi_data += PC1(found_key, data[0:len(data) - extra_size])
+            decoded_data = PC1(found_key, data[0:len(data) - extra_size])
+            if i==1:
+                self.print_replica = (decoded_data[0:4] == '%MOP')
+            self.mobi_data += decoded_data
             if extra_size > 0:
                 self.mobi_data += data[-extra_size:]
         if self.num_sections > self.records+1:
@@ -391,9 +418,9 @@ def getUnencryptedBookWithList(infile,pidlist):
 
 def main(argv=sys.argv):
     print ('MobiDeDrm v%(__version__)s. '
-	   'Copyright 2008-2010 The Dark Reverser.' % globals())
+        'Copyright 2008-2011 The Dark Reverser et al.' % globals())
     if len(argv)<3 or len(argv)>4:
-        print "Removes protection from Mobipocket books"
+        print "Removes protection from Kindle/Mobipocket and Kindle/Print Replica ebooks"
         print "Usage:"
         print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
         return 1
@@ -401,9 +428,9 @@ def main(argv=sys.argv):
         infile = argv[1]
         outfile = argv[2]
         if len(argv) is 4:
-        	pidlist = argv[3].split(',')
+            pidlist = argv[3].split(',')
         else:
-        	pidlist = {}
+            pidlist = {}
         try:
             stripped_file = getUnencryptedBookWithList(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)

DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/DeDRM_app.pyw

@@ -263,6 +263,7 @@ class PrefsDialog(Toplevel):
             filetypes=[('ePub Files','.epub'),
                        ('Kindle','.azw'),
                        ('Kindle','.azw1'),
+                       ('Kindle','.azw4'),
                        ('Kindle','.tpz'),
                        ('Kindle','.mobi'),
                        ('Kindle','.prc'),
@@ -465,7 +466,7 @@ class ConvDialog(Toplevel):
         if ext == '.pdb':
             self.p2 = processPDB(apphome, infile, outdir, rscpath)
             return 0
-        if ext in ['.azw', '.azw1', '.prc', '.mobi', '.tpz']:
+        if ext in ['.azw', '.azw1', '.azw4', '.prc', '.mobi', '.tpz']:
             self.p2 = processK4MOBI(apphome, infile, outdir, rscpath)
             return 0
         if ext == '.pdf':

DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py

@@ -17,7 +17,7 @@ from __future__ import with_statement
 #    and many many others
 
 
-__version__ = '3.1'
+__version__ = '3.7'
 
 class Unbuffered:
     def __init__(self, stream):
@@ -76,7 +76,7 @@ def cleanup_name(name):
 def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
     # handle the obvious cases at the beginning
     if not os.path.isfile(infile):
-        print "Error: Input file does not exist"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: Input file does not exist"
         return 1
 
     mobi = True
@@ -106,17 +106,20 @@ def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
         mb.processBook(pidlst)
 
     except mobidedrm.DrmException, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
     except topazextract.TpzDRMError, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
     except Exception, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
 
     if mobi:
-        outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
+        if mb.getPrintReplica():
+            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.azw4')
+        else:
+            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
         mb.getMobiFile(outfile)
         return 0            
 
@@ -158,7 +161,6 @@ def main(argv=sys.argv):
     print ('K4MobiDeDrm v%(__version__)s '
 	   'provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, ApprenticeAlf, etc .' % globals())
 
-    print ' '
     try:
         opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
     except getopt.GetoptError, err:

DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mutils.py

@@ -1,11 +1,12 @@
-# standlone set of Mac OSX specific routines needed for K4DeDRM
+# standlone set of Mac OSX specific routines needed for KindleBooks
 
 from __future__ import with_statement
 
 import sys
 import os
-import subprocess
+import os.path
 
+import subprocess
 from struct import pack, unpack, unpack_from
 
 class DrmException(Exception):
@@ -68,11 +69,9 @@ def _load_crypto_libcrypto():
                 raise DrmException('AES decryption failed')
             return out.raw
 
-        def keyivgen(self, passwd, salt):
+        def keyivgen(self, passwd, salt, iter, keylen):
             saltlen = len(salt)
             passlen = len(passwd)
-            iter = 0x3e8
-            keylen = 80
             out = create_string_buffer(keylen)
             rv = PKCS5_PBKDF2_HMAC_SHA1(passwd, passlen, salt, saltlen, iter, keylen, out)
             return out.raw
@@ -114,9 +113,10 @@ def SHA256(message):
 charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
 charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM" 
 
-# For Future Reference from .kinf approach of K4PC
-charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
-
+# For kinf approach of K4PC/K4Mac
+# On K4PC charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
+# For Mac they seem to re-use charMap2 here
+charMap5 = charMap2
 
 def encode(data, map):
     result = ""
@@ -144,7 +144,7 @@ def decode(data,map):
         result += pack("B",value)
     return result
 
-# For Future Reference from .kinf approach of K4PC
+# For .kinf approach of K4PC and now K4Mac
 # generate table of prime number less than or equal to int n
 def primes(n):
     if n==2: return [2]
@@ -166,7 +166,6 @@ def primes(n):
     return [2]+[x for x in s if x]
 
 
-
 # uses a sub process to get the Hard Drive Serial Number using ioreg
 # returns with the serial number of drive whose BSD Name is "disk0"
 def GetVolumeSerialNumber():
@@ -196,24 +195,217 @@ def GetVolumeSerialNumber():
                 foundIt = True
                 break
     if not foundIt:
-        sernum = '9999999999'
+        sernum = ''
     return sernum
 
+def GetUserHomeAppSupKindleDirParitionName():
+    home = os.getenv('HOME')
+    dpath =  home + '/Library/Application Support/Kindle'
+    cmdline = '/sbin/mount'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    disk = ''
+    foundIt = False
+    for j in xrange(cnt):
+        resline = reslst[j]
+        if resline.startswith('/dev'):
+            (devpart, mpath) = resline.split(' on ')
+            dpart = devpart[5:]
+            pp = mpath.find('(')
+            if pp >= 0:
+                mpath = mpath[:pp-1]
+            if dpath.startswith(mpath):
+                disk = dpart
+    return disk
+
+# uses a sub process to get the UUID of the specified disk partition using ioreg
+def GetDiskPartitionUUID(diskpart):
+    uuidnum = os.getenv('MYUUIDNUMBER')
+    if uuidnum != None:
+        return uuidnum
+    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    bsdname = None
+    uuidnum = None
+    foundIt = False
+    nest = 0
+    uuidnest = -1
+    partnest = -2
+    for j in xrange(cnt):
+        resline = reslst[j]
+        if resline.find('{') >= 0:
+            nest += 1
+        if resline.find('}') >= 0:
+            nest -= 1
+        pp = resline.find('"UUID" = "')
+        if pp >= 0:
+            uuidnum = resline[pp+10:-1]
+            uuidnum = uuidnum.strip()
+            uuidnest = nest
+            if partnest == uuidnest and uuidnest > 0:
+                foundIt = True
+                break
+        bb = resline.find('"BSD Name" = "')
+        if bb >= 0:
+            bsdname = resline[bb+14:-1]
+            bsdname = bsdname.strip()
+            if (bsdname == diskpart):
+                partnest = nest
+            else :
+                partnest = -2
+            if partnest == uuidnest and partnest > 0:
+                foundIt = True
+                break
+        if nest == 0:
+            partnest = -2
+            uuidnest = -1
+            uuidnum = None
+            bsdname = None
+    if not foundIt:
+        uuidnum = ''
+    return uuidnum
+    
+def GetMACAddressMunged():
+    macnum = os.getenv('MYMACNUM')
+    if macnum != None:
+        return macnum
+    cmdline = '/sbin/ifconfig en0'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    macnum = None
+    foundIt = False
+    for j in xrange(cnt):
+        resline = reslst[j]
+        pp = resline.find('ether ')
+        if pp >= 0:
+            macnum = resline[pp+6:-1]
+            macnum = macnum.strip()
+            # print "original mac", macnum
+            # now munge it up the way Kindle app does
+            # by xoring it with 0xa5 and swapping elements 3 and 4
+            maclst = macnum.split(':')
+            n = len(maclst)
+            if n != 6:
+                fountIt = False
+                break
+            for i in range(6):
+                maclst[i] = int('0x' + maclst[i], 0)
+            mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+            mlst[5] = maclst[5] ^ 0xa5
+            mlst[4] = maclst[3] ^ 0xa5
+            mlst[3] = maclst[4] ^ 0xa5
+            mlst[2] = maclst[2] ^ 0xa5
+            mlst[1] = maclst[1] ^ 0xa5
+            mlst[0] = maclst[0] ^ 0xa5
+            macnum = "%0.2x%0.2x%0.2x%0.2x%0.2x%0.2x" % (mlst[0], mlst[1], mlst[2], mlst[3], mlst[4], mlst[5])
+            foundIt = True
+            break
+    if not foundIt:
+        macnum = ''
+    return macnum
+
+
 # uses unix env to get username instead of using sysctlbyname 
 def GetUserName():
     username = os.getenv('USER')
     return username
 
+
 # implements an Pseudo Mac Version of Windows built-in Crypto routine
-def CryptUnprotectData(encryptedData, salt):
-    sp = GetVolumeSerialNumber() + '!@#' + GetUserName()
+# used by Kindle for Mac versions < 1.6.0
+def CryptUnprotectData(encryptedData):
+    sernum = GetVolumeSerialNumber()
+    if sernum == '':
+        sernum = '9999999999'
+    sp = sernum + '!@#' + GetUserName()
     passwdData = encode(SHA256(sp),charMap1)
+    salt = '16743'
+    iter = 0x3e8
+    keylen = 0x80
     crp = LibCrypto()
-    key_iv = crp.keyivgen(passwdData, salt)
+    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
     key = key_iv[0:32]
     iv = key_iv[32:48]
     crp.set_decrypt_key(key,iv)
     cleartext = crp.decrypt(encryptedData)
+    cleartext = decode(cleartext,charMap1)
+    return cleartext
+
+
+def isNewInstall():
+    home = os.getenv('HOME')
+    # soccer game fan anyone
+    dpath = home + '/Library/Application Support/Kindle/storage/.pes2011'
+    # print dpath, os.path.exists(dpath)
+    if os.path.exists(dpath):
+        return True
+    return False
+    
+
+def GetIDString():
+    # K4Mac now has an extensive set of ids strings it uses
+    # in encoding pids and in creating unique passwords
+    # for use in its own version of CryptUnprotectDataV2
+
+    # BUT Amazon has now become nasty enough to detect when its app
+    # is being run under a debugger and actually changes code paths
+    # including which one of these strings is chosen, all to try 
+    # to prevent reverse engineering
+
+    # Sad really ... they will only hurt their own sales ...
+    # true book lovers really want to keep their books forever
+    # and move them to their devices and DRM prevents that so they 
+    # will just buy from someplace else that they can remove 
+    # the DRM from
+
+    # Amazon should know by now that true book lover's are not like
+    # penniless kids that pirate music, we do not pirate books
+
+    if isNewInstall():
+        mungedmac = GetMACAddressMunged()
+        if len(mungedmac) > 7:
+            return mungedmac
+    sernum = GetVolumeSerialNumber()
+    if len(sernum) > 7:
+        return sernum
+    diskpart = GetUserHomeAppSupKindleDirParitionName()
+    uuidnum = GetDiskPartitionUUID(diskpart)
+    if len(uuidnum) > 7:
+        return uuidnum
+    mungedmac = GetMACAddressMunged()
+    if len(mungedmac) > 7:
+        return mungedmac
+    return '9999999999'
+
+
+# implements an Pseudo Mac Version of Windows built-in Crypto routine
+# used for Kindle for Mac Versions >= 1.6.0
+def CryptUnprotectDataV2(encryptedData):
+    sp = GetUserName() + ':&%:' + GetIDString()
+    passwdData = encode(SHA256(sp),charMap5)
+    # salt generation as per the code
+    salt = 0x0512981d * 2 * 1 * 1
+    salt = str(salt) + GetUserName()
+    salt = encode(salt,charMap5)
+    crp = LibCrypto()
+    iter = 0x800
+    keylen = 0x400
+    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
+    key = key_iv[0:32]
+    iv = key_iv[32:48]
+    crp.set_decrypt_key(key,iv)
+    cleartext = crp.decrypt(encryptedData)
+    cleartext = decode(cleartext, charMap5)
     return cleartext
 
 
@@ -232,18 +424,16 @@ def getKindleInfoFiles(kInfoFiles):
         if os.path.isfile(resline):
             kInfoFiles.append(resline)
             found = True
-    # For Future Reference
-    # 
-    # # add any .kinf files 
-    # cmdline = 'find "' + home + '/Library/Application Support" -name "rainier*.kinf"'
-    # cmdline = cmdline.encode(sys.getfilesystemencoding())
-    # p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    # out1, out2 = p1.communicate()
-    # reslst = out1.split('\n')
-    # for resline in reslst:
-    #     if os.path.isfile(resline):
-    #         kInfoFiles.append(resline)
-    #         found = True
+    # add any .kinf files 
+    cmdline = 'find "' + home + '/Library/Application Support" -name ".rainier*-kinf"'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p1.communicate()
+    reslst = out1.split('\n')
+    for resline in reslst:
+        if os.path.isfile(resline):
+            kInfoFiles.append(resline)
+            found = True
     if not found:
         print('No kindle-info files have been found.')
     return kInfoFiles
@@ -251,7 +441,7 @@ def getKindleInfoFiles(kInfoFiles):
 # determine type of kindle info provided and return a 
 # database of keynames and values
 def getDBfromFile(kInfoFile):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
+    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber", "max_date", "SIGVERIF"]
     DB = {}
     cnt = 0
     infoReader = open(kInfoFile, 'r')
@@ -259,7 +449,6 @@ def getDBfromFile(kInfoFile):
     data = infoReader.read()
 
     if data.find('[') != -1 :
-
         # older style kindle-info file
         items = data.split('[')
         for item in items:
@@ -273,84 +462,89 @@ def getDBfromFile(kInfoFile):
                 if keyname == "unknown":
                     keyname = keyhash
                 encryptedValue = decode(rawdata,charMap2)
-                salt = '16743'
-                cleartext = CryptUnprotectData(encryptedValue, salt)
-                DB[keyname] = decode(cleartext,charMap1)
+                cleartext = CryptUnprotectData(encryptedValue)
+                DB[keyname] = cleartext
                 cnt = cnt + 1
         if cnt == 0:
             DB = None
         return DB
 
-    # For Future Reference taken from K4PC 1.5.0 .kinf
-    # 
-    # # else newer style .kinf file
-    # # the .kinf file uses "/" to separate it into records
-    # # so remove the trailing "/" to make it easy to use split
-    # data = data[:-1]
-    # items = data.split('/')
-    # 
-    # # loop through the item records until all are processed
-    # while len(items) > 0:
-    # 
-    #     # get the first item record
-    #     item = items.pop(0)
-    # 
-    #     # the first 32 chars of the first record of a group
-    #     # is the MD5 hash of the key name encoded by charMap5
-    #     keyhash = item[0:32]
-    # 
-    #     # the raw keyhash string is also used to create entropy for the actual
-    #     # CryptProtectData Blob that represents that keys contents
-    #     entropy = SHA1(keyhash)
-    # 
-    #     # the remainder of the first record when decoded with charMap5 
-    #     # has the ':' split char followed by the string representation
-    #     # of the number of records that follow
-    #     # and make up the contents
-    #     srcnt = decode(item[34:],charMap5)
-    #     rcnt = int(srcnt)
-    # 
-    #     # read and store in rcnt records of data
-    #     # that make up the contents value
-    #     edlst = []
-    #     for i in xrange(rcnt):
-    #         item = items.pop(0)
-    #         edlst.append(item)
-    # 
-    #     keyname = "unknown"
-    #     for name in names:
-    #         if encodeHash(name,charMap5) == keyhash:
-    #             keyname = name
-    #             break
-    #     if keyname == "unknown":
-    #         keyname = keyhash
-    # 
-    #     # the charMap5 encoded contents data has had a length 
-    #     # of chars (always odd) cut off of the front and moved
-    #     # to the end to prevent decoding using charMap5 from 
-    #     # working properly, and thereby preventing the ensuing 
-    #     # CryptUnprotectData call from succeeding.
-    # 
-    #     # The offset into the charMap5 encoded contents seems to be:
-    #     # len(contents) - largest prime number less than or equal to int(len(content)/3)
-    #     # (in other words split "about" 2/3rds of the way through)
-    # 
-    #     # move first offsets chars to end to align for decode by charMap5
-    #     encdata = "".join(edlst)
-    #     contlen = len(encdata)
-    #     noffset = contlen - primes(int(contlen/3))[-1]
-    # 
-    #     # now properly split and recombine 
-    #     # by moving noffset chars from the start of the 
-    #     # string to the end of the string 
-    #     pfx = encdata[0:noffset]
-    #     encdata = encdata[noffset:]
-    #     encdata = encdata + pfx
-    # 
-    #     # decode using Map5 to get the CryptProtect Data
-    #     encryptedValue = decode(encdata,charMap5)
-    #     DB[keyname] = CryptUnprotectData(encryptedValue, entropy, 1)
-    #     cnt = cnt + 1
+    # else newer style .kinf file used by K4Mac >= 1.6.0
+    # the .kinf file uses "/" to separate it into records
+    # so remove the trailing "/" to make it easy to use split
+    data = data[:-1]
+    items = data.split('/')
+
+    # loop through the item records until all are processed
+    while len(items) > 0:
+    
+        # get the first item record
+        item = items.pop(0)
+    
+        # the first 32 chars of the first record of a group
+        # is the MD5 hash of the key name encoded by charMap5
+        keyhash = item[0:32]
+        keyname = "unknown"
+
+        # the raw keyhash string is also used to create entropy for the actual
+        # CryptProtectData Blob that represents that keys contents
+        # "entropy" not used for K4Mac only K4PC
+        # entropy = SHA1(keyhash)
+    
+        # the remainder of the first record when decoded with charMap5 
+        # has the ':' split char followed by the string representation
+        # of the number of records that follow
+        # and make up the contents
+        srcnt = decode(item[34:],charMap5)
+        rcnt = int(srcnt)
+    
+        # read and store in rcnt records of data
+        # that make up the contents value
+        edlst = []
+        for i in xrange(rcnt):
+            item = items.pop(0)
+            edlst.append(item)
+    
+        keyname = "unknown"
+        for name in names:
+            if encodeHash(name,charMap5) == keyhash:
+                keyname = name
+                break
+        if keyname == "unknown":
+            keyname = keyhash
+    
+        # the charMap5 encoded contents data has had a length 
+        # of chars (always odd) cut off of the front and moved
+        # to the end to prevent decoding using charMap5 from 
+        # working properly, and thereby preventing the ensuing 
+        # CryptUnprotectData call from succeeding.
+    
+        # The offset into the charMap5 encoded contents seems to be:
+        # len(contents) - largest prime number less than or equal to int(len(content)/3)
+        # (in other words split "about" 2/3rds of the way through)
+    
+        # move first offsets chars to end to align for decode by charMap5
+        encdata = "".join(edlst)
+        contlen = len(encdata)
+
+        # now properly split and recombine 
+        # by moving noffset chars from the start of the 
+        # string to the end of the string 
+        noffset = contlen - primes(int(contlen/3))[-1]
+        pfx = encdata[0:noffset]
+        encdata = encdata[noffset:]
+        encdata = encdata + pfx
+    
+        # decode using charMap5 to get the CryptProtect Data
+        encryptedValue = decode(encdata,charMap5)
+        cleartext = CryptUnprotectDataV2(encryptedValue)
+        # Debugging
+        # print keyname
+        # print cleartext
+        # print cleartext.encode('hex')
+        # print
+        DB[keyname] = cleartext
+        cnt = cnt + 1
 
     if cnt == 0:
         DB = None

DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4pcutils.py

@@ -122,6 +122,9 @@ def GetVolumeSerialNumber():
     return GetVolumeSerialNumber
 GetVolumeSerialNumber = GetVolumeSerialNumber()
 
+def GetIDString():
+    return GetVolumeSerialNumber()
+
 def getLastError():
     GetLastError = kernel32.GetLastError
     GetLastError.argtypes = None
@@ -181,18 +184,27 @@ def getKindleInfoFiles(kInfoFiles):
         kInfoFiles.append(kinfopath)
 
     # now look for newer (K4PC 1.5.0 and later rainier.2.1.1.kinf file
+
     kinfopath = path +'\\Amazon\\Kindle For PC\\storage\\rainier.2.1.1.kinf'
     if not os.path.isfile(kinfopath):
-        print('No .kinf files have not been found.')
+        print('No K4PC 1.5.X .kinf files have not been found.')
     else:
         kInfoFiles.append(kinfopath)
+
+    # now look for even newer (K4PC 1.6.0 and later) rainier.2.1.1.kinf file
+    kinfopath = path +'\\Amazon\\Kindle\\storage\\rainier.2.1.1.kinf'
+    if not os.path.isfile(kinfopath):
+        print('No K4PC 1.6.X .kinf files have not been found.')
+    else:
+        kInfoFiles.append(kinfopath)
+
     return kInfoFiles
 
 
 # determine type of kindle info provided and return a 
 # database of keynames and values
 def getDBfromFile(kInfoFile):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
+    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber", "max_date", "SIGVERIF"]
     DB = {}
     cnt = 0
     infoReader = open(kInfoFile, 'r')

DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/kgenpids.py

@@ -22,16 +22,16 @@ else:
 
 if inCalibre:
     if sys.platform.startswith('win'):
-        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
     if sys.platform.startswith('darwin'):
-        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 else:
     if sys.platform.startswith('win'):
-        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
     if sys.platform.startswith('darwin'):
-        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
 
 charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
@@ -218,14 +218,14 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):
         print "Keys not found in " + kInfoFile
         return pidlst
         
-    # Get the HDD serial
-    encodedSystemVolumeSerialNumber = encodeHash(GetVolumeSerialNumber(),charMap1)
+    # Get the ID string used
+    encodedIDString = encodeHash(GetIDString(),charMap1)
 
     # Get the current user name
     encodedUsername = encodeHash(GetUserName(),charMap1)
 
     # concat, hash and encode to calculate the DSN
-    DSN = encode(SHA1(MazamaRandomNumber+encodedSystemVolumeSerialNumber+encodedUsername),charMap1)
+    DSN = encode(SHA1(MazamaRandomNumber+encodedIDString+encodedUsername),charMap1)
        
     # Compute the device PID (for which I can tell, is used for nothing).
     table =  generatePidEncryptionTable()

DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/mobidedrm.py

@@ -49,11 +49,13 @@
 #  0.27 - Correct pid metadata token generation to match that used by skindle (Thank You Bart!)
 #  0.28 - slight additional changes to metadata token generation (None -> '')
 #  0.29 - It seems that the ideas about when multibyte trailing characters were
-#         included in the encryption were wrong. They aren't for DOC compressed
-#         files, but they are for HUFF/CDIC compress files!
+#         included in the encryption were wrong. They are for DOC compressed
+#         files, but they are not for HUFF/CDIC compress files!
 #  0.30 - Modified interface slightly to work better with new calibre plugin style
+#  0.31 - The multibyte encrytion info is true for version 7 files too.
+#  0.32 - Added support for "Print Replica" Kindle ebooks
 
-__version__ = '0.30'
+__version__ = '0.32'
 
 import sys
 
@@ -162,6 +164,9 @@ class MobiBook:
         return self.data_file[off:endoff]
 
     def __init__(self, infile):
+        print ('MobiDeDrm v%(__version__)s. '
+           'Copyright 2008-2011 The Dark Reverser et al.' % globals())
+
         # initial sanity check on file
         self.data_file = file(infile, 'rb').read()
         self.mobi_data = ''
@@ -192,14 +197,15 @@ class MobiBook:
             self.meta_array = {}
             return
         self.mobi_length, = struct.unpack('>L',self.sect[0x14:0x18])
+        self.mobi_codepage, = struct.unpack('>L',self.sect[0x1c:0x20])
         self.mobi_version, = struct.unpack('>L',self.sect[0x68:0x6C])
         print "MOBI header version = %d, length = %d" %(self.mobi_version, self.mobi_length)
         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) and (self.compression != 17480):
-            # multibyte utf8 data is included in the encryption for mobi_version 6 and below
+        if (self.compression != 17480):
+            # multibyte utf8 data is included in the encryption for PalmDoc compression
             # so clear that byte so that we leave it to be decrypted.
             self.extra_data_flags &= 0xFFFE
 
@@ -229,8 +235,13 @@ class MobiBook:
         except:
             self.meta_array = {}
             pass
+        self.print_replica = False
             
     def getBookTitle(self):
+        codec_map = {
+            1252 : 'windows-1252',
+            65001 : 'utf-8',
+        }
         title = ''
         if 503 in self.meta_array:
             title = self.meta_array[503]
@@ -241,7 +252,10 @@ class MobiBook:
         if title == '':
             title = self.header[:32]
             title = title.split("\0")[0]
-        return title
+        codec = 'windows-1252'
+        if self.mobi_codepage in codec_map.keys():
+            codec = codec_map[self.mobi_codepage]
+        return unicode(title, codec).encode('utf-8')
 
     def getPIDMetaInfo(self):
         rec209 = ''
@@ -305,6 +319,9 @@ class MobiBook:
 
     def getMobiFile(self, outpath):
         file(outpath,'wb').write(self.mobi_data)
+        
+    def getPrintReplica(self):
+        return self.print_replica
 
     def processBook(self, pidlist):
         crypto_type, = struct.unpack('>H', self.sect[0xC:0xC+2])
@@ -312,10 +329,17 @@ class MobiBook:
         self.crypto_type = crypto_type
         if crypto_type == 0:
             print "This book is not encrypted."
+            # we must still check for Print Replica
+            self.print_replica = (self.loadSection(1)[0:4] == '%MOP')
             self.mobi_data = self.data_file
             return
         if crypto_type != 2 and crypto_type != 1:
             raise DrmException("Cannot decode unknown Mobipocket encryption type %d" % crypto_type)
+        if 406 in self.meta_array:
+            data406 = self.meta_array[406]
+            val406, = struct.unpack('>Q',data406)
+            if val406 != 0:
+                raise DrmException("Cannot decode library or rented ebooks.")
 
         goodpids = []
         for pid in pidlist:
@@ -366,7 +390,10 @@ class MobiBook:
             if i%100 == 0:
                 print ".",
             # print "record %d, extra_size %d" %(i,extra_size)
-            self.mobi_data += PC1(found_key, data[0:len(data) - extra_size])
+            decoded_data = PC1(found_key, data[0:len(data) - extra_size])
+            if i==1:
+                self.print_replica = (decoded_data[0:4] == '%MOP')
+            self.mobi_data += decoded_data
             if extra_size > 0:
                 self.mobi_data += data[-extra_size:]
         if self.num_sections > self.records+1:
@@ -391,9 +418,9 @@ def getUnencryptedBookWithList(infile,pidlist):
 
 def main(argv=sys.argv):
     print ('MobiDeDrm v%(__version__)s. '
-	   'Copyright 2008-2010 The Dark Reverser.' % globals())
+        'Copyright 2008-2011 The Dark Reverser et al.' % globals())
     if len(argv)<3 or len(argv)>4:
-        print "Removes protection from Mobipocket books"
+        print "Removes protection from Kindle/Mobipocket and Kindle/Print Replica ebooks"
         print "Usage:"
         print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
         return 1
@@ -401,9 +428,9 @@ def main(argv=sys.argv):
         infile = argv[1]
         outfile = argv[2]
         if len(argv) is 4:
-        	pidlist = argv[3].split(',')
+            pidlist = argv[3].split(',')
         else:
-        	pidlist = {}
+            pidlist = {}
         try:
             stripped_file = getUnencryptedBookWithList(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)

KindleBooks/KindleBooks.pyw

@@ -109,7 +109,7 @@ class MainDialog(Tkinter.Frame):
     # post output from subprocess in scrolled text widget
     def showCmdOutput(self, msg):
         if msg and msg !='':
-            msg = msg.encode('utf-8')
+            # msg = msg.encode('utf-8')
             if sys.platform.startswith('win'):
                 msg = msg.replace('\r\n','\n')
             self.stext.insert(Tkconstants.END,msg)
@@ -149,7 +149,7 @@ class MainDialog(Tkinter.Frame):
         mobipath = tkFileDialog.askopenfilename(
             initialdir = cpath,
             parent=None, title='Select Kindle/Mobi/Topaz  eBook File',
-            defaultextension='.prc', filetypes=[('Mobi eBook File', '.prc'), ('Mobi eBook File', '.azw'),('Mobi eBook File', '.mobi'),('Mobi eBook File', '.tpz'),('Mobi eBook File', '.azw1'),('All Files', '.*')])
+            defaultextension='.prc', filetypes=[('Mobi eBook File', '.prc'), ('Mobi eBook File', '.azw'),('Mobi eBook File', '.mobi'),('Mobi eBook File', '.tpz'),('Mobi eBook File', '.azw1'),('Mobi azw4 eBook File', '.azw4'),('All Files', '.*')])
         if mobipath:
             mobipath = os.path.normpath(mobipath)
             self.mobipath.delete(0, Tkconstants.END)

KindleBooks/lib/k4mobidedrm.py

@@ -17,7 +17,7 @@ from __future__ import with_statement
 #    and many many others
 
 
-__version__ = '3.1'
+__version__ = '3.7'
 
 class Unbuffered:
     def __init__(self, stream):
@@ -76,7 +76,7 @@ def cleanup_name(name):
 def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
     # handle the obvious cases at the beginning
     if not os.path.isfile(infile):
-        print "Error: Input file does not exist"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: Input file does not exist"
         return 1
 
     mobi = True
@@ -106,17 +106,20 @@ def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
         mb.processBook(pidlst)
 
     except mobidedrm.DrmException, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
     except topazextract.TpzDRMError, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
     except Exception, e:
-        print "Error: " + str(e) + "\nDRM Removal Failed.\n"
+        print >>sys.stderr, ('K4MobiDeDrm v%(__version__)s\n' % globals()) + "Error: " + str(e) + "\nDRM Removal Failed.\n"
         return 1
 
     if mobi:
-        outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
+        if mb.getPrintReplica():
+            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.azw4')
+        else:
+            outfile = os.path.join(outdir, outfilename + '_nodrm' + '.mobi')
         mb.getMobiFile(outfile)
         return 0            
 
@@ -158,7 +161,6 @@ def main(argv=sys.argv):
     print ('K4MobiDeDrm v%(__version__)s '
 	   'provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, ApprenticeAlf, etc .' % globals())
 
-    print ' '
     try:
         opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
     except getopt.GetoptError, err:

KindleBooks/lib/k4mutils.py

@@ -1,11 +1,12 @@
-# standlone set of Mac OSX specific routines needed for K4DeDRM
+# standlone set of Mac OSX specific routines needed for KindleBooks
 
 from __future__ import with_statement
 
 import sys
 import os
-import subprocess
+import os.path
 
+import subprocess
 from struct import pack, unpack, unpack_from
 
 class DrmException(Exception):
@@ -68,11 +69,9 @@ def _load_crypto_libcrypto():
                 raise DrmException('AES decryption failed')
             return out.raw
 
-        def keyivgen(self, passwd, salt):
+        def keyivgen(self, passwd, salt, iter, keylen):
             saltlen = len(salt)
             passlen = len(passwd)
-            iter = 0x3e8
-            keylen = 80
             out = create_string_buffer(keylen)
             rv = PKCS5_PBKDF2_HMAC_SHA1(passwd, passlen, salt, saltlen, iter, keylen, out)
             return out.raw
@@ -114,9 +113,10 @@ def SHA256(message):
 charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
 charMap2 = "ZB0bYyc1xDdW2wEV3Ff7KkPpL8UuGA4gz-Tme9Nn_tHh5SvXCsIiR6rJjQaqlOoM" 
 
-# For Future Reference from .kinf approach of K4PC
-charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
-
+# For kinf approach of K4PC/K4Mac
+# On K4PC charMap5 = "AzB0bYyCeVvaZ3FfUuG4g-TtHh5SsIiR6rJjQq7KkPpL8lOoMm9Nn_c1XxDdW2wE"
+# For Mac they seem to re-use charMap2 here
+charMap5 = charMap2
 
 def encode(data, map):
     result = ""
@@ -144,7 +144,7 @@ def decode(data,map):
         result += pack("B",value)
     return result
 
-# For Future Reference from .kinf approach of K4PC
+# For .kinf approach of K4PC and now K4Mac
 # generate table of prime number less than or equal to int n
 def primes(n):
     if n==2: return [2]
@@ -166,7 +166,6 @@ def primes(n):
     return [2]+[x for x in s if x]
 
 
-
 # uses a sub process to get the Hard Drive Serial Number using ioreg
 # returns with the serial number of drive whose BSD Name is "disk0"
 def GetVolumeSerialNumber():
@@ -196,24 +195,217 @@ def GetVolumeSerialNumber():
                 foundIt = True
                 break
     if not foundIt:
-        sernum = '9999999999'
+        sernum = ''
     return sernum
 
+def GetUserHomeAppSupKindleDirParitionName():
+    home = os.getenv('HOME')
+    dpath =  home + '/Library/Application Support/Kindle'
+    cmdline = '/sbin/mount'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    disk = ''
+    foundIt = False
+    for j in xrange(cnt):
+        resline = reslst[j]
+        if resline.startswith('/dev'):
+            (devpart, mpath) = resline.split(' on ')
+            dpart = devpart[5:]
+            pp = mpath.find('(')
+            if pp >= 0:
+                mpath = mpath[:pp-1]
+            if dpath.startswith(mpath):
+                disk = dpart
+    return disk
+
+# uses a sub process to get the UUID of the specified disk partition using ioreg
+def GetDiskPartitionUUID(diskpart):
+    uuidnum = os.getenv('MYUUIDNUMBER')
+    if uuidnum != None:
+        return uuidnum
+    cmdline = '/usr/sbin/ioreg -l -S -w 0 -r -c AppleAHCIDiskDriver'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    bsdname = None
+    uuidnum = None
+    foundIt = False
+    nest = 0
+    uuidnest = -1
+    partnest = -2
+    for j in xrange(cnt):
+        resline = reslst[j]
+        if resline.find('{') >= 0:
+            nest += 1
+        if resline.find('}') >= 0:
+            nest -= 1
+        pp = resline.find('"UUID" = "')
+        if pp >= 0:
+            uuidnum = resline[pp+10:-1]
+            uuidnum = uuidnum.strip()
+            uuidnest = nest
+            if partnest == uuidnest and uuidnest > 0:
+                foundIt = True
+                break
+        bb = resline.find('"BSD Name" = "')
+        if bb >= 0:
+            bsdname = resline[bb+14:-1]
+            bsdname = bsdname.strip()
+            if (bsdname == diskpart):
+                partnest = nest
+            else :
+                partnest = -2
+            if partnest == uuidnest and partnest > 0:
+                foundIt = True
+                break
+        if nest == 0:
+            partnest = -2
+            uuidnest = -1
+            uuidnum = None
+            bsdname = None
+    if not foundIt:
+        uuidnum = ''
+    return uuidnum
+    
+def GetMACAddressMunged():
+    macnum = os.getenv('MYMACNUM')
+    if macnum != None:
+        return macnum
+    cmdline = '/sbin/ifconfig en0'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p.communicate()
+    reslst = out1.split('\n')
+    cnt = len(reslst)
+    macnum = None
+    foundIt = False
+    for j in xrange(cnt):
+        resline = reslst[j]
+        pp = resline.find('ether ')
+        if pp >= 0:
+            macnum = resline[pp+6:-1]
+            macnum = macnum.strip()
+            # print "original mac", macnum
+            # now munge it up the way Kindle app does
+            # by xoring it with 0xa5 and swapping elements 3 and 4
+            maclst = macnum.split(':')
+            n = len(maclst)
+            if n != 6:
+                fountIt = False
+                break
+            for i in range(6):
+                maclst[i] = int('0x' + maclst[i], 0)
+            mlst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+            mlst[5] = maclst[5] ^ 0xa5
+            mlst[4] = maclst[3] ^ 0xa5
+            mlst[3] = maclst[4] ^ 0xa5
+            mlst[2] = maclst[2] ^ 0xa5
+            mlst[1] = maclst[1] ^ 0xa5
+            mlst[0] = maclst[0] ^ 0xa5
+            macnum = "%0.2x%0.2x%0.2x%0.2x%0.2x%0.2x" % (mlst[0], mlst[1], mlst[2], mlst[3], mlst[4], mlst[5])
+            foundIt = True
+            break
+    if not foundIt:
+        macnum = ''
+    return macnum
+
+
 # uses unix env to get username instead of using sysctlbyname 
 def GetUserName():
     username = os.getenv('USER')
     return username
 
+
 # implements an Pseudo Mac Version of Windows built-in Crypto routine
-def CryptUnprotectData(encryptedData, salt):
-    sp = GetVolumeSerialNumber() + '!@#' + GetUserName()
+# used by Kindle for Mac versions < 1.6.0
+def CryptUnprotectData(encryptedData):
+    sernum = GetVolumeSerialNumber()
+    if sernum == '':
+        sernum = '9999999999'
+    sp = sernum + '!@#' + GetUserName()
     passwdData = encode(SHA256(sp),charMap1)
+    salt = '16743'
+    iter = 0x3e8
+    keylen = 0x80
     crp = LibCrypto()
-    key_iv = crp.keyivgen(passwdData, salt)
+    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
     key = key_iv[0:32]
     iv = key_iv[32:48]
     crp.set_decrypt_key(key,iv)
     cleartext = crp.decrypt(encryptedData)
+    cleartext = decode(cleartext,charMap1)
+    return cleartext
+
+
+def isNewInstall():
+    home = os.getenv('HOME')
+    # soccer game fan anyone
+    dpath = home + '/Library/Application Support/Kindle/storage/.pes2011'
+    # print dpath, os.path.exists(dpath)
+    if os.path.exists(dpath):
+        return True
+    return False
+    
+
+def GetIDString():
+    # K4Mac now has an extensive set of ids strings it uses
+    # in encoding pids and in creating unique passwords
+    # for use in its own version of CryptUnprotectDataV2
+
+    # BUT Amazon has now become nasty enough to detect when its app
+    # is being run under a debugger and actually changes code paths
+    # including which one of these strings is chosen, all to try 
+    # to prevent reverse engineering
+
+    # Sad really ... they will only hurt their own sales ...
+    # true book lovers really want to keep their books forever
+    # and move them to their devices and DRM prevents that so they 
+    # will just buy from someplace else that they can remove 
+    # the DRM from
+
+    # Amazon should know by now that true book lover's are not like
+    # penniless kids that pirate music, we do not pirate books
+
+    if isNewInstall():
+        mungedmac = GetMACAddressMunged()
+        if len(mungedmac) > 7:
+            return mungedmac
+    sernum = GetVolumeSerialNumber()
+    if len(sernum) > 7:
+        return sernum
+    diskpart = GetUserHomeAppSupKindleDirParitionName()
+    uuidnum = GetDiskPartitionUUID(diskpart)
+    if len(uuidnum) > 7:
+        return uuidnum
+    mungedmac = GetMACAddressMunged()
+    if len(mungedmac) > 7:
+        return mungedmac
+    return '9999999999'
+
+
+# implements an Pseudo Mac Version of Windows built-in Crypto routine
+# used for Kindle for Mac Versions >= 1.6.0
+def CryptUnprotectDataV2(encryptedData):
+    sp = GetUserName() + ':&%:' + GetIDString()
+    passwdData = encode(SHA256(sp),charMap5)
+    # salt generation as per the code
+    salt = 0x0512981d * 2 * 1 * 1
+    salt = str(salt) + GetUserName()
+    salt = encode(salt,charMap5)
+    crp = LibCrypto()
+    iter = 0x800
+    keylen = 0x400
+    key_iv = crp.keyivgen(passwdData, salt, iter, keylen)
+    key = key_iv[0:32]
+    iv = key_iv[32:48]
+    crp.set_decrypt_key(key,iv)
+    cleartext = crp.decrypt(encryptedData)
+    cleartext = decode(cleartext, charMap5)
     return cleartext
 
 
@@ -232,18 +424,16 @@ def getKindleInfoFiles(kInfoFiles):
         if os.path.isfile(resline):
             kInfoFiles.append(resline)
             found = True
-    # For Future Reference
-    # 
-    # # add any .kinf files 
-    # cmdline = 'find "' + home + '/Library/Application Support" -name "rainier*.kinf"'
-    # cmdline = cmdline.encode(sys.getfilesystemencoding())
-    # p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-    # out1, out2 = p1.communicate()
-    # reslst = out1.split('\n')
-    # for resline in reslst:
-    #     if os.path.isfile(resline):
-    #         kInfoFiles.append(resline)
-    #         found = True
+    # add any .kinf files 
+    cmdline = 'find "' + home + '/Library/Application Support" -name ".rainier*-kinf"'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p1.communicate()
+    reslst = out1.split('\n')
+    for resline in reslst:
+        if os.path.isfile(resline):
+            kInfoFiles.append(resline)
+            found = True
     if not found:
         print('No kindle-info files have been found.')
     return kInfoFiles
@@ -251,7 +441,7 @@ def getKindleInfoFiles(kInfoFiles):
 # determine type of kindle info provided and return a 
 # database of keynames and values
 def getDBfromFile(kInfoFile):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
+    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber", "max_date", "SIGVERIF"]
     DB = {}
     cnt = 0
     infoReader = open(kInfoFile, 'r')
@@ -259,7 +449,6 @@ def getDBfromFile(kInfoFile):
     data = infoReader.read()
 
     if data.find('[') != -1 :
-
         # older style kindle-info file
         items = data.split('[')
         for item in items:
@@ -273,84 +462,89 @@ def getDBfromFile(kInfoFile):
                 if keyname == "unknown":
                     keyname = keyhash
                 encryptedValue = decode(rawdata,charMap2)
-                salt = '16743'
-                cleartext = CryptUnprotectData(encryptedValue, salt)
-                DB[keyname] = decode(cleartext,charMap1)
+                cleartext = CryptUnprotectData(encryptedValue)
+                DB[keyname] = cleartext
                 cnt = cnt + 1
         if cnt == 0:
             DB = None
         return DB
 
-    # For Future Reference taken from K4PC 1.5.0 .kinf
-    # 
-    # # else newer style .kinf file
-    # # the .kinf file uses "/" to separate it into records
-    # # so remove the trailing "/" to make it easy to use split
-    # data = data[:-1]
-    # items = data.split('/')
-    # 
-    # # loop through the item records until all are processed
-    # while len(items) > 0:
-    # 
-    #     # get the first item record
-    #     item = items.pop(0)
-    # 
-    #     # the first 32 chars of the first record of a group
-    #     # is the MD5 hash of the key name encoded by charMap5
-    #     keyhash = item[0:32]
-    # 
-    #     # the raw keyhash string is also used to create entropy for the actual
-    #     # CryptProtectData Blob that represents that keys contents
-    #     entropy = SHA1(keyhash)
-    # 
-    #     # the remainder of the first record when decoded with charMap5 
-    #     # has the ':' split char followed by the string representation
-    #     # of the number of records that follow
-    #     # and make up the contents
-    #     srcnt = decode(item[34:],charMap5)
-    #     rcnt = int(srcnt)
-    # 
-    #     # read and store in rcnt records of data
-    #     # that make up the contents value
-    #     edlst = []
-    #     for i in xrange(rcnt):
-    #         item = items.pop(0)
-    #         edlst.append(item)
-    # 
-    #     keyname = "unknown"
-    #     for name in names:
-    #         if encodeHash(name,charMap5) == keyhash:
-    #             keyname = name
-    #             break
-    #     if keyname == "unknown":
-    #         keyname = keyhash
-    # 
-    #     # the charMap5 encoded contents data has had a length 
-    #     # of chars (always odd) cut off of the front and moved
-    #     # to the end to prevent decoding using charMap5 from 
-    #     # working properly, and thereby preventing the ensuing 
-    #     # CryptUnprotectData call from succeeding.
-    # 
-    #     # The offset into the charMap5 encoded contents seems to be:
-    #     # len(contents) - largest prime number less than or equal to int(len(content)/3)
-    #     # (in other words split "about" 2/3rds of the way through)
-    # 
-    #     # move first offsets chars to end to align for decode by charMap5
-    #     encdata = "".join(edlst)
-    #     contlen = len(encdata)
-    #     noffset = contlen - primes(int(contlen/3))[-1]
-    # 
-    #     # now properly split and recombine 
-    #     # by moving noffset chars from the start of the 
-    #     # string to the end of the string 
-    #     pfx = encdata[0:noffset]
-    #     encdata = encdata[noffset:]
-    #     encdata = encdata + pfx
-    # 
-    #     # decode using Map5 to get the CryptProtect Data
-    #     encryptedValue = decode(encdata,charMap5)
-    #     DB[keyname] = CryptUnprotectData(encryptedValue, entropy, 1)
-    #     cnt = cnt + 1
+    # else newer style .kinf file used by K4Mac >= 1.6.0
+    # the .kinf file uses "/" to separate it into records
+    # so remove the trailing "/" to make it easy to use split
+    data = data[:-1]
+    items = data.split('/')
+
+    # loop through the item records until all are processed
+    while len(items) > 0:
+    
+        # get the first item record
+        item = items.pop(0)
+    
+        # the first 32 chars of the first record of a group
+        # is the MD5 hash of the key name encoded by charMap5
+        keyhash = item[0:32]
+        keyname = "unknown"
+
+        # the raw keyhash string is also used to create entropy for the actual
+        # CryptProtectData Blob that represents that keys contents
+        # "entropy" not used for K4Mac only K4PC
+        # entropy = SHA1(keyhash)
+    
+        # the remainder of the first record when decoded with charMap5 
+        # has the ':' split char followed by the string representation
+        # of the number of records that follow
+        # and make up the contents
+        srcnt = decode(item[34:],charMap5)
+        rcnt = int(srcnt)
+    
+        # read and store in rcnt records of data
+        # that make up the contents value
+        edlst = []
+        for i in xrange(rcnt):
+            item = items.pop(0)
+            edlst.append(item)
+    
+        keyname = "unknown"
+        for name in names:
+            if encodeHash(name,charMap5) == keyhash:
+                keyname = name
+                break
+        if keyname == "unknown":
+            keyname = keyhash
+    
+        # the charMap5 encoded contents data has had a length 
+        # of chars (always odd) cut off of the front and moved
+        # to the end to prevent decoding using charMap5 from 
+        # working properly, and thereby preventing the ensuing 
+        # CryptUnprotectData call from succeeding.
+    
+        # The offset into the charMap5 encoded contents seems to be:
+        # len(contents) - largest prime number less than or equal to int(len(content)/3)
+        # (in other words split "about" 2/3rds of the way through)
+    
+        # move first offsets chars to end to align for decode by charMap5
+        encdata = "".join(edlst)
+        contlen = len(encdata)
+
+        # now properly split and recombine 
+        # by moving noffset chars from the start of the 
+        # string to the end of the string 
+        noffset = contlen - primes(int(contlen/3))[-1]
+        pfx = encdata[0:noffset]
+        encdata = encdata[noffset:]
+        encdata = encdata + pfx
+    
+        # decode using charMap5 to get the CryptProtect Data
+        encryptedValue = decode(encdata,charMap5)
+        cleartext = CryptUnprotectDataV2(encryptedValue)
+        # Debugging
+        # print keyname
+        # print cleartext
+        # print cleartext.encode('hex')
+        # print
+        DB[keyname] = cleartext
+        cnt = cnt + 1
 
     if cnt == 0:
         DB = None

KindleBooks/lib/k4pcutils.py

@@ -122,6 +122,9 @@ def GetVolumeSerialNumber():
     return GetVolumeSerialNumber
 GetVolumeSerialNumber = GetVolumeSerialNumber()
 
+def GetIDString():
+    return GetVolumeSerialNumber()
+
 def getLastError():
     GetLastError = kernel32.GetLastError
     GetLastError.argtypes = None
@@ -181,18 +184,27 @@ def getKindleInfoFiles(kInfoFiles):
         kInfoFiles.append(kinfopath)
 
     # now look for newer (K4PC 1.5.0 and later rainier.2.1.1.kinf file
+
     kinfopath = path +'\\Amazon\\Kindle For PC\\storage\\rainier.2.1.1.kinf'
     if not os.path.isfile(kinfopath):
-        print('No .kinf files have not been found.')
+        print('No K4PC 1.5.X .kinf files have not been found.')
     else:
         kInfoFiles.append(kinfopath)
+
+    # now look for even newer (K4PC 1.6.0 and later) rainier.2.1.1.kinf file
+    kinfopath = path +'\\Amazon\\Kindle\\storage\\rainier.2.1.1.kinf'
+    if not os.path.isfile(kinfopath):
+        print('No K4PC 1.6.X .kinf files have not been found.')
+    else:
+        kInfoFiles.append(kinfopath)
+
     return kInfoFiles
 
 
 # determine type of kindle info provided and return a 
 # database of keynames and values
 def getDBfromFile(kInfoFile):
-    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber"]
+    names = ["kindle.account.tokens","kindle.cookie.item","eulaVersionAccepted","login_date","kindle.token.item","login","kindle.key.item","kindle.name.info","kindle.device.info", "MazamaRandomNumber", "max_date", "SIGVERIF"]
     DB = {}
     cnt = 0
     infoReader = open(kInfoFile, 'r')

KindleBooks/lib/kgenpids.py

@@ -22,16 +22,16 @@ else:
 
 if inCalibre:
     if sys.platform.startswith('win'):
-        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from calibre_plugins.k4mobidedrm.k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
     if sys.platform.startswith('darwin'):
-        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from calibre_plugins.k4mobidedrm.k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 else:
     if sys.platform.startswith('win'):
-        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from k4pcutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
     if sys.platform.startswith('darwin'):
-        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetVolumeSerialNumber
+        from k4mutils import getKindleInfoFiles, getDBfromFile, GetUserName, GetIDString
 
 
 charMap1 = "n5Pr6St7Uv8Wx9YzAb0Cd1Ef2Gh3Jk4M"
@@ -218,14 +218,14 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):
         print "Keys not found in " + kInfoFile
         return pidlst
         
-    # Get the HDD serial
-    encodedSystemVolumeSerialNumber = encodeHash(GetVolumeSerialNumber(),charMap1)
+    # Get the ID string used
+    encodedIDString = encodeHash(GetIDString(),charMap1)
 
     # Get the current user name
     encodedUsername = encodeHash(GetUserName(),charMap1)
 
     # concat, hash and encode to calculate the DSN
-    DSN = encode(SHA1(MazamaRandomNumber+encodedSystemVolumeSerialNumber+encodedUsername),charMap1)
+    DSN = encode(SHA1(MazamaRandomNumber+encodedIDString+encodedUsername),charMap1)
        
     # Compute the device PID (for which I can tell, is used for nothing).
     table =  generatePidEncryptionTable()

KindleBooks/lib/mobidedrm.py

@@ -49,11 +49,13 @@
 #  0.27 - Correct pid metadata token generation to match that used by skindle (Thank You Bart!)
 #  0.28 - slight additional changes to metadata token generation (None -> '')
 #  0.29 - It seems that the ideas about when multibyte trailing characters were
-#         included in the encryption were wrong. They aren't for DOC compressed
-#         files, but they are for HUFF/CDIC compress files!
+#         included in the encryption were wrong. They are for DOC compressed
+#         files, but they are not for HUFF/CDIC compress files!
 #  0.30 - Modified interface slightly to work better with new calibre plugin style
+#  0.31 - The multibyte encrytion info is true for version 7 files too.
+#  0.32 - Added support for "Print Replica" Kindle ebooks
 
-__version__ = '0.30'
+__version__ = '0.32'
 
 import sys
 
@@ -162,6 +164,9 @@ class MobiBook:
         return self.data_file[off:endoff]
 
     def __init__(self, infile):
+        print ('MobiDeDrm v%(__version__)s. '
+           'Copyright 2008-2011 The Dark Reverser et al.' % globals())
+
         # initial sanity check on file
         self.data_file = file(infile, 'rb').read()
         self.mobi_data = ''
@@ -192,14 +197,15 @@ class MobiBook:
             self.meta_array = {}
             return
         self.mobi_length, = struct.unpack('>L',self.sect[0x14:0x18])
+        self.mobi_codepage, = struct.unpack('>L',self.sect[0x1c:0x20])
         self.mobi_version, = struct.unpack('>L',self.sect[0x68:0x6C])
         print "MOBI header version = %d, length = %d" %(self.mobi_version, self.mobi_length)
         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) and (self.compression != 17480):
-            # multibyte utf8 data is included in the encryption for mobi_version 6 and below
+        if (self.compression != 17480):
+            # multibyte utf8 data is included in the encryption for PalmDoc compression
             # so clear that byte so that we leave it to be decrypted.
             self.extra_data_flags &= 0xFFFE
 
@@ -229,8 +235,13 @@ class MobiBook:
         except:
             self.meta_array = {}
             pass
+        self.print_replica = False
             
     def getBookTitle(self):
+        codec_map = {
+            1252 : 'windows-1252',
+            65001 : 'utf-8',
+        }
         title = ''
         if 503 in self.meta_array:
             title = self.meta_array[503]
@@ -241,7 +252,10 @@ class MobiBook:
         if title == '':
             title = self.header[:32]
             title = title.split("\0")[0]
-        return title
+        codec = 'windows-1252'
+        if self.mobi_codepage in codec_map.keys():
+            codec = codec_map[self.mobi_codepage]
+        return unicode(title, codec).encode('utf-8')
 
     def getPIDMetaInfo(self):
         rec209 = ''
@@ -305,6 +319,9 @@ class MobiBook:
 
     def getMobiFile(self, outpath):
         file(outpath,'wb').write(self.mobi_data)
+        
+    def getPrintReplica(self):
+        return self.print_replica
 
     def processBook(self, pidlist):
         crypto_type, = struct.unpack('>H', self.sect[0xC:0xC+2])
@@ -312,10 +329,17 @@ class MobiBook:
         self.crypto_type = crypto_type
         if crypto_type == 0:
             print "This book is not encrypted."
+            # we must still check for Print Replica
+            self.print_replica = (self.loadSection(1)[0:4] == '%MOP')
             self.mobi_data = self.data_file
             return
         if crypto_type != 2 and crypto_type != 1:
             raise DrmException("Cannot decode unknown Mobipocket encryption type %d" % crypto_type)
+        if 406 in self.meta_array:
+            data406 = self.meta_array[406]
+            val406, = struct.unpack('>Q',data406)
+            if val406 != 0:
+                raise DrmException("Cannot decode library or rented ebooks.")
 
         goodpids = []
         for pid in pidlist:
@@ -366,7 +390,10 @@ class MobiBook:
             if i%100 == 0:
                 print ".",
             # print "record %d, extra_size %d" %(i,extra_size)
-            self.mobi_data += PC1(found_key, data[0:len(data) - extra_size])
+            decoded_data = PC1(found_key, data[0:len(data) - extra_size])
+            if i==1:
+                self.print_replica = (decoded_data[0:4] == '%MOP')
+            self.mobi_data += decoded_data
             if extra_size > 0:
                 self.mobi_data += data[-extra_size:]
         if self.num_sections > self.records+1:
@@ -391,9 +418,9 @@ def getUnencryptedBookWithList(infile,pidlist):
 
 def main(argv=sys.argv):
     print ('MobiDeDrm v%(__version__)s. '
-	   'Copyright 2008-2010 The Dark Reverser.' % globals())
+        'Copyright 2008-2011 The Dark Reverser et al.' % globals())
     if len(argv)<3 or len(argv)>4:
-        print "Removes protection from Mobipocket books"
+        print "Removes protection from Kindle/Mobipocket and Kindle/Print Replica ebooks"
         print "Usage:"
         print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
         return 1
@@ -401,9 +428,9 @@ def main(argv=sys.argv):
         infile = argv[1]
         outfile = argv[2]
         if len(argv) is 4:
-        	pidlist = argv[3].split(',')
+            pidlist = argv[3].split(',')
         else:
-        	pidlist = {}
+            pidlist = {}
         try:
             stripped_file = getUnencryptedBookWithList(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)

Kindle_for_Android_Patch/ReadMe_K4Android.txt

@@ -25,7 +25,7 @@ adb pull /data/app/com.amazon.kindle-1.apk kindle3.apk
 adb uninstall com.amazon.kindle
 apktool d kindle3.apk kindle3
 cd kindle3
-patch -p1 < ..\kindle3.patch
+patch -p1 < ../kindle3.patch
 cd ..
 apktool b kindle3 kindle3_patched.apk
 jarsigner -verbose -keystore kindle.keystore kindle3_patched.apk kindle

Mobi_Additional_Tools/lib/mobidedrm.py

@@ -49,11 +49,13 @@
 #  0.27 - Correct pid metadata token generation to match that used by skindle (Thank You Bart!)
 #  0.28 - slight additional changes to metadata token generation (None -> '')
 #  0.29 - It seems that the ideas about when multibyte trailing characters were
-#         included in the encryption were wrong. They aren't for DOC compressed
-#         files, but they are for HUFF/CDIC compress files!
+#         included in the encryption were wrong. They are for DOC compressed
+#         files, but they are not for HUFF/CDIC compress files!
 #  0.30 - Modified interface slightly to work better with new calibre plugin style
+#  0.31 - The multibyte encrytion info is true for version 7 files too.
+#  0.32 - Added support for "Print Replica" Kindle ebooks
 
-__version__ = '0.30'
+__version__ = '0.32'
 
 import sys
 
@@ -162,6 +164,9 @@ class MobiBook:
         return self.data_file[off:endoff]
 
     def __init__(self, infile):
+        print ('MobiDeDrm v%(__version__)s. '
+           'Copyright 2008-2011 The Dark Reverser et al.' % globals())
+
         # initial sanity check on file
         self.data_file = file(infile, 'rb').read()
         self.mobi_data = ''
@@ -192,14 +197,15 @@ class MobiBook:
             self.meta_array = {}
             return
         self.mobi_length, = struct.unpack('>L',self.sect[0x14:0x18])
+        self.mobi_codepage, = struct.unpack('>L',self.sect[0x1c:0x20])
         self.mobi_version, = struct.unpack('>L',self.sect[0x68:0x6C])
         print "MOBI header version = %d, length = %d" %(self.mobi_version, self.mobi_length)
         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) and (self.compression != 17480):
-            # multibyte utf8 data is included in the encryption for mobi_version 6 and below
+        if (self.compression != 17480):
+            # multibyte utf8 data is included in the encryption for PalmDoc compression
             # so clear that byte so that we leave it to be decrypted.
             self.extra_data_flags &= 0xFFFE
 
@@ -229,8 +235,13 @@ class MobiBook:
         except:
             self.meta_array = {}
             pass
+        self.print_replica = False
             
     def getBookTitle(self):
+        codec_map = {
+            1252 : 'windows-1252',
+            65001 : 'utf-8',
+        }
         title = ''
         if 503 in self.meta_array:
             title = self.meta_array[503]
@@ -241,7 +252,10 @@ class MobiBook:
         if title == '':
             title = self.header[:32]
             title = title.split("\0")[0]
-        return title
+        codec = 'windows-1252'
+        if self.mobi_codepage in codec_map.keys():
+            codec = codec_map[self.mobi_codepage]
+        return unicode(title, codec).encode('utf-8')
 
     def getPIDMetaInfo(self):
         rec209 = ''
@@ -305,6 +319,9 @@ class MobiBook:
 
     def getMobiFile(self, outpath):
         file(outpath,'wb').write(self.mobi_data)
+        
+    def getPrintReplica(self):
+        return self.print_replica
 
     def processBook(self, pidlist):
         crypto_type, = struct.unpack('>H', self.sect[0xC:0xC+2])
@@ -312,10 +329,17 @@ class MobiBook:
         self.crypto_type = crypto_type
         if crypto_type == 0:
             print "This book is not encrypted."
+            # we must still check for Print Replica
+            self.print_replica = (self.loadSection(1)[0:4] == '%MOP')
             self.mobi_data = self.data_file
             return
         if crypto_type != 2 and crypto_type != 1:
             raise DrmException("Cannot decode unknown Mobipocket encryption type %d" % crypto_type)
+        if 406 in self.meta_array:
+            data406 = self.meta_array[406]
+            val406, = struct.unpack('>Q',data406)
+            if val406 != 0:
+                raise DrmException("Cannot decode library or rented ebooks.")
 
         goodpids = []
         for pid in pidlist:
@@ -366,7 +390,10 @@ class MobiBook:
             if i%100 == 0:
                 print ".",
             # print "record %d, extra_size %d" %(i,extra_size)
-            self.mobi_data += PC1(found_key, data[0:len(data) - extra_size])
+            decoded_data = PC1(found_key, data[0:len(data) - extra_size])
+            if i==1:
+                self.print_replica = (decoded_data[0:4] == '%MOP')
+            self.mobi_data += decoded_data
             if extra_size > 0:
                 self.mobi_data += data[-extra_size:]
         if self.num_sections > self.records+1:
@@ -391,9 +418,9 @@ def getUnencryptedBookWithList(infile,pidlist):
 
 def main(argv=sys.argv):
     print ('MobiDeDrm v%(__version__)s. '
-	   'Copyright 2008-2010 The Dark Reverser.' % globals())
+        'Copyright 2008-2011 The Dark Reverser et al.' % globals())
     if len(argv)<3 or len(argv)>4:
-        print "Removes protection from Mobipocket books"
+        print "Removes protection from Kindle/Mobipocket and Kindle/Print Replica ebooks"
         print "Usage:"
         print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
         return 1
@@ -401,9 +428,9 @@ def main(argv=sys.argv):
         infile = argv[1]
         outfile = argv[2]
         if len(argv) is 4:
-        	pidlist = argv[3].split(',')
+            pidlist = argv[3].split(',')
         else:
-        	pidlist = {}
+            pidlist = {}
         try:
             stripped_file = getUnencryptedBookWithList(infile, pidlist)
             file(outfile, 'wb').write(stripped_file)

ReadMe_First.txt

@@ -6,17 +6,17 @@ The set includes tools to remove DRM from eReader PDB books, Barnes and Noble eP
 This ReadMe_First.txt is meant to give users a quick overview of what is available and how to get started.
 
 
-Calibre Users (Mac OS X, Linux, Windows)
+Calibre Users (Mac OS X, Windows)
 -------------
 If you are a calibre user, the quickest and easiest way to remove DRM from your ebooks is to open the Calibre_Plugins folder and install each of the plugins following the instructions and configuration directions provided in each plugins README file.
 
 Once installed and configured, you can simply import a DRM book into Calibre and end up with the DeDRM version in the Calibre database.
 
-These plugins work for Windows, Mac OS X, and Linux
+These plugins work for Windows and  Mac OS X
 
 
 
-Mac OS X Users (Mac OS X 10.5 and 10.6)
+Mac OS X Users (Mac OS X 10.5, 10.6, and 10.7)
 --------------
 From the DeDRM_for_Mac_and_Win folder, drag the DeDRM_X.X.app.zip droplet to your Desktop.  Double-click on it once to unzip it to create the DeDRM X.X.app droplet.   Double-click on the droplet once and it will guide you through collecting the data it needs to remove the DRM.
 
@@ -33,16 +33,12 @@ From the DeDRM_for_Mac_and_Win folder, fully extract the DeDRM_WinApp_vX.X.zip.
 To use it simply drag ebooks or folders onto the DeDRM_Drop_Target short-cut, and it will process the ebooks.
 
 
-Linux Users
------------
-Since the state of the Linux Desktop is so jumbled and sad with so many different ways to set it up and different configuration files that depend on your version of Linux,  making a DeDRM drag and drop tool for multiple versions of Linux is simply an exercise in futility. That said, you should have no problems running the gui tools (or their command line equivalents) described next.
-
 
 Not a Calibre or a DeDRM User?
 ------------------------------
 There are a number of python based tools that have graphical user interfaces to make them easy to use.  To use any of these tools, you need to have Python 2.5, 2.6, or 2.7  for 32 bits installed on your machine as well as a matching PyCrypto or OpenSSL for some tools.
 
-On Mac OS X (10.5 and 10.6) and Linux (recent versions), your systems already have the proper Python and OpenSSL installed.  So nothing need be done, you can already run these tools by double-clicking on the .pyw python scripts.
+On Mac OS X (10.5, 10.6 and 10.7), your systems already have the proper Python and OpenSSL installed.  So nothing need be done, you can already run these tools by double-clicking on the .pyw python scripts.
 
 Users of Mac OS X 10.3 and 10.4, need to download and install the "32-bit Mac Installer disk Image (2.7.X) for OS X 10.3 and later from  http://www.python.org/download/releases/2.7.1/
 
@@ -54,14 +50,11 @@ The scripts are organized by type of ebook you need to remove the DRM from.  Cho
      "Adobe_PDF_Tools"
      "Barnes_and_Noble_ePub_Tools"
      "eReader_PDB_Tools"
-     "KindleBooks_Tools"
+     "KindleBooks"
      "Kindle_for_Android_Patch"
 
 by simply opening that folder.
 
-In the  "KindleBooks_Tools" folder the primary tool is in the "KindleBooks" folder.
-
-If you are a Windows user, or a Linux platform using Wine, or Mac OS X or have trouble running the KindleBooks tools, there are two other tools provided.  These are  called "Kindle_4_Mac_Unswindle" and "Kindle_4_PC_Unswindle".
 
 Look for a README inside of the relevant folder to get you started. 
 
@@ -109,3 +102,47 @@ For PyCrypto:
 
 Once Windows users have installed Python 2.X for 32 bits, and the matching OpenSSL OR PyCrypto pieces, they too are ready to run the scripts.
 
+
+
+Linux Users
+-----------
+
+Unfortuantely, the Calibre Plugins do not really work well on Linux because of issues running Calibre under Wine. Native versions of Calibre can not be used with the K4MobiDeDRM plugin because the plugin will not be able to find the information it needs to remove the DRM.
+
+Although some of the scripts do work on native Linux, others require the use of a recent version of Wine. 
+
+Here are the instructions for using KindleBooks.pyw on Linux under Wine.
+
+1. upgrade to very recent versions of Wine; This has been tested with Wine 1.3.18 – 1.3.22. It may work with earlier versions but no promises.
+
+2. Some versions of winecfg have a bug in setting the volume serial number, so create a .windows-serial file at root of drive_c to set a proper windows volume serial number (8 digit hex value for unsigned integer).
+cd ~
+cd .wine
+cd drive_c
+echo deadbeaf > .windows-serial
+
+Replace deadbeef with whatever you want but I would stay away from the default setting of ffffffff
+
+3. Only ***after*** setting the volume serial number properly – download and install under wine K4PC version for Windows. Register it and download from your Archive one of your Kindle ebooks. Versions known to work are K4PC 1.4.1 and earlier. Later version may work but no promises.
+
+4. Download and install under wine ActiveState Active Python 2.7 for Windows 32bit
+
+5. Download and unzip tools_v4.5.zip
+
+6. Then run KindleBook.pyw  ***under python running on wine*** using one of the following methods:
+
+From a Linux shell:
+
+   wine python KindleBooks.pyw
+
+Or to get a Windows (wine) command prompt
+
+   wine cmd
+   python KindleBooks.pyw
+
+Or to get a "Windows" file explorer:
+
+   winefile
+
+   and then double-click on any  .pyw files to run them in the wine environment
+