Mirrors
/
DeDRM_tools
mirror of https://github.com/noDRM/DeDRM_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Completely remove erroneous check

This commit is contained in:
apprenticeharper 2016-01-15 06:30:54 +00:00
parent ca42e028a7
commit 8aa2157d55
8 changed files with 19 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptepub.py
View File

@ -3,7 +3,7 @@
from __future__ import with_statement from __future__ import with_statement
# ineptepub.pyw, version 6.4 # ineptepub.pyw, version 6.5
# Copyright © 2009-2010 by i♥cabbages # Copyright © 2009-2010 by i♥cabbages
# Released under the terms of the GNU General Public Licence, version 3 # Released under the terms of the GNU General Public Licence, version 3
@ -41,13 +41,14 @@ from __future__ import with_statement
# 6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis # 6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis
# 6.3 - Add additional check on DER file sanity # 6.3 - Add additional check on DER file sanity
# 6.4 - Remove erroneous check on DER file sanity # 6.4 - Remove erroneous check on DER file sanity
# 6.5 - Completely remove erroneous check on DER file sanity
""" """
Decrypt Adobe Digital Editions encrypted ePub books. Decrypt Adobe Digital Editions encrypted ePub books.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = "6.4" __version__ = "6.5"
import sys import sys
import os import os
@ -316,11 +317,6 @@ def _load_crypto_pycrypto():
key = [key.getChild(x).value for x in xrange(1, 4)] key = [key.getChild(x).value for x in xrange(1, 4)]
key = [self.bytesToNumber(v) for v in key] key = [self.bytesToNumber(v) for v in key]
self._rsa = _RSA.construct(key) self._rsa = _RSA.construct(key)
# check if pointer is not NULL
try:
c = self._rsa.contents
except ValueError:
raise ADEPTError('Error parsing ADEPT user key DER')
def bytesToNumber(self, bytes): def bytesToNumber(self, bytes):
total = 0L total = 0L

10
DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py
View File

@ -3,7 +3,7 @@
from __future__ import with_statement from __future__ import with_statement
# ineptpdf.pyw, version 8.0.3 # ineptpdf.pyw, version 8.0.4
# Copyright © 2009-2010 by i♥cabbages # Copyright © 2009-2010 by i♥cabbages
# Released under the terms of the GNU General Public Licence, version 3 # Released under the terms of the GNU General Public Licence, version 3
@ -56,6 +56,7 @@ from __future__ import with_statement
# 8.0.1 - Broken Metadata fix. # 8.0.1 - Broken Metadata fix.
# 8.0.2 - Add additional check on DER file sanity # 8.0.2 - Add additional check on DER file sanity
# 8.0.3 - Remove erroneous check on DER file sanity # 8.0.3 - Remove erroneous check on DER file sanity
# 8.0.4 - Completely remove erroneous check on DER file sanity
""" """
@ -63,7 +64,7 @@ Decrypts Adobe ADEPT-encrypted PDF files.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = "8.0.3" __version__ = "8.0.4"
import sys import sys
import os import os
@ -387,11 +388,6 @@ def _load_crypto_pycrypto():
key = [key.getChild(x).value for x in xrange(1, 4)] key = [key.getChild(x).value for x in xrange(1, 4)]
key = [self.bytesToNumber(v) for v in key] key = [self.bytesToNumber(v) for v in key]
self._rsa = _RSA.construct(key) self._rsa = _RSA.construct(key)
# check if pointer is not NULL
try:
c = self._rsa.contents
except ValueError:
raise ADEPTError('Error parsing ADEPT user key DER')
def bytesToNumber(self, bytes): def bytesToNumber(self, bytes):
total = 0L total = 0L

10
DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py
View File

@ -3,7 +3,7 @@
from __future__ import with_statement from __future__ import with_statement
# ineptepub.pyw, version 6.4 # ineptepub.pyw, version 6.5
# Copyright © 2009-2010 by i♥cabbages # Copyright © 2009-2010 by i♥cabbages
# Released under the terms of the GNU General Public Licence, version 3 # Released under the terms of the GNU General Public Licence, version 3
@ -41,13 +41,14 @@ from __future__ import with_statement
# 6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis # 6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis
# 6.3 - Add additional check on DER file sanity # 6.3 - Add additional check on DER file sanity
# 6.4 - Remove erroneous check on DER file sanity # 6.4 - Remove erroneous check on DER file sanity
# 6.5 - Completely remove erroneous check on DER file sanity
""" """
Decrypt Adobe Digital Editions encrypted ePub books. Decrypt Adobe Digital Editions encrypted ePub books.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = "6.4" __version__ = "6.5"
import sys import sys
import os import os
@ -316,11 +317,6 @@ def _load_crypto_pycrypto():
key = [key.getChild(x).value for x in xrange(1, 4)] key = [key.getChild(x).value for x in xrange(1, 4)]
key = [self.bytesToNumber(v) for v in key] key = [self.bytesToNumber(v) for v in key]
self._rsa = _RSA.construct(key) self._rsa = _RSA.construct(key)
# check if pointer is not NULL
try:
c = self._rsa.contents
except ValueError:
raise ADEPTError('Error parsing ADEPT user key DER')
def bytesToNumber(self, bytes): def bytesToNumber(self, bytes):
total = 0L total = 0L

10
DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py
View File

