]>
xmof Git - DeDRM.git/log
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: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 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
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 [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
Jony [Sun, 2 Feb 2020 08:20:52 +0000 (09:20 +0100)]
New translation: Swedish
I have finished the Swedish translation. Please merge it.
ZolaLa [Sat, 1 Feb 2020 05:22:56 +0000 (05:22 +0000)]
Update FAQs.md
Apprentice Harper [Thu, 30 Jan 2020 12:08:45 +0000 (12:08 +0000)]
Merge pull request #859 from HansChua/linux_handling
Allow users to specify Kobo directory and add 'ip' command for linux
Apprentice Harper [Thu, 30 Jan 2020 12:06:38 +0000 (12:06 +0000)]
Merge branch 'master' into linux_handling
Apprentice Harper [Thu, 30 Jan 2020 12:04:00 +0000 (12:04 +0000)]
Merge pull request #848 from sretlawd/kfx_dsn_fix
Allow decryption with DSN only.
Apprentice Harper [Thu, 30 Jan 2020 12:03:08 +0000 (12:03 +0000)]
Merge pull request #847 from aplaice/linux_documentation
Improve documentation for using Kindle for PC with Linux in Wine
Apprentice Harper [Thu, 30 Jan 2020 12:02:15 +0000 (12:02 +0000)]
Merge pull request #845 from aplaice/fix_default_winepath
Fix automatic import of decryption keys on Linux with wine
Apprentice Harper [Thu, 30 Jan 2020 12:00:02 +0000 (12:00 +0000)]
Merge pull request #850 from cclauss/modernize-Python-2-codes
Use print() function in both Python 2 and Python 3
Apprentice Harper [Thu, 30 Jan 2020 11:58:50 +0000 (11:58 +0000)]
Merge branch 'master' into modernize-Python-2-codes
Apprentice Harper [Thu, 30 Jan 2020 11:57:21 +0000 (11:57 +0000)]
Merge pull request #983 from cclauss/patch-1
GitHub Action: There is no requirements.txt
Christian Clauss [Thu, 23 Jan 2020 12:24:45 +0000 (13:24 +0100)]
Remove the unused rename_key() method
Apprentice Harper [Thu, 23 Jan 2020 12:11:24 +0000 (12:11 +0000)]
Merge pull request #863 from taroxd/patch-2
Fix typos - thanks.
Apprentice Harper [Thu, 23 Jan 2020 12:10:34 +0000 (12:10 +0000)]
Merge pull request #895 from adrw/patch-1
Update link - thanks.
Apprentice Harper [Thu, 23 Jan 2020 12:09:31 +0000 (12:09 +0000)]
Merge pull request #910 from corysolovewicz/patch-2
Update FAQs.md
Apprentice Harper [Thu, 23 Jan 2020 12:14:19 +0000 (12:14 +0000)]
Allow Kindle serial numbers to have spaces, allowing copy/paste from Amazon web site (thanks to jakemarsden)
Christian Clauss [Mon, 20 Jan 2020 14:23:19 +0000 (15:23 +0100)]
Focus only on legacy Python for now
Christian Clauss [Mon, 20 Jan 2020 14:17:06 +0000 (15:17 +0100)]
Undefined name: from ignoblekeygen import generate_key
Christian Clauss [Mon, 20 Jan 2020 14:11:14 +0000 (15:11 +0100)]
Undefined name: strip(uuidnum) --> uuidnum.strip()
Christian Clauss [Mon, 20 Jan 2020 13:58:03 +0000 (14:58 +0100)]
Undefined name: errlog = ''
Christian Clauss [Mon, 20 Jan 2020 13:55:42 +0000 (14:55 +0100)]
Undefined name: errlog = ''
Christian Clauss [Mon, 20 Jan 2020 13:47:04 +0000 (14:47 +0100)]
Undefined name: import zipfix
Christian Clauss [Mon, 20 Jan 2020 13:41:29 +0000 (14:41 +0100)]
Undefined name: Define RegError
Christian Clauss [Mon, 20 Jan 2020 13:34:56 +0000 (14:34 +0100)]
Undefined name: Error() --> ValueError()
Christian Clauss [Mon, 20 Jan 2020 13:33:16 +0000 (14:33 +0100)]
import erdr2pml, ineptpdf, k4mobidedrm
Christian Clauss [Mon, 20 Jan 2020 13:29:03 +0000 (14:29 +0100)]
Undefined name: from .convert2xml import encodeNumber
Christian Clauss [Mon, 20 Jan 2020 12:54:20 +0000 (13:54 +0100)]
Identity is not the same thing as equality in Python
Christian Clauss [Mon, 20 Jan 2020 12:52:54 +0000 (13:52 +0100)]
Undefined name: import traceback for line 70
Christian Clauss [Mon, 20 Jan 2020 12:49:02 +0000 (13:49 +0100)]
Undefined name: import traceback
Christian Clauss [Mon, 20 Jan 2020 12:46:20 +0000 (13:46 +0100)]
flake8 . --builtins=_,I
Christian Clauss [Mon, 20 Jan 2020 12:45:36 +0000 (13:45 +0100)]
Undefined name: from datetime import datetime
Christian Clauss [Mon, 20 Jan 2020 12:41:14 +0000 (13:41 +0100)]
flake8 . --builtins=_
Christian Clauss [Mon, 20 Jan 2020 12:39:27 +0000 (13:39 +0100)]
builtins=_
Christian Clauss [Mon, 20 Jan 2020 12:35:10 +0000 (13:35 +0100)]
GitHub Action: There is no requirements.txt
Apprentice Harper [Mon, 20 Jan 2020 12:32:28 +0000 (12:32 +0000)]
Merge pull request #957 from cclauss/patch-1
GitHub Actions: Lint and test our Python code
Apprentice Harper [Mon, 20 Jan 2020 12:28:26 +0000 (12:28 +0000)]
Merge pull request #965 from jakemarsden/patch-1
Fix very minor typo in contrib README
Apprentice Harper [Sun, 19 Jan 2020 14:48:20 +0000 (14:48 +0000)]
Merge pull request #971 from cgaspar/master
Update lzma import to include calibre >= 4.6.0
Carson Gaspar [Sat, 4 Jan 2020 13:20:16 +0000 (05:20 -0800)]
Update lzma import to include calibre >= 4.6.0
Jake Marsden [Sun, 29 Dec 2019 10:30:29 +0000 (23:30 +1300)]
Fix very minor typo in contrib README
Christian Clauss [Tue, 17 Dec 2019 07:51:25 +0000 (08:51 +0100)]
GitHub Actions: Lint and test our Python code
Cory Solovewicz [Sat, 5 Oct 2019 19:03:59 +0000 (12:03 -0700)]
Update FAQs.md
Update formatting: Wrap all filenames, file paths, and terminal commands in code quotes and cleaned up the file hashes by putting them in an unordered ist.
Andrew (Paradi) Alexander [Thu, 5 Sep 2019 16:04:40 +0000 (12:04 -0400)]
Update link
taroxd [Mon, 15 Jul 2019 12:27:00 +0000 (20:27 +0800)]
Update DeDRM_plugin_ReadMe.txt
taroxd [Mon, 15 Jul 2019 12:19:40 +0000 (20:19 +0800)]
Fix typo
snah [Sat, 6 Jul 2019 03:01:28 +0000 (11:01 +0800)]
Allow users to specify Kobo directory and add 'ip' command for linux
cclauss [Mon, 24 Jun 2019 16:49:38 +0000 (18:49 +0200)]
Use print() function in both Python 2 and Python 3
Legacy __print__ statements are syntax errors in Python 3 but __print()__ function works as expected in both Python 2 and Python 3.
Dan Walters [Fri, 14 Jun 2019 19:20:56 +0000 (14:20 -0500)]
Allow decryption with DSN only.
Adam Plaice [Wed, 12 Jun 2019 20:36:14 +0000 (22:36 +0200)]
Improve documentation for using Kindle for PC with Linux in Wine
I've tested this on Ubuntu 18.04, with wine installed from the default
package repos (no PPAs) with Kindle for PC version 1.17.
Adam Plaice [Wed, 12 Jun 2019 19:13:25 +0000 (21:13 +0200)]
Fix automatic import of decryption keys on Linux with wine
By default, the wineprefix passed to WineGetKeys is "". Unfortunately,
os.path.abspath(os.path.expanduser(os.path.expandvars("")))
returns the path to the working directory, which depends on the
directory from which calibre was invoked. Hence under current
behaviour the wineprefix becomes that path, no longer being the empty
string. This means that the `cmdline` that's run is always
`WINEPREFIX=/some/path/ wine python.exe [...]`, rather than `wine
python.exe [...]` even under default conditions, when the wineprefix
hasn't been changed. Unless the user is improbably lucky and invokes
calibre from ~/.wine/ (the default wineprefix), this causes automatic
retrieval of the keys to always fail.
The bug was introduced in
f2190a67558a .
Checking for "" allows for correct behaviour in the default case,
while keeping the nice behaviour of expanding `~`.
Apprentice Harper [Sat, 18 May 2019 17:42:56 +0000 (18:42 +0100)]
Update README.md
added three very FAQs
Apprentice Harper [Mon, 22 Apr 2019 14:03:09 +0000 (15:03 +0100)]
Update FAQs.md
Apprentice Harper [Mon, 22 Apr 2019 14:01:43 +0000 (15:01 +0100)]
Update FAQs.md
better pycrypto install instructions for Mac
Apprentice Harper [Sat, 30 Mar 2019 16:13:05 +0000 (16:13 +0000)]
Fix silly version number error
Apprentice Harper [Sat, 30 Mar 2019 15:02:40 +0000 (15:02 +0000)]
Version to 6.6.3 with update for kindle book name cleanup and .kinf2018 support (initial)
Apprentice Harper [Sat, 23 Feb 2019 16:45:16 +0000 (16:45 +0000)]
Update FAQs.md
confirmed that it's Kindle for Mac and PC 1.25 that's incompatible at present.
Apprentice Harper [Sat, 23 Feb 2019 16:13:22 +0000 (16:13 +0000)]
Update for Mac application - 64 bit and no splash screen
Apprentice Harper [Sat, 19 Jan 2019 15:43:46 +0000 (15:43 +0000)]
Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools
Apprentice Harper [Sat, 19 Jan 2019 15:36:09 +0000 (15:36 +0000)]
Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools
Apprentice Harper [Sat, 19 Jan 2019 15:30:06 +0000 (15:30 +0000)]
Update FAQs.md
better version info for Kindle for Mac and KIndle for PC
Apprentice Harper [Sat, 19 Jan 2019 15:17:06 +0000 (15:17 +0000)]
Merge pull request #613 from jonahweissman/cli-instructions
Create Calibre CLI instructions
Apprentice Harper [Sat, 19 Jan 2019 15:16:07 +0000 (15:16 +0000)]
Merge pull request #685 from mvastola/master
Fix "UnicodeEncodeError" in k4mobidedrm.py with titles containing UTF-8 chars
Apprentice Harper [Sun, 2 Dec 2018 11:51:51 +0000 (11:51 +0000)]
64-bit Macintosh Application, executable bit set on droplet, Updated release script, Version set to 6.6.2
Apprentice Harper [Sun, 2 Dec 2018 11:37:07 +0000 (11:37 +0000)]
Move to new positions
Mike Vastola [Wed, 14 Nov 2018 23:01:25 +0000 (18:01 -0500)]
Small fix to bug in K4/Mobi DeDRM with unicode filenames.
Fixes #658
Jonah Weissman [Sat, 13 Oct 2018 18:34:47 +0000 (14:34 -0400)]
Clarify CLI instructions are for Calibre plugin
Apprentice Harper [Sat, 13 Oct 2018 17:58:46 +0000 (18:58 +0100)]
Merge pull request #421 from drzraf/patch-1
obok.py: support fetching mac address on linux
Apprentice Harper [Sat, 13 Oct 2018 17:48:54 +0000 (18:48 +0100)]
Merge pull request #641 from adericbourg/patch-1
Fix typo
Apprentice Harper [Sat, 13 Oct 2018 17:44:23 +0000 (18:44 +0100)]
Merge pull request #623 from shhivam/master
Drastically simplified and corrected primes() in src/kindlekey.py
Apprentice Harper [Sat, 13 Oct 2018 17:41:20 +0000 (18:41 +0100)]
Merge pull request #546 from felixonmars/patch-1
Fix some typos in ReadMe_First.txt
Alban Dericbourg [Tue, 25 Sep 2018 19:42:30 +0000 (21:42 +0200)]
Fix typo
s/ooo/oo
shhivam [Sat, 8 Sep 2018 18:03:54 +0000 (23:33 +0530)]
shifted the comment to docstring
shhivam [Sat, 8 Sep 2018 18:00:00 +0000 (23:30 +0530)]
optimised and corrected primes func drastically
Jonah Weissman [Fri, 20 Jul 2018 00:00:25 +0000 (20:00 -0400)]
Create CLI instructions
Apprentice Harper [Wed, 29 Aug 2018 07:07:02 +0000 (08:07 +0100)]
Update FAQs.md
Apprentice Harper [Wed, 29 Aug 2018 07:03:47 +0000 (08:03 +0100)]
Update FAQs.md
Felix Yan [Thu, 14 Jun 2018 16:38:30 +0000 (00:38 +0800)]
Fix some typos in ReadMe_First.txt
Apprentice Harper [Sat, 2 Jun 2018 16:07:35 +0000 (17:07 +0100)]
Update FAQs.md
Updated KFX info
Apprentice Harper [Sat, 2 Jun 2018 16:00:10 +0000 (17:00 +0100)]
Update README.md
Apprentice Harper [Sat, 2 Jun 2018 15:47:00 +0000 (16:47 +0100)]
Update version number to 6.6.1, with wzyboy's new folder structure.
Apprentice Harper [Sat, 2 Jun 2018 15:21:44 +0000 (16:21 +0100)]
Merge pull request #502 from wzyboy/feature/reuse-code
Reuse code