Commit 7f8c1a46 authored by Hilko Bengen's avatar Hilko Bengen Committed by Sophie Brun
Browse files

Import Debian changes 7.80+dfsg1-1

nmap (7.80+dfsg1-1) unstable; urgency=medium

  * New upstream version 7.80+dfsg1 (Closes: #934728)
  * Disable check for upstream signatures which are apparently
    no longer published.
  * Bump Debhelper compat level
  * Replace dh_install --fail-missing
  * Bump Standards-Version
  * dh_missing
  * Rework patches
parents 0cc5012d 7034fae5
......@@ -7,11 +7,14 @@ config.log
config.status
config.h
makefile.dep
libtool
*.pc
*.py[co]
.*.swp
.deps/
.libs/
stamp-h1
/libdnet-stripped/dnet-config
/libdnet-stripped/include/stamp-h1
/libdnet-stripped/libtool
/libdnet-stripped/src/.libs/
/nbase/nbase_config.h
/ncat/ncat
/ncat/test/addrset
......@@ -32,7 +35,6 @@ autom4te.cache/
/libpcap/*.3pcap
libpcap/version.c
libpcap/version.h
libpcap/bpf_filter.c
libpcap/libpcap.so.1.2.1
libpcap/net
libpcap/pcap-config
......@@ -40,13 +42,14 @@ libpcap/pcap-filter.manmisc
libpcap/pcap-linktype.manmisc
libpcap/pcap-savefile.manfile
libpcap/pcap-tstamp.manmisc
libpcre/.deps/
libpcap/pcap_version.h
libssh2/src/libssh2_config.h
libpcre/pcre-config
libpcre/stamp-h1
ndiff/INSTALLED_FILES
libz/contrib/vstudio/vc11/Debug_lib/
libz/contrib/vstudio/vc11/Release_lib/
libz/zconf.h
libz/configure.log
!liblinear/Makefile
!liblinear/blas/Makefile
!liblua/Makefile
......
This diff is collapsed.
......@@ -4,7 +4,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -128,7 +128,7 @@
* *
***************************************************************************/
/* $Id: FingerPrintResults.cc 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: FingerPrintResults.cc 37640 2019-05-28 21:36:04Z dmiller $ */
#include "FingerPrintResults.h"
#include "osscan.h"
......
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -128,7 +128,7 @@
* *
***************************************************************************/
/* $Id: FingerPrintResults.h 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: FingerPrintResults.h 37640 2019-05-28 21:36:04Z dmiller $ */
#ifndef FINGERPRINTRESULTS_H
#define FINGERPRINTRESULTS_H
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -129,7 +129,7 @@
* *
***************************************************************************/
/* $Id: MACLookup.cc 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: MACLookup.cc 37640 2019-05-28 21:36:04Z dmiller $ */
#include "nmap.h"
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -129,12 +129,12 @@
* *
***************************************************************************/
/* $Id: MACLookup.h 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: MACLookup.h 37640 2019-05-28 21:36:04Z dmiller $ */
#ifndef MACLOOKUP_H
#define MACLOOKUP_H
#include "nbase/nbase.h"
#include <nbase.h>
/* Takes a three byte MAC address prefix (passing the whole MAC is OK
too) and returns the company which has registered the prefix.
......
# Extract the version string from nmap.h.
export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
export NMAP_UPDATE_CHANNEL := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_UPDATE_CHANNEL' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
NMAP_NAME= Nmap
NMAP_URL= https://nmap.org
NMAP_PLATFORM=@host@
datarootdir = @datarootdir@
prefix = @prefix@
......@@ -21,7 +19,6 @@ export NSOCKDIR=@NSOCKDIR@
export LIBLUADIR = @LIBLUADIR@
export LIBLINEARDIR = @LIBLINEARDIR@
export NDIR=$(shell pwd)
export LIBLUA_LIBS = @LIBLUA_LIBS@
export LIBLINEAR_LIBS = @LIBLINEAR_LIBS@
export NCATDIR=@NCATDIR@
CC = @CC@
......@@ -38,7 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@
NDIFFDIR = @NDIFFDIR@
NPINGDIR = @NPINGDIR@
PYTHON = @PYTHON@
DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
DEFS = @DEFS@ -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
# With GCC, add extra security checks to source code.
# http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
# Level 1 only makes changes that don't affect "conforming" programs,
......@@ -91,7 +88,7 @@ UNINSTALLZENMAP=@UNINSTALLZENMAP@
UNINSTALLNDIFF=@UNINSTALLNDIFF@
UNINSTALLNPING=@UNINSTALLNPING@
ifneq (@LIBLUA_LIBS@,)
ifneq (@NOLUA@,yes)
NSE_SRC=nse_main.cc nse_utility.cc nse_nsock.cc nse_dnet.cc nse_fs.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_lpeg.cc
NSE_HDRS=nse_main.h nse_utility.h nse_nsock.h nse_dnet.h nse_fs.h nse_nmaplib.h nse_debug.h nse_pcrelib.h nse_lpeg.h
NSE_OBJS=nse_main.o nse_utility.o nse_nsock.o nse_dnet.o nse_fs.o nse_nmaplib.o nse_debug.o nse_pcrelib.o nse_lpeg.o
......@@ -114,7 +111,7 @@ 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 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 NewTargets.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 probespec.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 NewTargets.o TargetGroup.o Target.o targets.o tcpip.o timing.o traceroute.o utils.o xml.o $(NSE_OBJS)
......@@ -222,7 +219,7 @@ distclean-nsock distclean-nbase @NDIFF_DIST_CLEAN@ clean debugclean
stamp-h.in config.cache config.log config.status
clean-pcap:
-cd $(LIBPCAPDIR) && $(MAKE) clean
-cd $(LIBPCAPDIR) && $(MAKE) clean && rm -f version.c pcap_version.h
clean-libssh2:
-cd $(LIBSSH2DIR)/src && $(MAKE) prefix="" DESTDIR=$(NDIR)/$(LIBSSH2DIR) uninstall-libLTLIBRARIES
......@@ -230,7 +227,7 @@ clean-libssh2:
-cd $(LIBSSH2DIR) && $(MAKE) clean
clean-zlib:
-cd $(ZLIBDIR) && $(MAKE) clean
-cd $(ZLIBDIR) && $(MAKE) clean && cp zconf.h.clean zconf.h
clean-pcre:
-cd $(LIBPCREDIR) && $(MAKE) clean
......
......@@ -3,7 +3,7 @@
* targets to the scan queue. *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -126,7 +126,7 @@
* *
***************************************************************************/
/* $Id: NewTargets.cc 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: NewTargets.cc 37640 2019-05-28 21:36:04Z dmiller $ */
#include "NewTargets.h"
#include "NmapOps.h"
......
......@@ -3,7 +3,7 @@
* targets to the scan queue. *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -126,7 +126,7 @@
* *
***************************************************************************/
/* $Id: NewTargets.h 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: NewTargets.h 37640 2019-05-28 21:36:04Z dmiller $ */
#ifndef NEWTARGETS_H
#define NEWTARGETS_H
......
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -128,15 +128,15 @@
* *
***************************************************************************/
/* $Id: NmapOps.cc 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: NmapOps.cc 37648 2019-05-29 16:39:05Z dmiller $ */
#ifdef WIN32
#include "winfix.h"
#endif
#include "nmap.h"
#include "nbase.h"
#include "NmapOps.h"
#include "osscan.h"
#include "nmap_error.h"
#ifdef WIN32
#include "winfix.h"
#endif
NmapOps o;
......@@ -415,7 +415,7 @@ bool NmapOps::UDPScan() {
bool NmapOps::RawScan() {
if (ackscan||finscan||idlescan||ipprotscan||maimonscan||nullscan||osscan||synscan||udpscan||windowscan||xmasscan||sctpinitscan||sctpcookieechoscan||traceroute)
return true;
if (pingtype & (PINGTYPE_ICMP_PING|PINGTYPE_ICMP_MASK|PINGTYPE_ICMP_TS|PINGTYPE_TCP_USE_ACK|PINGTYPE_UDP|PINGTYPE_SCTP_INIT))
if (pingtype & (PINGTYPE_ICMP_PING|PINGTYPE_ICMP_MASK|PINGTYPE_ICMP_TS|PINGTYPE_TCP_USE_ACK|PINGTYPE_UDP|PINGTYPE_PROTO|PINGTYPE_SCTP_INIT))
return true;
/* A SYN scan will only generate raw packets if nmap is running as root.
Otherwise, it becomes a connect scan. */
......@@ -431,7 +431,7 @@ void NmapOps::ValidateOptions() {
#ifdef WIN32
if (!have_pcap)
privreq = "Npcap, but it seems to be missing.\n\
Npcap is available from http://www.npcap.org. The Npcap driver service must\n\
Npcap is available from https://npcap.org. The Npcap driver service must\n\
be started by an administrator before Npcap can be used. Running nmap.exe\n\
will open a UAC dialog where you can start the service if you have\n\
administrator privileges.";
......
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -128,7 +128,7 @@
* *
***************************************************************************/
/* $Id: NmapOps.h 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: NmapOps.h 37640 2019-05-28 21:36:04Z dmiller $ */
#ifndef NMAP_OPS_H
#define NMAP_OPS_H
......@@ -188,7 +188,7 @@ class NmapOps {
int isr00t;
/* Whether we have pcap functions (can be false on Windows). */
bool have_pcap;
int debugging;
u8 debugging;
bool resuming;
#define PACKET_SEND_NOPREF 1
......@@ -221,7 +221,7 @@ class NmapOps {
void setVersionTrace(bool vt) { vTrace = vt; }
bool openOnly() { return open_only; }
void setOpenOnly(bool oo) { open_only = oo; }
int verbose;
u8 verbose;
/* The requested minimum packet sending rate, or 0.0 if unset. */
float min_packet_send_rate;
/* The requested maximum packet sending rate, or 0.0 if unset. */
......
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -128,7 +128,7 @@
* *
***************************************************************************/
/* $Id: NmapOutputTable.cc 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: NmapOutputTable.cc 37640 2019-05-28 21:36:04Z dmiller $ */
#ifdef WIN32
#include "nmap_winconfig.h"
......@@ -233,7 +233,7 @@ void NmapOutputTable::addItemFormatted(unsigned int row,
res = Vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
if (res > sizeof(buf))
if (res >= sizeof(buf))
fatal("NmapOutputTable only supports adding up to 4096 to a cell via %s.", __func__);
addItem(row, column, fullrow, true, buf, res);
......
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -128,7 +128,7 @@
* *
***************************************************************************/
/* $Id: NmapOutputTable.h 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: NmapOutputTable.h 37640 2019-05-28 21:36:04Z dmiller $ */
#ifndef NMAPOUTPUTTABLE_H
#define NMAPOUTPUTTABLE_H
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -129,7 +129,7 @@
* *
***************************************************************************/
/* $Id: Target.cc 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: Target.cc 37640 2019-05-28 21:36:04Z dmiller $ */
#ifdef WIN32
#include "nmap_winconfig.h"
......
......@@ -6,7 +6,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -129,7 +129,7 @@
* *
***************************************************************************/
/* $Id: Target.h 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: Target.h 37640 2019-05-28 21:36:04Z dmiller $ */
#ifndef TARGET_H
#define TARGET_H
......@@ -144,13 +144,14 @@
#include "portreasons.h"
#include "portlist.h"
#include "scan_engine.h"
#include "probespec.h"
#include "osscan.h"
#include "osscan2.h"
class FingerPrintResults;
#include <list>
#include <string>
#include <time.h> /* time_t */
#ifndef INET6_ADDRSTRLEN
#define INET6_ADDRSTRLEN 46
......
......@@ -7,7 +7,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -130,7 +130,7 @@
* *
***************************************************************************/
/* $Id: TargetGroup.cc 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: TargetGroup.cc 37665 2019-06-21 17:00:09Z dmiller $ */
#include "tcpip.h"
#include "TargetGroup.h"
......@@ -861,7 +861,12 @@ int TargetGroup::get_next_host(struct sockaddr_storage *ss, size_t *sslen) {
limit it to exactly one address). */
NetBlock *netblock_resolved = this->netblock->resolve();
if (netblock_resolved != NULL) {
this->netblock = netblock_resolved;
/* resolve may return the original netblock if it's not a type that needs
* to be resolved. Don't delete it! */
if (netblock_resolved != this->netblock) {
delete this->netblock;
this->netblock = netblock_resolved;
}
}
else {
error("Failed to resolve \"%s\".", this->netblock->hostname.c_str());
......
......@@ -7,7 +7,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -130,12 +130,13 @@
* *
***************************************************************************/
/* $Id: TargetGroup.h 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: TargetGroup.h 37640 2019-05-28 21:36:04Z dmiller $ */
#ifndef TARGETGROUP_H
#define TARGETGROUP_H
#include <list>
#include <cstddef>
class NetBlock;
......@@ -157,7 +158,7 @@ public:
/* Grab the next host from this expression (if any). Returns 0 and
fills in ss if successful. ss must point to a pre-allocated
sockaddr_storage structure */
int get_next_host(struct sockaddr_storage *ss, size_t *sslen);
int get_next_host(struct sockaddr_storage *ss, std::size_t *sslen);
/* Returns true iff the given address is the one that was resolved to create
this target group; i.e., not one of the addresses derived from it with a
netmask. */
......
......@@ -87,27 +87,6 @@ int main() {
[AC_MSG_RESULT(cross-compiling -- assuming yes); $3])
])
dnl Checks if PCAP_NETMASK_UNKNOWN is defined (has been since libpcap 1.1.1)
dnl Sets it to 0 (no checking) if it's not defined.
AC_DEFUN([PCAP_DEFINE_NETMASK_UNKNOWN],
[
AC_MSG_CHECKING(if PCAP_NETMASK_UNKNOWN is defined/handled by libpcap)
AC_CACHE_VAL(ac_cv_have_pcap_netmask_unknown,
AC_TRY_COMPILE(
[
#include <pcap.h>
],
[
int i = PCAP_NETMASK_UNKNOWN;
],
ac_cv_have_pcap_netmask_unknown=yes,
ac_cv_have_pcap_netmask_unknown=no))
if test $ac_cv_have_pcap_netmask_unknown = no; then
AC_DEFINE(PCAP_NETMASK_UNKNOWN, 0, [Possibly using libpcap prior to 1.1.0.])
fi
AC_MSG_RESULT($ac_cv_have_pcap_netmask_unknown)
])
dnl Checks if IPPROTO_RAW induces IP_HDRINCL-like behavior in AF_INET6 sockets.
dnl Defines HAVE_IPV6_IPPROTO_RAW if so. So far I only know this happens on
dnl Linux.
......
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -128,7 +128,7 @@
* *
***************************************************************************/
/* $Id: charpool.cc 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: charpool.cc 37640 2019-05-28 21:36:04Z dmiller $ */
#include <stddef.h>
......
......@@ -5,7 +5,7 @@
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
* *
* The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
* The Nmap Security Scanner is (C) 1996-2019 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 *
......@@ -128,7 +128,7 @@
* *
***************************************************************************/
/* $Id: charpool.h 37126 2018-01-28 21:18:17Z fyodor $ */
/* $Id: charpool.h 37640 2019-05-28 21:36:04Z dmiller $ */
#ifndef CHARPOOL_H
#define CHARPOOL_H
......
......@@ -68,7 +68,33 @@ check_liblinear() {
echo " Latest:" $LINEAR_LATEST
}
check_zlib() {
ZLIB_SOURCE="https://zlib.net/"
ZLIB_VERSION=$(awk '$2=="ZLIB_VERSION"{print$3;exit}' $NDIR/libz/zlib.h | tr -d '"')
ZLIB_LATEST=$(curl -s $ZLIB_SOURCE | perl -lne 'if(/zlib-([\d.]+).tar.gz/){print $1}' | newest)
if [ "$ZLIB_VERSION" != "$ZLIB_LATEST" ]; then
echo "Newer version of zlib available"
echo " Current:" $ZLIB_VERSION
echo " Latest: " $ZLIB_LATEST
echo " Source: $ZLIB_SOURCE"
fi
}
check_libssh2() {
LIBSSH2_SOURCE="https://www.libssh2.org/download/"
LIBSSH2_VERSION=$(awk '$2=="LIBSSH2_VERSION"{print$3;exit}' $NDIR/libssh2/include/libssh2.h | tr -d '"')
LIBSSH2_LATEST=$(curl -s $LIBSSH2_SOURCE | perl -lne 'if(/libssh2-([\d.]+).tar.gz/){print $1}' | newest)
if [ "$LIBSSH2_VERSION" != "$LIBSSH2_LATEST" ]; then
echo "Newer version of libssh2 available"
echo " Current:" $LIBSSH2_VERSION
echo " Latest: " $LIBSSH2_LATEST
echo " Source: $LIBSSH2_SOURCE"
fi
}
check_libpcre
check_libpcap
check_liblua
check_liblinear
check_zlib
check_libssh2
......@@ -653,6 +653,7 @@ LUA_CLEAN
LUA_BUILD
LIBLUADIR
LIBLUA_LIBS
NOLUA
DNET_DIST_CLEAN
DNET_CLEAN
DNET_BUILD
......@@ -1948,48 +1949,6 @@ $as_echo "$ac_res" >&6; }
} # ac_fn_c_check_decl
# ac_fn_cxx_try_run LINENO
# ------------------------
# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes