Miroirs/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/apprenticeharper/DeDRM_tools synced 2024-12-27 09:58:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support .kinf2018 on Mac

Browse source
This commit is contained in:
apprenticesakuya 2020-06-11 17:26:36 +00:00 committed by GitHub
parent ea916d85fc
commit 837562db66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
DeDRM_plugin/kindlekey.py
View file

@ -1449,6 +1449,18 @@ elif isosx:
kInfoFiles=[] kInfoFiles=[]
found = False found = False
home = os.getenv('HOME') home = os.getenv('HOME')
# check for .kinf2018 file in new location (App Store Kindle for Mac)
testpath = home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support/Kindle/storage/.kinf2018'
if os.path.isfile(testpath):
kInfoFiles.append(testpath)
print('Found k4Mac kinf2018 file: ' + testpath)
found = True
# check for .kinf2018 files
testpath = home + '/Library/Application Support/Kindle/storage/.kinf2018'
if os.path.isfile(testpath):
kInfoFiles.append(testpath)
print('Found k4Mac kinf2018 file: ' + testpath)
found = True
# check for .kinf2011 file in new location (App Store Kindle for Mac) # check for .kinf2011 file in new location (App Store Kindle for Mac)
testpath = home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support/Kindle/storage/.kinf2011' testpath = home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support/Kindle/storage/.kinf2011'
if os.path.isfile(testpath): if os.path.isfile(testpath):
@ -1529,12 +1541,21 @@ elif isosx:
cleartext = UnprotectHeaderData(encryptedValue) cleartext = UnprotectHeaderData(encryptedValue)
# now extract the pieces in the same way # now extract the pieces in the same way
# this version is different from K4PC it scales the build number by multipying by 735
pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE) pattern = re.compile(r'''\[Version:(\d+)\]\[Build:(\d+)\]\[Cksum:([^\]]+)\]\[Guid:([\{\}a-z0-9\-]+)\]''', re.IGNORECASE)
for m in re.finditer(pattern, cleartext): for m in re.finditer(pattern, cleartext):
entropy = str(int(m.group(2)) * 0x2df) + m.group(4) version = int(m.group(1))
build = m.group(2)
guid = m.group(4)
cud = CryptUnprotectData(entropy,IDString) if version == 5: # .kinf2011: identical to K4PC, except the build number gets multiplied
entropy = str(0x2df * int(build)) + guid
cud = CryptUnprotectData(entropy,IDString)
elif version == 6: # .kinf2018: identical to K4PC
salt = str(0x6d8 * int(build)) + guid
sp = GetUserName() + '+@#$%+' + IDString
passwd = encode(SHA256(sp), charMap5)
key = LibCrypto().keyivgen(passwd, salt, 10000, 0x400)[:32]
# loop through the item records until all are processed # loop through the item records until all are processed
while len(items) > 0: while len(items) > 0:
@ -1595,9 +1616,28 @@ elif isosx:
encdata = encdata[noffset:] encdata = encdata[noffset:]
encdata = encdata + pfx encdata = encdata + pfx
# decode using testMap8 to get the CryptProtect Data if version == 5:
encryptedValue = decode(encdata,testMap8) # decode using testMap8 to get the CryptProtect Data
cleartext = cud.decrypt(encryptedValue) encryptedValue = decode(encdata,testMap8)
cleartext = cud.decrypt(encryptedValue)
elif version == 6:
from Crypto.Cipher import AES
from Crypto.Util import Counter
# decode using new testMap8 to get IV + ciphertext
iv_ciphertext = decode(encdata, testMap8)
# pad IV so that we can substitute AES-CTR for GCM
iv = iv_ciphertext[:12] + b'\x00\x00\x00\x02'
ciphertext = iv_ciphertext[12:]
# convert IV to int for use with pycrypto
iv_ints = unpack('>QQ', iv)
iv = iv_ints[0] << 64 | iv_ints[1]
# set up AES-CTR
ctr = Counter.new(128, initial_value=iv)
cipher = AES.new(key, AES.MODE_CTR, counter=ctr)
# decrypt and decode
cleartext = decode(cipher.decrypt(ciphertext), charMap5)
# print keyname # print keyname
# print cleartext # print cleartext
if len(cleartext) > 0: if len(cleartext) > 0: