fdf0389936
MobiDeDRM fixes
...
Change handling of PIDs to cope with byte arrays or strings passed in. Also fixed handling of a very old default key format.
3 years ago
13e9a14907
Merge pull request #1398 from xxyzz/config
...
return str from load_resource()
4 years ago
a1059650f6
return str from load_resource()
4 years ago
a3cc221932
Revert changes to k4mobidedrm.py
4 years ago
6732be1434
`getPidList()` now returns pids as bytes instead of bytearrays
4 years ago
ad5cb056f0
Add conversion from bytearray to bytes so that pids are hashable
4 years ago
8e436ad920
Python 3 fixes fort correct version of __init__.py
4 years ago
ae806f734e
Python 3 fixes for __init__.py
4 years ago
ccfa454226
Merge branch 'Python2' - the DeDRM plugn version change
4 years ago
6716db1f62
Derive calibre version tuple from __version__ string
4 years ago
0e0d7d8b14
Don't rule out running from the command line
4 years ago
981aadc497
Merge pull request #1380 from xxyzz/byte-string
...
Fix byte string error for KFX
4 years ago
26eb5d676c
Merge branch 'Python2' Bring across version number updates from 6.8.1 release
4 years ago
464788a3f1
Update DeDRM version number to 6.8.1, and kindlekey to 2.8
4 years ago
036f9007fd
Merge branch 'Python2': Get the changes to fix Kindle key retrieval for Mac OS X Big Sur
4 years ago
f9d9b6016f
Python 3 fixes for Barnes&Noble
4 years ago
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
b8b324956c
replace bord with ord and some other byte string fix
...
PyCryptodome's bord() in Python3 does nothing.
4 years ago
1955b34883
import ion correctly
4 years ago
dbc5c2b4de
Merge pull request #1269 from keshavgbpecdelhi/patch-4
...
using the Kindle & prompt
4 years ago
856fef55be
Merge pull request #1268 from keshavgbpecdelhi/patch-3
...
changing wil to will
4 years ago
f2fa0426b7
Merge pull request #1267 from keshavgbpecdelhi/patch-2
...
prompt and will
4 years ago
c3376cc492
Merge pull request #1266 from keshavgbpecdelhi/patch-1
...
"promt" doesn't make any sense
4 years ago
c52e4db3df
Python 3 fix for old ereader PDB DRM removal
4 years ago
45038cc77b
Python 3 fix for epubtest.py that detects version of DRM used
4 years ago
5ec9c98a0b
Python 3 fixes for Android kindle key retrieval
4 years ago
66bab7bd7d
using byte string in kfxdedrm.py
4 years ago
e0c7d7d382
Revert "PyCrypto requires RSA values to be long"
...
This reverts commit a1703e15d4
4 years ago
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
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
dbc7f26097
Merge pull request #1357 from task-hazy/python_3_cli_linux
...
Adjust wineutils to better call wine python
4 years ago
74bcf33591
Python 3 fixes
4 years ago
a1703e15d4
PyCrypto requires RSA values to be long
...
This is at least true for PyCrypto 2.6.1
4 years ago
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
4 years ago
a74f37c79e
Minor Python 3 fix for Customize dialog
4 years ago
7f4e6698ef
More Python 3 fixes for Customize plugin dialog
4 years ago
4a319a3522
Convert all to bytes first before concat
4 years ago
f1ef1b8ecd
Merge pull request #1340 from ableeker/python3
...
Python 3 fixes config.py alfcrypto.py
4 years ago
6dd022e6a0
Python 3 fixes config.py alfcrypto.py
4 years ago
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).
4 years ago
e0ec691dd6
Fix another exception thrown when unable to find kindle keys.
4 years ago
0add3646d9
_winreg in python3 has been changed to winreg. Update imports.
4 years ago
c4c20eb07e
Merge pull request #1318 from task-hazy/kindle_fetch
...
Get working kindlekey.py on Python 3.8.6
4 years ago
cc33f40ecc
Get working kindlekey.py on Python 3.8.6
4 years ago
939cdbb0c9
More fixes for Amazon books, fixing identity checks, started on Topaz.
4 years ago
dc27c36761
test file type correctly
4 years ago
781268e17e
More general changes, and get mobidedrm and kindlekey to work on Mac.
4 years ago
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
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.
4 years ago
62e0a69089
Fix launching help link from customization dialog.
...
To fix error with python3 when launching help link open files in binary
mode.
4 years ago
Apprentice Harper
xxyzz
penenkel
Aldo Bleeker
Dan Norris
Ivan Lazar Miljenovic
Task Hazy
fireattack
Jeremy Whiting