PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-10 15:36:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge from svn://svn.insecure.org/nmap-exp/daniel/{nmap,ncat,nsock}-sctp.

Browse Source 
This adds SCTP support (including SSL over SCTP) to Nsock and Ncat.
This commit is contained in:
david
2009-07-25 00:03:48 +00:00
parent 53cefe9de0
commit 9aebba220c
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CHANGELOG
View File

@@ -1,4 +1,19 @@
# Nmap Changelog ($Id$); -*-text-*- # Nmap Changelog ($Id$); -*-text-*-
o [Nsock] [Ncat] Implemented SSL over SCTP connections in client mode.
SCTP support is now fully SSL enabled. [Daniel Roethlisberger]
o [Ncat] Implemented support for SCTP listening sockets, including SSL
support. Since there is no SSL support for SCTP client sockets yet,
SSL support is not terribly useful yet. [Daniel Roethlisberger]
o [Nsock] [Ncat] Implemented basic SCTP client functionality. Only the
default SCTP stream is used. This is also called TCP compatible mode.
While it allows Ncat to be used for manually probing open SCTP ports,
more complicated services making use of multiple streams or depending
on specific message boundaries cannot be talked to successfully.
[Daniel Roethlisberger]
o [Zenmap] Merged the changes in the zenmap-filter branch to the main zenmap o [Zenmap] Merged the changes in the zenmap-filter branch to the main zenmap
branch. Pressing Ctrl+L now brings up the filter interface for filtering out branch. Pressing Ctrl+L now brings up the filter interface for filtering out
uninteresting hosts. Alternatively, the interface is accessible via the uninteresting hosts. Alternatively, the interface is accessible via the

4
nse_nsock.cc
View File

@@ -586,8 +586,8 @@ static int l_nsock_connect(lua_State * L)
break; break;
case SSL: case SSL:
nsock_connect_ssl(nsp, udata->nsiod, l_nsock_connect_handler, nsock_connect_ssl(nsp, udata->nsiod, l_nsock_connect_handler,
udata->timeout, &udata->yield, dest->ai_addr, dest->ai_addrlen, port, udata->timeout, &udata->yield, dest->ai_addr, dest->ai_addrlen,
udata->ssl_session); IPPROTO_TCP, port, udata->ssl_session);
break; break;
} }

2
service_scan.cc
View File

@@ -1792,7 +1792,7 @@ static void startNextProbe(nsock_pool nsp, nsock_iod nsi, ServiceGroup *SG,
nsock_connect_ssl(nsp, svc->niod, servicescan_connect_handler, nsock_connect_ssl(nsp, svc->niod, servicescan_connect_handler,
DEFAULT_CONNECT_SSL_TIMEOUT, svc, DEFAULT_CONNECT_SSL_TIMEOUT, svc,
(struct sockaddr *) &ss, (struct sockaddr *) &ss,
ss_len, svc->portno, svc->ssl_session); ss_len, svc->proto, svc->portno, svc->ssl_session);
} }
} else { } else {
assert(svc->proto == IPPROTO_UDP); assert(svc->proto == IPPROTO_UDP);