PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 12:41:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge 7.95 release branch into trunk

Browse Source
This commit is contained in:
dmiller
2024-04-23 19:34:03 +00:00
parent e8c7e7ba01
commit 95b974b101
31 changed files with 3779 additions and 2949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
CHANGELOG
View File

@@ -1,5 +1,21 @@
#Nmap Changelog ($Id$); -*-text-*- #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) o [NSE] Four new scripts from the DINA community (https://github.com/DINA-community)
for querying industrial control systems: 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 + profinet-cm-lookup queries the DCERPC endpoint mapper exposed via the
PNIO-CM service. PNIO-CM service.
o Integrated over 2500 service/version detection fingerprints submitted since o Upgraded included libraries: Lua 5.4.6, libpcre2 10.43, zlib 1.3.1,
June 2020. The signature count went up 1.4% to 12089, including 9 new libssh2 1.11.0, liblinear 2.47
softmatches. We now detect 1246 protocols, including new additions of grpc,
mysqlx, essnet, remotemouse, and tuya.
o Integrated over 4000 IPv4 OS fingerprints submitted since June 2020. Added o [GH#2639] Upgraded OpenSSL binaries (for the Windows builds and for
336 fingerprints, bringing the new total to 6036. Additions include iOS 15 & RPMs) to version 3.0.13. CVEs resolved in this update include only 2
16, macOS Ventura & Monterey, Linux 6.1, OpenBSD 7.1, and lwIP 2.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 o [NSE] ssh-auth-methods will now print the pre-authentication banner text when
available. Requires libssh2 1.11.0 or later. [Daniel Miller] 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 [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 [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 [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 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 for nmap-os-db that allows ranges within the TCP Options string. This leads
to more concise and maintainable fingerprints. [Daniel Miller] 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 [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 [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 o [NSE] Fixed DNS TXT record parsing which caused asn-query to fail in Nmap

7
Makefile.in
View File

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

4
docs/man-xlate/nmap-es.1
View File

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

4
docs/man-xlate/nmap-fr.1
View File

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

4
docs/man-xlate/nmap-hr.1
View File

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

4
docs/man-xlate/nmap-hu.1
View File

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

4
docs/man-xlate/nmap-id.1
View File

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

4
docs/man-xlate/nmap-it.1
View File

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

8
docs/man-xlate/nmap-ja.1
View File

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

4
docs/man-xlate/nmap-pl.1
View File

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

4
docs/man-xlate/nmap-pt_BR.1
View File

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

4
docs/man-xlate/nmap-sk.1
View File

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

8
docs/nmap.1
View File

@@ -2,12 +2,12 @@
.\" Title: nmap .\" Title: nmap
.\" Author: [see the "Authors" section] .\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 05/17/2023 .\" Date: 04/12/2024
.\" Manual: Nmap Reference Guide .\" Manual: Nmap Reference Guide
.\" Source: Nmap .\" Source: Nmap
.\" Language: English .\" 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 .\" * 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 .RS 4
.\} .\}
.nf .nf
Nmap 7\&.94 ( https://nmap\&.org ) Nmap 7\&.95 ( https://nmap\&.org )
Usage: nmap [Scan Type(s)] [Options] {target specification} Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION: TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc\&. Can pass hostnames, IP addresses, networks, etc\&.
@@ -132,7 +132,7 @@ HOST DISCOVERY:
\-sL: List Scan \- simply list targets to scan \-sL: List Scan \- simply list targets to scan
\-sn: Ping Scan \- disable port scan \-sn: Ping Scan \- disable port scan
\-Pn: Treat all hosts as online \-\- skip host discovery \-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 \-PE/PP/PM: ICMP echo, timestamp, and netmask request discovery probes
\-PO[protocol list]: IP Protocol Ping \-PO[protocol list]: IP Protocol Ping
\-n/\-R: Never do DNS resolution/Always resolve [default: sometimes] \-n/\-R: Never do DNS resolution/Always resolve [default: sometimes]

4
docs/nmap.usage.txt
View File

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

4
docs/zenmap.1
View File

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

2
macosx/openssl.modules
View File

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

38
mswin32/Makefile
View File

@@ -1,6 +1,6 @@
export MSYS2_ARG_CONV_EXCL=* export MSYS2_ARG_CONV_EXCL=*
MAKENSIS=C:/Program Files (x86)/NSIS/makensis.exe MAKENSIS=C:/Program Files (x86)/NSIS/makensis.exe
SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\r\n' | sed 's%$$%bin/x86/signtool.exe%') SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\r\n' | sed 's%$$%bin/10.0.0.22000/x86/signtool.exe%')
NMAPDIR=.. NMAPDIR=..
NMAPDIR_WIN=$(shell echo '$(NMAPDIR)' | sed 's|/cygdrive/\(.\)|\1:|;s|/|\\|g') NMAPDIR_WIN=$(shell echo '$(NMAPDIR)' | sed 's|/cygdrive/\(.\)|\1:|;s|/|\\|g')
ZENMAP_WINDIR=$(NMAPDIR)/zenmap/install_scripts/windows ZENMAP_WINDIR=$(NMAPDIR)/zenmap/install_scripts/windows
@@ -11,6 +11,13 @@ export NPCAP_VERSION := $(shell ls npcap-*.exe | sed -e 's/npcap-\([0-9.]*\)[-oe
NSE_FILES = $(NMAPDIR)/scripts/script.db $(NMAPDIR)/scripts/*.nse NSE_FILES = $(NMAPDIR)/scripts/script.db $(NMAPDIR)/scripts/*.nse
NMAP_MSWIN32_AUX = $(NMAPDIR)/../nmap-mswin32-aux NMAP_MSWIN32_AUX = $(NMAPDIR)/../nmap-mswin32-aux
SIGNTOOL_ARGS = sign /a /n "Insecure.Com LLC" /tr http://timestamp.digicert.com /td sha256 /fd sha256 SIGNTOOL_ARGS = sign /a /n "Insecure.Com LLC" /tr http://timestamp.digicert.com /td sha256 /fd sha256
NSIS_COMMON_ARGS = "/DVERSION=$(NMAP_VERSION)" "/DNUM_VERSION=$(NMAP_NUM_VERSION)" "/DNPCAP_VERSION=$(NPCAP_VERSION)"
ifdef OEM_SUFFIX
NSIS_COMMON_ARGS += "/DNMAP_NAME=$(NMAP_OEM_NAME)" "/DNMAP_OEM=1"
else
NSIS_COMMON_ARGS += "/DNMAP_NAME=$(NMAP_NAME)"
endif
PLATFORM=Win32 PLATFORM=Win32
VCCONFIG=Release VCCONFIG=Release
@@ -31,6 +38,9 @@ bundle-nmap: bundle-zip bundle-nsis
build-nmap${OEM_SUFFIX}: nmap.sln build-nmap${OEM_SUFFIX}: nmap.sln
cmd /c Build.bat Build "$(VCCONFIG)${OEM_SUFFIX}" cmd /c Build.bat Build "$(VCCONFIG)${OEM_SUFFIX}"
vc_redist.x86.exe:
wget https://aka.ms/vs/17/release/vc_redist.x86.exe
stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefixes $(NMAPDIR)/nmap-os-db $(NMAPDIR)/nmap-protocols $(NMAPDIR)/nmap-rpc $(NMAPDIR)/nmap-service-probes $(NMAPDIR)/nmap-services $(NMAPDIR)/docs/nmap.xsl $(NMAPDIR)/nse_main.lua $(NMAPDIR)/mswin32/nmap_performance.reg $(NMAPDIR)/README-WIN32 $(NMAPDIR)/docs/3rd-party-licenses.txt icon1.ico LICENSE.formatted vc_redist.x86.exe stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefixes $(NMAPDIR)/nmap-os-db $(NMAPDIR)/nmap-protocols $(NMAPDIR)/nmap-rpc $(NMAPDIR)/nmap-service-probes $(NMAPDIR)/nmap-services $(NMAPDIR)/docs/nmap.xsl $(NMAPDIR)/nse_main.lua $(NMAPDIR)/mswin32/nmap_performance.reg $(NMAPDIR)/README-WIN32 $(NMAPDIR)/docs/3rd-party-licenses.txt icon1.ico LICENSE.formatted vc_redist.x86.exe
mkdir -p nmap-$(NMAP_VERSION) mkdir -p nmap-$(NMAP_VERSION)
cp $^ nmap-$(NMAP_VERSION)/ cp $^ nmap-$(NMAP_VERSION)/
@@ -39,7 +49,7 @@ stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefix
# error on startup: 0xc0000022. # error on startup: 0xc0000022.
cmd /c copy $(subst /,\\,$(NMAP_MSWIN32_AUX))\\OpenSSL\\bin\\*.dll nmap-$(NMAP_VERSION) cmd /c copy $(subst /,\\,$(NMAP_MSWIN32_AUX))\\OpenSSL\\bin\\*.dll nmap-$(NMAP_VERSION)
cmd /c copy $(NMAPDIR_WIN)\\libssh2\\win32\\$(VCCONFIG)_dll\\libssh2.dll nmap-$(NMAP_VERSION) cmd /c copy $(NMAPDIR_WIN)\\libssh2\\win32\\$(VCCONFIG)_dll\\libssh2.dll nmap-$(NMAP_VERSION)
cmd /c copy $(NMAPDIR_WIN)\\libz\\contrib\\vstudio\\vc14\\x86\\ZlibDll$(VCCONFIG)WithoutAsm\\zlibwapi.dll nmap-$(NMAP_VERSION) cmd /c copy $(NMAPDIR_WIN)\\libz\\contrib\\vstudio\\vc16\\x86\\ZlibDll$(VCCONFIG)WithoutAsm\\zlibwapi.dll nmap-$(NMAP_VERSION)
mkdir -p nmap-$(NMAP_VERSION)/scripts mkdir -p nmap-$(NMAP_VERSION)/scripts
cp -f $(NSE_FILES) nmap-$(NMAP_VERSION)/scripts/ cp -f $(NSE_FILES) nmap-$(NMAP_VERSION)/scripts/
for f in `cd $(NMAPDIR) && find nselib -name .svn -prune -o -type d -print`; do \ for f in `cd $(NMAPDIR) && find nselib -name .svn -prune -o -type d -print`; do \
@@ -50,7 +60,6 @@ stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefix
done done
cp -r $(NMAPDIR)/docs/licenses nmap-$(NMAP_VERSION)/ cp -r $(NMAPDIR)/docs/licenses nmap-$(NMAP_VERSION)/
rm -rf nmap-$(NMAP_VERSION)/licenses/.svn rm -rf nmap-$(NMAP_VERSION)/licenses/.svn
cp vc_redist.x86.exe nmap-$(NMAP_VERSION)
cp $(NMAPDIR)/ncat/$(VCCONFIG)/ncat.exe nmap-$(NMAP_VERSION) cp $(NMAPDIR)/ncat/$(VCCONFIG)/ncat.exe nmap-$(NMAP_VERSION)
cp $(NMAPDIR)/ncat/$(VCCONFIG)/ca-bundle.crt nmap-$(NMAP_VERSION) cp $(NMAPDIR)/ncat/$(VCCONFIG)/ca-bundle.crt nmap-$(NMAP_VERSION)
cp $(NMAPDIR)/nping/$(VCCONFIG)/nping.exe nmap-$(NMAP_VERSION) cp $(NMAPDIR)/nping/$(VCCONFIG)/nping.exe nmap-$(NMAP_VERSION)
@@ -72,28 +81,21 @@ stage-nmap:
stage-nmap-oem: stage-nmap-oem:
$(MAKE) OEM_SUFFIX=-oem stage-nmap-main $(MAKE) OEM_SUFFIX=-oem stage-nmap-main
stage-nmap-main: build-nmap${OEM_SUFFIX} nmap-$(NMAP_VERSION)${OEM_SUFFIX}/Uninstall.exe: nsis/Nmap.nsi
mkdir -p nmap-$(NMAP_VERSION)${OEM_SUFFIX} mkdir -p nmap-$(NMAP_VERSION)${OEM_SUFFIX}
"$(MAKENSIS)" /DINNER $(NSIS_COMMON_ARGS) nsis/Nmap.nsi
nmap-$(NMAP_VERSION)${OEM_SUFFIX}/tempinstaller.exe || test $$? -eq 2
rm nmap-$(NMAP_VERSION)${OEM_SUFFIX}/tempinstaller.exe
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}/ 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)/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 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 # TODO: evaluate whether we should also sign the Python stuff for Zenmap, Ndiff
"$(SIGNTOOL)" $(SIGNTOOL_ARGS) $^ "$(SIGNTOOL)" $(SIGNTOOL_ARGS) $^ nmap-$(NMAP_VERSION)/zenmap/bin/* nmap-$(NMAP_VERSION)/zenmap/lib/gdk-pixbuf-2.0/*/*.dll
touch sign-files touch sign-files
NSIS_COMMON_ARGS = "/DVERSION=$(NMAP_VERSION)" "/DNUM_VERSION=$(NMAP_NUM_VERSION)" "/DNPCAP_VERSION=$(NPCAP_VERSION)"
bundle-nsis: sign-files bundle-nsis: sign-files
rm -f nmap-$(NMAP_VERSION)*/tempinstaller.exe nmap-$(NMAP_VERSION)*/Uninstall.exe
# Make the uninstallers
"$(MAKENSIS)" /DINNER $(NSIS_COMMON_ARGS) "/DNMAP_NAME=$(NMAP_NAME)" nsis/Nmap.nsi
nmap-$(NMAP_VERSION)/tempinstaller.exe || test $$? -eq 2
test -f nmap-$(NMAP_VERSION)/Uninstall.exe
"$(MAKENSIS)" /DINNER $(NSIS_COMMON_ARGS) "/DNMAP_NAME=$(NMAP_OEM_NAME)" "/DNMAP_OEM=1" nsis/Nmap.nsi
nmap-$(NMAP_VERSION)-oem/tempinstaller.exe || test $$? -eq 2
test -f nmap-$(NMAP_VERSION)-oem/Uninstall.exe
# Sign uninstallers
"$(SIGNTOOL)" $(SIGNTOOL_ARGS) nmap-$(NMAP_VERSION)/Uninstall.exe nmap-$(NMAP_VERSION)-oem/Uninstall.exe
# Now build the installers
"$(MAKENSIS)" $(NSIS_COMMON_ARGS) "/DNMAP_NAME=$(NMAP_NAME)" nsis/Nmap.nsi "$(MAKENSIS)" $(NSIS_COMMON_ARGS) "/DNMAP_NAME=$(NMAP_NAME)" nsis/Nmap.nsi
"$(MAKENSIS)" $(NSIS_COMMON_ARGS) "/DNMAP_NAME=$(NMAP_OEM_NAME)" "/DNMAP_OEM=1" nsis/Nmap.nsi "$(MAKENSIS)" $(NSIS_COMMON_ARGS) "/DNMAP_NAME=$(NMAP_OEM_NAME)" "/DNMAP_OEM=1" nsis/Nmap.nsi
"$(SIGNTOOL)" $(SIGNTOOL_ARGS) nmap-$(NMAP_VERSION)-setup.exe nmap-$(NMAP_VERSION)-oem-setup.exe "$(SIGNTOOL)" $(SIGNTOOL_ARGS) nmap-$(NMAP_VERSION)-setup.exe nmap-$(NMAP_VERSION)-oem-setup.exe

6
mswin32/nmap.vcxproj
View File

@@ -93,7 +93,7 @@
<AdditionalDependencies>liblua.lib;nsock.lib;pcre2-8-static.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> <AdditionalDependencies>liblua.lib;nsock.lib;pcre2-8-static.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
<OutputFile>.\Debug\nmap.exe</OutputFile> <OutputFile>.\Debug\nmap.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\libssh2\win32\Debug_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;build-pcre2\Debug;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\libssh2\win32\Debug_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;build-pcre2\Debug;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc16\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DelayLoadDLLs>packet.dll;wpcap.dll</DelayLoadDLLs> <DelayLoadDLLs>packet.dll;wpcap.dll</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -134,7 +134,7 @@
<AdditionalDependencies>liblua.lib;nsock.lib;pcre2-8-static.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> <AdditionalDependencies>liblua.lib;nsock.lib;pcre2-8-static.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
<OutputFile>.\$(Configuration)/nmap.exe</OutputFile> <OutputFile>.\$(Configuration)/nmap.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;build-pcre2\Release;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;build-pcre2\Release;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc16\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DelayLoadDLLs>packet.dll;wpcap.dll</DelayLoadDLLs> <DelayLoadDLLs>packet.dll;wpcap.dll</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -174,7 +174,7 @@
<AdditionalDependencies>liblua.lib;nsock.lib;pcre2-8-static.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> <AdditionalDependencies>liblua.lib;nsock.lib;pcre2-8-static.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
<OutputFile>.\$(Configuration)/nmap.exe</OutputFile> <OutputFile>.\$(Configuration)/nmap.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;build-pcre2\Release;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;build-pcre2\Release;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc16\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DelayLoadDLLs>packet.dll;wpcap.dll</DelayLoadDLLs> <DelayLoadDLLs>packet.dll;wpcap.dll</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>

6
ncat/docs/ncat.1
View File

@@ -2,12 +2,12 @@
.\" Title: Ncat .\" Title: Ncat
.\" Author: [see the "Authors" section] .\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 05/17/2023 .\" Date: 04/12/2024
.\" Manual: Ncat Reference Guide .\" Manual: Ncat Reference Guide
.\" Source: Ncat .\" Source: Ncat
.\" Language: English .\" Language: English
.\" .\"
.TH "NCAT" "1" "05/17/2023" "Ncat" "Ncat Reference Guide" .TH "NCAT" "1" "04/12/2024" "Ncat" "Ncat Reference Guide"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * 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 .RS 4
.\} .\}
.nf .nf
Ncat 7\&.94 ( https://nmap\&.org/ncat ) Ncat 7\&.95 ( https://nmap\&.org/ncat )
Usage: ncat [options] [hostname] [port] Usage: ncat [options] [hostname] [port]
Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds, Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds,

2
ncat/docs/ncat.usage.txt
View File

@@ -1,4 +1,4 @@
Ncat 7.94SVN ( https://nmap.org/ncat ) Ncat 7.95 ( https://nmap.org/ncat )
Usage: ncat [options] [hostname] [port] Usage: ncat [options] [hostname] [port]
Options taking a time assume seconds. Append 'ms' for milliseconds, Options taking a time assume seconds. Append 'ms' for milliseconds,

2
ncat/ncat.h
View File

@@ -79,7 +79,7 @@
/* Ncat information for output, etc. */ /* Ncat information for output, etc. */
#define NCAT_NAME "Ncat" #define NCAT_NAME "Ncat"
#define NCAT_URL "https://nmap.org/ncat" #define NCAT_URL "https://nmap.org/ncat"
#define NCAT_VERSION "7.94SVN" #define NCAT_VERSION "7.95"
#ifndef __GNUC__ #ifndef __GNUC__
#ifndef __attribute__ #ifndef __attribute__

4
ndiff/docs/ndiff.1
View File

@@ -2,12 +2,12 @@
.\" Title: ndiff .\" Title: ndiff
.\" Author: [see the "Authors" section] .\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 05/17/2023 .\" Date: 04/12/2024
.\" Manual: User Commands .\" Manual: User Commands
.\" Source: Ndiff .\" Source: Ndiff
.\" Language: English .\" Language: English
.\" .\"
.TH "NDIFF" "1" "05/17/2023" "Ndiff" "User Commands" .TH "NDIFF" "1" "04/12/2024" "Ndiff" "User Commands"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------

1589
nmap-services
View File

File diff suppressed because it is too large Load Diff

6
nmap.h
View File

@@ -123,10 +123,10 @@
/* Edit this definition only within the quotes, because it is read from this /* Edit this definition only within the quotes, because it is read from this
file by the makefiles. */ file by the makefiles. */
#define NMAP_MAJOR 7 #define NMAP_MAJOR 7
#define NMAP_MINOR 94 #define NMAP_MINOR 95
#define NMAP_BUILD 2 #define NMAP_BUILD 0
/* SVN, BETA, etc. */ /* SVN, BETA, etc. */
#define NMAP_SPECIAL "SVN" #define NMAP_SPECIAL ""
#define NMAP_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) NMAP_SPECIAL #define NMAP_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) NMAP_SPECIAL
#define NMAP_NUM_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) "." STR(NMAP_BUILD) ".0" #define NMAP_NUM_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) "." STR(NMAP_BUILD) ".0"

10
nmap.spec.in
View File

@@ -10,8 +10,9 @@
%define name nmap %define name nmap
%define version @VERSION@ %define version @VERSION@
%define release 1 %define release 2
%define _prefix /usr %define _prefix /usr
%define makeargs OPENSSL_LIBS="%{openssl}/lib64/libssl.a %{openssl}/lib64/libcrypto.a" LIBSSL="%{openssl}/lib64/libssl.a %{openssl}/lib64/libcrypto.a" ZLIB_LIBS="$(pwd)/libz/libz.a" LIBZ="$(pwd)/lib64/libz.a"
Summary: Network exploration tool and security scanner Summary: Network exploration tool and security scanner
Name: %{name} Name: %{name}
@@ -31,8 +32,9 @@ URL: https://nmap.org
# modules were installed so it's not dependent on any particular ABI. # modules were installed so it's not dependent on any particular ABI.
AutoReqProv: no AutoReqProv: no
# For Ndiff. # For Ndiff.
BuildRequires: python3-devel, epel-rpm-macros BuildRequires: python3-devel
Requires: python3 >= 3.0 Requires: python3 >= 3.0
%global debug_package %{nil}
# RPM can't be relocatable until I stop storing path info in the binary. # RPM can't be relocatable until I stop storing path info in the binary.
# Prefix: %{_prefix} # Prefix: %{_prefix}
@@ -68,12 +70,12 @@ both console and graphical versions are available.
%if "%{static}" == "1" %if "%{static}" == "1"
make static make static
%else %else
make make %{makeargs}
%endif %endif
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %{makeargs}
# Don't package the Ndiff uninstaller with the RPM. # Don't package the Ndiff uninstaller with the RPM.
rm -f $RPM_BUILD_ROOT%{_bindir}/uninstall_ndiff rm -f $RPM_BUILD_ROOT%{_bindir}/uninstall_ndiff
strip $RPM_BUILD_ROOT%{_bindir}/* || : strip $RPM_BUILD_ROOT%{_bindir}/* || :

4927
nping/configure vendored
View File

File diff suppressed because it is too large Load Diff

4
nping/docs/nping.1
View File

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

2
nping/nping.h
View File

@@ -265,7 +265,7 @@
/* General tunable defines **************************************************/ /* General tunable defines **************************************************/
#define NPING_NAME "Nping" #define NPING_NAME "Nping"
#define NPING_URL "https://nmap.org/nping" #define NPING_URL "https://nmap.org/nping"
#define NPING_VERSION "0.7.94SVN" #define NPING_VERSION "0.7.95"
#define DEFAULT_VERBOSITY VB_0 #define DEFAULT_VERBOSITY VB_0

6
zenmap.spec.in
View File

@@ -25,8 +25,9 @@ BuildArch: noarch
# setup.py takes care of adjusting sys.path to point to wherever the # setup.py takes care of adjusting sys.path to point to wherever the
# modules were installed so it's not dependent on any particular ABI. # modules were installed so it's not dependent on any particular ABI.
AutoReqProv: no AutoReqProv: no
BuildRequires: python3-devel, epel-rpm-macros BuildRequires: python3-devel
Requires: python3 >= 3.0, nmap, python3-gobject, gtk3 Requires: python3 >= 3.0, nmap, python3-gobject, gtk3
%global debug_package %{nil}
Prefix: %{_prefix} Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
@@ -78,8 +79,7 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || :
%{python3_sitelib}/zenmapGUI/ %{python3_sitelib}/zenmapGUI/
%{python3_sitelib}/zenmapCore/ %{python3_sitelib}/zenmapCore/
%{python3_sitelib}/radialnet/ %{python3_sitelib}/radialnet/
%{python3_sitelib}/zenmap-*.egg-info %{python3_sitelib}/zenmap-*.dist-info/
%{_datadir}/zenmap/
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%changelog %changelog

5
zenmap/install_scripts/utils/version_update.py
View File

@@ -66,7 +66,6 @@ import sys
import re import re
from datetime import datetime from datetime import datetime
VERSION = os.path.join("share", "zenmap", "config", "zenmap_version")
VERSION_PY = os.path.join("zenmapCore", "Version.py") VERSION_PY = os.path.join("zenmapCore", "Version.py")
NAME_PY = os.path.join("zenmapCore", "Name.py") NAME_PY = os.path.join("zenmapCore", "Name.py")
@@ -88,10 +87,6 @@ def update_date(base_dir):
def update_version(base_dir, version): def update_version(base_dir, version):
version = re.sub(r'(?=[^0-9.])', '+', version, 1) version = re.sub(r'(?=[^0-9.])', '+', version, 1)
print(">>> Updating %s" % os.path.join(base_dir, VERSION))
vf = open(os.path.join(base_dir, VERSION), "w")
print(version, file=vf)
vf.close()
print(">>> Updating %s" % os.path.join(base_dir, VERSION_PY)) print(">>> Updating %s" % os.path.join(base_dir, VERSION_PY))
vf = open(os.path.join(base_dir, VERSION_PY), "w") vf = open(os.path.join(base_dir, VERSION_PY), "w")
print("VERSION = \"%s\"" % version, file=vf) print("VERSION = \"%s\"" % version, file=vf)

2
zenmap/zenmapCore/Version.py
View File

@@ -1 +1 @@
VERSION = "7.94+SVN" VERSION = "7.95"