1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 22:21:29 +00:00
Commit Graph

277 Commits

Author SHA1 Message Date
dmiller
6e33d6ac3c Bump date in copyright headers 2016-04-04 15:38:44 +00:00
dmiller
616cf9730e clear session data before attempting a reconnect without SSLv2-compatibility. Fixes #318. Fixes #308 2016-03-12 23:26:26 +00:00
dmiller
d2136e5ad0 Force-clear SSL_OP_NO_SSLv2 flag (required for 1.0.2g and later to allow SSLv2) 2016-03-12 23:26:25 +00:00
dmiller
ee048d5349 Avoid printf on NULL pointer if no string is registered for the error code. 2016-01-04 16:48:09 +00:00
dmiller
37d517b32e Use XP compatibility SDK, because users are complaining 2015-11-10 16:47:35 +00:00
dmiller
f4619edece Update http urls for nmap.org to https 2015-11-05 20:41:05 +00:00
dmiller
83c2bc1d18 Remove some more generated files when doing a distclean. Fixes #218 2015-10-07 16:34:12 +00:00
andrew
90f534d8c1 Removed an unnecessary check that a string is non-NULL before free()ing memory in proxy_*_node_delete. 2015-08-21 14:39:31 +00:00
dmiller
f66eadbcd2 Fix typo of nsock_loglevel_t enum value (broke build on VS2013) 2015-06-30 19:49:07 +00:00
henri
ea495ddecd Cosmetic fixes
Removed unneeded NULL-checks before free()
Flattened code structures
2015-06-27 08:21:56 +00:00
henri
b55ff2d68f Don't associate nsock logging info to a nspool.
Make current loglevel and current log callback global
to the library. Attaching them to the nsock pool doesn't
bring any benefit and prevents from logging activity in
code sections that don't have access to a pool (such as
proxy chain specification parsing).

Updated external calls and nsock tests accordingly.
2015-06-27 08:21:53 +00:00
henri
b75233ce98 Consistently renamed nsi_XXX calls into nsock_iod_XXX
This is part of the effort to make nsock expose only
nsock_ prefixed symbols and simplify the API.
2015-06-27 08:21:33 +00:00
henri
fd40b8df08 Simplify Nsock SSL init API
Replaced nsock_pool_ssl_init_max_speed() by a NSOCK_SSL_MAX_SPEED
flag to be passed to nsock_pool_ssl_init(). Default (flag=0) means
secure.
2015-06-27 08:21:22 +00:00
henri
0348359f60 Enforce nsock naming scheme.
convert nsp_* calls into nsock_pool_*. Separate words with underscores
where appropriate.
2015-06-27 08:21:16 +00:00
henri
ab161bbb0b Remove nsock_pool unique identifiers.
This isn't used anywhere and I cannot think of any use case.
The NSP is supposed to be unique and global as it controls the
event loop.
2015-06-27 08:21:05 +00:00
dmiller
68409b2226 Update copyright date to 2015 2015-06-03 13:01:29 +00:00
henri
d7a3d43eb6 Reduce CPU consumption with nsock engine poll
Entering nsock_loop() with the poll engine activated and no registered FD
(timers only, for instance) should not directly return, but sleep until next
timeout.
2015-02-21 21:15:21 +00:00
henri
7b02dea019 Remove dead code: einfo->evlen cannot be zero. 2015-02-21 21:15:15 +00:00
dmiller
7e30cb9c4a Only run SSL nsock tests if configured with OpenSSL 2015-02-11 04:55:36 +00:00
dmiller
2bf814b499 Add autoconf placeholder for HAVE_OPENSSL in nsock_config.h.in 2015-02-11 04:55:35 +00:00
dmiller
0952bed032 Merge final changes to support VS2013 build
Changes:

