From: Apprentice Harper <apprenticeharper@gmail.com>
Date: Sat, 28 Nov 2020 16:07:31 +0000 (+0000)
Subject: Merge branch 'Python2': Get the changes to fix Kindle key retrieval for Mac OS X... 
X-Git-Url: http://git.xmof.duckdns.org/?a=commitdiff_plain;h=036f9007fdd755eb0bdfec1aaf87be15d343981b;p=DeDRM.git

Merge branch 'Python2': Get the changes to fix Kindle key retrieval for Mac OS X Big Sur
---

036f9007fdd755eb0bdfec1aaf87be15d343981b
diff --cc DeDRM_plugin/kindlekey.py
index 3816e1e,c496266..73425f8
--- a/DeDRM_plugin/kindlekey.py
+++ b/DeDRM_plugin/kindlekey.py
@@@ -1174,8 -1183,12 +1174,11 @@@ elif isosx
  
          libcrypto = find_library('crypto')
          if libcrypto is None:
-             raise DrmException("libcrypto not found")
-         libcrypto = CDLL(libcrypto)
+             libcrypto = '/usr/lib/libcrypto.dylib'
+         try:
+             libcrypto = CDLL(libcrypto)
+         except Exception as e:
 -            raise DrmException(u"libcrypto not found: " % e)
 -
++            raise DrmException("libcrypto not found: " % e)
  
          # From OpenSSL's crypto aes header
          #