From f06480daed9a9b2cdce61904222cc87788afdf84 Mon Sep 17 00:00:00 2001 From: dmiller Date: Thu, 15 Oct 2026 22:30:27 +0000 Subject: [PATCH] Reintegrate Nmap 7.992 release branch --- CHANGELOG | 77 ++++++++++++++++---- Makefile.in | 2 +- docs/man-xlate/nmap-de.1 | 9 +-- docs/man-xlate/nmap-es.1 | 4 +- docs/man-xlate/nmap-fr.1 | 9 +-- docs/man-xlate/nmap-hr.1 | 4 +- docs/man-xlate/nmap-hu.1 | 9 +-- docs/man-xlate/nmap-id.1 | 9 +-- docs/man-xlate/nmap-it.1 | 9 +-- docs/man-xlate/nmap-ja.1 | 6 +- docs/nmap.1 | 6 +- docs/nmap.usage.txt | 2 +- docs/zenmap.1 | 4 +- macosx/openssl.modules | 6 +- mswin32/Makefile | 7 +- ncat/docs/ncat.1 | 6 +- ncat/docs/ncat.usage.txt | 2 +- ncat/ncat.h | 2 +- ndiff/Version.py | 2 +- ndiff/docs/ndiff.1 | 4 +- nmap.h | 2 +- nping/docs/nping.1 | 4 +- nping/nping.h | 2 +- zenmap/install_scripts/macosx/make-bundle.sh | 1 + zenmap/pyproject.toml | 3 +- zenmap/zenmapCore/Version.py | 2 +- zenmap/zenmapCore/data/config/zenmap_version | 1 - 27 files changed, 108 insertions(+), 86 deletions(-) delete mode 100644 zenmap/zenmapCore/data/config/zenmap_version diff --git a/CHANGELOG b/CHANGELOG index 5cee9c9ed..cc65255a3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,54 @@ #Nmap Changelog ($Id$); -*-text-*- +Nmap 7.992 [2026-10-15] + +o Upgraded included libraries: + - Source: libpcap 1.10.7, pcre2 10.49, lua 5.4.9, libdnet 1.18.2 + - Binary installers: OpenSSL 3.5.9, Python 3.14.8 + +o [Windows] Upgraded the included version of Npcap from 1.88 to 1.89, resolving + one crash and upgrading to libpcap 1.10.7. See https://npcap.com/changelog + +o [Security][NSE] Karan Bamal of SentinelOne reported the following issues with + NSE scripts and libraries, which have all been fixed: + - afp.lua used a hardcoded DH private exponent, so that credentials passed + via command line could be decrypted from network traffic. The DHCAST128 UAM + is known to be cryptographically broken, and has been replaced in this + release with DHX2. + - Redirect to unverified URL in anyconnect.lua and upnp.lua + - Unbounded memory consumption in rpc.lua, drda.lua, eigrp.lua, + msrpctypes.lua, db2-das-info, and dns-zone-transfer + - Uninterruptible CPU usage (infinite loop) not subject to --script-timeout or + --host-timeout in rdp.lua, tn3270.lua, and ospf.lua + - Infinite loop waiting for errored coroutines in tftp.lua, effectively + mitigated by --script-timeout + +o [Security] Zach Hanley of Horizon3.ai, in collaboration with Claude and + Anthropic Research, reported three issues, which have all been fixed: + - Two distinct use-after-free bugs in massdns parallel DNS resolver. + - NSE uses the default seed for Lua's pseudorandom number generator, namely + the output of time() and the heap address of the Lua state. A brute-force + search based on math.random()-generated network traffic can reveal the ASLR + base address of the process. + +o [Security][NSE] In some non-standard builds (e.g. --without-openssl), NSE + scripts were attempting to load missing Lua modules from the current working + directory. Fixed by removing Lua's default package searchers, leaving only + the existing nselib file fetcher. + +o Added a libfuzzer-based framework for fuzzing internal functions of Nmap, + Ncat, and Nping. So far, 10 functions have been instrumented and 3 minor + issues have been fixed. [Daniel Miller] + +o [GH#3523] Fixed an rare false-positive case in TCP Connect scan (-sT) where a + failed connect() may leave SO_ERROR set to 0 even though an ICMP error has + been received and select() has indicated the socket. + +o [NSE] Introduced execution time and memory allocation limits for NSE scripts. + Script threads that run for more than 5 seconds without yielding (e.g. + calling a socket operation) will be killed. Memory allocations beyond 400MB + will throw an error. Specific limits may be changed in the future. + o [NSE] Added 8 new scripts, for a total of 620 NSE scripts, all for auditing DICOM (medical imaging) services: @@ -44,6 +93,11 @@ o [NSE] Added 8 new scripts, for a total of 620 NSE scripts, all for auditing declaring exhaustion, and reporting a graded verdict with recovery time. [Paulino Calderon] +o [Zenmap] Fixed crashes: + - [GH#3497] configparser.DuplicateSectionError in Profile Editor + - [GH#3431] KeyError: 'vl_6_logo' + - [GH#3420] sqlite3.DatabaseError: database disk image is malformed + o [NSE] Expanded the dicom.lua library from a basic A-ASSOCIATE/C-ECHO helper into a full DIMSE toolkit. It now supports C-STORE, C-FIND, C-GET and C-MOVE; A-ASSOCIATE-RQ with multiple presentation contexts and SCP/SCU role @@ -51,12 +105,6 @@ o [NSE] Expanded the dicom.lua library from a basic A-ASSOCIATE/C-ECHO helper parse in implicit and explicit VR; and DICOM-over-TLS transport (PS3.15, port 2762) selectable with the dicom.tls script-arg. [Paulino Calderon] -o [GH#3523] Fixed an rare false-positive case in TCP Connect scan (-sT) where a - failed connect() may leave SO_ERROR set to 0 even though an ICMP error has - been received and select() has indicated the socket. - -o Upgraded included libraries: libpcap 1.10.7, pcre2 10.49, lua 5.4.9, libdnet 1.18.2 - o [Ndiff][GH#3468] Fixed `make check-ndiff` to work with Python 3.12+ [gargamel778] o [NSE][GH#3492] vulners API queries for versions like 4.100 were being @@ -69,13 +117,6 @@ o [Ncat][GH#3489][GH#3498] Ncat in listen mode no longer sends termination caller's shell or test harness. The signal is now forwarded to the children Ncat started for connections when -k and cmdexec are both in effect. [MRX-72] -o [Zenmap][GH#3497] Fixed a crash in Profile Editor: configparser.DuplicateSectionError - -o [NSE] Introduced execution time and memory allocation limits for NSE scripts. - Script threads that run for more than 5 seconds without yielding (e.g. - calling a socket operation) will be killed. Memory allocations beyond 400MB - will throw an error. Specific limits may be changed in the future. - o [Nsock][GH#3449] Nsock no longer calls fatal() when encountering a pcap-related error. Instead, errors are propagated to the caller the same way other socket errors are handled. @@ -85,8 +126,6 @@ o [GH#3438][GH#3511] Fixed warnings and crashes due to bind() failing on macOS "mksock_bind_addr(): Bind to :0 failed (IOD #3): Invalid argument (22)" [Daniel Miller, MRX-72] -o [Zenmap][GH#3431] Fix "KeyError: 'vl_6_logo'" crash in Zenmap 7.991. - o [NSE] Added DHX2 authentication method to afp.lua [Daniel Miller] o [NSE][GH#3536] Function ipOps.isPrivate() was incorrectly treating all IPv4 @@ -101,6 +140,10 @@ o [NSE][GH#3494] Malformed TPKT header could have caused parser infinite loop in library iec61850mms. Truncated data were silently ignored. [Zasnit1, nnposter] +o Prevent -iR from running forever if all addresses are excluded or if all + available addresses have been scanned with --unique. The underlying addrset + trie has been optimized for fast lookup and minimal memory use. + o [NSE][GH#3447] IP options parsing by the packet library no longer crashes on incomplete options. IP header data after EOOL are no longer parsed as options. [Ibrahim AlJaafreh, nnposter] @@ -123,6 +166,10 @@ o [NSE][GH#3307] Script iec61850-mms was never executed due to a flawed o [NSE] Scripts http-config-backup and rsync-list-modules now provide XML output. [nnposter] +o Fixed a fatal error in traceroute with -sO: "Unknown protocol _: QUITTING." + +o Made DNS TXID random, not sequential, in massdns.cc. + o [NSE][GH#3430] Nmap now tolerates TLS targets that do not send close_notify. [nnposter] diff --git a/Makefile.in b/Makefile.in index e645652d9..48f39f5f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -354,7 +354,7 @@ $(NPINGDIR)/nping.h: nmap.h mv -f $@.tmp $@ # Update the version number used by Zenmap. -$(ZENMAPDIR)/zenmapCore/Version.py $(ZENMAPDIR)/share/zenmap/config/zenmap_version: nmap.h +$(ZENMAPDIR)/zenmapCore/Version.py: nmap.h cd $(ZENMAPDIR) && $(PYTHON) install_scripts/utils/version_update.py "$(NMAP_VERSION)" tests/%: tests/%.cc $(OBJS) diff --git a/docs/man-xlate/nmap-de.1 b/docs/man-xlate/nmap-de.1 index 7de597279..5c5f3a69e 100644 --- a/docs/man-xlate/nmap-de.1 +++ b/docs/man-xlate/nmap-de.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Autor" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 06.08.2025 +.\" Date: 07.10.2026 .\" Manual: Nmap-Referenz-Handbuch .\" Source: Nmap .\" Language: German .\" -.TH "NMAP" "1" "06.08.2025" "Nmap" "Nmap\-Referenz\-Handbuch" +.TH "NMAP" "1" "07.10.2026" "Nmap" "Nmap\-Referenz\-Handbuch" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1985,11 +1985,6 @@ kann die Umgebungsvariable gesetzt werden\&. .RE .PP -\fB\-\-release\-memory\fR (gibt Speicher vor Terminierung frei) -.RS 4 -Diese Option ist nur bei der Suche nach Speicherlecks nützlich\&. Sie bewirkt, dass Nmap den von ihm belegten Speicher direkt vor seiner Terminierung freigibt, damit man echte Speicherlecks einfacher finden kann\&. Normalerweise macht Nmap das nicht, weil es das Betriebssystem ohnehin macht, wenn es den Prozess terminiert\&. -.RE -.PP \fB\-V\fR; \fB\-\-version\fR (gibt Versionsnummer aus) .RS 4 Gibt Nmaps Versionsnummer aus und terminiert\&. diff --git a/docs/man-xlate/nmap-es.1 b/docs/man-xlate/nmap-es.1 index a0452c829..6d3346678 100644 --- a/docs/man-xlate/nmap-es.1 +++ b/docs/man-xlate/nmap-es.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Autor" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 19/03/2026 +.\" Date: 07/10/2026 .\" Manual: Guía de referencia de Nmap .\" Source: Nmap .\" Language: Spanish .\" -.TH "NMAP" "1" "19/03/2026" "Nmap" "Guía de referencia de Nmap" +.TH "NMAP" "1" "07/10/2026" "Nmap" "Guía de referencia de Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-fr.1 b/docs/man-xlate/nmap-fr.1 index da761bbfe..08bb688d8 100644 --- a/docs/man-xlate/nmap-fr.1 +++ b/docs/man-xlate/nmap-fr.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Auteur" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 19/03/2026 +.\" Date: 07/10/2026 .\" Manual: Guide de référence Nmap .\" Source: Nmap .\" Language: French .\" -.TH "NMAP" "1" "19/03/2026" "Nmap" "Guide de référence Nmap" +.TH "NMAP" "1" "07/10/2026" "Nmap" "Guide de référence Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1735,11 +1735,6 @@ Cette option est l\*(Aqopposée de \fB\-\-unprivileged\fR\&. .RE .PP -\fB\-\-release\-memory\fR (Libérer la mémoire avant de quitter) -.RS 4 -Cette option n\*(Aqest utile que dans le cadre du deboggage de fuites de mémoire\&. Elle force Nmap a libérer la mémoire allouée juste avant de quitter de facon a repérer les véritables fuites de mémoire\&. En temps normal Nmap ne fait pas ceci étant donné que l\*(AqOS le fait de toutes facons à la fin du processus\&. -.RE -.PP \fB\-V\fR; \fB\-\-version\fR (Affiche le numéro de version) .RS 4 Donne le numéro de version de Nmap et quitte\&. diff --git a/docs/man-xlate/nmap-hr.1 b/docs/man-xlate/nmap-hr.1 index e235a9f25..59267593d 100644 --- a/docs/man-xlate/nmap-hr.1 +++ b/docs/man-xlate/nmap-hr.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/19/2026 +.\" Date: 10/07/2026 .\" Manual: Nmap vodič .\" Source: Nmap .\" Language: Croatian .\" -.TH "NMAP" "1" "03/19/2026" "Nmap" "Nmap vodič" +.TH "NMAP" "1" "10/07/2026" "Nmap" "Nmap vodič" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-hu.1 b/docs/man-xlate/nmap-hu.1 index 71aa7b977..7bea00101 100644 --- a/docs/man-xlate/nmap-hu.1 +++ b/docs/man-xlate/nmap-hu.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 19/03/2026 +.\" Date: 07/10/2026 .\" Manual: Nmap Referencia Útmutató .\" Source: Nmap .\" Language: Hungarian .\" -.TH "NMAP" "1" "19/03/2026" "Nmap" "Nmap Referencia Útmutató" +.TH "NMAP" "1" "07/10/2026" "Nmap" "Nmap Referencia Útmutató" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1885,11 +1885,6 @@ paraméter ellentéte\&. Az Nmap úgy kezeli a felhasználót, mint akinek nincs paraméterrel egyenértékű az NMAP_UNPRIVILEGED környezeti változó beállítása\&. .RE .PP -\fB\-\-release\-memory\fR (Kilépés előtt felszabadítja a memóriát) -.RS 4 -Ez a paraméter csak a memóriaszivárgási hibák keresésekor hasznos\&. Arra utasítja az Nmap programot, hogy a kilépés előtt szabadítsa fel a lefoglalt memóriát, így a memóriaszivárgás könnyen felderíthető\&. Normál helyzetben az Nmap átugorja ezt, mivel a program leállításakor az operációs rendszert ezt amúgy is végrehajtja\&. -.RE -.PP \fB\-V\fR; \fB\-\-version\fR (Programváltozat megjelenítése) .RS 4 Megjeleníti az Nmap program változatszámát és kilép\&. diff --git a/docs/man-xlate/nmap-id.1 b/docs/man-xlate/nmap-id.1 index 1bbee0d8d..6a51859fa 100644 --- a/docs/man-xlate/nmap-id.1 +++ b/docs/man-xlate/nmap-id.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Penulis" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/27/2026 +.\" Date: 10/07/2026 .\" Manual: Panduan Referensi Nmap .\" Source: Nmap .\" Language: Indonesian .\" -.TH "NMAP" "1" "03/27/2026" "Nmap" "Panduan Referensi Nmap" +.TH "NMAP" "1" "10/07/2026" "Nmap" "Panduan Referensi Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1930,11 +1930,6 @@ dapat diset sebagai alternatif ekivalen bagi \fB\-\-unprivileged\fR\&. .RE .PP -\fB\-\-release\-memory\fR (Release memory before quitting) -.RS 4 -Opsi ini hanya berguna untuk memory\-leak debugging\&. Ia membuat Nmap merilis memori yang telah dialokasikan sebelum ia berhenti sehingga kebocoran memori sebenarnya mudah ditemukan\&. Normalnya Nmap melewati langkah ini karena SO melakukannya setelah penghentian proses\&. -.RE -.PP \fB\-V\fR; \fB\-\-version\fR (Print version number) .RS 4 Mencetak angka versi Nmap dan keluar\&. diff --git a/docs/man-xlate/nmap-it.1 b/docs/man-xlate/nmap-it.1 index b3247862b..6af09f3f1 100644 --- a/docs/man-xlate/nmap-it.1 +++ b/docs/man-xlate/nmap-it.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Autore" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 19/03/2026 +.\" Date: 07/10/2026 .\" Manual: Guida di riferimento di Nmap .\" Source: Nmap .\" Language: Italian .\" -.TH "NMAP" "1" "19/03/2026" "Nmap" "Guida di riferimento di Nmap" +.TH "NMAP" "1" "07/10/2026" "Nmap" "Guida di riferimento di Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -2083,11 +2083,6 @@ quest\*(Aqopzione è l\*(Aqopposta di \fB\-\-unprivileged\fR\&. .RE .PP -\fB\-\-release\-memory \fR(Release memory before quitting) -.RS 4 -Quest\*(Aqopzione è utile solo per la risoluzione di problemi di perdita di memoria (memory\-leak debugging)\&. Obbliga infatti ad Nmap a liberare la memoria allocata appena prima di uscire così da individuare più facilmente le effettive perdite di memoria\&. Di solito Nmap salta questo passaggio come fa il sistema operativo in ogni caso al momento della chiusura del processo\&. -.RE -.PP \fB\-V\fR; \fB\-\-version\fR (Print version number) .RS 4 Stampa a video il numero di versione di Nmap ed esce\&. diff --git a/docs/man-xlate/nmap-ja.1 b/docs/man-xlate/nmap-ja.1 index f07ba660e..90df21703 100644 --- a/docs/man-xlate/nmap-ja.1 +++ b/docs/man-xlate/nmap-ja.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 27/03/2026 +.\" Date: 07/10/2026 .\" Manual: Nmap リファレンスガイド .\" Source: Nmap .\" Language: Japanese .\" -.TH "NMAP" "1" "27/03/2026" "Nmap" "Nmap リファレンスガイド" +.TH "NMAP" "1" "07/10/2026" "Nmap" "Nmap リファレンスガイド" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -93,7 +93,7 @@ Nmapの最新バージョンは、\m[blue]\fB\%https://nmap.org\fR\m[]から入 .RS 4 .\} .nf -Nmap 7\&.99SVN ( https://nmap\&.org ) +Nmap 7\&.992 ( https://nmap\&.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc\&. diff --git a/docs/nmap.1 b/docs/nmap.1 index 6599d0844..0afe73282 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 08/07/2026 +.\" Date: 10/07/2026 .\" Manual: Nmap Reference Guide .\" Source: Nmap .\" Language: English .\" -.TH "NMAP" "1" "08/07/2026" "Nmap" "Nmap Reference Guide" +.TH "NMAP" "1" "10/07/2026" "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\&.991SVN ( https://nmap\&.org ) +Nmap 7\&.992 ( https://nmap\&.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc\&. diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index e6cdeac55..766d2d407 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 7.991SVN ( https://nmap.org ) +Nmap 7.992SVN ( https://nmap.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc. diff --git a/docs/zenmap.1 b/docs/zenmap.1 index 80cfcdf5e..283100fd3 100644 --- a/docs/zenmap.1 +++ b/docs/zenmap.1 @@ -2,12 +2,12 @@ .\" Title: zenmap .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 08/07/2026 +.\" Date: 10/07/2026 .\" Manual: Zenmap Reference Guide .\" Source: Zenmap .\" Language: English .\" -.TH "ZENMAP" "1" "08/07/2026" "Zenmap" "Zenmap Reference Guide" +.TH "ZENMAP" "1" "10/07/2026" "Zenmap" "Zenmap Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/macosx/openssl.modules b/macosx/openssl.modules index 8ecde83dd..82c995fe3 100644 --- a/macosx/openssl.modules +++ b/macosx/openssl.modules @@ -1,8 +1,8 @@ - - + + + ]> diff --git a/mswin32/Makefile b/mswin32/Makefile index 0bfa74dee..3729dbaae 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -92,9 +92,10 @@ nmap-$(NMAP_VERSION)${OEM_SUFFIX}/Uninstall.exe: nsis/Nmap.nsi LICENSE.formatted stage-nmap-main: build-nmap${OEM_SUFFIX} nmap-$(NMAP_VERSION)${OEM_SUFFIX}/Uninstall.exe cp $(VCCONFIG)${OEM_SUFFIX}/nmap.exe nmap-$(NMAP_VERSION)${OEM_SUFFIX}/ -sign-files: nmap-$(NMAP_VERSION)-oem/nmap.exe nmap-$(NMAP_VERSION)/nmap.exe nmap-$(NMAP_VERSION)-oem/Uninstall.exe nmap-$(NMAP_VERSION)/Uninstall.exe nmap-$(NMAP_VERSION)/ncat.exe nmap-$(NMAP_VERSION)/nping.exe nmap-$(NMAP_VERSION)/libssh2.dll nmap-$(NMAP_VERSION)/libcrypto-3.dll nmap-$(NMAP_VERSION)/libssl-3.dll nmap-$(NMAP_VERSION)/zlibwapi.dll - # TODO: evaluate whether we should also sign the Python stuff for Zenmap, Ndiff - "$(SIGNTOOL)" $(SIGNTOOL_ARGS) $^ nmap-$(NMAP_VERSION)/zenmap/bin/* nmap-$(NMAP_VERSION)/zenmap/lib/gdk-pixbuf-2.0/*/loaders/*.dll +SIGN_FILES = $(shell find nmap-$(NMAP_VERSION) nmap-$(NMAP_VERSION)-oem \ + -type f \( -name '*.exe' -o -name '*.dll' -o -name '*.pyd' \)) +sign-files: $(SIGN_FILES) + "$(SIGNTOOL)" $(SIGNTOOL_ARGS) $? touch sign-files bundle-nsis: sign-files diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1 index 6bf6e309b..33bf3c23d 100644 --- a/ncat/docs/ncat.1 +++ b/ncat/docs/ncat.1 @@ -2,12 +2,12 @@ .\" Title: Ncat .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 08/07/2026 +.\" Date: 10/07/2026 .\" Manual: Ncat Reference Guide .\" Source: Ncat .\" Language: English .\" -.TH "NCAT" "1" "08/07/2026" "Ncat" "Ncat Reference Guide" +.TH "NCAT" "1" "10/07/2026" "Ncat" "Ncat Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -43,7 +43,7 @@ Among Ncat\*(Aqs vast number of features there is the ability to chain Ncats tog .RS 4 .\} .nf -Ncat 7\&.991SVN ( https://nmap\&.org/ncat ) +Ncat 7\&.992 ( https://nmap\&.org/ncat ) Usage: ncat [options] [hostname] [port] Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds, diff --git a/ncat/docs/ncat.usage.txt b/ncat/docs/ncat.usage.txt index 53bd742df..8abeb3292 100644 --- a/ncat/docs/ncat.usage.txt +++ b/ncat/docs/ncat.usage.txt @@ -1,4 +1,4 @@ -Ncat 7.991SVN ( https://nmap.org/ncat ) +Ncat 7.992SVN ( https://nmap.org/ncat ) Usage: ncat [options] [hostname] [port] Options taking a time assume seconds. Append 'ms' for milliseconds, diff --git a/ncat/ncat.h b/ncat/ncat.h index 8a367c445..b94ad9b3a 100644 --- a/ncat/ncat.h +++ b/ncat/ncat.h @@ -79,7 +79,7 @@ /* Ncat information for output, etc. */ #define NCAT_NAME "Ncat" #define NCAT_URL "https://nmap.org/ncat" -#define NCAT_VERSION "7.991SVN" +#define NCAT_VERSION "7.992SVN" #ifndef __GNUC__ #ifndef __attribute__ diff --git a/ndiff/Version.py b/ndiff/Version.py index 23abf3891..7a004d298 100644 --- a/ndiff/Version.py +++ b/ndiff/Version.py @@ -1 +1 @@ -VERSION = "7.991+SVN" +VERSION = "7.992+SVN" diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1 index 9235ffee3..9411d89fb 100644 --- a/ndiff/docs/ndiff.1 +++ b/ndiff/docs/ndiff.1 @@ -2,12 +2,12 @@ .\" Title: ndiff .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 08/07/2026 +.\" Date: 10/07/2026 .\" Manual: User Commands .\" Source: Ndiff .\" Language: English .\" -.TH "NDIFF" "1" "08/07/2026" "Ndiff" "User Commands" +.TH "NDIFF" "1" "10/07/2026" "Ndiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/nmap.h b/nmap.h index 4aa558333..55d09aba5 100644 --- a/nmap.h +++ b/nmap.h @@ -123,7 +123,7 @@ /* Edit this definition only within the quotes, because it is read from this file by the makefiles. */ #define NMAP_MAJOR 7 -#define NMAP_MINOR 991 +#define NMAP_MINOR 992 #define NMAP_BUILD 1 /* SVN, BETA, etc. */ #define NMAP_SPECIAL "SVN" diff --git a/nping/docs/nping.1 b/nping/docs/nping.1 index bfb9f30be..523991f22 100644 --- a/nping/docs/nping.1 +++ b/nping/docs/nping.1 @@ -2,12 +2,12 @@ .\" Title: nping .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 08/07/2026 +.\" Date: 10/07/2026 .\" Manual: Nping Reference Guide .\" Source: Nping .\" Language: English .\" -.TH "NPING" "1" "08/07/2026" "Nping" "Nping Reference Guide" +.TH "NPING" "1" "10/07/2026" "Nping" "Nping Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/nping/nping.h b/nping/nping.h index a9f157af3..516e025dd 100644 --- a/nping/nping.h +++ b/nping/nping.h @@ -259,7 +259,7 @@ /* General tunable defines **************************************************/ #define NPING_NAME "Nping" #define NPING_URL "https://nmap.org/nping" -#define NPING_VERSION "7.991SVN" +#define NPING_VERSION "7.992SVN" #define DEFAULT_VERBOSITY VB_0 diff --git a/zenmap/install_scripts/macosx/make-bundle.sh b/zenmap/install_scripts/macosx/make-bundle.sh index 6f615263d..d54b3d106 100755 --- a/zenmap/install_scripts/macosx/make-bundle.sh +++ b/zenmap/install_scripts/macosx/make-bundle.sh @@ -25,6 +25,7 @@ $CC $CPPFLAGS $CFLAGS $LDFLAGS -L$PREFIX/lib `python3-config --cflags --ldflags ~/gtk-mac-bundler/examples/python-launcher.c echo "Installing Zenmap to local system" +python3 -m ensurepip --upgrade python3 -m pip install --no-deps --force-reinstall "$ZENMAP_DIR" python3 -m pip install --no-deps --force-reinstall "$NDIFF_DIR" diff --git a/zenmap/pyproject.toml b/zenmap/pyproject.toml index 5784cf015..0f2fc644c 100644 --- a/zenmap/pyproject.toml +++ b/zenmap/pyproject.toml @@ -42,8 +42,7 @@ include = ["zenmapCore*", "zenmapGUI*", "radialnet*"] "*.usp", "*.html", "*.mo", - "*.xml", - "zenmap_version" + "*.xml" ] [tool.setuptools.dynamic] diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py index 23abf3891..7a004d298 100644 --- a/zenmap/zenmapCore/Version.py +++ b/zenmap/zenmapCore/Version.py @@ -1 +1 @@ -VERSION = "7.991+SVN" +VERSION = "7.992+SVN" diff --git a/zenmap/zenmapCore/data/config/zenmap_version b/zenmap/zenmapCore/data/config/zenmap_version deleted file mode 100644 index 6c84dfce1..000000000 --- a/zenmap/zenmapCore/data/config/zenmap_version +++ /dev/null @@ -1 +0,0 @@ -7.94+SVN