Derive calibre version tuple from __version__ string

Update DeDRM version number to 6.8.1, and kindlekey to 2.8
Merge pull request #1381 from protochron/fix_big_sur_python_2
2020-11-29 10:40:14 +00:00 · 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 14 additions and 8 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,13 +71,14 @@ __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.
 """
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 8, 0)
+PLUGIN_VERSION_TUPLE = tuple([int(x) for x in __version__.split(".")])
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'
--- 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
        #
Author	SHA1	Message	Date
Apprentice Harper	6716db1f62	Derive calibre version tuple from __version__ string	2020-11-29 10:40:14 +00:00
Apprentice Harper	464788a3f1	Update DeDRM version number to 6.8.1, and kindlekey to 2.8	2020-11-28 16:11:17 +00:00
Apprentice Harper	218539f131	Merge pull request #1381 from protochron/fix_big_sur_python_2 Fix loading libcrypto on OSX Big Sur	2020-11-28 15:44:42 +00:00
Dan Norris	cdab22e59c	Fix loading libcrypto on OSX Big Sur It looks like Big Sur removed `libcrypto.dylib` as a file on the filesystem, so loading it using `ctypes.find_library` fails which breaks Kindle decryption. Now to load a dylib you need to attempt to load it directly and the operating system will load the dylib from the OS' cache or fail. This fixes the problem by explicitly setting the path to libcrypto to `/usr/lib/libcrypto.dylib` if `ctypes.find_library` does not find the file, loading the dylib and raising an exception if it fails at that point. See saltstack/salt#5778 for more detailed info. Closes #1369.	2020-11-27 22:28:34 -05:00