]>
xmof Git - DeDRM.git/log
raiden64 [Fri, 5 Mar 2021 21:54:53 +0000 (22:54 +0100)]
Fix in keyfetch for obok on MacOS
Apprentice Harper [Sun, 21 Feb 2021 14:35:49 +0000 (14:35 +0000)]
Version number update
Update to 7.1.0 for a full release
Apprentice Harper [Sun, 21 Feb 2021 14:19:59 +0000 (14:19 +0000)]
Merge pull request #1529 from ableeker/python3
Fix for Python 3
Aldo Bleeker [Sun, 14 Feb 2021 11:50:55 +0000 (12:50 +0100)]
Fix for Python 3
Apprentice Harper [Sun, 14 Feb 2021 08:56:58 +0000 (08:56 +0000)]
Merge pull request #1522 from lkcv/patch-1
Add detection for Kobo directory location on Linux
Apprentice Harper [Sun, 14 Feb 2021 08:55:56 +0000 (08:55 +0000)]
Merge pull request #1502 from ableeker/python3
Fix for broken book keys
Apprentice Harper [Sun, 14 Feb 2021 08:50:26 +0000 (08:50 +0000)]
Merge pull request #1499 from xxyzz/kfx
encode serialnum before returning it, close #1479
lkcv [Mon, 8 Feb 2021 02:21:03 +0000 (21:21 -0500)]
Update obok.py
Aldo Bleeker [Thu, 28 Jan 2021 12:06:59 +0000 (13:06 +0100)]
Fix for broken book keys
xxyzz [Wed, 27 Jan 2021 06:31:05 +0000 (14:31 +0800)]
encode serialnum before returning it, close #1479
Apprentice Harper [Sat, 23 Jan 2021 14:32:43 +0000 (14:32 +0000)]
Merge pull request #1482 from 2weak2live/master
Fix python3 encoding problem in voucher decryption
Apprentice Harper [Sat, 23 Jan 2021 14:30:21 +0000 (14:30 +0000)]
Merge pull request #1481 from icaroscherma/patch-1
[Tetrachroma FileOpen] Fixes Python 2.7 import issue, not linked to pywin
Apprentice Harper [Sat, 23 Jan 2021 14:29:56 +0000 (14:29 +0000)]
Merge pull request #1491 from jony0008/master
Update sv
Jony [Wed, 20 Jan 2021 11:01:00 +0000 (12:01 +0100)]
Update sv
2Weak2Live [Thu, 14 Jan 2021 03:44:11 +0000 (22:44 -0500)]
Fix python3 encoding problem in voucher decryption
Ícaro R. Scherma [Thu, 14 Jan 2021 00:44:16 +0000 (16:44 -0800)]
Fixes Python 2.7 import issue, not linked to pywin
Apprentice Harper [Sun, 3 Jan 2021 16:11:02 +0000 (16:11 +0000)]
Update ineptpdf.py
integer division, and version
Apprentice Harper [Sun, 3 Jan 2021 16:01:14 +0000 (16:01 +0000)]
Updated to inept.pdf for PC
Contributed changes for PC compatibility. Thanks, Aldo.
Update main version to 7.0.2
Apprentice Harper [Sun, 3 Jan 2021 15:35:17 +0000 (15:35 +0000)]
Update ineptpdf.py
Fix handling of metadata
Apprentice Harper [Wed, 30 Dec 2020 12:14:04 +0000 (12:14 +0000)]
Version to 7.0.1, ineptpdf fixes
ineptpdf should now decrypt at least some Adobe PDFs
Apprentice Harper [Sun, 27 Dec 2020 12:16:11 +0000 (12:16 +0000)]
Update ineptepub.py
Handle uncompressed elements (if any) in the zip file.
Apprentice Harper [Sat, 26 Dec 2020 16:02:12 +0000 (16:02 +0000)]
Merge pull request #1445 from ableeker/python3
Some more fixes for ePub
Apprentice Harper [Sat, 26 Dec 2020 16:00:04 +0000 (16:00 +0000)]
Merge pull request #1443 from jony0008/master
Update sv translation
Apprentice Harper [Sat, 26 Dec 2020 15:58:42 +0000 (15:58 +0000)]
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.
Aldo Bleeker [Sat, 26 Dec 2020 14:36:10 +0000 (15:36 +0100)]
Some more fixes for ePub
Jony [Fri, 25 Dec 2020 12:47:14 +0000 (12:47 +0000)]
Update sv translation
Apprentice Harper [Sun, 13 Dec 2020 11:28:51 +0000 (11:28 +0000)]
Merge pull request #1413 from ableeker/python3
Small fix to make Obok help link work.
Aldo Bleeker [Wed, 9 Dec 2020 16:34:24 +0000 (17:34 +0100)]
Small fix to make Obok help work.
Apprentice Harper [Fri, 4 Dec 2020 12:52:42 +0000 (12:52 +0000)]
Merge pull request #1398 from xxyzz/config
return str from load_resource()
Apprentice Harper [Fri, 4 Dec 2020 12:51:26 +0000 (12:51 +0000)]
Merge pull request #1392 from penenkel/patch-1
Add conversion from bytearray to bytes so that pids are hashable
xxyzz [Thu, 3 Dec 2020 11:02:09 +0000 (19:02 +0800)]
return str from load_resource()
penenkel [Wed, 2 Dec 2020 21:36:29 +0000 (22:36 +0100)]
Revert changes to k4mobidedrm.py
penenkel [Wed, 2 Dec 2020 21:34:29 +0000 (22:34 +0100)]
`getPidList()` now returns pids as bytes instead of bytearrays
penenkel [Mon, 30 Nov 2020 22:25:01 +0000 (23:25 +0100)]
Add conversion from bytearray to bytes so that pids are hashable
Apprentice Harper [Sun, 29 Nov 2020 16:35:46 +0000 (16:35 +0000)]
Merge pull request #1389 from ableeker/python3
Python 3 fixes for __init__.py
Aldo Bleeker [Sun, 29 Nov 2020 15:54:45 +0000 (16:54 +0100)]
Python 3 fixes fort correct version of __init__.py
Aldo Bleeker [Sun, 29 Nov 2020 12:39:04 +0000 (13:39 +0100)]
Python 3 fixes for __init__.py
Apprentice Harper [Sun, 29 Nov 2020 10:47:09 +0000 (10:47 +0000)]
Merge branch 'Python2' - the DeDRM plugn version change
Apprentice Harper [Sun, 29 Nov 2020 10:40:14 +0000 (10:40 +0000)]
Derive calibre version tuple from __version__ string
Apprentice Harper [Sat, 28 Nov 2020 16:25:54 +0000 (16:25 +0000)]
Don't rule out running from the command line
Apprentice Harper [Sat, 28 Nov 2020 16:19:17 +0000 (16:19 +0000)]
Merge pull request #1380 from xxyzz/byte-string
Fix byte string error for KFX
Apprentice Harper [Sat, 28 Nov 2020 16:18:09 +0000 (16:18 +0000)]
Merge branch 'Python2' Bring across version number updates from 6.8.1 release
Apprentice Harper [Sat, 28 Nov 2020 16:11:17 +0000 (16:11 +0000)]
Update DeDRM version number to 6.8.1, and kindlekey to 2.8
Apprentice Harper [Sat, 28 Nov 2020 16:07:31 +0000 (16:07 +0000)]
Merge branch 'Python2': Get the changes to fix Kindle key retrieval for Mac OS X Big Sur
Apprentice Harper [Sat, 28 Nov 2020 15:47:22 +0000 (15:47 +0000)]
Merge pull request #1383 from ableeker/python3
Python 3 fixes for Barnes&Noble
Apprentice Harper [Sat, 28 Nov 2020 15:45:43 +0000 (15:45 +0000)]
Merge pull request #1382 from koumaza/koumaza/refine-github-actions-workflow
Refine GitHub Actions Workflow
Apprentice Harper [Sat, 28 Nov 2020 15:44:42 +0000 (15:44 +0000)]
Merge pull request #1381 from protochron/fix_big_sur_python_2
Fix loading libcrypto on OSX Big Sur
Aldo Bleeker [Sat, 28 Nov 2020 13:49:27 +0000 (14:49 +0100)]
Python 3 fixes for Barnes&Noble
shanghai yakisoba chan! [Sat, 28 Nov 2020 12:39:27 +0000 (21:39 +0900)]
Update Format.yaml: Change execution condition of workflow
Execute format workflow only if there is `!format` in the commit message.
shanghai yakisoba chan! [Sat, 28 Nov 2020 06:48:31 +0000 (15:48 +0900)]
Refine gh-actions
* Update and rename Python_test.yml to Lint.yaml
* Create Format.yaml
Dan Norris [Sat, 28 Nov 2020 03:11:44 +0000 (22:11 -0500)]
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.
xxyzz [Sat, 28 Nov 2020 03:22:27 +0000 (11:22 +0800)]
replace bord with ord and some other byte string fix
PyCryptodome's bord() in Python3 does nothing.
xxyzz [Sat, 28 Nov 2020 03:20:53 +0000 (11:20 +0800)]
import ion correctly
Apprentice Harper [Fri, 27 Nov 2020 19:34:20 +0000 (19:34 +0000)]
Merge pull request #1269 from keshavgbpecdelhi/patch-4
using the Kindle & prompt
Apprentice Harper [Fri, 27 Nov 2020 19:34:08 +0000 (19:34 +0000)]
Merge pull request #1268 from keshavgbpecdelhi/patch-3
changing wil to will
Apprentice Harper [Fri, 27 Nov 2020 19:33:59 +0000 (19:33 +0000)]
Merge pull request #1267 from keshavgbpecdelhi/patch-2
prompt and will
Apprentice Harper [Fri, 27 Nov 2020 19:33:46 +0000 (19:33 +0000)]
Merge pull request #1266 from keshavgbpecdelhi/patch-1
"promt" doesn't make any sense
Apprentice Harper [Fri, 27 Nov 2020 19:32:25 +0000 (19:32 +0000)]
Update ReadMe_Overview.txt
Apprentice Harper [Fri, 27 Nov 2020 19:29:12 +0000 (19:29 +0000)]
Update FAQs.md
update with calibre 5 and new KFX info
Apprentice Harper [Fri, 27 Nov 2020 19:20:44 +0000 (19:20 +0000)]
Update README.md
Update ReadMe for calibre 5 and new KFX DRM
Apprentice Harper [Fri, 27 Nov 2020 15:51:33 +0000 (15:51 +0000)]
Python 3 fix for old ereader PDB DRM removal
Apprentice Harper [Fri, 27 Nov 2020 15:49:57 +0000 (15:49 +0000)]
Python 3 fix for epubtest.py that detects version of DRM used
Apprentice Harper [Fri, 27 Nov 2020 15:46:06 +0000 (15:46 +0000)]
Python 3 fixes for Android kindle key retrieval
xxyzz [Fri, 27 Nov 2020 14:01:18 +0000 (22:01 +0800)]
using byte string in kfxdedrm.py
Apprentice Harper [Wed, 25 Nov 2020 08:36:06 +0000 (08:36 +0000)]
Revert "PyCrypto requires RSA values to be long"
This reverts commit
a1703e15d4e9f1afc00a746cac1d1df585bfb546 .
Apprentice Harper [Mon, 23 Nov 2020 14:22:48 +0000 (14:22 +0000)]
Revert to byte arrays for maps on PC, and so fix for Mac which still used byte arrays. Remove some unused code.
Apprentice Harper [Mon, 23 Nov 2020 13:31:10 +0000 (13:31 +0000)]
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)
Apprentice Harper [Mon, 23 Nov 2020 13:28:29 +0000 (13:28 +0000)]
Merge pull request #1357 from task-hazy/python_3_cli_linux
Adjust wineutils to better call wine python
Apprentice Harper [Mon, 23 Nov 2020 13:26:27 +0000 (13:26 +0000)]
Merge pull request #1354 from ableeker/python3
Python3 customisation dialog
Aldo Bleeker [Sun, 22 Nov 2020 15:03:45 +0000 (16:03 +0100)]
Python 3 fixes
Ivan Lazar Miljenovic [Wed, 11 Nov 2020 12:51:19 +0000 (20:51 +0800)]
PyCrypto requires RSA values to be long
This is at least true for PyCrypto 2.6.1
Task Hazy [Mon, 9 Nov 2020 23:51:13 +0000 (16:51 -0700)]
Adjust wineutils to better call wine python
Separate out logic to find correct python executable, and change to not
do shell call with subprocess
Aldo Bleeker [Sat, 7 Nov 2020 12:43:58 +0000 (13:43 +0100)]
Minor Python 3 fix for Customize dialog
Aldo Bleeker [Fri, 6 Nov 2020 22:49:18 +0000 (23:49 +0100)]
More Python 3 fixes for Customize plugin dialog
Apprentice Harper [Thu, 5 Nov 2020 10:51:56 +0000 (10:51 +0000)]
Merge pull request #1348 from fireattack/master
Convert all to bytes first before concat (fix for Windows routine)
fireattack [Mon, 2 Nov 2020 08:09:52 +0000 (02:09 -0600)]
Convert all to bytes first before concat
Apprentice Harper [Thu, 29 Oct 2020 14:09:28 +0000 (14:09 +0000)]
Merge pull request #1340 from ableeker/python3
Python 3 fixes config.py alfcrypto.py
Apprentice Harper [Thu, 29 Oct 2020 14:06:53 +0000 (14:06 +0000)]
Merge pull request #1338 from ivan-m/wine_pythonpath
Set PYTHONPATH="" when running through wine
Aldo [Wed, 28 Oct 2020 17:54:33 +0000 (18:54 +0100)]
Python 3 fixes config.py alfcrypto.py
Ivan Lazar Miljenovic [Tue, 27 Oct 2020 05:34:16 +0000 (13:34 +0800)]
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).
Apprentice Harper [Thu, 22 Oct 2020 12:56:05 +0000 (13:56 +0100)]
Merge pull request #1333 from jpwhiting/fixwinreg
Fixwinreg - thanks, these all look useful and good.
Apprentice Harper [Thu, 22 Oct 2020 12:54:11 +0000 (13:54 +0100)]
Merge pull request #1331 from koumaza/koumaza/issue-template
Create Question Issue Template
Apprentice Harper [Thu, 22 Oct 2020 12:53:01 +0000 (13:53 +0100)]
Merge pull request #1329 from koumaza/koumaza/readme-wiki-how-to-remove
Add link to Wiki Page `How to remove DRM` in README.md
Jeremy Whiting [Wed, 21 Oct 2020 16:56:58 +0000 (10:56 -0600)]
Fix another exception thrown when unable to find kindle keys.
Jeremy Whiting [Wed, 21 Oct 2020 16:43:54 +0000 (10:43 -0600)]
_winreg in python3 has been changed to winreg. Update imports.
shanghai yakisoba chan! [Wed, 21 Oct 2020 00:00:04 +0000 (09:00 +0900)]
Update README.md
Change Wiki Link
shanghai yakisoba chan! [Tue, 20 Oct 2020 17:26:26 +0000 (02:26 +0900)]
Create QUESTION.md
shanghai yakisoba chan! [Tue, 20 Oct 2020 16:29:35 +0000 (01:29 +0900)]
Update README.md
Add Wiki Page Link
Apprentice Harper [Tue, 20 Oct 2020 15:21:36 +0000 (16:21 +0100)]
Merge pull request #1318 from task-hazy/kindle_fetch
Get working kindlekey.py on Python 3.8.6
Task Hazy [Wed, 14 Oct 2020 19:44:12 +0000 (13:44 -0600)]
Get working kindlekey.py on Python 3.8.6
Apprentice Harper [Fri, 16 Oct 2020 12:58:59 +0000 (13:58 +0100)]
More fixes for Amazon books, fixing identity checks, started on Topaz.
Apprentice Harper [Fri, 16 Oct 2020 12:22:19 +0000 (13:22 +0100)]
test file type correctly
Apprentice Harper [Wed, 14 Oct 2020 15:34:27 +0000 (16:34 +0100)]
Update README.md
Apprentice Harper [Wed, 14 Oct 2020 15:33:14 +0000 (16:33 +0100)]
Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools
Apprentice Harper [Wed, 14 Oct 2020 15:25:01 +0000 (16:25 +0100)]
Merge pull request #1297 from PetraOleum/patch-1
Update doc link for preferences code
Apprentice Harper [Wed, 14 Oct 2020 15:24:16 +0000 (16:24 +0100)]
Merge pull request #1296 from tartley/lint-fixes
Fix CI lint failures
Apprentice Harper [Wed, 14 Oct 2020 15:23:49 +0000 (16:23 +0100)]
More general changes, and get mobidedrm and kindlekey to work on Mac.
Petra Lamborn [Fri, 9 Oct 2020 09:25:01 +0000 (22:25 +1300)]
Update doc link for preferences code
This should really be properly explained, but at least it's not a dead link now!
Jonathan Hartley [Thu, 8 Oct 2020 19:37:04 +0000 (14:37 -0500)]
Remove unused fns in make_release.py
Apprentice Harper [Sun, 4 Oct 2020 19:36:12 +0000 (20:36 +0100)]
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.