* Fix a collision of the name PS_NONE with a different constant in shlobj.h
* Update solution and project files for VS2013
* Update the NSIS installer to reference the VC 2013 redistributable
2015-01-17 04:35:01 +00:00
dmiller
fc99bed706 Don't use unnecessary parens with __declspec
Reported by nnposter, this broke on VS2010. Pretty sure this was just a
simple mistake in the first place. Fixes #33
2015-01-01 13:39:47 +00:00
dmiller
04ac366666 Fix nsock tests using wrong type (clang complains) 2014-12-31 04:30:58 +00:00
dmiller
59de1a50de Fix Nsock's make check: wrong value tested 2014-11-17 13:32:41 +00:00
dmiller
f6d70cd3e6 Revert r33815 (unrelated changes) 2014-11-17 13:31:56 +00:00
dmiller
2b9fade75b Fix Nsock's make check: wrong value tested 2014-11-17 13:25:35 +00:00
dmiller
85bb2d388d Define a NORETURN macro 2014-11-17 13:25:32 +00:00
dmiller
a067bc25bc Let MSVC know about noreturn attribute to help with code analysis 2014-11-12 13:29:40 +00:00
dmiller
7797826e5d Silence a compiler warning on VS2013: not all code paths return a value 2014-11-11 06:06:46 +00:00
dmiller
16bbe3719c Fix undefined symbol error on Windows 2014-11-11 05:19:50 +00:00
dmiller
53f7a37b7d Add config.h entries for PCAP_NETMASK_UNKNOWN 2014-11-03 02:47:53 +00:00
dmiller
80f18a2bc7 Add configure test for PCAP_NETMASK_UNKNOWN 2014-10-31 13:28:12 +00:00
fyodor
f6f59a7cd7 Auto regeneration with latest template files, etc. 2014-08-13 22:57:43 +00:00
henri
97103efdfb Try to trigger connection failure in a more portable way.
The former one was hackish and didn't behave consistently
between operating systems.

Passing in a zero addrlen should reliably make connect(2) fail.
2014-08-10 18:31:00 +00:00
henri
a913288efa Added missing variable declaration, as reported by Gisle Vanem 2014-08-10 13:22:09 +00:00
dmiller
9bf8974b38 Let nsock use /bin/sh instead of Bash for testing 2014-08-02 04:38:04 +00:00
henri
b5a6d20a6e Fail early when unable to properly resolve proxy names.
Some errors were not properly propagated. Ensure proxy_resolve() returns
a negative error code and make the caller fatal() when unable to complete
proxy_chain initialization for whatever reason.
2014-07-08 17:50:51 +00:00
dmiller
ec9074f718 Correct "it's" to "its" where necessary
it's = it is
its = belonging to it
2014-06-19 04:58:46 +00:00
henri
240da6ede2 Attempt to connect to 0.0.0.1 to reliably trigger an error.
0.0.0.1 seems to always fail with EINVAL, where 192.0.2.1 actually sends
a probe (and timeout.)
2014-06-11 20:14:20 +00:00
henri
ccf6e15b90 Nsock early error reporting.
Report finished (likely failed) events as early as possible. Because the
corresponding IODs can have no I/O activity, they wouldn't be flagged as active
by the I/O engines and the events could end up being delivered at shutdown only
(or never).

Reported by d33tah on http://seclists.org/nmap-dev/2014/q2/409
2014-06-11 20:14:16 +00:00
henri
a00aa0a460 New nsock regression test: TestConnectFailure.
Trigger a ENETUNREACH error on connect() and check if properly reported.

As of now the test fails, the error isn't delivered.
2014-06-05 19:44:00 +00:00
henri
e4d9793d92 Expose external nsock types as pointers to the internal structures instead of void pointers. 2014-05-21 19:59:46 +00:00
henri
d13dab54c3 Replaced internal opaque types by structs. 2014-05-21 19:59:42 +00:00
henri
687d153378 Divide code cleanly between ssl and non-ssl versions 2014-05-21 19:59:29 +00:00
dmiller
573f9c1a73 Fix a libpcap dependency flag in nsock test suite 2014-03-14 22:08:51 +00:00
dmiller
3f0d0c16f9 Spellcheck on Nmap, Nsock, Nbase source files 2014-02-20 18:44:12 +00:00
dmiller
c9714990c7 Remove trailing whitespace from C/C++ files
https://secwiki.org/w/Nmap/Code_Standards
2014-02-12 20:25:51 +00:00
henri
d5746993e2 Define nsi_delete() notify modes as enums.
These values aren't flags that can be ORed.
2014-02-03 20:53:09 +00:00
henri
64fb5b3482 Added safe fd_set operations.
Only FD_SET and FD_CLR were available. Added a FD_ISSET equivalent.
Implemented them as static inline instead of macros for consistency.

These functions abort() if the FD number is higher than FD_SETSIZE
(except on windows where no check is performed).
2014-01-30 19:02:57 +00:00
dmiller
83fd814a2c Really fix nsock's pcap configuration
This wasn't using Nmap's included libpcap if no options were specified,
instead compiling nsock without pcap support if no libpcap could be
found (which breaks Nmap)
2014-01-30 03:40:26 +00:00