Fixes sqlmapproject#1574

stamparm · stamparm · commit b5b3411f16ad · 2015-12-06T23:49:22.000+01:00
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1897,7 +1897,7 @@ def _setKnowledgeBaseAttributes(flushAll=True):
     kb.safeReq = AttribDict()
     kb.singleLogFlags = set()
     kb.reduceTests = None
-    kb.tlsSNI = None
+    kb.tlsSNI = {}
     kb.stickyDBMS = False
     kb.stickyLevel = None
     kb.storeCrawlingChoice = None
diff --git a/lib/request/httpshandler.py b/lib/request/httpshandler.py
@@ -45,12 +45,12 @@ def create_sock():
 
         # Reference(s): https://docs.python.org/2/library/ssl.html#ssl.SSLContext
         #               https://www.mnot.net/blog/2014/12/27/python_2_and_tls_sni
-        if kb.tlsSNI != False and hasattr(ssl, "SSLContext"):
+        if kb.tlsSNI.get(self.host) != False and hasattr(ssl, "SSLContext"):
             for protocol in filter(lambda _: _ >= ssl.PROTOCOL_TLSv1, _protocols):
                 try:
                     sock = create_sock()
                     context = ssl.SSLContext(protocol)
-                    _ = context.wrap_socket(sock, do_handshake_on_connect=False, server_hostname=self.host)
+                    _ = context.wrap_socket(sock, do_handshake_on_connect=True, server_hostname=self.host)
                     if _:
                         success = True
                         self.sock = _
@@ -63,8 +63,8 @@ def create_sock():
                     self._tunnel_host = None
                     logger.debug("SSL connection error occurred ('%s')" % getSafeExString(ex))
 
-            if kb.tlsSNI is None:
-                kb.tlsSNI = success
+            if kb.tlsSNI.get(self.host) is None:
+                kb.tlsSNI[self.host] = success
 
         if not success:
             for protocol in _protocols:
