llrosy798
0b2b81fd23
fix previous bug
2021-01-21 23:48:04 +09:00
llrosy798
63aecc598f
update secret table
2021-01-21 23:46:03 +09:00
llrosy798
51c8be6baf
fill unknown symbols in known catalog
2021-01-21 23:41:22 +09:00
Apprentice Harper
a7974f0f14
Update ineptpdf.py
...
integer division, and version
2021-01-03 16:11:02 +00:00
Apprentice Harper
ed412bee35
Updated to inept.pdf for PC
...
Contributed changes for PC compatibility. Thanks, Aldo.
Update main version to 7.0.2
2021-01-03 16:01:14 +00:00
Apprentice Harper
6cee615f26
Update ineptpdf.py
...
Fix handling of metadata
2021-01-03 15:35:17 +00:00
Apprentice Harper
c4581b4d72
Version to 7.0.1, ineptpdf fixes
...
ineptpdf should now decrypt at least some Adobe PDFs
2020-12-30 12:14:04 +00:00
Apprentice Harper
f6a568bcc1
Update ineptepub.py
...
Handle uncompressed elements (if any) in the zip file.
2020-12-27 12:16:11 +00:00
Apprentice Harper
bf6170e613
Merge pull request #1445 from ableeker/python3
...
Some more fixes for ePub
2020-12-26 16:02:12 +00:00
Apprentice Harper
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.
2020-12-26 15:58:42 +00:00
Aldo Bleeker
5599c1694b
Some more fixes for ePub
2020-12-26 15:36:10 +01:00
Apprentice Harper
13e9a14907
Merge pull request #1398 from xxyzz/config
...
return str from load_resource()
2020-12-04 12:52:42 +00:00
xxyzz
a1059650f6
return str from load_resource()
2020-12-03 19:02:09 +08:00
penenkel
a3cc221932
Revert changes to k4mobidedrm.py
2020-12-02 22:36:29 +01:00
penenkel
6732be1434
`getPidList()` now returns pids as bytes instead of bytearrays
2020-12-02 22:34:29 +01:00
penenkel
ad5cb056f0
Add conversion from bytearray to bytes so that pids are hashable
2020-11-30 23:25:01 +01:00
Aldo Bleeker
8e436ad920
Python 3 fixes fort correct version of __init__.py
2020-11-29 16:54:45 +01:00
Aldo Bleeker
ae806f734e
Python 3 fixes for __init__.py
2020-11-29 13:39:04 +01:00
Apprentice Harper
ccfa454226
Merge branch 'Python2' - the DeDRM plugn version change
2020-11-29 10:47:09 +00:00
Apprentice Harper
6716db1f62
Derive calibre version tuple from __version__ string
2020-11-29 10:40:14 +00:00
Apprentice Harper
0e0d7d8b14
Don't rule out running from the command line
2020-11-28 16:25:54 +00:00
Apprentice Harper
981aadc497
Merge pull request #1380 from xxyzz/byte-string
...
Fix byte string error for KFX
2020-11-28 16:19:17 +00:00
Apprentice Harper
26eb5d676c
Merge branch 'Python2' Bring across version number updates from 6.8.1 release
2020-11-28 16:18:09 +00:00
Apprentice Harper
464788a3f1
Update DeDRM version number to 6.8.1, and kindlekey to 2.8
2020-11-28 16:11:17 +00:00
Apprentice Harper
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
Aldo Bleeker
f9d9b6016f
Python 3 fixes for Barnes&Noble
2020-11-28 14:49:27 +01:00
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 .
2020-11-27 22:28:34 -05:00
xxyzz
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
xxyzz
1955b34883
import ion correctly
2020-11-28 11:20:53 +08:00
Apprentice Harper
dbc5c2b4de
Merge pull request #1269 from keshavgbpecdelhi/patch-4
...
using the Kindle & prompt
2020-11-27 19:34:20 +00:00
Apprentice Harper
856fef55be
Merge pull request #1268 from keshavgbpecdelhi/patch-3
...
changing wil to will
2020-11-27 19:34:08 +00:00
Apprentice Harper
f2fa0426b7
Merge pull request #1267 from keshavgbpecdelhi/patch-2
...
prompt and will
2020-11-27 19:33:59 +00:00
Apprentice Harper
c3376cc492
Merge pull request #1266 from keshavgbpecdelhi/patch-1
...
"promt" doesn't make any sense
2020-11-27 19:33:46 +00:00
Apprentice Harper
c52e4db3df
Python 3 fix for old ereader PDB DRM removal
2020-11-27 15:51:33 +00:00
Apprentice Harper
45038cc77b
Python 3 fix for epubtest.py that detects version of DRM used
2020-11-27 15:49:57 +00:00
Apprentice Harper
5ec9c98a0b
Python 3 fixes for Android kindle key retrieval
2020-11-27 15:46:06 +00:00
xxyzz
66bab7bd7d
using byte string in kfxdedrm.py
2020-11-27 22:01:18 +08:00
Apprentice Harper
e0c7d7d382
Revert "PyCrypto requires RSA values to be long"
...
This reverts commit a1703e15d4
.
2020-11-25 08:36:06 +00:00
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.
2020-11-23 14:22:48 +00:00
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)
2020-11-23 13:31:10 +00:00
Apprentice Harper
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
Aldo Bleeker
74bcf33591
Python 3 fixes
2020-11-22 16:03:45 +01:00
Ivan Lazar Miljenovic
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
Task Hazy
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
Aldo Bleeker
a74f37c79e
Minor Python 3 fix for Customize dialog
2020-11-07 13:43:58 +01:00
Aldo Bleeker
7f4e6698ef
More Python 3 fixes for Customize plugin dialog
2020-11-06 23:49:18 +01:00
fireattack
4a319a3522
Convert all to bytes first before concat
2020-11-02 02:09:52 -06:00
Apprentice Harper
f1ef1b8ecd
Merge pull request #1340 from ableeker/python3
...
Python 3 fixes config.py alfcrypto.py
2020-10-29 14:09:28 +00:00
Aldo
6dd022e6a0
Python 3 fixes config.py alfcrypto.py
2020-10-28 18:54:33 +01:00
Ivan Lazar Miljenovic
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