ef67dbd204
Fix more Py2/Py3 stuff
2023-08-06 15:49:52 +02:00
53996cf49c
More Python2 fixes
2023-08-03 20:45:06 +02:00
fb8b003444
Support for Adobe's 'aes128-cbc-uncompressed' encryption (see #242 )
2023-01-06 14:32:25 +01:00
3c12806f38
Fix issue with remaining data in encryption.xml
2023-01-06 14:29:56 +01:00
a0bb84fbfc
Move unicode_argv to its own file
2022-08-06 20:19:18 +02:00
de23b5c221
Move SafeUnbuffered to own Python file
2022-08-06 20:09:30 +02:00
80cbaa4841
Fix ZIP attribute "external_attr" getting reset
2022-08-06 13:53:03 +02:00
c15135b12f
Fix RSA.import_key ( fixes #101 )
...
Apparently "import_key" only exists in newer versions (as an alias to
"importKey"). "importKey" works in all versions ...
2022-07-16 09:54:00 +02:00
b283777c0a
Add back unpad to fix Python2 support
2022-03-19 10:14:45 +01:00
c5aebcca01
Add support for "hardened" Adobe DRM
...
What took the most time was not reverse-engineering
the scheme, but actually finding books using it...
Closes #20 , #25 , #45
2022-03-18 15:45:39 +00:00
a1dd63ae5f
Remove OpenSSL support; only support PyCryptodome
...
This allows us to clean up the code a lot.
On Windows, it isn't installed by default and
most of the time not be found at all.
On M1 Macs, the kernel will kill the process instead.
Closes #33 .
2022-03-18 15:45:39 +00:00
d5473f1db0
Try to fix B&N issues
2022-01-02 16:23:36 +01:00
3b9c201421
Lots of B&N updates
2021-12-23 11:58:40 +01:00
90910ab106
Add back Python2 support (ADEPT)
2021-11-16 11:09:03 +01:00
88dd1350c0
Add useful error message for the new, uncracked ADEPT DRM
2021-11-15 19:51:36 +01:00
40a8e4360b
No longer break obfuscated fonts on DRM removal
2021-11-15 18:38:34 +01:00
969fe52e13
Improve key detection
2021-11-15 11:59:56 +01:00
33b9630ca5
Fix for broken book keys
2021-01-28 13:06:59 +01:00
f6a568bcc1
Update ineptepub.py
...
Handle uncompressed elements (if any) in the zip file.
2020-12-27 12:16:11 +00:00
e0c7d7d382
Revert "PyCrypto requires RSA values to be long"
...
This reverts commit a1703e15d4
2020-11-25 08:36:06 +00:00
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)
2020-11-23 13:31:10 +00:00
74bcf33591
Python 3 fixes
2020-11-22 16:03:45 +01:00
a1703e15d4
PyCrypto requires RSA values to be long
...
This is at least true for PyCrypto 2.6.1
2020-11-11 20:51:19 +08:00
781268e17e
More general changes, and get mobidedrm and kindlekey to work on Mac.
2020-10-14 16:23:49 +01:00
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.
2020-10-04 20:36:12 +01:00
de50a02af9
More generic 3.0 changes, to be tested.
2020-09-27 11:54:49 +01:00
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
2020-09-26 21:22:47 +01:00
0859f197fc
Update init file, update versions in files, update comments in files
2020-06-18 07:42:41 +01:00
f7b4efc3e1
More handling of difference between python2 and python3
...
Place where python3 use bytes/int and python2 str/str
2020-05-08 18:09:27 +02:00
2fbf2c1c5f
decoding from base64 in a portable way
2020-05-08 18:09:27 +02:00
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'
2020-05-08 18:09:27 +02:00
92bf51bc8f
Remove stand-alone apps. Only support the two plugins.
2020-02-16 10:12:25 +00:00
NoDRM