1
0
mirror of https://github.com/nmap/nmap.git synced 2026-02-01 02:59:01 +00:00
Commit Graph

122 Commits

Author SHA1 Message Date
fyodor
6e01ecd452 Update an email address, fix a typo, and slightly reword a sentence. 2013-07-30 00:02:00 +00:00
fyodor
fa6db96c73 Update the man page to use the latest text from COPYING file and regenerate 2013-07-29 23:57:40 +00:00
fyodor
b01fd55cb6 Change version number to 6.41SVN and regenerate auto-generated files such as man page, script.db, etc. 2013-07-29 06:00:07 +00:00
fyodor
83fb10ec56 Update the Nmap copyright/license files. This isn't the new Nmap Public Source License we've been discussing on the list, but rather just a 'quick patch' to hopefully prevent some of the abuse we've been seeing from companies lately. More details on the changes will be posted to the dev list. Also, the copyright year was updated to 2013 (which is the only change to Nsock license statements). 2013-07-28 22:05:05 +00:00
d33tah
8f84863a23 add NCAT_LOCAL_ADDR, NCAT_LOCAL_PORT, NCAT_REMOTE_ADDR, NCAR_REMOTE_PORT,
NCAT_REMOTE_ADDR environment variables set in all --*-exec child processes.
(this is a merge of ncat-env-conninfo as of r31516)
2013-07-24 13:58:15 +00:00
d33tah
f5a142b0d4 make --lua-exec-internal switch STDOUT to binary mode. (this was merged from nmap-exp/d33tah/lua-exec-examples/ncat, r31481) 2013-07-23 12:36:09 +00:00
d33tah
aa1b31450b reverting the last commit, will put the script in a separate branch. 2013-07-20 15:39:38 +00:00
d33tah
7c526d7a75 commit the first version of my httpd.lua demo - probably most advanced one so far. 2013-07-20 15:12:04 +00:00
d33tah
713641fb2f fix the Lua tests. 2013-07-17 21:41:22 +00:00
d33tah
2521c7c692 now that SIGPIPE is not a problem, finally add the chargen script. 2013-07-10 15:17:20 +00:00
d33tah
8520c1359e restore default SIGPIPE handler in netexec child process. 2013-07-10 15:10:35 +00:00
d33tah
6a98174f5d reverting r31265 - kept breaking the build on FreeBSD. 2013-07-08 16:58:42 +00:00
dmiller
1d8353f17b Fix linking error with Ncat by adding -ldl 2013-07-05 16:25:33 +00:00
d33tah
5ebd15fb91 coding style fix 2013-07-04 20:07:04 +00:00
d33tah
b62709eb20 merging in the --lua-exec feature for ncat. 2013-07-02 16:56:03 +00:00
david
73d4b0f0a0 Ncat: Add tests for idle timeout in listen mode
This patch adds tests for idle timeout in listen mode
for all supported protocols. It also modifies existing
test for idle time in connection mode to test the option
for all supported protocols.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
2013-06-30 06:08:45 +00:00
david
5c4207f009 Ncat: Implement idle timeout option for listen mode
This patch implements "-i" (idle timeout) option for listen mode.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
2013-06-30 06:08:43 +00:00
david
9e82bb6c4e Support chained certificate files with --ssl-cert.
Use the recommended SSL_CTX_use_certificate_chain_file over
SSL_CTX_use_certificate_file.
https://www.openssl.org/docs/ssl/SSL_CTX_use_certificate.html#NOTES

Patch by Greg Bailey.
http://seclists.org/nmap-dev/2013/q2/399
2013-06-29 22:33:56 +00:00
david
851676e407 Remove obsolete ncat.sln and nping.sln files. 2013-06-28 03:31:44 +00:00
henri
7f9f75f6b1 Updated ncat documentation so that it doesn't prevent users from using -v
more than three times.

The current rules are:
  -v      --> verbose mode
  -vv...  --> debug mode

