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

diff --cc DeDRM_plugin/kindlekey.py
index 3816e1ee94670290ea149c224662ef00070b55ba,c496266dcf3f2458f62cfe1835a122373fb12335..73425f8685cb053a7b406365aa434e8d1a7dce89
--- 1/DeDRM_plugin/kindlekey.py
--- 2/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
          #