5599c1694b
Some more fixes for ePub
2020-12-26 15:36:10 +01:00
13e9a14907
Merge pull request #1398 from xxyzz/config
...
return str from load_resource()
2020-12-04 12:52:42 +00:00
a1059650f6
return str from load_resource()
2020-12-03 19:02:09 +08:00
a3cc221932
Revert changes to k4mobidedrm.py
2020-12-02 22:36:29 +01:00
6732be1434
`getPidList()` now returns pids as bytes instead of bytearrays
2020-12-02 22:34:29 +01:00
ad5cb056f0
Add conversion from bytearray to bytes so that pids are hashable
2020-11-30 23:25:01 +01:00
8e436ad920
Python 3 fixes fort correct version of __init__.py
2020-11-29 16:54:45 +01:00
ae806f734e
Python 3 fixes for __init__.py
2020-11-29 13:39:04 +01:00
ccfa454226
Merge branch 'Python2' - the DeDRM plugn version change
2020-11-29 10:47:09 +00:00
6716db1f62
Derive calibre version tuple from __version__ string
2020-11-29 10:40:14 +00:00
0e0d7d8b14
Don't rule out running from the command line
2020-11-28 16:25:54 +00:00
981aadc497
Merge pull request #1380 from xxyzz/byte-string
...
Fix byte string error for KFX
2020-11-28 16:19:17 +00:00
26eb5d676c
Merge branch 'Python2' Bring across version number updates from 6.8.1 release
2020-11-28 16:18:09 +00:00
464788a3f1
Update DeDRM version number to 6.8.1, and kindlekey to 2.8
2020-11-28 16:11:17 +00:00
036f9007fd
Merge branch 'Python2': Get the changes to fix Kindle key retrieval for Mac OS X Big Sur
2020-11-28 16:07:31 +00:00
f9d9b6016f
Python 3 fixes for Barnes&Noble
2020-11-28 14:49:27 +01:00
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 .
2020-11-27 22:28:34 -05:00
b8b324956c
replace bord with ord and some other byte string fix
...
PyCryptodome's bord() in Python3 does nothing.
2020-11-28 11:22:27 +08:00
1955b34883
import ion correctly
2020-11-28 11:20:53 +08:00
dbc5c2b4de
Merge pull request #1269 from keshavgbpecdelhi/patch-4
...
using the Kindle & prompt
2020-11-27 19:34:20 +00:00
856fef55be
Merge pull request #1268 from keshavgbpecdelhi/patch-3
...
changing wil to will
2020-11-27 19:34:08 +00:00
f2fa0426b7
Merge pull request #1267 from keshavgbpecdelhi/patch-2
...
prompt and will
2020-11-27 19:33:59 +00:00
c3376cc492
Merge pull request #1266 from keshavgbpecdelhi/patch-1
...
"promt" doesn't make any sense
2020-11-27 19:33:46 +00:00
c52e4db3df
Python 3 fix for old ereader PDB DRM removal
2020-11-27 15:51:33 +00:00
45038cc77b
Python 3 fix for epubtest.py that detects version of DRM used
2020-11-27 15:49:57 +00:00
5ec9c98a0b
Python 3 fixes for Android kindle key retrieval
2020-11-27 15:46:06 +00:00
66bab7bd7d
using byte string in kfxdedrm.py
2020-11-27 22:01:18 +08:00
e0c7d7d382
Revert "PyCrypto requires RSA values to be long"
...
This reverts commit a1703e15d4
2020-11-25 08:36:06 +00:00
f12a4f3856
Revert to byte arrays for maps on PC, and so fix for Mac which still used byte arrays. Remove some unused code.
2020-11-23 14:22:48 +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
dbc7f26097
Merge pull request #1357 from task-hazy/python_3_cli_linux
...
Adjust wineutils to better call wine python
2020-11-23 13:28:29 +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
591448d1f5
Adjust wineutils to better call wine python
...
Separate out logic to find correct python executable, and change to not
do shell call with subprocess
2020-11-09 16:51:13 -07:00
a74f37c79e
Minor Python 3 fix for Customize dialog
2020-11-07 13:43:58 +01:00
7f4e6698ef
More Python 3 fixes for Customize plugin dialog
2020-11-06 23:49:18 +01:00
4a319a3522
Convert all to bytes first before concat
2020-11-02 02:09:52 -06:00
f1ef1b8ecd
Merge pull request #1340 from ableeker/python3
...
Python 3 fixes config.py alfcrypto.py
2020-10-29 14:09:28 +00:00
6dd022e6a0
Python 3 fixes config.py alfcrypto.py
2020-10-28 18:54:33 +01:00
ef59e112c1
Set PYTHONPATH="" when running through wine
...
Without this, it's possible for the Linux PYTHONPATH to leak through
and mixing up the PyCrypto libraries being called (or possibly
exceeding the allowed length of the PYTHONPATH in wine).
2020-10-27 13:34:16 +08:00
e0ec691dd6
Fix another exception thrown when unable to find kindle keys.
2020-10-21 10:56:58 -06:00
0add3646d9
_winreg in python3 has been changed to winreg. Update imports.
2020-10-21 10:56:50 -06:00
c4c20eb07e
Merge pull request #1318 from task-hazy/kindle_fetch
...
Get working kindlekey.py on Python 3.8.6
2020-10-20 16:21:36 +01:00
cc33f40ecc
Get working kindlekey.py on Python 3.8.6
2020-10-16 12:07:34 -06:00
939cdbb0c9
More fixes for Amazon books, fixing identity checks, started on Topaz.
2020-10-16 13:58:59 +01:00
dc27c36761
test file type correctly
2020-10-16 13:22:19 +01: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
dca0cf7d00
Fix kgenpids string vs bytes usage for python3 for calibre 5.1.
...
In order to properly get pids etc. we need to pass bytes to MD5 and SHA1
instead of unicode strings. Also ord() is no longer needed since
data is bytes value gets int and we need chr() to get characters from
the mapping bytearrays.
2020-10-03 22:36:35 -06:00
62e0a69089
Fix launching help link from customization dialog.
...
To fix error with python3 when launching help link open files in binary
mode.
2020-10-03 22:36:35 -06:00
Aldo Bleeker