Commit Graph

15 Commits (master)

Author SHA1 Message Date
Aldo Bleeker 33b9630ca5 Fix for broken book keys 3 years ago
Apprentice Harper f6a568bcc1 Update ineptepub.py
Handle uncompressed elements (if any) in the zip file.
3 years ago
Apprentice Harper e0c7d7d382 Revert "PyCrypto requires RSA values to be long"
This reverts commit a1703e15d4.
4 years ago
Apprentice Harper 87881659c4
Merge pull request #1362 from ivan-m/pycrypto_rsa_long
PyCrypto requires RSA values to be long not int (which is possible for small numbers)
4 years ago
Aldo Bleeker 74bcf33591 Python 3 fixes 4 years ago
Ivan Lazar Miljenovic a1703e15d4 PyCrypto requires RSA values to be long
This is at least true for PyCrypto 2.6.1
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 0859f197fc Update init file, update versions in files, update comments in files 4 years ago
Rémi Vanicat f7b4efc3e1 More handling of difference between python2 and python3
Place where python3 use bytes/int and python2 str/str
4 years ago
Rémi Vanicat 2fbf2c1c5f decoding from base64 in a portable way 4 years ago
Rémi Vanicat 3166273622 modernizing ineptepub.
decrypting as python2 work
failing with python3:
  File "ineptepub.py", line 424, in decryptBook
    bookkey = rsa.decrypt(bookkey.decode('base64'))
AttributeError: 'str' object has no attribute 'decode'
4 years ago
Apprentice Harper 92bf51bc8f Remove stand-alone apps. Only support the two plugins. 4 years ago