Debug can be higher than two (use debug>=6 for full nsock logs for instance).
2013-06-24 21:06:19 +00:00
david
d1eae0196a Tabs to spaces. 2013-06-19 15:19:09 +00:00
david
42f3bcfdea fixing one typo in original ncat_core.c (atleast=>at least)
Originally by d33tah in r30940 in /nmap-exp/d33tag/ncat-lua.
2013-06-18 00:26:21 +00:00
d33tah
e9c6e5b925 revert the previous commit, git-svn pushed it to the wrong directory. 2013-06-13 15:10:07 +00:00
d33tah
3e3e87f462 * create d33tah directory at nmap-exp
* create a branch ncat-lua in nmap-exp/d33tah based on current nmap trunk
* merge in patches from github into ncat-lua branch
2013-06-13 15:04:23 +00:00
david
b30aba076a Set the default --max-conns to 60 on Windows.
Suggested by Andrey Olkhin.
http://seclists.org/nmap-dev/2013/q1/390
2013-06-02 09:03:44 +00:00
david
fc80b4573c Track proxy socklen and pass it on to targetlen.
Patch by Joachim Henke.
http://seclists.org/nmap-dev/2013/q1/413
2013-05-05 10:43:53 +00:00
david
21a8af6c08 Fix Ncat IPv6 HTTP CONNECT proxy syntax.
Patch by Joachim Henke.
http://seclists.org/nmap-dev/2013/q1/413
2013-05-05 10:21:46 +00:00
david
e408faae10 Fix signed/unsigned confusion in subprocess_thread_func.
Andrey Olkhin found that a test was always true because of the
signedness of a type.
http://seclists.org/nmap-dev/2013/q1/210
2013-03-02 08:32:28 +00:00
david
c3d079a584 Namespace subprocess pipes by PID.
Patch by Andrey Olkhin.
http://seclists.org/nmap-dev/2013/q1/210
2013-03-02 07:34:49 +00:00
david
0fceb95b5a Whitespace. 2013-02-24 02:50:02 +00:00
david
ee4d1e126b Remove a close that made a test unreliable. 2013-02-23 06:54:31 +00:00
david
c60b72f7a0 XFAIL some tests having to do with EOF handling.
http://seclists.org/nmap-dev/2013/q1/227
2013-02-23 06:54:30 +00:00
david
811d6096e1 Quit on EOF in non-TCP mode.
Apparently SCTP can't have the same kind of half-open sockets that TCP
has. When one direction is closed, we can't do anything further with the
socket.
http://seclists.org/nmap-dev/2013/q1/227
2013-02-23 06:54:29 +00:00
david
a9cb84f189 Break out separate SCTP tests for half-open sockets.
These should have different behavior than TCP.
http://seclists.org/nmap-dev/2013/q1/227
2013-02-23 06:54:28 +00:00
david
84773c74a5 Switch to an o.proto option instead of o.udp and o.sctp.
This eliminates the ambiguity that could exist when, say, both o.udp and
o.sctp were both set. The code would use whichever it happened to test
first. This also makes TCP mode explicit with IPPROTO_TCP.
2013-02-23 05:56:00 +00:00
david
ce51d8c4da Use the default value of MultiThreadedDLL where possible. 2013-02-09 20:30:01 +00:00
david
6b095f42d2 Use MultiThreadedDebugDLL (/MDd) in place of MultiThreadedDebug (/MTd).
This is to match r8507, which did the analogous thing for the Release
configuration.
http://seclists.org/nmap-dev/2013/q1/120
2013-02-09 20:29:55 +00:00
david
9901c8e7a9 Close stdout on socket EOF. 2013-02-09 08:29:39 +00:00
david
88a35de3b5 Quit on socket EOF only in --recv-only mode.
Suggested by Tomas Hozza.
http://seclists.org/nmap-dev/2013/q1/188
2013-02-09 08:29:38 +00:00
david
81c777abfd Simplify connect-mode stdin EOF handling. 2013-02-09 08:29:37 +00:00
david
9a10429474 Round out EOF and shutdown tests.
The existing tests here didn't make much sense, and didn't cover all the
situations we care about. The 8 tests now check each of

