]>
xmof Git - DeDRM.git/log
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.
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
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.
Apprentice Harper [Sun, 4 Oct 2020 19:07:37 +0000 (20:07 +0100)]
Merge pull request #1275 from jpwhiting/python3fixes
Python3fixes
Apprentice Harper [Sun, 4 Oct 2020 19:04:32 +0000 (20:04 +0100)]
Merge pull request #1265 from heindevries/master
Some changes in obok.py to make it work on windows
Jeremy Whiting [Fri, 2 Oct 2020 06:19:49 +0000 (00:19 -0600)]
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.
Jeremy Whiting [Fri, 2 Oct 2020 06:17:47 +0000 (00:17 -0600)]
Fix launching help link from customization dialog.
To fix error with python3 when launching help link open files in binary
mode.
Jeremy Whiting [Fri, 2 Oct 2020 04:41:57 +0000 (22:41 -0600)]
Use open instead of file() to export keys to file.
Fixes export of Kindle keys in calibre 5.0.1 here.
keshavgbpecdelhi [Wed, 30 Sep 2020 18:46:55 +0000 (00:16 +0530)]
using the Kindle & prompt
As I already said prompt is the right word so yeah...
and "you are use kindle" is making no sense so replacing it to make it meaningful i.e. "If you are using the Kindle for PC under Wine"
keshavgbpecdelhi [Wed, 30 Sep 2020 18:35:46 +0000 (00:05 +0530)]
wil to will
typo
keshavgbpecdelhi [Wed, 30 Sep 2020 18:31:32 +0000 (00:01 +0530)]
prompt and will
Sorry but typos are typos
"promt" should be written as "prompt"
and "wil" should be "will"
keshavgbpecdelhi [Wed, 30 Sep 2020 17:42:26 +0000 (23:12 +0530)]
"promt" doesn't make any sense
I think it may be a silly mistake or something because the other prompts are written well except this. Just to webpage will not look authentic by using a wrong spelling so writing the sentence like as follows :
Clicking this button will prompt you to enter a new name for the highlighted key in the list.
HdV [Wed, 30 Sep 2020 14:56:14 +0000 (16:56 +0200)]
Merge branch 'master' of https://github.com/heindevries/DeDRM_tools
merging
HdV [Wed, 30 Sep 2020 12:25:32 +0000 (13:25 +0100)]
Changes to make obok work on win
_winreg renamed to winreg in python 3
os.popen3() replaced by subprocess.Popen()
Apprentice Harper [Wed, 30 Sep 2020 12:25:32 +0000 (13:25 +0100)]
Fix problem on Mac with byte arrays.
Apprentice Harper [Wed, 30 Sep 2020 10:45:50 +0000 (11:45 +0100)]
Merge pull request #1255 from cclauss/patch-2
GitHub Action test on both Python 2 and Python 3
Christian Clauss [Sun, 27 Sep 2020 23:03:30 +0000 (01:03 +0200)]
Update genbook.py
Christian Clauss [Sun, 27 Sep 2020 23:00:21 +0000 (01:00 +0200)]
Old style exceptions are syntax errors in Python 3
Switch to new style exceptions which work on both Python 2 and Python 3.
Christian Clauss [Sun, 27 Sep 2020 22:49:21 +0000 (00:49 +0200)]
print() is a function in Python since 1/1/2020
Christian Clauss [Sun, 27 Sep 2020 22:39:57 +0000 (00:39 +0200)]
Fix Python syntax error: add a comma
Discovered by flake8 running in our GitHub Action
Christian Clauss [Sun, 27 Sep 2020 22:36:25 +0000 (00:36 +0200)]
GitHub Action test on both Python 2 and Python 3
Apprentice Harper [Sun, 27 Sep 2020 10:54:49 +0000 (11:54 +0100)]
More generic 3.0 changes, to be tested.
Apprentice Harper [Sun, 27 Sep 2020 09:11:37 +0000 (10:11 +0100)]
Merge pull request #1248 from kubik147/adobekey
Make adobekey.py work in Python 3
kubik147 [Sat, 26 Sep 2020 22:57:53 +0000 (00:57 +0200)]
Remove the u string prefixes
kubik147 [Sat, 26 Sep 2020 22:46:32 +0000 (00:46 +0200)]
Make adobekey.py work in Python 3
Apprentice Harper [Sat, 26 Sep 2020 20:19:48 +0000 (21:19 +0100)]
Merge pull request #1170 from Dr-Willy/master
Fix path in make_release.py
Apprentice Harper [Sat, 26 Sep 2020 20:19:17 +0000 (21:19 +0100)]
Merge pull request #1241 from erikbrinkman/patch-1
Support ebook-convert
Apprentice Harper [Sat, 26 Sep 2020 20:22:47 +0000 (21:22 +0100)]
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
Erik Brinkman [Sun, 20 Sep 2020 20:43:23 +0000 (16:43 -0400)]
Support ebook-convert
`ebook-convert` converts ebooks without adding them to the calibre library, and so dedrm_tools fails to run and convert books that are processed in this way. Adding on_preprocess means that it will also run on any preprocessing allowing these tools to be used by the cli tools.
As far as I'm aware, there's nothing wrong with having this run in both instances, and it still seems to allow conversion in the "standard way".
Dr-Willy [Mon, 20 Jul 2020 09:07:20 +0000 (21:07 +1200)]
Fix path in make_release.py
Apprentice Harper [Thu, 18 Jun 2020 07:03:20 +0000 (08:03 +0100)]
Updates to FAQs and ReadMes
Apprentice Harper [Thu, 18 Jun 2020 06:42:41 +0000 (07:42 +0100)]
Update init file, update versions in files, update comments in files
Apprentice Harper [Wed, 17 Jun 2020 15:04:41 +0000 (16:04 +0100)]
Merge pull request #1095 from fondfire/patch-1
Create ignoblepdf.py
Apprentice Harper [Wed, 17 Jun 2020 14:57:27 +0000 (15:57 +0100)]
Merge pull request #1091 from vanicat/inetepub-python3
Inetepub python3
Apprentice Harper [Wed, 17 Jun 2020 14:56:37 +0000 (15:56 +0100)]
Merge pull request #1037 from apprenticesakuya/master
Finish .kinf2018 support and add KFX v2/v3 support
apprenticesakuya [Tue, 16 Jun 2020 01:19:15 +0000 (01:19 +0000)]
Support KFX VoucherEnvelope versions 2 and 3
apprenticesakuya [Thu, 11 Jun 2020 17:26:36 +0000 (17:26 +0000)]
Support .kinf2018 on Mac
fondfire [Sat, 16 May 2020 03:08:30 +0000 (22:08 -0500)]
Create ignoblepdf.py
New Python 2 program to decrypt Barnes & Noble encrypted PDF files.
Rémi Vanicat [Fri, 8 May 2020 15:57:28 +0000 (17:57 +0200)]
More handling of difference between python2 and python3
Place where python3 use bytes/int and python2 str/str
Rémi Vanicat [Fri, 8 May 2020 15:51:40 +0000 (17:51 +0200)]
decoding from base64 in a portable way
Rémi Vanicat [Fri, 8 May 2020 15:35:01 +0000 (17:35 +0200)]
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'
apprenticesakuya [Fri, 27 Mar 2020 20:01:09 +0000 (13:01 -0700)]
Finish .kinf2018 support
Apprentice Harper [Mon, 17 Feb 2020 12:07:35 +0000 (12:07 +0000)]
merge of translations
Apprentice Harper [Mon, 17 Feb 2020 12:06:23 +0000 (12:06 +0000)]
Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools
Apprentice Harper [Sun, 16 Feb 2020 10:12:25 +0000 (10:12 +0000)]
Remove stand-alone apps. Only support the two plugins.
Apprentice Harper [Thu, 6 Feb 2020 12:01:44 +0000 (12:01 +0000)]
Merge pull request #989 from jony0008/master
New translation for obok plug-in: Swedish
Apprentice Harper [Thu, 6 Feb 2020 11:59:15 +0000 (11:59 +0000)]
Merge pull request #988 from ZolaLa9/Update-FAQs-for-Kindle-for-Mac-and-Catalina
Update FAQs.md for K4Mac and Catalina