Commit Graph

17 Commits (master)

Author SHA1 Message Date
Apprentice Harper 26eb5d676c Merge branch 'Python2' Bring across version number updates from 6.8.1 release 4 years ago
Apprentice Harper 464788a3f1 Update DeDRM version number to 6.8.1, and kindlekey to 2.8 4 years ago
Apprentice Harper 036f9007fd Merge branch 'Python2': Get the changes to fix Kindle key retrieval for Mac OS X Big Sur 4 years ago
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.
4 years ago
Apprentice Harper f12a4f3856 Revert to byte arrays for maps on PC, and so fix for Mac which still used byte arrays. Remove some unused code. 4 years ago
fireattack 4a319a3522 Convert all to bytes first before concat 4 years ago
Jeremy Whiting 0add3646d9 _winreg in python3 has been changed to winreg. Update imports. 4 years ago
Task Hazy cc33f40ecc Get working kindlekey.py on Python 3.8.6 4 years ago
Apprentice Harper 781268e17e More general changes, and get mobidedrm and kindlekey to work on Mac. 4 years ago
Apprentice Harper e31752e334 Mostly Mac fixes. mobidedrm.py now works, and k4mobidedrm for at least some input. kindlekey.py should be working too. But lots more changes and testing to do. 4 years ago
Apprentice Harper de50a02af9 More generic 3.0 changes, to be tested. 4 years ago
Apprentice Harper afa4ac5716 Starting on Version 7.0 using the work done by others. Completely untested. I will be testing things, but I thought I'd get this base version up for others to give pull requests.
THIS IS ON THE MASTER BRANCH. The Master branch will be Python 3.0 from now on. While Python 2.7 support will not be deliberately broken, all efforts should now focus on Python 3.0 compatibility.

I can see a lot of work has been done. There's more to do. I've bumped the version number of everything I came across to the next major number for Python 3.0 compatibility indication.

Thanks everyone. I hope to update here at least once a week until we have a stable 7.0 release for calibre 5.0
4 years ago
Apprentice Harper 4868a7460e Updates to FAQs and ReadMes 4 years ago
Apprentice Harper 0859f197fc Update init file, update versions in files, update comments in files 4 years ago
apprenticesakuya 837562db66
Support .kinf2018 on Mac 4 years ago
apprenticesakuya ea916d85fc
Finish .kinf2018 support 4 years ago
Apprentice Harper 92bf51bc8f Remove stand-alone apps. Only support the two plugins. 4 years ago