From 553e82711011a8ba2d9a7b581e32d6cb6b89e9ca Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 25 Oct 2014 12:09:55 +0000
Subject: [PATCH] sslcert: if -sV detects ssl, then no STARTTLS is needed

---
 nselib/sslcert.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nselib/sslcert.lua b/nselib/sslcert.lua
index 311b0db32..c74e26e7b 100644
--- a/nselib/sslcert.lua
+++ b/nselib/sslcert.lua
@@ -418,6 +418,9 @@ local SPECIALIZED_PREPARE_TLS_WITHOUT_RECONNECT = {
 -- @param port A port table with 'number' and 'service' keys
 -- @return A STARTTLS function or nil
 function getPrepareTLSWithoutReconnect(port)
+  if port.service_tunnel == "ssl" then
+    return nil
+  end
   return (SPECIALIZED_PREPARE_TLS_WITHOUT_RECONNECT[port.number] or
     SPECIALIZED_PREPARE_TLS_WITHOUT_RECONNECT[port.service])
 end
@@ -429,6 +432,9 @@ end
 -- @param port A port table with 'number' and 'service' keys
 -- @return A STARTTLS function or nil
 function isPortSupported(port)
+  if port.service_tunnel == "ssl" then
+    return nil
+  end
   return (SPECIALIZED_PREPARE_TLS[port.number] or
     SPECIALIZED_PREPARE_TLS[port.service])
 end