Merge 7.95 release branch into trunk

CHANGELOG

@@ -1,5 +1,21 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+Nmap 7.95 [2024-04-23]
+
+o [Windows] Upgraded Npcap (our Windows raw packet capturing and
+ transmission driver) from version 1.75 to the latest version 1.79. It
+ includes many performance improvements, bug fixes and feature
+ enhancements described at https://npcap.com/changelog.
+
+o Integrated over 4000 IPv4 OS fingerprints submitted since June 2020. Added
+ 336 fingerprints, bringing the new total to 6036. Additions include iOS 15 &
+ 16, macOS Ventura & Monterey, Linux 6.1, OpenBSD 7.1, and lwIP 2.2
+
+o Integrated over 2500 service/version detection fingerprints submitted since
+ June 2020. The signature count went up 1.4% to 12089, including 9 new
+ softmatches. We now detect 1246 protocols, including new additions of grpc,
+ mysqlx, essnet, remotemouse, and tuya.
+
 o [NSE] Four new scripts from the DINA community (https://github.com/DINA-community)
  for querying industrial control systems:
 
@@ -15,32 +31,31 @@ o [NSE] Four new scripts from the DINA community (https://github.com/DINA-commun
  + profinet-cm-lookup queries the DCERPC endpoint mapper exposed via the
  PNIO-CM service.
 
-o Integrated over 2500 service/version detection fingerprints submitted since
- June 2020. The signature count went up 1.4% to 12089, including 9 new
- softmatches. We now detect 1246 protocols, including new additions of grpc,
- mysqlx, essnet, remotemouse, and tuya.
+o Upgraded included libraries: Lua 5.4.6, libpcre2 10.43, zlib 1.3.1,
+ libssh2 1.11.0, liblinear 2.47
 
-o Integrated over 4000 IPv4 OS fingerprints submitted since June 2020. Added
- 336 fingerprints, bringing the new total to 6036. Additions include iOS 15 &
- 16, macOS Ventura & Monterey, Linux 6.1, OpenBSD 7.1, and lwIP 2.2
+o [GH#2639] Upgraded OpenSSL binaries (for the Windows builds and for
+ RPMs) to version 3.0.13. CVEs resolved in this update include only 2
+ moderate-severity issues which we do not believe affect Nmap:
+ CVE-2023-5363 and CVE-2023-2650
+
+o [Zenmap][Ndiff][GH#2649] Zenmap and Ndiff now use setuptools, not distutils for packaging.
+
+o [Ncat][GH#2685] Fixed Ncat UDP server mode to not quit after EOF on stdin. Reported
+ as Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1039613
+
+o [GH#2672] Fixed an issue where TCP Connect scan (-sT) on Windows would fail to open any
+ sockets, leading to scans that never finish. [Daniel Miller]
 
 o [NSE] ssh-auth-methods will now print the pre-authentication banner text when
  available. Requires libssh2 1.11.0 or later. [Daniel Miller]
 
-o Upgrade included libraries: Lua 5.4.6, libpcre2 10.43, zlib 1.3.1,
- libssh2 1.11.0, liblinear 2.47
-
 o [Zenmap][GH#2739] Fix a crash in Zenmap when changing a host comment.
 
 o [NSE][GH#2766] Fix TLS 1.2 signature algorithms for EdDSA. [Daniel Roethlisberger]
 
-o [Zenmap][Ndiff][GH#2649] Zenmap and Ndiff now use setuptools, not distutils for packaging.
-
 o [Zenmap][GH#2706] RPM spec files now correctly require the python3 package, not python>=3
 
-o [GH#2672] Fixed an issue where TCP Connect scan (-sT) on Windows would fail to open any
- sockets, leading to scans that never finish. [Daniel Miller]
-
 o Improvements to OS detection fingerprint matching, including a syntax change
  for nmap-os-db that allows ranges within the TCP Options string. This leads
  to more concise and maintainable fingerprints. [Daniel Miller]
@@ -57,9 +72,6 @@ o [GH#2731] Fix an out-of-bounds read which led to out-of-memory errors when
 
 o [GH#2609] Fixed a memory leak in Nsock: compiled pcap filters were not freed.
 
-o [Ncat][GH#2685] Fixed Ncat UDP server mode to not quit after EOF on stdin. Reported
- as Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1039613
-
 o [GH#2658] Fixed a crash when using service name wildcards with -p, as in -p "http*"
 
 o [NSE] Fixed DNS TXT record parsing which caused asn-query to fail in Nmap

Makefile.in

@@ -361,12 +361,13 @@ tests/%: tests/%.cc $(OBJS)
 DEFAULT_PYTHON_PATH = /usr/bin/env python3
 
 build-zenmap: $(ZENMAPDIR)/pyproject.toml $(ZENMAPDIR)/zenmapCore/Version.py
- $(PYTHON) -m build $(ZENMAPDIR)
+ $(PYTHON) -m build $(ZENMAPDIR)/
 
 install-zenmap: $(ZENMAPDIR)/pyproject.toml
- $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
- $(PYTHON) -m pip install $(ZENMAPDIR) $(if $(DESTDIR),--root "$(DESTDIR)")
+ $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(deskdir)
+ $(PYTHON) -m pip install $(ZENMAPDIR)/ $(if $(DESTDIR),--root "$(DESTDIR)")
  $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
+ $(INSTALL) -c -m 644 $(ZENMAPDIR)/install_scripts/unix/*.desktop $(DESTDIR)$(deskdir)
 # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
 # already a link.
  if [ ! -f $(DESTDIR)$(bindir)/nmapfe -o -L $(DESTDIR)$(bindir)/nmapfe ]; then \

docs/man-xlate/nmap-es.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 17/05/2023
+.\" Date: 12/04/2024
 .\" Manual: Guía de referencia de Nmap
 .\" Source: Nmap
 .\" Language: Spanish
 .\"
-.TH "NMAP" "1" "17/05/2023" "Nmap" "Guía de referencia de Nmap"
+.TH "NMAP" "1" "12/04/2024" "Nmap" "Guía de referencia de Nmap"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man-xlate/nmap-fr.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [see the "Auteur" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 17/05/2023
+.\" Date: 12/04/2024
 .\" Manual: Guide de référence Nmap
 .\" Source: Nmap
 .\" Language: French
 .\"
-.TH "NMAP" "1" "17/05/2023" "Nmap" "Guide de référence Nmap"
+.TH "NMAP" "1" "12/04/2024" "Nmap" "Guide de référence Nmap"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man-xlate/nmap-hr.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 05/17/2023
+.\" Date: 04/12/2024
 .\" Manual: Nmap vodič
 .\" Source: Nmap
 .\" Language: Croatian
 .\"
-.TH "NMAP" "1" "05/17/2023" "Nmap" "Nmap vodič"
+.TH "NMAP" "1" "04/12/2024" "Nmap" "Nmap vodič"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man-xlate/nmap-hu.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [FIXME: author] [see https://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 17/05/2023
+.\" Date: 12/04/2024
 .\" Manual: Nmap Referencia Útmutató
 .\" Source: Nmap
 .\" Language: Hungarian
 .\"
-.TH "NMAP" "1" "17/05/2023" "Nmap" "Nmap Referencia Útmutató"
+.TH "NMAP" "1" "12/04/2024" "Nmap" "Nmap Referencia Útmutató"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man-xlate/nmap-id.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [see the "Penulis" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 05/17/2023
+.\" Date: 04/12/2024
 .\" Manual: Panduan Referensi Nmap
 .\" Source: Nmap
 .\" Language: Indonesian
 .\"
-.TH "NMAP" "1" "05/17/2023" "Nmap" "Panduan Referensi Nmap"
+.TH "NMAP" "1" "04/12/2024" "Nmap" "Panduan Referensi Nmap"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man-xlate/nmap-it.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [see the "Autore" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 17/05/2023
+.\" Date: 12/04/2024
 .\" Manual: Guida di riferimento di Nmap
 .\" Source: Nmap
 .\" Language: Italian
 .\"
-.TH "NMAP" "1" "17/05/2023" "Nmap" "Guida di riferimento di Nmap"
+.TH "NMAP" "1" "12/04/2024" "Nmap" "Guida di riferimento di Nmap"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man-xlate/nmap-ja.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [FIXME: author] [see https://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 17/05/2023
+.\" Date: 12/04/2024
 .\" Manual: Nmap リファレンスガイド
 .\" Source: Nmap
 .\" Language: Japanese
 .\"
-.TH "NMAP" "1" "17/05/2023" "Nmap" "Nmap リファレンスガイド"
+.TH "NMAP" "1" "12/04/2024" "Nmap" "Nmap リファレンスガイド"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -93,7 +93,7 @@ Nmapの最新バージョンは、\m[blue]\fB\%https://nmap.org\fR\m[]から入
 .RS 4
 .\}
 .nf
-Nmap 7\&.94 ( https://nmap\&.org )
+Nmap 7\&.95 ( https://nmap\&.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
  Can pass hostnames, IP addresses, networks, etc\&.
@@ -106,7 +106,7 @@ HOST DISCOVERY:
  \-sL: List Scan \- simply list targets to scan
  \-sn: Ping Scan \- disable port scan
  \-Pn: Treat all hosts as online \-\- skip host discovery
- \-PS/PA/PU/PY[portlist]: TCP SYN/ACK, UDP or SCTP discovery to given ports
+ \-PS/PA/PU/PY[portlist]: TCP SYN, TCP ACK, UDP or SCTP discovery to given ports
  \-PE/PP/PM: ICMP echo, timestamp, and netmask request discovery probes
  \-PO[protocol list]: IP Protocol Ping
  \-n/\-R: Never do DNS resolution/Always resolve [default: sometimes]

docs/man-xlate/nmap-pl.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 05/17/2023
+.\" Date: 04/12/2024
 .\" Manual: Opis programu Nmap
 .\" Source: Nmap
 .\" Language: Polish
 .\"
-.TH "NMAP" "1" "05/17/2023" "Nmap" "Opis programu Nmap"
+.TH "NMAP" "1" "04/12/2024" "Nmap" "Opis programu Nmap"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man-xlate/nmap-pt_BR.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 17/05/2023
+.\" Date: 12/04/2024
 .\" Manual: Guia de Referência do Nmap
 .\" Source: Nmap
 .\" Language: Portuguese (Brazil)
 .\"
-.TH "NMAP" "1" "17/05/2023" "Nmap" "Guia de Referência do Nmap"
+.TH "NMAP" "1" "12/04/2024" "Nmap" "Guia de Referência do Nmap"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man-xlate/nmap-sk.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [FIXME: author] [see https://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 17. mája 2023
+.\" Date: 12. apríla 2024
 .\" Manual: Nmap - Referencna prirucka
 .\" Source: Nmap
 .\" Language: Slovak
 .\"
-.TH "NMAP" "1" "17. mája 2023" "Nmap" "Nmap \- Referencna prirucka"
+.TH "NMAP" "1" "12. apríla 2024" "Nmap" "Nmap \- Referencna prirucka"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/nmap.1

@@ -2,12 +2,12 @@
 .\" Title: nmap
 .\" Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 05/17/2023
+.\" Date: 04/12/2024
 .\" Manual: Nmap Reference Guide
 .\" Source: Nmap
 .\" Language: English
 .\"
-.TH "NMAP" "1" "05/17/2023" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "04/12/2024" "Nmap" "Nmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -119,7 +119,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 .RS 4
 .\}
 .nf
-Nmap 7\&.94 ( https://nmap\&.org )
+Nmap 7\&.95 ( https://nmap\&.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
  Can pass hostnames, IP addresses, networks, etc\&.
@@ -132,7 +132,7 @@ HOST DISCOVERY:
  \-sL: List Scan \- simply list targets to scan
  \-sn: Ping Scan \- disable port scan
  \-Pn: Treat all hosts as online \-\- skip host discovery
- \-PS/PA/PU/PY[portlist]: TCP SYN/ACK, UDP or SCTP discovery to given ports
+ \-PS/PA/PU/PY[portlist]: TCP SYN, TCP ACK, UDP or SCTP discovery to given ports
  \-PE/PP/PM: ICMP echo, timestamp, and netmask request discovery probes
  \-PO[protocol list]: IP Protocol Ping
  \-n/\-R: Never do DNS resolution/Always resolve [default: sometimes]

docs/nmap.usage.txt

@@ -1,4 +1,4 @@
-Nmap 7.94SVN ( https://nmap.org )
+Nmap 7.95 ( https://nmap.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
  Can pass hostnames, IP addresses, networks, etc.
@@ -11,7 +11,7 @@ HOST DISCOVERY:
  -sL: List Scan - simply list targets to scan
  -sn: Ping Scan - disable port scan
  -Pn: Treat all hosts as online -- skip host discovery
- -PS/PA/PU/PY[portlist]: TCP SYN/ACK, UDP or SCTP discovery to given ports
+ -PS/PA/PU/PY[portlist]: TCP SYN, TCP ACK, UDP or SCTP discovery to given ports
  -PE/PP/PM: ICMP echo, timestamp, and netmask request discovery probes
  -PO[protocol list]: IP Protocol Ping
  -n/-R: Never do DNS resolution/Always resolve [default: sometimes]

docs/zenmap.1

@@ -2,12 +2,12 @@
 .\" Title: zenmap
 .\" Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <https://docbook.sf.net/>
-.\" Date: 05/17/2023
+.\" Date: 04/12/2024
 .\" Manual: Zenmap Reference Guide
 .\" Source: Zenmap
 .\" Language: English
 .\"
-.TH "ZENMAP" "1" "05/17/2023" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "04/12/2024" "Zenmap" "Zenmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

macosx/openssl.modules

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd" [
-<!ENTITY nmap_version "7.94SVN">
+<!ENTITY nmap_version "7.95">
 <!ENTITY openssl_version "3.0.13">
 ]>
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>