client !--send-only EOF on stdin
client  --send-only EOF on stdin
server !--send-only EOF on stdin
server  --send-only EOF on stdin

client !--recv-only EOF on socket
client  --recv-only EOF on socket
server !--recv-only EOF on socket
server  --recv-only EOF on socket

The other thing we care about is whether the client/server keeps running
after the EOF. That is now checked in each of the tests too.
2013-02-09 08:29:36 +00:00
david
61255ee01e Retab ncat-test.pl. 2013-02-09 08:29:35 +00:00
david
a6dd675fd3 Don't do operations with side effects inside asserts.
ncat_assert is safe because it cannot be disabled. <assert.h> assert is
also safe because we make sure that NDEBUG remains defined. Doing this
helps avoid potential bad effects of something changing in the future.
2013-01-04 18:59:56 +00:00
david
63d9e8b5d5 Use ncat_assert in place of assert everywhere. 2013-01-04 18:59:47 +00:00
david
4519c2ec74 Assert that get_fdinfo doesn't return NULL.
Resolves these Parfait reports
(http://seclists.org/nmap-dev/2012/q4/412).

Error: Null pointer dereference (CWE 476)
    Read from null pointer 'fdn'
         at line 328 of components/nmap/build/amd64/ncat/ncat_core.c in function 'blocking_fdinfo_send'.
           Function 'get_fdinfo' may return constant 'NULL' at line 615, called at line 366 in function 'ncat_broadcast'.
           Constant 'NULL' passed into function 'blocking_fdinfo_send', argument 'fdn', from call at line 367.
           Null pointer introduced at line 615 of components/nmap/build/amd64/ncat/util.c in function 'get_fdinfo'.
         at line 330 of components/nmap/build/amd64/ncat/ncat_core.c in function 'blocking_fdinfo_send'.
           Function 'get_fdinfo' may return constant 'NULL' at line 615, called at line 366 in function 'ncat_broadcast'.
           Constant 'NULL' passed into function 'blocking_fdinfo_send', argument 'fdn', from call at line 367.
           Null pointer introduced at line 615 of components/nmap/build/amd64/ncat/util.c in function 'get_fdinfo'.
Error: Null pointer dereference (CWE 476)
    Read from null pointer 'fdn'
         at line 946 of components/nmap/build/amd64/ncat/ncat_listen.c in function 'shutdown_sockets'.
           Function 'get_fdinfo' may return constant 'NULL' at line 615, called at line 945.
           Null pointer introduced at line 615 of components/nmap/build/amd64/ncat/util.c in function 'get_fdinfo'.
2012-12-22 06:02:30 +00:00
david
d98bbcc8ab Add an ncat_assert macro.
This is an assert that will remain even if NDEBUG is defined.
2012-12-22 06:02:25 +00:00
david
93b978fba8 Merge 30432:30436 from /nmap-exp/david/ipv6-ranges.
This is simple IPv6 unicast ranges. For example,
nmap -6 en.wikipedia.org/120 -sn

The other, more complicated part of this overall change is automatic
multicast scanning of large local subnets. That part isn't done yet.
2012-12-19 01:10:39 +00:00
henri
809f1eda68 Merged nsock-logging from nmap-exp/henri/nsock-logging/
Reworked the logging infrastructure to make it more flexible
and consistent.

Updated nmap, nping and ncat accordingly.  Nsock log level can
now be adjusted at runtime by pressing d/D in nmap.
2012-12-15 10:59:30 +00:00
fyodor
a90d961f51 auto-generated files (nroff versions of man pages) 2012-12-10 01:17:51 +00:00
fyodor
8f585c7882 Update my email address: fyodor@insecure.org => fyodor@nmap.org 2012-12-10 01:14:42 +00:00