From 72d3ffe6361300aa84bbf43300b3ce54ff4b4168 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 3 Mar 2009 17:38:28 +0000 Subject: [PATCH] Version detection used to omit the "ssl/" service name prefix if an SSL-tunneled port didn't respond to any version probes. Now it keeps "ssl/" as an indication that SSL was discovered, even if the service behind it wasn't identified. Kristof Boeynaems reported the problem and contributed a patch. --- CHANGELOG | 6 ++++++ service_scan.cc | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index e95359a66..44efd0475 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,11 @@ # Nmap Changelog ($Id$); -*-text-*- +o Version detection used to omit the "ssl/" service name prefix if an + SSL-tunneled port didn't respond to any version probes. Now it keeps + "ssl/" as an indication that SSL was discovered, even if the service + behind it wasn't identified. Kristof Boeynaems reported the problem + and contributed a patch. + o [Ncat] The --talk option has been renamed --chat. --talk remains as an undocumented alias. diff --git a/service_scan.cc b/service_scan.cc index 4f84ae6fb..e0eff313f 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -2310,7 +2310,6 @@ list::iterator svc; *(*svc)->devicetype_matched? (*svc)->devicetype_matched : NULL, shouldWePrintFingerprint(*svc) ? (*svc)->getServiceFingerprint(NULL) : NULL); } else { - if ((*svc)->getServiceFingerprint(NULL)) (*svc)->port->setServiceProbeResults((*svc)->probe_state, NULL, (*svc)->tunnel, NULL, NULL, NULL, NULL, NULL, NULL, (*svc)->getServiceFingerprint(NULL));