diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptepub.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptepub.py index 5c135ad..db3e54b 100644 --- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptepub.py +++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptepub.py @@ -3,7 +3,7 @@ from __future__ import with_statement -# ineptepub.pyw, version 6.4 +# ineptepub.pyw, version 6.5 # Copyright © 2009-2010 by i♥cabbages # 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.3 - Add additional 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. """ __license__ = 'GPL v3' -__version__ = "6.4" +__version__ = "6.5" import sys import os @@ -316,11 +317,6 @@ def _load_crypto_pycrypto(): key = [key.getChild(x).value for x in xrange(1, 4)] key = [self.bytesToNumber(v) for v in 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): total = 0L diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py index 839297f..0e25d29 100644 --- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py +++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py @@ -3,7 +3,7 @@ from __future__ import with_statement -# ineptpdf.pyw, version 8.0.3 +# ineptpdf.pyw, version 8.0.4 # Copyright © 2009-2010 by i♥cabbages # 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.2 - Add additional 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' -__version__ = "8.0.3" +__version__ = "8.0.4" import sys import os @@ -387,11 +388,6 @@ def _load_crypto_pycrypto(): key = [key.getChild(x).value for x in xrange(1, 4)] key = [self.bytesToNumber(v) for v in 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): total = 0L diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py index 5c135ad..db3e54b 100644 --- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py +++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py @@ -3,7 +3,7 @@ from __future__ import with_statement -# ineptepub.pyw, version 6.4 +# ineptepub.pyw, version 6.5 # Copyright © 2009-2010 by i♥cabbages # 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.3 - Add additional 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. """ __license__ = 'GPL v3' -__version__ = "6.4" +__version__ = "6.5" import sys import os @@ -316,11 +317,6 @@ def _load_crypto_pycrypto(): key = [key.getChild(x).value for x in xrange(1, 4)] key = [self.bytesToNumber(v) for v in 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): total = 0L diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py index 839297f..0e25d29 100644 --- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py +++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py @@ -3,7 +3,7 @@ from __future__ import with_statement -# ineptpdf.pyw, version 8.0.3 +# ineptpdf.pyw, version 8.0.4 # Copyright © 2009-2010 by i♥cabbages # 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.2 - Add additional 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' -__version__ = "8.0.3" +__version__ = "8.0.4" import sys import os @@ -387,11 +388,6 @@ def _load_crypto_pycrypto(): key = [key.getChild(x).value for x in xrange(1, 4)] key = [self.bytesToNumber(v) for v in 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): total = 0L diff --git a/DeDRM_calibre_plugin/DeDRM_plugin.zip b/DeDRM_calibre_plugin/DeDRM_plugin.zip index 8c0dcea..9261c6e 100644 Binary files a/DeDRM_calibre_plugin/DeDRM_plugin.zip and b/DeDRM_calibre_plugin/DeDRM_plugin.zip differ diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py b/DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py index 5c135ad..db3e54b 100644 --- a/DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py +++ b/DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py @@ -3,7 +3,7 @@ from __future__ import with_statement -# ineptepub.pyw, version 6.4 +# ineptepub.pyw, version 6.5 # Copyright © 2009-2010 by i♥cabbages # 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.3 - Add additional 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. """ __license__ = 'GPL v3' -__version__ = "6.4" +__version__ = "6.5" import sys import os @@ -316,11 +317,6 @@ def _load_crypto_pycrypto(): key = [key.getChild(x).value for x in xrange(1, 4)] key = [self.bytesToNumber(v) for v in 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): total = 0L diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py b/DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py index 839297f..0e25d29 100644 --- a/DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py +++ b/DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py @@ -3,7 +3,7 @@ from __future__ import with_statement -# ineptpdf.pyw, version 8.0.3 +# ineptpdf.pyw, version 8.0.4 # Copyright © 2009-2010 by i♥cabbages # 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.2 - Add additional 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' -__version__ = "8.0.3" +__version__ = "8.0.4" import sys import os @@ -387,11 +388,6 @@ def _load_crypto_pycrypto(): key = [key.getChild(x).value for x in xrange(1, 4)] key = [self.bytesToNumber(v) for v in 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): total = 0L diff --git a/Other_Tools/Kobo/obok.py b/Other_Tools/Kobo/obok.py index 26d1e38..9720dcf 100644 --- a/Other_Tools/Kobo/obok.py +++ b/Other_Tools/Kobo/obok.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Version 6.3.5 January 2016 +# Version 3.2.0 January 2016 # Update for latest version of Windows Desktop app. # Support Kobo devices in the command line version. #