856fef55be
Merge pull request #1268 from keshavgbpecdelhi/patch-3
...
changing wil to will
2020-11-27 19:34:08 +00:00
f2fa0426b7
Merge pull request #1267 from keshavgbpecdelhi/patch-2
...
prompt and will
2020-11-27 19:33:59 +00:00
c3376cc492
Merge pull request #1266 from keshavgbpecdelhi/patch-1
...
"promt" doesn't make any sense
2020-11-27 19:33:46 +00:00
dc72c368a5
Update ReadMe_Overview.txt
2020-11-27 19:32:25 +00:00
77033e1602
Update FAQs.md
...
update with calibre 5 and new KFX info
2020-11-27 19:29:12 +00:00
15cd372ad9
Update README.md
...
Update ReadMe for calibre 5 and new KFX DRM
2020-11-27 19:20:44 +00:00
c52e4db3df
Python 3 fix for old ereader PDB DRM removal
2020-11-27 15:51:33 +00:00
45038cc77b
Python 3 fix for epubtest.py that detects version of DRM used
2020-11-27 15:49:57 +00:00
5ec9c98a0b
Python 3 fixes for Android kindle key retrieval
2020-11-27 15:46:06 +00:00
66bab7bd7d
using byte string in kfxdedrm.py
2020-11-27 22:01:18 +08:00
e0c7d7d382
Revert "PyCrypto requires RSA values to be long"
...
This reverts commit a1703e15d4
2020-11-25 08:36:06 +00:00
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
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
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
c58e82d97f
Merge pull request #1354 from ableeker/python3
...
Python3 customisation dialog
2020-11-23 13:26:27 +00:00
74bcf33591
Python 3 fixes
2020-11-22 16:03:45 +01:00
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
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
a74f37c79e
Minor Python 3 fix for Customize dialog
2020-11-07 13:43:58 +01:00
7f4e6698ef
More Python 3 fixes for Customize plugin dialog
2020-11-06 23:49:18 +01:00
e2e19fb50f
Merge pull request #1348 from fireattack/master
...
Convert all to bytes first before concat (fix for Windows routine)
2020-11-05 10:51:56 +00:00
4a319a3522
Convert all to bytes first before concat
2020-11-02 02:09:52 -06:00
f1ef1b8ecd
Merge pull request #1340 from ableeker/python3
...
Python 3 fixes config.py alfcrypto.py
2020-10-29 14:09:28 +00:00
af0acf31a3
Merge pull request #1338 from ivan-m/wine_pythonpath
...
Set PYTHONPATH="" when running through wine
2020-10-29 14:06:53 +00:00
6dd022e6a0
Python 3 fixes config.py alfcrypto.py
2020-10-28 18:54:33 +01:00
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
019abecd05
Merge pull request #1333 from jpwhiting/fixwinreg
...
Fixwinreg - thanks, these all look useful and good.
2020-10-22 13:56:05 +01:00
7b3bbbd008
Merge pull request #1331 from koumaza/koumaza/issue-template
...
Create Question Issue Template
2020-10-22 13:54:11 +01:00
32968b1328
Merge pull request #1329 from koumaza/koumaza/readme-wiki-how-to-remove
...
Add link to Wiki Page `How to remove DRM` in README.md
2020-10-22 13:53:01 +01:00
e0ec691dd6
Fix another exception thrown when unable to find kindle keys.
2020-10-21 10:56:58 -06:00
0add3646d9
_winreg in python3 has been changed to winreg. Update imports.
2020-10-21 10:56:50 -06:00
16024ee972
Update README.md
...
Change Wiki Link
2020-10-21 09:00:04 +09:00
9cfe09e507
Create QUESTION.md
2020-10-21 02:26:26 +09:00
4a58d6f7dc
Update README.md
...
Add Wiki Page Link
2020-10-21 01:29:35 +09:00
c4c20eb07e
Merge pull request #1318 from task-hazy/kindle_fetch
...
Get working kindlekey.py on Python 3.8.6
2020-10-20 16:21:36 +01:00
cc33f40ecc
Get working kindlekey.py on Python 3.8.6
2020-10-16 12:07:34 -06:00
939cdbb0c9
More fixes for Amazon books, fixing identity checks, started on Topaz.
2020-10-16 13:58:59 +01:00
dc27c36761
test file type correctly
2020-10-16 13:22:19 +01:00
7262264b95
Update README.md
2020-10-14 16:34:27 +01:00
4b160132a5
Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools
2020-10-14 16:33:14 +01:00
85fb4ff729
Merge pull request #1297 from PetraOleum/patch-1
...
Update doc link for preferences code
2020-10-14 16:25:01 +01:00
608bd400ee
Merge pull request #1296 from tartley/lint-fixes
...
Fix CI lint failures
2020-10-14 16:24:16 +01:00
781268e17e
More general changes, and get mobidedrm and kindlekey to work on Mac.
2020-10-14 16:23:49 +01:00
41d3da12ec
Update doc link for preferences code
...
This should really be properly explained, but at least it's not a dead link now!
2020-10-09 22:25:01 +13:00
83139bc590
Remove unused fns in make_release.py
2020-10-08 14:37:04 -05:00
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.
2020-10-04 20:36:12 +01:00
2eb31c8fb5
Merge pull request #1275 from jpwhiting/python3fixes
...
Python3fixes
2020-10-04 20:07:37 +01:00
a3c7bad67e
Merge pull request #1265 from heindevries/master
...
Some changes in obok.py to make it work on windows
2020-10-04 20:04:32 +01:00
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.
2020-10-03 22:36:35 -06:00
62e0a69089
Fix launching help link from customization dialog.
...
To fix error with python3 when launching help link open files in binary
mode.
2020-10-03 22:36:35 -06:00
Apprentice Harper