diff --git a/CHANGELOG b/CHANGELOG index 298890b5c..4480f50a2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,19 @@ # 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 branch. Pressing Ctrl+L now brings up the filter interface for filtering out uninteresting hosts. Alternatively, the interface is accessible via the diff --git a/nse_nsock.cc b/nse_nsock.cc index faef19101..ef00b6bc1 100644 --- a/nse_nsock.cc +++ b/nse_nsock.cc @@ -586,8 +586,8 @@ static int l_nsock_connect(lua_State * L) break; case SSL: nsock_connect_ssl(nsp, udata->nsiod, l_nsock_connect_handler, - udata->timeout, &udata->yield, dest->ai_addr, dest->ai_addrlen, port, - udata->ssl_session); + udata->timeout, &udata->yield, dest->ai_addr, dest->ai_addrlen, + IPPROTO_TCP, port, udata->ssl_session); break; } diff --git a/service_scan.cc b/service_scan.cc index 2421b2cd1..5354113ae 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -1792,7 +1792,7 @@ static void startNextProbe(nsock_pool nsp, nsock_iod nsi, ServiceGroup *SG, nsock_connect_ssl(nsp, svc->niod, servicescan_connect_handler, DEFAULT_CONNECT_SSL_TIMEOUT, svc, (struct sockaddr *) &ss, - ss_len, svc->portno, svc->ssl_session); + ss_len, svc->proto, svc->portno, svc->ssl_session); } } else { assert(svc->proto == IPPROTO_UDP);