mirror of
https://github.com/noDRM/DeDRM_tools.git
synced 2024-09-28 11:06:10 +06:00
Compare commits
No commits in common. "master" and "v10.0.9" have entirely different histories.
71
.github/workflows/main.yml
vendored
71
.github/workflows/main.yml
vendored
|
@ -21,32 +21,45 @@ jobs:
|
||||||
DeDRM_tools_*.zip
|
DeDRM_tools_*.zip
|
||||||
DeDRM_tools.zip
|
DeDRM_tools.zip
|
||||||
|
|
||||||
- name: Prepare release
|
# - name: Delete old release
|
||||||
run: cp DeDRM_tools.zip DeDRM_alpha_${{ github.sha }}.zip
|
# uses: cb80/delrel@latest
|
||||||
|
# with:
|
||||||
|
# tag: autorelease
|
||||||
- uses: dev-drprasad/delete-older-releases@v0.2.1
|
# token: ${{ github.token }}
|
||||||
with:
|
#
|
||||||
repo: noDRM/DeDRM_tools_autorelease
|
# - name: Delete old tag
|
||||||
keep_latest: 0
|
# uses: dev-drprasad/delete-tag-and-release@v1.0
|
||||||
delete_tags: true
|
# with:
|
||||||
env:
|
# tag_name: autorelease
|
||||||
GITHUB_TOKEN: ${{ secrets.AUTORELEASE_KEY }}
|
# github_token: ${{ github.token }}
|
||||||
|
# delete_release: true
|
||||||
- name: Auto-release
|
#
|
||||||
id: autorelease
|
# - name: Prepare release
|
||||||
uses: softprops/action-gh-release@v1
|
# run: cp DeDRM_tools.zip DeDRM_alpha_${{ github.sha }}.zip
|
||||||
with:
|
#
|
||||||
tag_name: autorelease_${{ github.sha }}
|
# - name: Auto-release
|
||||||
repository: noDRM/DeDRM_tools_autorelease
|
# id: autorelease
|
||||||
token: ${{ secrets.AUTORELEASE_KEY }}
|
# uses: softprops/action-gh-release@v1
|
||||||
name: Automatic alpha release with latest changes
|
# with:
|
||||||
body: |
|
# tag_name: autorelease
|
||||||
This release is automatically generated by Github for each commit.
|
# token: ${{ github.token }}
|
||||||
|
# name: Automatic alpha release with latest changes
|
||||||
This means, every time a change is made to the repo, a release with an untested copy of the plugin at that stage will be created. This will contain the most up-to-date code, but it's not tested at all and may be broken.
|
# body: |
|
||||||
|
# This release is automatically generated by Github for each commit.
|
||||||
Last update based on Git commit [${{ github.sha }}](https://github.com/noDRM/DeDRM_tools/commit/${{ github.sha }}).
|
#
|
||||||
prerelease: true
|
# This means, every time a change is made to this repo, this release will be updated to contain an untested copy of the plugin at that stage. This will contain the most up-to-date code, but it's not tested at all and may be broken.
|
||||||
draft: false
|
#
|
||||||
files: DeDRM_alpha_${{ github.sha }}.zip
|
# Last update based on Git commit ${{ github.sha }}.
|
||||||
|
# prerelease: true
|
||||||
|
# draft: true
|
||||||
|
# files: DeDRM_alpha_${{ github.sha }}.zip
|
||||||
|
#
|
||||||
|
# - name: Make release public
|
||||||
|
# uses: irongut/EditRelease@v1.2.0
|
||||||
|
# with:
|
||||||
|
# token: ${{ github.token }}
|
||||||
|
# id: ${{ steps.autorelease.outputs.id }}
|
||||||
|
# draft: false
|
||||||
|
# prerelease: true
|
||||||
|
#
|
||||||
|
#
|
|
@ -99,10 +99,4 @@ This is v10.0.9, a release candidate for v10.1.0. I don't expect there to be maj
|
||||||
|
|
||||||
## Fixes on master (not yet released):
|
## Fixes on master (not yet released):
|
||||||
|
|
||||||
- Fix a bug where decrypting a 40-bit RC4 pdf with R=2 didn't work.
|
- (none)
|
||||||
- Fix a bug where decrypting a 256-bit AES pdf with V=5 didn't work.
|
|
||||||
- Fix bugs in kgenpids.py, alfcrypto.py, mobidedrm.py and kindlekey.py that caused it to fail on Python 2 (#380).
|
|
||||||
- Fix some bugs (Python 2 and Python 3) in erdr2pml.py (untested).
|
|
||||||
- Fix file lock bug in androidkindlekey.py on Windows with Calibre >= 7 (untested).
|
|
||||||
- A bunch of updates to the external FileOpen ineptpdf script, might fix #442 (untested).
|
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,7 @@ if "calibre" in sys.modules and sys.version_info[0] == 2:
|
||||||
if os.path.join(config_dir, "plugins", "DeDRM.zip") not in sys.path:
|
if os.path.join(config_dir, "plugins", "DeDRM.zip") not in sys.path:
|
||||||
sys.path.insert(0, os.path.join(config_dir, "plugins", "DeDRM.zip"))
|
sys.path.insert(0, os.path.join(config_dir, "plugins", "DeDRM.zip"))
|
||||||
|
|
||||||
if "calibre" in sys.modules:
|
|
||||||
# Explicitly set the package identifier so we are allowed to import stuff ...
|
# Explicitly set the package identifier so we are allowed to import stuff ...
|
||||||
__package__ = "calibre_plugins.dedrm"
|
#__package__ = "DeDRM_plugin"
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE_END@@
|
#@@CALIBRE_COMPAT_CODE_END@@
|
||||||
|
|
|
@ -96,9 +96,6 @@ import traceback
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
#@@CALIBRE_COMPAT_CODE@@
|
||||||
|
|
||||||
try:
|
try:
|
||||||
try:
|
|
||||||
from . import __version
|
|
||||||
except:
|
|
||||||
import __version
|
import __version
|
||||||
except:
|
except:
|
||||||
print("#############################")
|
print("#############################")
|
||||||
|
@ -137,9 +134,7 @@ try:
|
||||||
except:
|
except:
|
||||||
config_dir = ""
|
config_dir = ""
|
||||||
|
|
||||||
try:
|
|
||||||
from . import utilities
|
|
||||||
except:
|
|
||||||
import utilities
|
import utilities
|
||||||
|
|
||||||
|
|
||||||
|
@ -920,9 +915,6 @@ class DeDRM(FileTypePlugin):
|
||||||
# perhaps we need to get a new default Kindle for Mac/PC key
|
# perhaps we need to get a new default Kindle for Mac/PC key
|
||||||
defaultkeys = []
|
defaultkeys = []
|
||||||
print("{0} v{1}: Failed to decrypt with error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION,e.args[0]))
|
print("{0} v{1}: Failed to decrypt with error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION,e.args[0]))
|
||||||
|
|
||||||
traceback.print_exc()
|
|
||||||
|
|
||||||
print("{0} v{1}: Looking for new default Kindle Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
|
print("{0} v{1}: Looking for new default Kindle Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -5,21 +5,10 @@
|
||||||
# (CLI interface without Calibre)
|
# (CLI interface without Calibre)
|
||||||
# Copyright © 2021 NoDRM
|
# Copyright © 2021 NoDRM
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
NOTE: This code is not functional (yet). I started working on it a while ago
|
|
||||||
to make a standalone version of the plugins that could work without Calibre,
|
|
||||||
too, but for now there's only a rough code structure and no working code yet.
|
|
||||||
|
|
||||||
Currently, to use these plugins, you will need to use Calibre. Hopwfully that'll
|
|
||||||
change in the future.
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
__license__ = 'GPL v3'
|
__license__ = 'GPL v3'
|
||||||
__docformat__ = 'restructuredtext en'
|
__docformat__ = 'restructuredtext en'
|
||||||
|
|
||||||
# For revision history see CHANGELOG.md
|
# For revision history see __init__.py
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Run DeDRM plugin without Calibre.
|
Run DeDRM plugin without Calibre.
|
||||||
|
|
|
@ -44,11 +44,10 @@ __version__ = '7.4'
|
||||||
import sys, os, struct, getopt
|
import sys, os, struct, getopt
|
||||||
from base64 import b64decode
|
from base64 import b64decode
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
|
||||||
|
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
from utilities import SafeUnbuffered
|
||||||
from .argv_utils import unicode_argv
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
# pbkdf2.py Copyright © 2009 Daniel Holth <dholth@fastmail.fm>
|
# pbkdf2.py Copyright © 2009 Daniel Holth <dholth@fastmail.fm>
|
||||||
# pbkdf2.py This code may be freely used and modified for any purpose.
|
# pbkdf2.py This code may be freely used and modified for any purpose.
|
||||||
|
|
||||||
import sys
|
|
||||||
import hmac
|
import hmac
|
||||||
from struct import pack
|
from struct import pack
|
||||||
import hashlib
|
import hashlib
|
||||||
|
@ -26,9 +25,6 @@ class Pukall_Cipher(object):
|
||||||
raise Exception("PC1: Bad key length")
|
raise Exception("PC1: Bad key length")
|
||||||
wkey = []
|
wkey = []
|
||||||
for i in range(8):
|
for i in range(8):
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
wkey.append(ord(key[i*2])<<8 | ord(key[i*2+1]))
|
|
||||||
else:
|
|
||||||
wkey.append(key[i*2]<<8 | key[i*2+1])
|
wkey.append(key[i*2]<<8 | key[i*2+1])
|
||||||
dst = bytearray(len(src))
|
dst = bytearray(len(src))
|
||||||
for i in range(len(src)):
|
for i in range(len(src)):
|
||||||
|
@ -41,12 +37,7 @@ class Pukall_Cipher(object):
|
||||||
sum2 = (sum2+sum1)&0xFFFF
|
sum2 = (sum2+sum1)&0xFFFF
|
||||||
temp1 = (temp1*20021+1)&0xFFFF
|
temp1 = (temp1*20021+1)&0xFFFF
|
||||||
byteXorVal ^= temp1 ^ sum2
|
byteXorVal ^= temp1 ^ sum2
|
||||||
|
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
curByte = ord(src[i])
|
|
||||||
else:
|
|
||||||
curByte = src[i]
|
curByte = src[i]
|
||||||
|
|
||||||
if not decryption:
|
if not decryption:
|
||||||
keyXorVal = curByte * 257;
|
keyXorVal = curByte * 257;
|
||||||
curByte = ((curByte ^ (byteXorVal >> 8)) ^ byteXorVal) & 0xFF
|
curByte = ((curByte ^ (byteXorVal >> 8)) ^ byteXorVal) & 0xFF
|
||||||
|
@ -54,12 +45,7 @@ class Pukall_Cipher(object):
|
||||||
keyXorVal = curByte * 257;
|
keyXorVal = curByte * 257;
|
||||||
for j in range(8):
|
for j in range(8):
|
||||||
wkey[j] ^= keyXorVal;
|
wkey[j] ^= keyXorVal;
|
||||||
|
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
dst[i] = chr(curByte)
|
|
||||||
else:
|
|
||||||
dst[i] = curByte
|
dst[i] = curByte
|
||||||
|
|
||||||
return bytes(dst)
|
return bytes(dst)
|
||||||
|
|
||||||
class Topaz_Cipher(object):
|
class Topaz_Cipher(object):
|
||||||
|
@ -117,7 +103,7 @@ class KeyIVGen(object):
|
||||||
def xorbytes( a, b ):
|
def xorbytes( a, b ):
|
||||||
if len(a) != len(b):
|
if len(a) != len(b):
|
||||||
raise Exception("xorbytes(): lengths differ")
|
raise Exception("xorbytes(): lengths differ")
|
||||||
return bytes(bytearray([x ^ y for x, y in zip(a, b)]))
|
return bytes([x ^ y for x, y in zip(a, b)])
|
||||||
|
|
||||||
def prf( h, data ):
|
def prf( h, data ):
|
||||||
hm = h.copy()
|
hm = h.copy()
|
||||||
|
|
|
@ -201,9 +201,6 @@ def get_serials2(path=STORAGE2):
|
||||||
for y in tokens:
|
for y in tokens:
|
||||||
serials.append(y)
|
serials.append(y)
|
||||||
serials.append(x+y)
|
serials.append(x+y)
|
||||||
|
|
||||||
connection.close()
|
|
||||||
|
|
||||||
return serials
|
return serials
|
||||||
|
|
||||||
def get_serials(path=STORAGE):
|
def get_serials(path=STORAGE):
|
||||||
|
|
|
@ -29,7 +29,7 @@ from calibre.constants import iswindows, isosx
|
||||||
|
|
||||||
from __init__ import PLUGIN_NAME, PLUGIN_VERSION
|
from __init__ import PLUGIN_NAME, PLUGIN_VERSION
|
||||||
from __version import RESOURCE_NAME as help_file_name
|
from __version import RESOURCE_NAME as help_file_name
|
||||||
from .utilities import uStrCmp
|
from utilities import uStrCmp
|
||||||
|
|
||||||
import prefs
|
import prefs
|
||||||
import androidkindlekey
|
import androidkindlekey
|
||||||
|
|
|
@ -5,10 +5,7 @@
|
||||||
# For use with Topaz Scripts Version 2.6
|
# For use with Topaz Scripts Version 2.6
|
||||||
# Python 3, September 2020
|
# Python 3, September 2020
|
||||||
|
|
||||||
|
from utilities import SafeUnbuffered
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import csv
|
import csv
|
||||||
|
|
|
@ -49,18 +49,16 @@
|
||||||
|
|
||||||
__version__ = '2.0'
|
__version__ = '2.0'
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
|
||||||
|
|
||||||
import sys, struct, os, traceback
|
import sys, struct, os, traceback
|
||||||
import zlib
|
import zlib
|
||||||
import zipfile
|
import zipfile
|
||||||
import xml.etree.ElementTree as etree
|
import xml.etree.ElementTree as etree
|
||||||
from .argv_utils import unicode_argv
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
NSMAP = {'adept': 'http://ns.adobe.com/adept',
|
NSMAP = {'adept': 'http://ns.adobe.com/adept',
|
||||||
'enc': 'http://www.w3.org/2001/04/xmlenc#'}
|
'enc': 'http://www.w3.org/2001/04/xmlenc#'}
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
|
|
||||||
_FILENAME_LEN_OFFSET = 26
|
_FILENAME_LEN_OFFSET = 26
|
||||||
|
|
|
@ -79,13 +79,12 @@ except ImportError:
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
#@@CALIBRE_COMPAT_CODE@@
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
from utilities import SafeUnbuffered
|
||||||
from .argv_utils import unicode_argv
|
|
||||||
|
|
||||||
iswindows = sys.platform.startswith('win')
|
iswindows = sys.platform.startswith('win')
|
||||||
isosx = sys.platform.startswith('darwin')
|
isosx = sys.platform.startswith('darwin')
|
||||||
|
|
||||||
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
import cgi
|
import cgi
|
||||||
import logging
|
import logging
|
||||||
|
@ -142,20 +141,14 @@ def sanitizeFileName(name):
|
||||||
|
|
||||||
def fixKey(key):
|
def fixKey(key):
|
||||||
def fixByte(b):
|
def fixByte(b):
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
b = ord(b)
|
|
||||||
|
|
||||||
return b ^ ((b ^ (b<<1) ^ (b<<2) ^ (b<<3) ^ (b<<4) ^ (b<<5) ^ (b<<6) ^ (b<<7) ^ 0x80) & 0x80)
|
return b ^ ((b ^ (b<<1) ^ (b<<2) ^ (b<<3) ^ (b<<4) ^ (b<<5) ^ (b<<6) ^ (b<<7) ^ 0x80) & 0x80)
|
||||||
return bytes(bytearray([fixByte(a) for a in key]))
|
return bytes([fixByte(a) for a in key])
|
||||||
|
|
||||||
def deXOR(text, sp, table):
|
def deXOR(text, sp, table):
|
||||||
r=b''
|
r=''
|
||||||
j = sp
|
j = sp
|
||||||
for i in range(len(text)):
|
for i in range(len(text)):
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
r += chr(ord(table[j]) ^ ord(text[i]))
|
r += chr(ord(table[j]) ^ ord(text[i]))
|
||||||
else:
|
|
||||||
r += bytes(bytearray([table[j] ^ text[i]]))
|
|
||||||
j = j + 1
|
j = j + 1
|
||||||
if j == len(table):
|
if j == len(table):
|
||||||
j = 0
|
j = 0
|
||||||
|
|
|
@ -4,9 +4,7 @@
|
||||||
# Python 3 for calibre 5.0
|
# Python 3 for calibre 5.0
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import csv
|
import csv
|
||||||
|
|
|
@ -45,16 +45,14 @@ import os
|
||||||
import hashlib
|
import hashlib
|
||||||
import base64
|
import base64
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from Cryptodome.Cipher import AES
|
from Cryptodome.Cipher import AES
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from Crypto.Cipher import AES
|
from Crypto.Cipher import AES
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
from .argv_utils import unicode_argv
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
class IGNOBLEError(Exception):
|
class IGNOBLEError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -27,16 +27,14 @@ import hashlib
|
||||||
import getopt
|
import getopt
|
||||||
import re
|
import re
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from calibre.constants import iswindows
|
from calibre.constants import iswindows
|
||||||
except:
|
except:
|
||||||
iswindows = sys.platform.startswith('win')
|
iswindows = sys.platform.startswith('win')
|
||||||
|
|
||||||
from .argv_utils import unicode_argv
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
class DrmException(Exception):
|
class DrmException(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -70,10 +70,9 @@ def unpad(data, padding=16):
|
||||||
|
|
||||||
return data[:-pad_len]
|
return data[:-pad_len]
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
from argv_utils import unicode_argv
|
||||||
from .argv_utils import unicode_argv
|
|
||||||
|
|
||||||
|
|
||||||
class ADEPTError(Exception):
|
class ADEPTError(Exception):
|
||||||
|
|
|
@ -92,14 +92,13 @@ def unpad(data, padding=16):
|
||||||
|
|
||||||
return data[:-pad_len]
|
return data[:-pad_len]
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
from utilities import SafeUnbuffered
|
||||||
from .argv_utils import unicode_argv
|
|
||||||
|
|
||||||
iswindows = sys.platform.startswith('win')
|
iswindows = sys.platform.startswith('win')
|
||||||
isosx = sys.platform.startswith('darwin')
|
isosx = sys.platform.startswith('darwin')
|
||||||
|
|
||||||
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
class ADEPTError(Exception):
|
class ADEPTError(Exception):
|
||||||
pass
|
pass
|
||||||
|
@ -834,7 +833,7 @@ def num_value(x):
|
||||||
x = resolve1(x)
|
x = resolve1(x)
|
||||||
if not (isinstance(x, int) or isinstance(x, Decimal)):
|
if not (isinstance(x, int) or isinstance(x, Decimal)):
|
||||||
if STRICT:
|
if STRICT:
|
||||||
raise PDFTypeError('Int or Decimal required: %r' % x)
|
raise PDFTypeError('Int or Float required: %r' % x)
|
||||||
return 0
|
return 0
|
||||||
return x
|
return x
|
||||||
|
|
||||||
|
@ -1367,14 +1366,14 @@ class PDFDocument(object):
|
||||||
|
|
||||||
def process_with_aes(self, key, encrypt, data, repetitions = 1, iv = None):
|
def process_with_aes(self, key, encrypt, data, repetitions = 1, iv = None):
|
||||||
if iv is None:
|
if iv is None:
|
||||||
iv = bytes(bytearray(16))
|
keylen = len(key)
|
||||||
|
iv = bytes([0x00]*keylen)
|
||||||
aes = AES.new(key, AES.MODE_CBC, iv)
|
|
||||||
|
|
||||||
if not encrypt:
|
if not encrypt:
|
||||||
plaintext = aes.decrypt(data)
|
plaintext = AES.new(key,AES.MODE_CBC,iv, True).decrypt(data)
|
||||||
return plaintext
|
return plaintext
|
||||||
else:
|
else:
|
||||||
|
aes = AES.new(key, AES.MODE_CBC, iv, False)
|
||||||
new_data = bytes(data * repetitions)
|
new_data = bytes(data * repetitions)
|
||||||
crypt = aes.encrypt(new_data)
|
crypt = aes.encrypt(new_data)
|
||||||
return crypt
|
return crypt
|
||||||
|
@ -1395,18 +1394,10 @@ class PDFDocument(object):
|
||||||
raise Exception("K1 < 32 ...")
|
raise Exception("K1 < 32 ...")
|
||||||
#def process_with_aes(self, key: bytes, encrypt: bool, data: bytes, repetitions: int = 1, iv: bytes = None):
|
#def process_with_aes(self, key: bytes, encrypt: bool, data: bytes, repetitions: int = 1, iv: bytes = None):
|
||||||
E = self.process_with_aes(K[:16], True, K1, 64, K[16:32])
|
E = self.process_with_aes(K[:16], True, K1, 64, K[16:32])
|
||||||
E = bytearray(E)
|
K = (hashlib.sha256, hashlib.sha384, hashlib.sha512)[sum(E) % 3](E).digest()
|
||||||
|
|
||||||
E_mod_3 = 0
|
|
||||||
for i in range(16):
|
|
||||||
E_mod_3 += E[i]
|
|
||||||
|
|
||||||
E_mod_3 %= 3
|
|
||||||
|
|
||||||
K = (hashlib.sha256, hashlib.sha384, hashlib.sha512)[E_mod_3](E).digest()
|
|
||||||
|
|
||||||
if round_number >= 64:
|
if round_number >= 64:
|
||||||
ch = E[-1:][0] # get last byte
|
ch = int.from_bytes(E[-1:], "big", signed=False)
|
||||||
if ch <= round_number - 32:
|
if ch <= round_number - 32:
|
||||||
done = True
|
done = True
|
||||||
|
|
||||||
|
@ -1487,23 +1478,14 @@ class PDFDocument(object):
|
||||||
EncMetadata = b'True'
|
EncMetadata = b'True'
|
||||||
if (EncMetadata == ('False' or 'false') or V < 4) and R >= 4:
|
if (EncMetadata == ('False' or 'false') or V < 4) and R >= 4:
|
||||||
hash.update(codecs.decode(b'ffffffff','hex'))
|
hash.update(codecs.decode(b'ffffffff','hex'))
|
||||||
|
|
||||||
# Finish hash:
|
|
||||||
hash = hash.digest()
|
|
||||||
|
|
||||||
if R >= 3:
|
if R >= 3:
|
||||||
# 8
|
# 8
|
||||||
for _ in range(50):
|
for _ in range(50):
|
||||||
hash = hashlib.md5(hash[:length//8]).digest()
|
hash = hashlib.md5(hash.digest()[:length//8])
|
||||||
if R == 2:
|
key = hash.digest()[:length//8]
|
||||||
# R=2 only uses first five bytes.
|
|
||||||
key = hash[:5]
|
|
||||||
else:
|
|
||||||
key = hash[:length//8]
|
|
||||||
|
|
||||||
if R == 2:
|
if R == 2:
|
||||||
# Algorithm 3.4
|
# Algorithm 3.4
|
||||||
u1 = ARC4.new(key).decrypt(self.PASSWORD_PADDING)
|
u1 = ARC4.new(key).decrypt(password)
|
||||||
elif R >= 3:
|
elif R >= 3:
|
||||||
# Algorithm 3.5
|
# Algorithm 3.5
|
||||||
hash = hashlib.md5(self.PASSWORD_PADDING) # 2
|
hash = hashlib.md5(self.PASSWORD_PADDING) # 2
|
||||||
|
@ -1516,7 +1498,6 @@ class PDFDocument(object):
|
||||||
k = b''.join(bytes([c ^ i]) for c in key )
|
k = b''.join(bytes([c ^ i]) for c in key )
|
||||||
x = ARC4.new(k).decrypt(x)
|
x = ARC4.new(k).decrypt(x)
|
||||||
u1 = x+x # 32bytes total
|
u1 = x+x # 32bytes total
|
||||||
|
|
||||||
if R == 2:
|
if R == 2:
|
||||||
is_authenticated = (u1 == U)
|
is_authenticated = (u1 == U)
|
||||||
else:
|
else:
|
||||||
|
@ -2042,7 +2023,7 @@ class PDFParser(PSStackParser):
|
||||||
except PDFNoValidXRef:
|
except PDFNoValidXRef:
|
||||||
# fallback
|
# fallback
|
||||||
self.seek(0)
|
self.seek(0)
|
||||||
pat = re.compile(br'^(\\d+)\\s+(\\d+)\\s+obj\\b')
|
pat = re.compile(b'^(\\d+)\\s+(\\d+)\\s+obj\\b')
|
||||||
offsets = {}
|
offsets = {}
|
||||||
xref = PDFXRef()
|
xref = PDFXRef()
|
||||||
while 1:
|
while 1:
|
||||||
|
|
|
@ -30,9 +30,6 @@ import struct
|
||||||
|
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from Cryptodome.Cipher import AES
|
from Cryptodome.Cipher import AES
|
||||||
from Cryptodome.Util.py3compat import bchr
|
from Cryptodome.Util.py3compat import bchr
|
||||||
|
@ -60,7 +57,7 @@ except ImportError:
|
||||||
# Windows-friendly choice: pylzma wheels
|
# Windows-friendly choice: pylzma wheels
|
||||||
import pylzma as lzma
|
import pylzma as lzma
|
||||||
|
|
||||||
from .kfxtables import *
|
from kfxtables import *
|
||||||
|
|
||||||
TID_NULL = 0
|
TID_NULL = 0
|
||||||
TID_BOOLEAN = 1
|
TID_BOOLEAN = 1
|
||||||
|
|
|
@ -88,9 +88,9 @@ import kgenpids
|
||||||
import androidkindlekey
|
import androidkindlekey
|
||||||
import kfxdedrm
|
import kfxdedrm
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
from .argv_utils import unicode_argv
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
|
|
||||||
# cleanup unicode filenames
|
# cleanup unicode filenames
|
||||||
|
|
|
@ -74,7 +74,7 @@ class KFXZipBook:
|
||||||
# Belt and braces. PIDs should be unicode strings, but just in case...
|
# Belt and braces. PIDs should be unicode strings, but just in case...
|
||||||
if isinstance(pid, bytes):
|
if isinstance(pid, bytes):
|
||||||
pid = pid.decode('ascii')
|
pid = pid.decode('ascii')
|
||||||
for dsn_len,secret_len in [(0,0), (16,0), (16,40), (32,0), (32,40), (40,0), (40,40)]:
|
for dsn_len,secret_len in [(0,0), (16,0), (16,40), (32,40), (40,0), (40,40)]:
|
||||||
if len(pid) == dsn_len + secret_len:
|
if len(pid) == dsn_len + secret_len:
|
||||||
break # split pid into DSN and account secret
|
break # split pid into DSN and account secret
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -53,17 +53,11 @@ def SHA1(message):
|
||||||
def encode(data, map):
|
def encode(data, map):
|
||||||
result = b''
|
result = b''
|
||||||
for char in data:
|
for char in data:
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
value = ord(char)
|
|
||||||
else:
|
|
||||||
value = char
|
value = char
|
||||||
|
|
||||||
Q = (value ^ 0x80) // len(map)
|
Q = (value ^ 0x80) // len(map)
|
||||||
R = value % len(map)
|
R = value % len(map)
|
||||||
|
result += bytes([map[Q]])
|
||||||
result += bytes(bytearray([map[Q]]))
|
result += bytes([map[R]])
|
||||||
result += bytes(bytearray([map[R]]))
|
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
# Hash the bytes in data and then encode the digest with the characters in map
|
# Hash the bytes in data and then encode the digest with the characters in map
|
||||||
|
@ -90,9 +84,6 @@ def decode(data,map):
|
||||||
def getTwoBitsFromBitField(bitField,offset):
|
def getTwoBitsFromBitField(bitField,offset):
|
||||||
byteNumber = offset // 4
|
byteNumber = offset // 4
|
||||||
bitPosition = 6 - 2*(offset % 4)
|
bitPosition = 6 - 2*(offset % 4)
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
return ord(bitField[byteNumber]) >> bitPosition & 3
|
|
||||||
else:
|
|
||||||
return bitField[byteNumber] >> bitPosition & 3
|
return bitField[byteNumber] >> bitPosition & 3
|
||||||
|
|
||||||
# Returns the six bits at offset from a bit field
|
# Returns the six bits at offset from a bit field
|
||||||
|
@ -106,8 +97,7 @@ def encodePID(hash):
|
||||||
global charMap3
|
global charMap3
|
||||||
PID = b''
|
PID = b''
|
||||||
for position in range (0,8):
|
for position in range (0,8):
|
||||||
PID += bytes(bytearray([charMap3[getSixBitsFromBitField(hash,position)]]))
|
PID += bytes([charMap3[getSixBitsFromBitField(hash,position)]])
|
||||||
|
|
||||||
return PID
|
return PID
|
||||||
|
|
||||||
# Encryption table used to generate the device PID
|
# Encryption table used to generate the device PID
|
||||||
|
@ -144,7 +134,7 @@ def generateDevicePID(table,dsn,nbRoll):
|
||||||
index = (index+1) %8
|
index = (index+1) %8
|
||||||
for counter in range (0,8):
|
for counter in range (0,8):
|
||||||
index = ((((pid[counter] >>5) & 3) ^ pid[counter]) & 0x1f) + (pid[counter] >> 7)
|
index = ((((pid[counter] >>5) & 3) ^ pid[counter]) & 0x1f) + (pid[counter] >> 7)
|
||||||
pidAscii += bytes(bytearray([charMap4[index]]))
|
pidAscii += bytes([charMap4[index]])
|
||||||
return pidAscii
|
return pidAscii
|
||||||
|
|
||||||
def crc32(s):
|
def crc32(s):
|
||||||
|
@ -160,7 +150,7 @@ def checksumPid(s):
|
||||||
for i in (0,1):
|
for i in (0,1):
|
||||||
b = crc & 0xff
|
b = crc & 0xff
|
||||||
pos = (b // l) ^ (b % l)
|
pos = (b // l) ^ (b % l)
|
||||||
res += bytes(bytearray([charMap4[pos%l]]))
|
res += bytes([charMap4[pos%l]])
|
||||||
crc >>= 8
|
crc >>= 8
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
@ -171,9 +161,6 @@ def pidFromSerial(s, l):
|
||||||
crc = crc32(s)
|
crc = crc32(s)
|
||||||
arr1 = [0]*l
|
arr1 = [0]*l
|
||||||
for i in range(len(s)):
|
for i in range(len(s)):
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
arr1[i%l] ^= ord(s[i])
|
|
||||||
else:
|
|
||||||
arr1[i%l] ^= s[i]
|
arr1[i%l] ^= s[i]
|
||||||
crc_bytes = [crc >> 24 & 0xff, crc >> 16 & 0xff, crc >> 8 & 0xff, crc & 0xff]
|
crc_bytes = [crc >> 24 & 0xff, crc >> 16 & 0xff, crc >> 8 & 0xff, crc & 0xff]
|
||||||
for i in range(l):
|
for i in range(l):
|
||||||
|
@ -181,7 +168,7 @@ def pidFromSerial(s, l):
|
||||||
pid = b""
|
pid = b""
|
||||||
for i in range(l):
|
for i in range(l):
|
||||||
b = arr1[i] & 0xff
|
b = arr1[i] & 0xff
|
||||||
pid += bytes(bytearray([charMap4[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]]))
|
pid += bytes([charMap4[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]])
|
||||||
return pid
|
return pid
|
||||||
|
|
||||||
|
|
||||||
|
@ -190,10 +177,6 @@ def getKindlePids(rec209, token, serialnum):
|
||||||
if isinstance(serialnum,str):
|
if isinstance(serialnum,str):
|
||||||
serialnum = serialnum.encode('utf-8')
|
serialnum = serialnum.encode('utf-8')
|
||||||
|
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
if isinstance(serialnum,unicode):
|
|
||||||
serialnum = serialnum.encode('utf-8')
|
|
||||||
|
|
||||||
if rec209 is None:
|
if rec209 is None:
|
||||||
return [serialnum]
|
return [serialnum]
|
||||||
|
|
||||||
|
|
|
@ -62,11 +62,7 @@ except NameError:
|
||||||
|
|
||||||
# Routines common to Mac and PC
|
# Routines common to Mac and PC
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
|
||||||
from .argv_utils import unicode_argv
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from calibre.constants import iswindows, isosx
|
from calibre.constants import iswindows, isosx
|
||||||
|
@ -74,7 +70,7 @@ except:
|
||||||
iswindows = sys.platform.startswith('win')
|
iswindows = sys.platform.startswith('win')
|
||||||
isosx = sys.platform.startswith('darwin')
|
isosx = sys.platform.startswith('darwin')
|
||||||
|
|
||||||
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
class DrmException(Exception):
|
class DrmException(Exception):
|
||||||
pass
|
pass
|
||||||
|
@ -119,17 +115,11 @@ def primes(n):
|
||||||
def encode(data, map):
|
def encode(data, map):
|
||||||
result = b''
|
result = b''
|
||||||
for char in data:
|
for char in data:
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
value = ord(char)
|
|
||||||
else:
|
|
||||||
value = char
|
value = char
|
||||||
|
|
||||||
Q = (value ^ 0x80) // len(map)
|
Q = (value ^ 0x80) // len(map)
|
||||||
R = value % len(map)
|
R = value % len(map)
|
||||||
|
result += bytes([map[Q]])
|
||||||
result += bytes(bytearray([map[Q]]))
|
result += bytes([map[R]])
|
||||||
result += bytes(bytearray([map[R]]))
|
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
# Hash the bytes in data and then encode the digest with the characters in map
|
# Hash the bytes in data and then encode the digest with the characters in map
|
||||||
|
@ -242,11 +232,6 @@ if iswindows:
|
||||||
|
|
||||||
# replace any non-ASCII values with 0xfffd
|
# replace any non-ASCII values with 0xfffd
|
||||||
for i in range(0,len(buffer)):
|
for i in range(0,len(buffer)):
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
if buffer[i]>u"\u007f":
|
|
||||||
#print "swapping char "+str(i)+" ("+buffer[i]+")"
|
|
||||||
buffer[i] = u"\ufffd"
|
|
||||||
else:
|
|
||||||
if buffer[i]>"\u007f":
|
if buffer[i]>"\u007f":
|
||||||
#print "swapping char "+str(i)+" ("+buffer[i]+")"
|
#print "swapping char "+str(i)+" ("+buffer[i]+")"
|
||||||
buffer[i] = "\ufffd"
|
buffer[i] = "\ufffd"
|
||||||
|
|
|
@ -16,25 +16,24 @@
|
||||||
import sys
|
import sys
|
||||||
import binascii
|
import binascii
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
from .utilities import SafeUnbuffered
|
from argv_utils import unicode_argv
|
||||||
from .argv_utils import unicode_argv
|
|
||||||
|
|
||||||
letters = b'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
|
letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
|
||||||
|
|
||||||
def crc32(s):
|
def crc32(s):
|
||||||
return (~binascii.crc32(s,-1))&0xFFFFFFFF
|
return (~binascii.crc32(s,-1))&0xFFFFFFFF
|
||||||
|
|
||||||
def checksumPid(s):
|
def checksumPid(s):
|
||||||
crc = crc32(s)
|
crc = crc32(s.encode('ascii'))
|
||||||
crc = crc ^ (crc >> 16)
|
crc = crc ^ (crc >> 16)
|
||||||
res = s
|
res = s
|
||||||
l = len(letters)
|
l = len(letters)
|
||||||
for i in (0,1):
|
for i in (0,1):
|
||||||
b = crc & 0xff
|
b = crc & 0xff
|
||||||
pos = (b // l) ^ (b % l)
|
pos = (b // l) ^ (b % l)
|
||||||
res += bytes(bytearray([letters[pos%l]]))
|
res += letters[pos%l]
|
||||||
crc >>= 8
|
crc >>= 8
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
@ -44,19 +43,16 @@ def pidFromSerial(s, l):
|
||||||
|
|
||||||
arr1 = [0]*l
|
arr1 = [0]*l
|
||||||
for i in range(len(s)):
|
for i in range(len(s)):
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
arr1[i%l] ^= ord(s[i])
|
|
||||||
else:
|
|
||||||
arr1[i%l] ^= s[i]
|
arr1[i%l] ^= s[i]
|
||||||
|
|
||||||
crc_bytes = [crc >> 24 & 0xff, crc >> 16 & 0xff, crc >> 8 & 0xff, crc & 0xff]
|
crc_bytes = [crc >> 24 & 0xff, crc >> 16 & 0xff, crc >> 8 & 0xff, crc & 0xff]
|
||||||
for i in range(l):
|
for i in range(l):
|
||||||
arr1[i] ^= crc_bytes[i&3]
|
arr1[i] ^= crc_bytes[i&3]
|
||||||
|
|
||||||
pid = b""
|
pid = ''
|
||||||
for i in range(l):
|
for i in range(l):
|
||||||
b = arr1[i] & 0xff
|
b = arr1[i] & 0xff
|
||||||
pid+=bytes(bytearray([letters[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]]))
|
pid+=letters[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]
|
||||||
|
|
||||||
return pid
|
return pid
|
||||||
|
|
||||||
|
|
|
@ -80,14 +80,11 @@ import sys
|
||||||
import os
|
import os
|
||||||
import struct
|
import struct
|
||||||
import binascii
|
import binascii
|
||||||
|
from alfcrypto import Pukall_Cipher
|
||||||
|
|
||||||
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
|
|
||||||
from .alfcrypto import Pukall_Cipher
|
|
||||||
from .utilities import SafeUnbuffered
|
|
||||||
from .argv_utils import unicode_argv
|
|
||||||
|
|
||||||
|
|
||||||
class DrmException(Exception):
|
class DrmException(Exception):
|
||||||
|
@ -106,26 +103,19 @@ def PC1(key, src, decryption=True):
|
||||||
except:
|
except:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
letters = b'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
|
# accepts unicode returns unicode
|
||||||
|
|
||||||
def crc32(s):
|
|
||||||
return (~binascii.crc32(s,-1))&0xFFFFFFFF
|
|
||||||
|
|
||||||
def checksumPid(s):
|
def checksumPid(s):
|
||||||
|
letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
|
||||||
s = s.encode()
|
crc = (~binascii.crc32(s.encode('utf-8'),-1))&0xFFFFFFFF
|
||||||
|
|
||||||
|
|
||||||
crc = crc32(s)
|
|
||||||
crc = crc ^ (crc >> 16)
|
crc = crc ^ (crc >> 16)
|
||||||
res = s
|
res = s
|
||||||
l = len(letters)
|
l = len(letters)
|
||||||
for i in (0,1):
|
for i in (0,1):
|
||||||
b = crc & 0xff
|
b = crc & 0xff
|
||||||
pos = (b // l) ^ (b % l)
|
pos = (b // l) ^ (b % l)
|
||||||
res += bytes(bytearray([letters[pos%l]]))
|
res += letters[pos%l]
|
||||||
crc >>= 8
|
crc >>= 8
|
||||||
return res.decode()
|
return res
|
||||||
|
|
||||||
# expects bytearray
|
# expects bytearray
|
||||||
def getSizeOfTrailingDataEntries(ptr, size, flags):
|
def getSizeOfTrailingDataEntries(ptr, size, flags):
|
||||||
|
@ -134,11 +124,7 @@ def getSizeOfTrailingDataEntries(ptr, size, flags):
|
||||||
if size <= 0:
|
if size <= 0:
|
||||||
return result
|
return result
|
||||||
while True:
|
while True:
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
v = ord(ptr[size-1])
|
|
||||||
else:
|
|
||||||
v = ptr[size-1]
|
v = ptr[size-1]
|
||||||
|
|
||||||
result |= (v & 0x7F) << bitpos
|
result |= (v & 0x7F) << bitpos
|
||||||
bitpos += 7
|
bitpos += 7
|
||||||
size -= 1
|
size -= 1
|
||||||
|
@ -154,9 +140,6 @@ def getSizeOfTrailingDataEntries(ptr, size, flags):
|
||||||
# if multibyte data is included in the encryped data, we'll
|
# if multibyte data is included in the encryped data, we'll
|
||||||
# have already cleared this flag.
|
# have already cleared this flag.
|
||||||
if flags & 1:
|
if flags & 1:
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
num += (ord(ptr[size - num - 1]) & 0x3) + 1
|
|
||||||
else:
|
|
||||||
num += (ptr[size - num - 1] & 0x3) + 1
|
num += (ptr[size - num - 1] & 0x3) + 1
|
||||||
return num
|
return num
|
||||||
|
|
||||||
|
@ -316,9 +299,6 @@ class MobiBook:
|
||||||
for pid in pidlist:
|
for pid in pidlist:
|
||||||
bigpid = pid.encode('utf-8').ljust(16,b'\0')
|
bigpid = pid.encode('utf-8').ljust(16,b'\0')
|
||||||
temp_key = PC1(keyvec1, bigpid, False)
|
temp_key = PC1(keyvec1, bigpid, False)
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
temp_key_sum = sum(map(ord,temp_key)) & 0xff
|
|
||||||
else:
|
|
||||||
temp_key_sum = sum(temp_key) & 0xff
|
temp_key_sum = sum(temp_key) & 0xff
|
||||||
found_key = None
|
found_key = None
|
||||||
for i in range(count):
|
for i in range(count):
|
||||||
|
@ -335,11 +315,7 @@ class MobiBook:
|
||||||
# Then try the default encoding that doesn't require a PID
|
# Then try the default encoding that doesn't require a PID
|
||||||
pid = '00000000'
|
pid = '00000000'
|
||||||
temp_key = keyvec1
|
temp_key = keyvec1
|
||||||
if sys.version_info[0] == 2:
|
|
||||||
temp_key_sum = sum(map(ord,temp_key)) & 0xff
|
|
||||||
else:
|
|
||||||
temp_key_sum = sum(temp_key) & 0xff
|
temp_key_sum = sum(temp_key) & 0xff
|
||||||
|
|
||||||
for i in range(count):
|
for i in range(count):
|
||||||
verification, size, type, cksum, cookie = struct.unpack('>LLLBxxx32s', data[i*0x30:i*0x30+0x30])
|
verification, size, type, cksum, cookie = struct.unpack('>LLLBxxx32s', data[i*0x30:i*0x30+0x30])
|
||||||
if cksum == temp_key_sum:
|
if cksum == temp_key_sum:
|
||||||
|
|
|
@ -24,10 +24,10 @@ import traceback
|
||||||
from struct import pack
|
from struct import pack
|
||||||
from struct import unpack
|
from struct import unpack
|
||||||
|
|
||||||
from .alfcrypto import Topaz_Cipher
|
from alfcrypto import Topaz_Cipher
|
||||||
from .utilities import SafeUnbuffered
|
from utilities import SafeUnbuffered
|
||||||
|
|
||||||
from .argv_utils import unicode_argv
|
from argv_utils import unicode_argv
|
||||||
|
|
||||||
|
|
||||||
#global switch
|
#global switch
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -3,13 +3,11 @@ DeDRM tools for ebooks
|
||||||
|
|
||||||
This is a fork of Apprentice Harper's version of the DeDRM tools. Apprentice Harper said that the original version of the plugin [is no longer maintained](https://github.com/apprenticeharper/DeDRM_tools#no-longer-maintained), so I've taken over, merged a bunch of open PRs, and added a ton more features and bugfixes.
|
This is a fork of Apprentice Harper's version of the DeDRM tools. Apprentice Harper said that the original version of the plugin [is no longer maintained](https://github.com/apprenticeharper/DeDRM_tools#no-longer-maintained), so I've taken over, merged a bunch of open PRs, and added a ton more features and bugfixes.
|
||||||
|
|
||||||
The latest stable (released) version is v10.0.3 which [can be downloaded here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3). The latest beta is v10.0.9, as a release candidate for v10.1.0. It [can be downloaded here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.9).
|
The latest stable (released) version is v10.0.3 which [can be downloaded here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3).
|
||||||
|
|
||||||
The latest alpha version is available [at this link](https://github.com/noDRM/DeDRM_tools_autorelease/releases). This version is completely untested and will contain the latest code changes in this repository. With each commit in this repository, a new automatic alpha version will be uploaded there. If you want the most up-to-date code to test things and are okay with the plugin occasionally breaking, you can download this version.
|
Take a look at [the CHANGELOG](https://github.com/noDRM/DeDRM_tools/blob/master/CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). This plugin will start with version v10.0.0.
|
||||||
|
|
||||||
Take a look at [the CHANGELOG](https://github.com/noDRM/DeDRM_tools/blob/master/CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1).
|
The v10.0.0 versions of this plugin should both work with Calibre 5.x (Python 3) as well as Calibre 4.x and lower (Python 2). If you encounter issues with this plugin in Calibre 4.x or lower, please open a bug report.
|
||||||
|
|
||||||
My version of the plugin should both work with Calibre 5.x/6.x (Python 3) as well as Calibre 4.x and lower (Python 2). If you encounter issues with this plugin in Calibre 4.x or lower, please open a bug report.
|
|
||||||
|
|
||||||
# Original README from Apprentice Harper
|
# Original README from Apprentice Harper
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user