diff --git a/lib/core/settings.py b/lib/core/settings.py index 1338d675d..ace8cdacb 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.2.8.12" +VERSION = "1.2.8.13" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) diff --git a/lib/request/pkihandler.py b/lib/request/pkihandler.py index 369cf7d4d..71a5eb352 100644 --- a/lib/request/pkihandler.py +++ b/lib/request/pkihandler.py @@ -9,6 +9,8 @@ import httplib import urllib2 from lib.core.data import conf +from lib.core.common import getSafeExString +from lib.core.exception import SqlmapConnectionException class HTTPSPKIAuthHandler(urllib2.HTTPSHandler): def __init__(self, auth_file): @@ -19,5 +21,10 @@ class HTTPSPKIAuthHandler(urllib2.HTTPSHandler): return self.do_open(self.getConnection, req) def getConnection(self, host, timeout=None): - # Reference: https://docs.python.org/2/library/ssl.html#ssl.SSLContext.load_cert_chain - return httplib.HTTPSConnection(host, cert_file=self.auth_file, key_file=self.auth_file, timeout=conf.timeout) + try: + # Reference: https://docs.python.org/2/library/ssl.html#ssl.SSLContext.load_cert_chain + return httplib.HTTPSConnection(host, cert_file=self.auth_file, key_file=self.auth_file, timeout=conf.timeout) + except IOError, ex: + errMsg = "error occurred while using key " + errMsg += "file '%s' ('%s')" % (self.auth_file, getSafeExString(ex)) + raise SqlmapConnectionException(errMsg) diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 27c47cf97..18b703e9a 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -48,7 +48,7 @@ c8c386d644d57c659d74542f5f57f632 lib/core/patch.py 0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py a7db43859b61569b601b97f187dd31c5 lib/core/revision.py fcb74fcc9577523524659ec49e2e964b lib/core/session.py -aaeca967ebd83967b78a9a56fb029696 lib/core/settings.py +0cb27d1543a4cd5a1f466846965a2bf3 lib/core/settings.py dd68a9d02fccb4fa1428b20e15b0db5d lib/core/shell.py a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py 5b7ff6f49ff3af62f8c12f74b6d49dd2 lib/core/target.py @@ -77,7 +77,7 @@ dd4598675027fae99f2e2475b05986da lib/request/direct.py 1e5532ede194ac9c083891c2f02bca93 lib/request/__init__.py a5cbc19ee18bd4b848515eb3ea3291f0 lib/request/inject.py aaf956c1e9855836c3f372e29d481393 lib/request/methodrequest.py -51eeaa8abf5ba62aaaade66d46ff8b00 lib/request/pkihandler.py +83c7a13e38ad5eedb6bb13463a7a9e90 lib/request/pkihandler.py 2c3774b72586985719035b195f144d7b lib/request/rangehandler.py 3cd9d17fc52bb62db29e0e24fc4d8a97 lib/request/redirecthandler.py 7f12d8f3b6665ed7053954bba70ff718 lib/request/templates.py