Update DeDRM version number to 6.8.1, and kindlekey to 2.8

Merge pull request #1381 from protochron/fix_big_sur_python_2
Fix loading libcrypto on OSX Big Sur
2020-11-28 16:11:17 +00:00 · 2020-11-28 15:44:42 +00:00 · 2020-11-27 22:28:34 -05:00
2 changed files with 13 additions and 7 deletions
--- a/DeDRM_plugin/init.py
+++ b/DeDRM_plugin/init.py
@@ -7,7 +7,7 @@ from __future__ import with_statement
 # Copyright © 2008-2020 Apprentice Harper et al.

 __license__   = 'GPL v3'
-__version__ = '6.8.0'
+__version__ = '6.8.1'
 __docformat__ = 'restructuredtext en'


@@ -71,6 +71,7 @@ __docformat__ = 'restructuredtext en'
 #   6.6.3 - More cleanup of kindle book names and start of support for .kinf2018
 #   6.7.0 - Handle new library in calibre.
 #   6.8.0 - Full support for .kinf2018 and new KFX encryption (Kindle for PC/Mac 2.5+)
+#   6.8.1 - Kindle key fix for Mac OS X Big Syr

 """
 Decrypt DRMed ebooks.
--- a/DeDRM_plugin/kindlekey.py
+++ b/DeDRM_plugin/kindlekey.py
@@ -7,7 +7,7 @@ from __future__ import with_statement
 # Copyright © 2008-2020 Apprentice Harper et al.

 __license__ = 'GPL v3'
-__version__ = '2.7'
+__version__ = '2.8'

 # Revision history:
 #  1.0   - Kindle info file decryption, extracted from k4mobidedrm, etc.
@@ -30,6 +30,7 @@ __version__ = '2.7'
 #  2.5   - Final Fix for Windows user names with non-ascii characters, thanks to oneofusoneofus
 #  2.6   - Start adding support for Kindle 1.25+ .kinf2018 file
 #  2.7   - Finish .kinf2018 support, PC & Mac by Apprentice Sakuya
+#  2.8   - Fix for Mac OS X Big Sur


 """
@@ -1183,8 +1184,12 @@ elif isosx:

        libcrypto = find_library('crypto')
        if libcrypto is None:
-            raise DrmException(u"libcrypto not found")
+            libcrypto = '/usr/lib/libcrypto.dylib'
+        try:
            libcrypto = CDLL(libcrypto)
+        except Exception as e:
+            raise DrmException(u"libcrypto not found: " % e)
+

        # From OpenSSL's crypto aes header
        #