PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 13:11:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge from /nmap-exp/david/nmap-ssl, /nmap-exp/david/ncat-ssl, and

Browse Source 
/nmap-exp/david/nsock-ssl. This brings in secure SSL connections for
Ncat. See http://seclists.org/nmap-dev/2009/q2/0183.html.
This commit is contained in:
david
2009-04-25 03:24:00 +00:00
parent ea388dc454
commit d122b91891
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@@ -1,5 +1,12 @@
# Nmap Changelog ($Id$); -*-text-*- # Nmap Changelog ($Id$); -*-text-*-
o [Ncat] In SSL mode, Ncat now always uses secure connections, meaning
that it uses only good ciphers and doesn't use SSLv2. Certificates
can optionally be verified with the --ssl-verify and --ssl-trustfile
options. Nsock provides the option of making SSL connections that
prioritize either speed or security; Ncat uses security while
version detection and NSE continue to use speed. [David]
o [Ncat] Made calling of checked allocation functions more uniform and o [Ncat] Made calling of checked allocation functions more uniform and
removed some unnecessary code. [Fotis Hantzis] removed some unnecessary code. [Fotis Hantzis]

4
nse_nsock.cc
View File

@@ -395,6 +395,10 @@ int luaopen_nsock (lua_State *L)
nsp = nsp_new(NULL); nsp = nsp_new(NULL);
if (o.scriptTrace()) if (o.scriptTrace())
nsp_settrace(nsp, NSOCK_TRACE_LEVEL, o.getStartTime()); nsp_settrace(nsp, NSOCK_TRACE_LEVEL, o.getStartTime());
#if HAVE_OPENSSL
/* Value speed over security in SSL connections. */
nsp_ssl_init_max_speed(nsp);
#endif
return 0; return 0;
} }

5
service_scan.cc
View File

@@ -2425,6 +2425,11 @@ int service_scan(vector<Target *> &Targets) {
nsp_settrace(nsp, NSOCK_TRACE_LEVEL, o.getStartTime()); nsp_settrace(nsp, NSOCK_TRACE_LEVEL, o.getStartTime());
} }
#if HAVE_OPENSSL
/* We don't care about connection security in version detection. */
nsp_ssl_init_max_speed(nsp);
#endif
launchSomeServiceProbes(nsp, SG); launchSomeServiceProbes(nsp, SG);
// How long do we have before timing out? // How long do we have before timing out?