Miroirs/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/apprenticeharper/DeDRM_tools synced 2025-01-13 20:01:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1381 from protochron/fix_big_sur_python_2

Browse source 
Fix loading libcrypto on OSX Big Sur
This commit is contained in:
Apprentice Harper 2020-11-28 15:44:42 +00:00 committed by GitHub
commit 218539f131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
DeDRM_plugin/kindlekey.py
View file

@ -901,7 +901,7 @@ if iswindows:
# double the buffer size # double the buffer size
buffer = create_unicode_buffer(len(buffer) * 2) buffer = create_unicode_buffer(len(buffer) * 2)
size.value = len(buffer) size.value = len(buffer)
# replace any non-ASCII values with 0xfffd # replace any non-ASCII values with 0xfffd
for i in xrange(0,len(buffer)): for i in xrange(0,len(buffer)):
if buffer[i]>u"\u007f": if buffer[i]>u"\u007f":
@ -987,7 +987,7 @@ if iswindows:
found = True found = True
print('Found K4PC 1.25+ kinf2018 file: ' + kinfopath.encode('ascii','ignore')) print('Found K4PC 1.25+ kinf2018 file: ' + kinfopath.encode('ascii','ignore'))
kInfoFiles.append(kinfopath) kInfoFiles.append(kinfopath)
# look for (K4PC 1.9.0 and later) .kinf2011 file # look for (K4PC 1.9.0 and later) .kinf2011 file
kinfopath = path +'\\Amazon\\Kindle\\storage\\.kinf2011' kinfopath = path +'\\Amazon\\Kindle\\storage\\.kinf2011'
if os.path.isfile(kinfopath): if os.path.isfile(kinfopath):
@ -1183,8 +1183,12 @@ elif isosx:
libcrypto = find_library('crypto') libcrypto = find_library('crypto')
if libcrypto is None: if libcrypto is None:
raise DrmException(u"libcrypto not found") libcrypto = '/usr/lib/libcrypto.dylib'
libcrypto = CDLL(libcrypto) try:
libcrypto = CDLL(libcrypto)
except Exception as e:
raise DrmException(u"libcrypto not found: " % e)
# From OpenSSL's crypto aes header # From OpenSSL's crypto aes header
# #
@ -1534,7 +1538,7 @@ elif isosx:
try: try:
DB = {} DB = {}
items = data.split('/') items = data.split('/')
# the headerblob is the encrypted information needed to build the entropy string # the headerblob is the encrypted information needed to build the entropy string
headerblob = items.pop(0) headerblob = items.pop(0)
encryptedValue = decode(headerblob, charMap1) encryptedValue = decode(headerblob, charMap1)