@ -3,7 +3,7 @@
from __future__ import with_statement from __future__ import with_statement
# ineptpdf.pyw, version 8.0.3 # ineptpdf.pyw, version 8.0.4
# Copyright © 2009-2010 by i♥cabbages # Copyright © 2009-2010 by i♥cabbages
# Released under the terms of the GNU General Public Licence, version 3 # Released under the terms of the GNU General Public Licence, version 3
@ -56,6 +56,7 @@ from __future__ import with_statement
# 8.0.1 - Broken Metadata fix. # 8.0.1 - Broken Metadata fix.
# 8.0.2 - Add additional check on DER file sanity # 8.0.2 - Add additional check on DER file sanity
# 8.0.3 - Remove erroneous check on DER file sanity # 8.0.3 - Remove erroneous check on DER file sanity
# 8.0.4 - Completely remove erroneous check on DER file sanity
""" """
@ -63,7 +64,7 @@ Decrypts Adobe ADEPT-encrypted PDF files.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = "8.0.3" __version__ = "8.0.4"
import sys import sys
import os import os
@ -387,11 +388,6 @@ def _load_crypto_pycrypto():
key = [key.getChild(x).value for x in xrange(1, 4)] key = [key.getChild(x).value for x in xrange(1, 4)]
key = [self.bytesToNumber(v) for v in key] key = [self.bytesToNumber(v) for v in key]
self._rsa = _RSA.construct(key) self._rsa = _RSA.construct(key)
# check if pointer is not NULL
try:
c = self._rsa.contents
except ValueError:
raise ADEPTError('Error parsing ADEPT user key DER')
def bytesToNumber(self, bytes): def bytesToNumber(self, bytes):
total = 0L total = 0L

BIN
DeDRM_calibre_plugin/DeDRM_plugin.zip
View File

Binary file not shown.

10
DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py
View File

@ -3,7 +3,7 @@
from __future__ import with_statement from __future__ import with_statement
# ineptepub.pyw, version 6.4 # ineptepub.pyw, version 6.5
# Copyright © 2009-2010 by i♥cabbages # Copyright © 2009-2010 by i♥cabbages
# Released under the terms of the GNU General Public Licence, version 3 # Released under the terms of the GNU General Public Licence, version 3
@ -41,13 +41,14 @@ from __future__ import with_statement
# 6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis # 6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis
# 6.3 - Add additional check on DER file sanity # 6.3 - Add additional check on DER file sanity
# 6.4 - Remove erroneous check on DER file sanity # 6.4 - Remove erroneous check on DER file sanity
# 6.5 - Completely remove erroneous check on DER file sanity
""" """
Decrypt Adobe Digital Editions encrypted ePub books. Decrypt Adobe Digital Editions encrypted ePub books.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = "6.4" __version__ = "6.5"
import sys import sys
import os import os
@ -316,11 +317,6 @@ def _load_crypto_pycrypto():
key = [key.getChild(x).value for x in xrange(1, 4)] key = [key.getChild(x).value for x in xrange(1, 4)]
key = [self.bytesToNumber(v) for v in key] key = [self.bytesToNumber(v) for v in key]
self._rsa = _RSA.construct(key) self._rsa = _RSA.construct(key)
# check if pointer is not NULL
try:
c = self._rsa.contents
except ValueError:
raise ADEPTError('Error parsing ADEPT user key DER')
def bytesToNumber(self, bytes): def bytesToNumber(self, bytes):
total = 0L total = 0L

10
DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py
View File

@ -3,7 +3,7 @@
from __future__ import with_statement from __future__ import with_statement
# ineptpdf.pyw, version 8.0.3 # ineptpdf.pyw, version 8.0.4
# Copyright © 2009-2010 by i♥cabbages # Copyright © 2009-2010 by i♥cabbages
# Released under the terms of the GNU General Public Licence, version 3 # Released under the terms of the GNU General Public Licence, version 3
@ -56,6 +56,7 @@ from __future__ import with_statement
# 8.0.1 - Broken Metadata fix. # 8.0.1 - Broken Metadata fix.
# 8.0.2 - Add additional check on DER file sanity # 8.0.2 - Add additional check on DER file sanity
# 8.0.3 - Remove erroneous check on DER file sanity # 8.0.3 - Remove erroneous check on DER file sanity
# 8.0.4 - Completely remove erroneous check on DER file sanity
""" """
@ -63,7 +64,7 @@ Decrypts Adobe ADEPT-encrypted PDF files.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = "8.0.3" __version__ = "8.0.4"
import sys import sys
import os import os
@ -387,11 +388,6 @@ def _load_crypto_pycrypto():
key = [key.getChild(x).value for x in xrange(1, 4)] key = [key.getChild(x).value for x in xrange(1, 4)]
key = [self.bytesToNumber(v) for v in key] key = [self.bytesToNumber(v) for v in key]
self._rsa = _RSA.construct(key) self._rsa = _RSA.construct(key)
# check if pointer is not NULL
try:
c = self._rsa.contents
except ValueError:
raise ADEPTError('Error parsing ADEPT user key DER')
def bytesToNumber(self, bytes): def bytesToNumber(self, bytes):
total = 0L total = 0L

2
Other_Tools/Kobo/obok.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Version 6.3.5 January 2016 # Version 3.2.0 January 2016
# Update for latest version of Windows Desktop app. # Update for latest version of Windows Desktop app.
# Support Kobo devices in the command line version. # Support Kobo devices in the command line version.
# #