Commit 381529aa authored by Sophie Brun's avatar Sophie Brun
Browse files

New upstream version 7.70+dfsg1

parent 57dcb682
......@@ -47,3 +47,9 @@ ndiff/INSTALLED_FILES
libz/contrib/vstudio/vc11/Debug_lib/
libz/contrib/vstudio/vc11/Release_lib/
libz/zconf.h
!liblinear/Makefile
!liblinear/blas/Makefile
!liblua/Makefile
!macosx/Makefile
!mswin32/Makefile
!zenmap/share/zenmap/locale/Makefile
# Nmap Changelog ($Id: CHANGELOG 36907 2017-07-31 22:31:50Z dmiller $); -*-text-*-
#Nmap Changelog ($Id: CHANGELOG 37194 2018-03-15 18:48:40Z dmiller $); -*-text-*-
o [Windows] Updated the bundled Npcap from 0.93 to 0.99-r2, with lots of
stability fixes and installation improvements, as well as fixes to raw 802.11
frame capture.
o Integrated all of your service/version detection fingerprints submitted from
March 2017 to August 2017 (728 of them). The signature count went up 1.02% to
11,672, including 26 new softmatches. We now detect 1224 protocols from
filenet-pch, lscp, and netassistant to sharp-remote, urbackup, and
watchguard.
o Integrated all of your IPv4 OS fingerprint submissions from September 2016 to
August 2017 (667 of them). Added 298 fingerprints, bringing the new total to
5,652. Additions include iOS 11, macOS Sierra, Linux 4.14, Android 7, and more.
o Integrated all 33 of your IPv6 OS fingerprint submissions from September 2016 to
August 2017. New groups for OpenBSD 6.0 and FreeBSD 11.0 were added, as well
as strengthened groups for Linux and OS X.
o [Ncat][GH#197][GH#1049] Fix --ssl connections from dropping on renegotiation,
the same issue that was partially fixed for server mode in [GH#773]. Reported
on Windows with -e by pkreuzt and vinod272. [Daniel Miller]
o [NSE] Added 9 NSE scripts, from 8 authors, bringing the total up to 588!
They are all listed at https://nmap.org/nsedoc/, and the summaries are below:
+ deluge-rpc-brute performs brute-force credential testing against Deluge
BitTorrent RPC services, using the new zlib library. [Claudiu Perta]
+ hostmap-crtsh lists subdomains by querying Google's Certificate
Transparency logs. [Paulino Calderon]
+ [GH#892] http-bigip-cookie decodes unencrypted F5 BIG-IP cookies and
reports back the IP address and port of the actual server behind the
load-balancer. [Seth Jackson]
+ http-jsonp-detection Attempts to discover JSONP endpoints in web servers.
JSONP endpoints can be used to bypass Same-origin Policy restrictions in
web browsers. [Vinamra Bhatia]
+ http-trane-info obtains information from Trane Tracer SC controllers and
connected HVAC devices. [Pedro Joaquin]
+ [GH#609] nbd-info uses the new nbd.lua library to query Network Block
Devices for protocol and file export information. [Mak Kolybabi]
+ rsa-vuln-roca checks for RSA keys generated by Infineon TPMs
vulnerable to Return Of Coppersmith Attack (ROCA) (CVE-2017-15361). Checks
SSH and TLS services. [Daniel Miller]
+ [GH#987] smb-enum-services retrieves the list of services running on a
remote Windows machine. Modern Windows systems requires a privileged domain
account in order to list the services. [Rewanth Cool]
+ tls-alpn checks TLS servers for Application Layer Protocol Negotiation
(ALPN) support and reports supported protocols. ALPN largely replaces NPN,
which tls-nextprotoneg was written for. [Daniel Miller]
o [NSE][GH#1062][GH#1149] Some changes to brute.lua to better handle
misbehaving or rate-limiting services. Most significantly,
brute.killstagnated now defaults to true. Thanks to xp3s and Adamtimtim for
reporing infinite loops and proposing changes.
o [NSE][GH#1111] Fix a script crash in ftp.lua when PASV connection timed out.
[Aniket Pandey]
o [NSE][GH#1114] Update bitcoin-getaddr to receive more than one response
message, since the first message usually only has one address in it. [h43z]
o [Ncat][GH#1139] Ncat now selects the correct default port for a given proxy
type. [Pavel Zhukov]
o [NSE] memcached-info can now gather information from the UDP memcached
service in addition to the TCP service. The UDP service is frequently used as
a DDoS reflector and amplifier. [Daniel Miller]
o [NSE][GH#1129] Changed url.absolute() behavior with respect to dot and
dot-dot path segments to comply with RFC 3986, section 5.2. [nnposter]
o Removed deprecated and undocumented aliases for several long options that
used underscores instead of hyphens, such as --max_retries. [Daniel Miller]
o When a soft match occurs, any probes that could result in a match with the
same service will be sent regardless of rarity, improving the chances of
matching unusual services on non-standard ports. [Daniel Miller]
o --version-all now turns off the soft match optimization, ensuring that all
probes really are sent, even if there aren't any existing match lines for the
softmatched service. [Daniel Miller]
o Increased effectiveness of service scan soft matches. Previously, all probes
which matched the port being scanned would be sent regardless of whether the
service was soft matched; softmatch lines only restricted non-port-matching
probes from being sent. Now, a soft match will cause ALL non-service-matching
probes to be skipped, even if the port number matches. [Daniel Miller]
o [GH#1112] Resolved crash opportunities caused by unexpected libpcap version
string format. [Gisle Vanem, nnposter]
o [NSE][GH#1083] New set of Telnet softmatches for version detection based on
Telnet DO/DON'T options offered, covering a wide variety of devices and
operating systems. [D Roberson]
o [NSE][GH#1090] Fix false positives in rexec-brute by checking responses for
indications of login failure. [Daniel Miller]
o [NSE][GH#1099] Fix http-fetch to keep downloaded files in separate
destination directories. [Aniket Pandey]
o [NSE] Added two new fingerprints to http-default-accounts
(Hikvision DS-XXX Network Camera and NUOO DVR) [Paulino Calderon]
o Add the --resolve-all option to resolve and scan all IP addresses of a host.
This essentially replaces the resolveall NSE script. [Daniel Miller]
o [NSE] VNC scripts now support Apple Remote Desktop authentication (auth type
30) [Daniel Miller]
o Added a new service detection match for WatchGuard Authentication Gateway.
[Paulino Calderon]
o [NSE][GH#1074] Added three new fingerprints to http-default-accounts
(ActiveMQ, Purestorage and Axis Network Cameras) [Rob Fitzpatrick, Paulino Calderon]
o [NSE][GH#1038][GH#1037] Script qscan was not observing interpacket delays
(parameter qscan.delay). [nnposter]
o [NSE][GH#1046] Script http-headers now fails properly if the target does not
return a valid HTTP response. [spacewander]
o [Ncat][Nsock][GH#972] Remove RC4 from the list of TLS ciphers used by
default, in accordance with RFC 7465. [Codarren Velvindron]
o [NSE][GH#1022] Fix a false positive condition in ipmi-cipher-zero caused by
not checking the error code in responses. Implementations which return an
error are not vulnerable. [Juho Jokelainen]
o [GH#978] Fixed Nsock on Windows giving errors when selecting on STDIN. This
was causing Ncat 7.60 in connect mode to quit with error:
libnsock select_loop(): nsock_loop error 10038: An operation was attempted on something that is not a socket.
[nnposter]
o [NSE][GH#958] Two new libraries for NSE.
- punycode
- idna
[Rewanth Cool]
o [NSE] New fingerprints for http-enum:
- [GH#954] Telerik UI CVE-2017-9248 [Harrison Neal]
- [GH#767] Many WordPress version detections [Rewanth Cool]
o [GH#981][GH#984][GH#996][GH#975] Fixed Ncat proxy authentication issues:
- Usernames and/or passwords could not be empty
- Passwords could not contain colons
- SOCKS5 authentication was not properly documented
- SOCKS5 authentication had a memory leak
[nnposter]
o [GH#1009][GH#1013] Fixes to autoconf header files to allow autoreconf to be
run. [Lukas Schwaighofer]
o [GH#977] Improved DNS service version detection coverage and consistency
by using data from a Project Sonar Internet wide survey. Numerouse false
positives were removed and reliable softmatches added. Match lines for
version.bind responses were also conslidated using the technique below.
[Tom Sellers]
o [GH#977] Changed version probe fallbacks so as to work cross protocol
(TCP/UDP). This enables consolidating match lines for services where the
responses on TCP and UDP are similar. [Tom Sellers]
o [NSE][GH#532] Added zlib library for NSE. This was a leftover project from
GSOC 2014, and will be very useful. [Claudiu Perta, Daniel Miller]
o [NSE][GH#1004] Fixed handling of brute.retries variable. It was being treated
as the number of tries, not retries, and a value of 0 would result in
infinite retries. Instead, it is now the number of retries, defaulting to 2
(3 total tries), with no option for infinite retries.
o [NSE] http-devframework-fingerprints.lua supports Jenkins server detection
and returns extra information when Jenkins is detected [Vinamra Bhatia]
o [GH#926] The rarity level of MS SQL's service detection probe was decreased.
Now we can find MS SQL in odd ports without increasing version intensity.
[Paulino Calderon]
o [GH#957] Fix reporting of zlib and libssh2 versions in "nmap --version". We
were always reporting the version number of the included source, even when a
different version was linked. [Pavel Zhukov]
o Add a new helper function for nmap-service-probes match lines: $I(1,">") will
unpack an unsigned big-endian integer value up to 8 bytes wide from capture
1. The second option can be "<" for little-endian. [Daniel Miller]
Nmap 7.60 [2017-07-31]
......@@ -184,6 +377,11 @@ o [Ncat] A series of changes and fixes based on feedback from the Red Hat commun
+ Enable --ssl-ciphers to be used with Ncat in client mode, not only in
server (listen) mode. [Daniel Miller]
o [NSE] New fingerprints for http-enum:
- Endpoints for Spring MVC and Boot Actuator [Paulino Calderon]
- [GH#620][GH#715] 8 fingerprints for Hadoop infrastructure components
[Thomas Debize, Varunram Ganesh]
o [NSE][GH#266][GH#704][GH#238][GH#883] NSE libraries smb and msrpc now use
fully qualified paths. SMB scripts now work against all modern versions
of Microsoft Windows. [Paulino Calderon]
......@@ -264,9 +462,6 @@ o [NSE] Added several commands to redis-info to extract listening addresses,
o [NSE][GH#679][GH#681] Refreshed script http-robtex-reverse-ip, reflecting
changes at the source site (www.robtex.com). [aDoN]
o [NSE][GH#620][GH#715] Added 8 new http-enum fingerprints for Hadoop
infrastructure components. [Thomas Debize, Varunram Ganesh]
o [NSE][GH#629] Added two new fingerprints to http-default-accounts
(APC Management Card, older NetScreen ScreenOS) [Steve Benson, nnposter]
......@@ -3887,7 +4082,7 @@ o [NSE] Fixed an error in the mssql library that was causing the
information. [Patrik]
o [NSE] Added the missing broadcast category to the broadcast-listener script.
[Jason DePriest]
[Jasey DePriest]
o [NSE] Made changes to the categories of the following scripts (new
categories shown) [Duarte Silva]:
......@@ -5654,7 +5849,7 @@ o Added EPROTO to the list of known error codes in service scan. Daniel
o [NSE] Improved smtp-commands.nse to work against more mail servers,
made it take an smtp-commands.domain script argument, and rewrote it
in the style of other smtp scripts. [Jason DePriest]
in the style of other smtp scripts. [Jasey DePriest]
o [NSE] Made smtp-commands run for the services smtp, smtps,
submission rather than just smtp. The other smtp scripts already do
......@@ -8656,7 +8851,7 @@ o [Zenmap] Profile updates: The -sS option was added to the "Intense
scan plus UDP" and "Slow comprehensive scan" profiles. The -PN (ping
only) option was added to "Quick traceroute". [David]
o [NSE] The smtp-commands script output is now more compact. [Jason
o [NSE] The smtp-commands script output is now more compact. [Jasey
DePriest, David]
o [Zenmap] Added a simple workaround for a bug in PyXML (an add-on
......@@ -9598,7 +9793,7 @@ o Updated to include the latest MAC Address prefixes from the IEEE in
nmap-mac-prefixes [Fyodor]
o Updated the SMTPcommands NSE script to work better against Postfix
and reduce verbosity. [Jason DePriest, Fyodor]
and reduce verbosity. [Jasey DePriest, Fyodor]
o Reorganized the way ping probes are handled internally. Rather than
being stored in the NmapOps structure, they are now stored within
......@@ -9625,7 +9820,7 @@ o NSE engine was cleaned up significantly. nse_auxiliar was removed,
o Fixed a bug in the showOwner NSE script which caused it to try UDP
ports instead of just TCP ports. This made it very slow in the
common case where there are many UDP ports in the open|filtered
state. Thanks to Jason DePriest for reporting the problem and Jah
state. Thanks to Jasey DePriest for reporting the problem and Jah
for tracking it down and fixing it.
o Nbase now generates pseudo-random numbers itself rather than using
......@@ -10518,7 +10713,7 @@ o Added a new ping type: IPProto Ping. Use -PO (that is the letter O
than using the old -P0 (zero). [Kris]
o The SMTPcommands.nse script was updated to support the HELP query in
addition to EHLO [Jason DePriest]
addition to EHLO [Jasey DePriest]
o Added --ttl support for connect() scans (-sT). [Kris]
......@@ -10654,7 +10849,7 @@ o Added an NSE script (HTTPpasswd.nse) for finding directory traversal
o Fixed an error related to version scans against SSL services on
UNIX. The error said "nsock_connect_ssl called - but nsock was
built w/o SSL support. QUITTING". Thanks to Jason DePriest for
built w/o SSL support. QUITTING". Thanks to Jasey DePriest for
tracking down the problem and David Fifield for fixing it.
o Removed win_dependencies cruft from UMIT directory. [Kris]
......@@ -10807,8 +11002,8 @@ o The UMIT graphical Nmap frontend is now included (as an ALPHA TEST
include UMIT in the Windows Nmap distributions soon.
o Added more Nmap Scripting Engine scripts, bringing the total to 31.
The new ones are bruteTelnet (Eddie Bell), SMTPcommands (Jason
DePriest), iax2Detect (Jason), nbstat (Brandon Enright),
The new ones are bruteTelnet (Eddie Bell), SMTPcommands (Jasey
DePriest), iax2Detect (Jasey), nbstat (Brandon Enright),
SNMPsysdescr (Thomas Buchanan), HTTPAuth (Thomas), finger (Eddie),
ircServerInfo (Doug Hoyte), and MSSQLm (Thomas Buchanan).
......@@ -15610,4 +15805,3 @@ o Changed the makefile 'all' target to use install-sh rather than
o Documentation updated and clarified slightly.
o Added this CHANGELOG file to the distribution.
# Table of Contents
---
* [Introduction](#intro)
* [Code Repository](#repo)
* [Bug Reports](#bug)
......
......@@ -4,7 +4,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2017 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* Project"). Nmap is also a registered trademark of the Nmap Project. *
* This program is free software; you may redistribute and/or modify it *
* under the terms of the GNU General Public License as published by the *
......@@ -88,12 +88,12 @@
* Covered Software without special permission from the copyright holders. *
* *
* If you have any questions about the licensing restrictions on using *
* Nmap in other works, are happy to help. As mentioned above, we also *
* offer alternative license to integrate Nmap into proprietary *
* Nmap in other works, we are happy to help. As mentioned above, we also *
* offer an alternative license to integrate Nmap into proprietary *
* applications and appliances. These contracts have been sold to dozens *
* of software vendors, and generally include a perpetual license as well *
* as providing for priority support and updates. They also fund the *
* continued development of Nmap. Please email sales@nmap.com for further *
* as providing support and updates. They also fund the continued *
* development of Nmap. Please email sales@nmap.com for further *
* information. *
* *
* If you have received a written license agreement or contract for *
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2017 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* Project"). Nmap is also a registered trademark of the Nmap Project. *
* This program is free software; you may redistribute and/or modify it *
* under the terms of the GNU General Public License as published by the *
......@@ -90,12 +90,12 @@
* Covered Software without special permission from the copyright holders. *
* *
* If you have any questions about the licensing restrictions on using *
* Nmap in other works, are happy to help. As mentioned above, we also *
* offer alternative license to integrate Nmap into proprietary *
* Nmap in other works, we are happy to help. As mentioned above, we also *
* offer an alternative license to integrate Nmap into proprietary *
* applications and appliances. These contracts have been sold to dozens *
* of software vendors, and generally include a perpetual license as well *
* as providing for priority support and updates. They also fund the *
* continued development of Nmap. Please email sales@nmap.com for further *
* as providing support and updates. They also fund the continued *
* development of Nmap. Please email sales@nmap.com for further *
* information. *
* *
* If you have received a written license agreement or contract for *
......@@ -320,7 +320,7 @@ int FPNetworkControl::cc_report_drop() {
value of ssthresh is held constant.
*/
int probes_outstanding = this->probes_sent - this->responses_recv - this->probes_timedout;
this->cc_ssthresh = MAX(probes_outstanding, OSSCAN_INITIAL_CWND);
this->cc_ssthresh = (float)MAX(probes_outstanding, OSSCAN_INITIAL_CWND);
this->cc_cwnd = OSSCAN_INITIAL_CWND;
return OP_SUCCESS;
}
......@@ -1495,8 +1495,8 @@ int FPHost::update_RTO(int measured_rtt_usecs, bool retransmission) {
*
* RTO <- SRTT + max (G, K*RTTVAR)
*/
this->rttvar = ((1.0 - 0.25) * this->rttvar) + (0.25 * ABS(this->srtt - measured_rtt_usecs));
this->srtt = ((1.0 - 0.125) * this->srtt) + (0.125 * measured_rtt_usecs);
this->rttvar += (ABS(this->srtt - measured_rtt_usecs) - this->rttvar) >> 2;
this->srtt += (measured_rtt_usecs - this->srtt) >> 3;
this->rto = this->srtt + MAX(500000, 4*this->rttvar);
}
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2017 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* Project"). Nmap is also a registered trademark of the Nmap Project. *
* This program is free software; you may redistribute and/or modify it *
* under the terms of the GNU General Public License as published by the *
......@@ -90,12 +90,12 @@
* Covered Software without special permission from the copyright holders. *
* *
* If you have any questions about the licensing restrictions on using *
* Nmap in other works, are happy to help. As mentioned above, we also *
* offer alternative license to integrate Nmap into proprietary *
* Nmap in other works, we are happy to help. As mentioned above, we also *
* offer an alternative license to integrate Nmap into proprietary *
* applications and appliances. These contracts have been sold to dozens *
* of software vendors, and generally include a perpetual license as well *
* as providing for priority support and updates. They also fund the *
* continued development of Nmap. Please email sales@nmap.com for further *
* as providing support and updates. They also fund the continued *
* development of Nmap. Please email sales@nmap.com for further *
* information. *
* *
* If you have received a written license agreement or contract for *
......
This diff is collapsed.
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2017 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* Project"). Nmap is also a registered trademark of the Nmap Project. *
* This program is free software; you may redistribute and/or modify it *
* under the terms of the GNU General Public License as published by the *
......@@ -89,12 +89,12 @@
* Covered Software without special permission from the copyright holders. *
* *
* If you have any questions about the licensing restrictions on using *
* Nmap in other works, are happy to help. As mentioned above, we also *
* offer alternative license to integrate Nmap into proprietary *
* Nmap in other works, we are happy to help. As mentioned above, we also *
* offer an alternative license to integrate Nmap into proprietary *
* applications and appliances. These contracts have been sold to dozens *
* of software vendors, and generally include a perpetual license as well *
* as providing for priority support and updates. They also fund the *
* continued development of Nmap. Please email sales@nmap.com for further *
* as providing support and updates. They also fund the continued *
* development of Nmap. Please email sales@nmap.com for further *
* information. *
* *
* If you have received a written license agreement or contract for *
......@@ -128,7 +128,7 @@
* *
***************************************************************************/
/* $Id: FingerPrintResults.cc 36788 2017-06-07 12:32:38Z dmiller $ */
/* $Id: FingerPrintResults.cc 37126 2018-01-28 21:18:17Z fyodor $ */
#include "FingerPrintResults.h"
#include "osscan.h"
......
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2017 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* Project"). Nmap is also a registered trademark of the Nmap Project. *
* This program is free software; you may redistribute and/or modify it *
* under the terms of the GNU General Public License as published by the *
......@@ -89,12 +89,12 @@
* Covered Software without special permission from the copyright holders. *
* *
* If you have any questions about the licensing restrictions on using *
* Nmap in other works, are happy to help. As mentioned above, we also *
* offer alternative license to integrate Nmap into proprietary *
* Nmap in other works, we are happy to help. As mentioned above, we also *
* offer an alternative license to integrate Nmap into proprietary *
* applications and appliances. These contracts have been sold to dozens *
* of software vendors, and generally include a perpetual license as well *
* as providing for priority support and updates. They also fund the *
* continued development of Nmap. Please email sales@nmap.com for further *
* as providing support and updates. They also fund the continued *
* development of Nmap. Please email sales@nmap.com for further *
* information. *
* *
* If you have received a written license agreement or contract for *
......@@ -128,7 +128,7 @@
* *
***************************************************************************/
/* $Id: FingerPrintResults.h 36788 2017-06-07 12:32:38Z dmiller $ */
/* $Id: FingerPrintResults.h 37126 2018-01-28 21:18:17Z fyodor $ */
#ifndef FINGERPRINTRESULTS_H
#define FINGERPRINTRESULTS_H
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2017 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* Project"). Nmap is also a registered trademark of the Nmap Project. *
* This program is free software; you may redistribute and/or modify it *
* under the terms of the GNU General Public License as published by the *
......@@ -90,12 +90,12 @@
* Covered Software without special permission from the copyright holders. *
* *
* If you have any questions about the licensing restrictions on using *
* Nmap in other works, are happy to help. As mentioned above, we also *
* offer alternative license to integrate Nmap into proprietary *
* Nmap in other works, we are happy to help. As mentioned above, we also *
* offer an alternative license to integrate Nmap into proprietary *
* applications and appliances. These contracts have been sold to dozens *
* of software vendors, and generally include a perpetual license as well *
* as providing for priority support and updates. They also fund the *
* continued development of Nmap. Please email sales@nmap.com for further *
* as providing support and updates. They also fund the continued *
* development of Nmap. Please email sales@nmap.com for further *
* information. *
* *
* If you have received a written license agreement or contract for *
......@@ -129,7 +129,7 @@
* *
***************************************************************************/
/* $Id: MACLookup.cc 36788 2017-06-07 12:32:38Z dmiller $ */
/* $Id: MACLookup.cc 37126 2018-01-28 21:18:17Z fyodor $ */
#include "nmap.h"
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2017 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* Project"). Nmap is also a registered trademark of the Nmap Project. *
* This program is free software; you may redistribute and/or modify it *
* under the terms of the GNU General Public License as published by the *
......@@ -90,12 +90,12 @@
* Covered Software without special permission from the copyright holders. *
* *
* If you have any questions about the licensing restrictions on using *
* Nmap in other works, are happy to help. As mentioned above, we also *
* offer alternative license to integrate Nmap into proprietary *
* Nmap in other works, we are happy to help. As mentioned above, we also *
* offer an alternative license to integrate Nmap into proprietary *
* applications and appliances. These contracts have been sold to dozens *
* of software vendors, and generally include a perpetual license as well *
* as providing for priority support and updates. They also fund the *
* continued development of Nmap. Please email sales@nmap.com for further *
* as providing support and updates. They also fund the continued *
* development of Nmap. Please email sales@nmap.com for further *
* information. *
* *
* If you have received a written license agreement or contract for *
......@@ -129,7 +129,7 @@
* *
***************************************************************************/
/* $Id: MACLookup.h 36788 2017-06-07 12:32:38Z dmiller $ */
/* $Id: MACLookup.h 37126 2018-01-28 21:18:17Z fyodor $ */
#ifndef MACLOOKUP_H
#define MACLOOKUP_H
......
......@@ -26,8 +26,8 @@ export LIBLINEAR_LIBS = @LIBLINEAR_LIBS@
export NCATDIR=@NCATDIR@
CC = @CC@
CXX = @CXX@
CCOPT =
DBGFLAGS =
CCOPT =
DBGFLAGS =
STRIP = @STRIP@
LIBPCAPDIR = @libpcapdir@
LIBSSH2DIR = @LIBSSH2DIR@
......@@ -74,7 +74,7 @@ LINGUAS ?= $(ALL_LINGUAS)
# DESTDIR is used by some package maintainers to install Nmap under
# its usual directory structure into a different tree. See the
# its usual directory structure into a different tree. See the
# CHANGELOG for more info.
DESTDIR =
......@@ -105,13 +105,18 @@ NSE_SRC+=nse_libssh2.cc
NSE_HDRS+=nse_libssh2.h
NSE_OBJS+=nse_libssh2.o
endif
ifneq (@ZLIB_LIBS@,)
NSE_SRC+=nse_zlib.cc
NSE_HDRS+=nse_zlib.h
NSE_OBJS+=nse_zlib.o
endif
endif
export SRCS = charpool.cc FingerPrintResults.cc FPEngine.cc FPModel.cc idle_scan.cc MACLookup.cc main.cc nmap.cc nmap_dns.cc nmap_error.cc nmap_ftp.cc NmapOps.cc NmapOutputTable.cc nmap_tty.cc osscan2.cc osscan.cc output.cc payload.cc portlist.cc portreasons.cc protocols.cc scan_engine.cc scan_engine_connect.cc scan_engine_raw.cc scan_lists.cc service_scan.cc services.cc Target.cc TargetGroup.cc targets.cc tcpip.cc timing.cc traceroute.cc utils.cc xml.cc $(NSE_SRC)
export SRCS = charpool.cc FingerPrintResults.cc FPEngine.cc FPModel.cc idle_scan.cc MACLookup.cc main.cc nmap.cc nmap_dns.cc nmap_error.cc nmap_ftp.cc NmapOps.cc NmapOutputTable.cc nmap_tty.cc osscan2.cc osscan.cc output.cc payload.cc portlist.cc portreasons.cc protocols.cc scan_engine.cc scan_engine_connect.cc scan_engine_raw.cc scan_lists.cc service_scan.cc services.cc Target.cc NewTargets.cc TargetGroup.cc targets.cc tcpip.cc timing.cc traceroute.cc utils.cc xml.cc $(NSE_SRC)
export HDRS = charpool.h FingerPrintResults.h FPEngine.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h nmap_ftp.h NmapOps.h NmapOutputTable.h nmap_tty.h nmap_winconfig.h osscan2.h osscan.h output.h payload.h portlist.h portreasons.h protocols.h scan_engine.h scan_engine_connect.h scan_engine_raw.h service_scan.h scan_lists.h services.h TargetGroup.h Target.h targets.h tcpip.h timing.h traceroute.h utils.h xml.h $(NSE_HDRS)
export HDRS = charpool.h FingerPrintResults.h FPEngine.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h nmap_ftp.h NmapOps.h NmapOutputTable.h nmap_tty.h nmap_winconfig.h osscan2.h osscan.h output.h payload.h portlist.h portreasons.h protocols.h scan_engine.h scan_engine_connect.h scan_engine_raw.h service_scan.h scan_lists.h services.h NewTargets.h TargetGroup.h Target.h targets.h tcpip.h timing.h traceroute.h utils.h xml.h $(NSE_HDRS)
OBJS = charpool.o FingerPrintResults.o FPEngine.o FPModel.o idle_scan.o MACLookup.o nmap_dns.o nmap_error.o nmap.o nmap_ftp.o NmapOps.o NmapOutputTable.o nmap_tty.o osscan2.o osscan.o output.o payload.o portlist.o portreasons.o protocols.o scan_engine.o scan_engine_connect.o scan_engine_raw.o scan_lists.o service_scan.o services.o TargetGroup.o Target.o targets.o tcpip.o timing.o traceroute.o utils.o xml.o $(NSE_OBJS)
OBJS = charpool.o FingerPrintResults.o FPEngine.o FPModel.o idle_scan.o MACLookup.o nmap_dns.o nmap_error.o nmap.o nmap_ftp.o NmapOps.o NmapOutputTable.o nmap_tty.o osscan2.o osscan.o output.o payload.o portlist.o portreasons.o protocols.o scan_engine.o scan_engine_connect.o scan_engine_raw.o scan_lists.o service_scan.o services.o NewTargets.o TargetGroup.o Target.o targets.o tcpip.o timing.o traceroute.o utils.o xml.o $(NSE_OBJS)
# %.o : %.cc -- nope this is a GNU extension
.cc.o:
......@@ -469,7 +474,7 @@ check-dns: tests/check_dns
check: @NCAT_CHECK@ @NSOCK_CHECK@ @ZENMAP_CHECK@ @NSE_CHECK@ @NDIFF_CHECK@ check-dns
${srcdir}/configure: configure.ac
${srcdir}/configure: configure.ac
cd ${srcdir} && autoconf
## autoheader might not change config.h.in, so touch a stamp file.
......
/***************************************************************************
* NewTargets.h -- The "NewTargets" class allows NSE scripts to add new *
* targets to the scan queue. *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* Project"). Nmap is also a registered trademark of the Nmap Project. *
* This program is free software; you may redistribute and/or modify it *
* under the terms of the GNU General Public License as published by the *