diff --git a/docs/man-xlate/nmap-es.1 b/docs/man-xlate/nmap-es.1
index 7edf67549..d224f329a 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: 15/04/2022
+.\" Date: 31/08/2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: Spanish
.\"
-.TH "NMAP" "1" "15/04/2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "31/08/2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-fr.1 b/docs/man-xlate/nmap-fr.1
index 6291f5382..75e4e9a6a 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: 15/04/2022
+.\" Date: 31/08/2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: French
.\"
-.TH "NMAP" "1" "15/04/2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "31/08/2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-hr.1 b/docs/man-xlate/nmap-hr.1
index 4f007d458..ebfbd533f 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: 04/15/2022
+.\" Date: 08/31/2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: Croatian
.\"
-.TH "NMAP" "1" "04/15/2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "08/31/2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-hu.1 b/docs/man-xlate/nmap-hu.1
index 078c0ba5e..8df985bd0 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: 15/04/2022
+.\" Date: 31/08/2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: Hungarian
.\"
-.TH "NMAP" "1" "15/04/2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "31/08/2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-id.1 b/docs/man-xlate/nmap-id.1
index bd01692ce..12ef995c2 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: 04/15/2022
+.\" Date: 08/31/2022
.\" Manual: Panduan Referensi Nmap
.\" Source: Nmap
.\" Language: Indonesian
.\"
-.TH "NMAP" "1" "04/15/2022" "Nmap" "Panduan Referensi Nmap"
+.TH "NMAP" "1" "08/31/2022" "Nmap" "Panduan Referensi Nmap"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -153,7 +153,7 @@ PORT SPECIFICATION AND SCAN ORDER:
\-p : Only scan specified ports
Ex: \-p22; \-p1\-65535; \-p U:53,111,137,T:21\-25,80,139,8080
\-F: Fast mode \- Scan fewer ports than the default scan
- \-r: Scan ports consecutively \- don\*(Aqt randomize
+ \-r: Scan ports sequentially \- don\*(Aqt randomize
\-\-top\-ports : Scan most common ports
\-\-port\-ratio : Scan ports more common than
SERVICE/VERSION DETECTION:
diff --git a/docs/man-xlate/nmap-it.1 b/docs/man-xlate/nmap-it.1
index 9e5dd78d4..93d84968d 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: 15/04/2022
+.\" Date: 31/08/2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: Italian
.\"
-.TH "NMAP" "1" "15/04/2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "31/08/2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -151,7 +151,7 @@ PORT SPECIFICATION AND SCAN ORDER:
Ex: \-p22; \-p1\-65535; \-p U:53,111,137,T:21\-25,80,139,8080,S:9
\-\-exclude\-ports : Exclude the specified ports from scanning
\-F: Fast mode \- Scan fewer ports than the default scan
- \-r: Scan ports consecutively \- don\*(Aqt randomize
+ \-r: Scan ports sequentially \- don\*(Aqt randomize
\-\-top\-ports : Scan most common ports
\-\-port\-ratio : Scan ports more common than
SERVICE/VERSION DETECTION:
diff --git a/docs/man-xlate/nmap-ja.1 b/docs/man-xlate/nmap-ja.1
index 725325c04..689931adc 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: 15/04/2022
+.\" Date: 31/08/2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: Japanese
.\"
-.TH "NMAP" "1" "15/04/2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "31/08/2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -126,7 +126,7 @@ PORT SPECIFICATION AND SCAN ORDER:
\-p : Only scan specified ports
Ex: \-p22; \-p1\-65535; \-p U:53,111,137,T:21\-25,80,139,8080
\-F: Fast \- Scan only the ports listed in the nmap\-services file)
- \-r: Scan ports consecutively \- don\*(Aqt randomize
+ \-r: Scan ports sequentially \- don\*(Aqt randomize
SERVICE/VERSION DETECTION:
\-sV: Probe open ports to determine service/version info
\-\-version\-light: Limit to most likely probes for faster identification
diff --git a/docs/man-xlate/nmap-pl.1 b/docs/man-xlate/nmap-pl.1
index d999e5406..9994b71b8 100644
--- a/docs/man-xlate/nmap-pl.1
+++ b/docs/man-xlate/nmap-pl.1
@@ -2,12 +2,12 @@
.\" Title: nmap
.\" Author: [see the "Autor" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 04/15/2022
+.\" Date: 08/31/2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: Polish
.\"
-.TH "NMAP" "1" "04/15/2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "08/31/2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-pt_BR.1 b/docs/man-xlate/nmap-pt_BR.1
index 7c74f2175..7bb28b5ee 100644
--- a/docs/man-xlate/nmap-pt_BR.1
+++ b/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
-.\" Date: 15/04/2022
+.\" Date: 31/08/2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: Portuguese (Brazil)
.\"
-.TH "NMAP" "1" "15/04/2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "31/08/2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -155,7 +155,7 @@ PORT SPECIFICATION AND SCAN ORDER:
\-p : Only scan specified ports
Ex: \-p22; \-p1\-65535; \-p U:53,111,137,T:21\-25,80,139,8080
\-F: Fast \- Scan only the ports listed in the nmap\-services file)
- \-r: Scan ports consecutively \- don\*(Aqt randomize
+ \-r: Scan ports sequentially \- don\*(Aqt randomize
SERVICE/VERSION DETECTION:
\-sV: Probe open ports to determine service/version info
\-\-version\-intensity : Set from 0 (light) to 9 (try all probes)
diff --git a/docs/man-xlate/nmap-ro.1 b/docs/man-xlate/nmap-ro.1
index 1f0f7072b..86fcbdd30 100644
--- a/docs/man-xlate/nmap-ro.1
+++ b/docs/man-xlate/nmap-ro.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: 04/15/2022
+.\" Date: 08/31/2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: Romanian
.\"
-.TH "NMAP" "1" "04/15/2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "08/31/2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -130,7 +130,7 @@ Usage: nmap [Scan
: FTP bounce scan PORT SPECIFICATION AND SCAN
ORDER: \-p : Only scan specified ports Ex: \-p22;
\-p1\-65535; \-p U:53,111,137,T:21\-25,80,139,8080 \-F: Fast \- Scan only the
- ports listed in the nmap\-services file) \-r: Scan ports consecutively \-
+ ports listed in the nmap\-services file) \-r: Scan ports sequentially \-
don\*(Aqt randomize SERVICE/VERSION DETECTION: \-sV: Probe open ports to
determine service/version info \-\-version\-light: Limit to most likely
probes for faster identification \-\-version\-all: Try every single probe
diff --git a/docs/man-xlate/nmap-sk.1 b/docs/man-xlate/nmap-sk.1
index 5d51cb21c..99aa54af9 100644
--- a/docs/man-xlate/nmap-sk.1
+++ b/docs/man-xlate/nmap-sk.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: 15. apríla 2022
+.\" Date: 31. augusta 2022
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: Slovak
.\"
-.TH "NMAP" "1" "15. apríla 2022" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "31. augusta 2022" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/nmap.1 b/docs/nmap.1
index 178ee9619..c10a28d40 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: 04/15/2022
+.\" Date: 08/31/2022
.\" Manual: Nmap Reference Guide
.\" Source: Nmap
.\" Language: English
.\"
-.TH "NMAP" "1" "04/15/2022" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "08/31/2022" "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\&.92SVN ( https://nmap\&.org )
+Nmap 7\&.93 ( https://nmap\&.org )
Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc\&.
@@ -153,7 +153,7 @@ PORT SPECIFICATION AND SCAN ORDER:
Ex: \-p22; \-p1\-65535; \-p U:53,111,137,T:21\-25,80,139,8080,S:9
\-\-exclude\-ports : Exclude the specified ports from scanning
\-F: Fast mode \- Scan fewer ports than the default scan
- \-r: Scan ports consecutively \- don\*(Aqt randomize
+ \-r: Scan ports sequentially \- don\*(Aqt randomize
\-\-top\-ports : Scan most common ports
\-\-port\-ratio : Scan ports more common than
SERVICE/VERSION DETECTION:
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index 0836dc097..7f77cbc94 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 7.92SVN ( https://nmap.org )
+Nmap 7.93 ( https://nmap.org )
Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc.
@@ -32,7 +32,7 @@ PORT SPECIFICATION AND SCAN ORDER:
Ex: -p22; -p1-65535; -p U:53,111,137,T:21-25,80,139,8080,S:9
--exclude-ports : Exclude the specified ports from scanning
-F: Fast mode - Scan fewer ports than the default scan
- -r: Scan ports consecutively - don't randomize
+ -r: Scan ports sequentially - don't randomize
--top-ports : Scan most common ports
--port-ratio : Scan ports more common than
SERVICE/VERSION DETECTION:
diff --git a/docs/zenmap.1 b/docs/zenmap.1
index bbb723ac8..9cc04f84d 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: 04/15/2022
+.\" Date: 08/31/2022
.\" Manual: Zenmap Reference Guide
.\" Source: Zenmap
.\" Language: English
.\"
-.TH "ZENMAP" "1" "04/15/2022" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "08/31/2022" "Zenmap" "Zenmap Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/mswin32/Makefile b/mswin32/Makefile
index 98553cefe..33c95b86e 100644
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@@ -29,7 +29,7 @@ bundle-nmap: bundle-zip bundle-nsis
build-nmap${OEM_SUFFIX}: nmap.sln
cmd /c Build.bat Build "$(VCCONFIG)${OEM_SUFFIX}"
-stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefixes $(NMAPDIR)/nmap-os-db $(NMAPDIR)/nmap-payloads $(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-payloads $(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)
cp $^ nmap-$(NMAP_VERSION)/
# Use "cmd /c copy" rather than "cp" to preserve Windows ACLs. Using
@@ -48,7 +48,7 @@ stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefix
done
cp -r $(NMAPDIR)/docs/licenses nmap-$(NMAP_VERSION)/
rm -rf nmap-$(NMAP_VERSION)/licenses/.svn
- cp VC_redist.x86.exe nmap-$(NMAP_VERSION)
+ cp vc_redist.x86.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)/nping/$(VCCONFIG)/nping.exe nmap-$(NMAP_VERSION)
@@ -73,7 +73,7 @@ stage-nmap-main: build-nmap${OEM_SUFFIX}
mkdir -p 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)/ndiff.exe nmap-$(NMAP_VERSION)/zenmap.exe nmap-$(NMAP_VERSION)/libssh2.dll nmap-$(NMAP_VERSION)/libcrypto-1_1.dll nmap-$(NMAP_VERSION)/libssl-1_1.dll nmap-$(NMAP_VERSION)/zlibwapi.dll
+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)/ndiff.exe nmap-$(NMAP_VERSION)/zenmap.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) $^
touch sign-files
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index a04b66c9d..9a7cefdef 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -235,8 +235,8 @@ Section "Nmap Core Files" SecCore
File /r /x .svn ${STAGE_DIR}\licenses
File ${STAGE_DIR}\libssh2.dll
File ${STAGE_DIR}\zlibwapi.dll
- File ${STAGE_DIR}\libcrypto-1_1.dll
- File ${STAGE_DIR}\libssl-1_1.dll
+ File ${STAGE_DIR}\libcrypto-3.dll
+ File ${STAGE_DIR}\libssl-3.dll
File /r /x mswin32 /x .svn /x ncat ${STAGE_DIR}\scripts
File /r /x mswin32 /x .svn ${STAGE_DIR}\nselib
File ${STAGE_DIR}\icon1.ico
@@ -538,8 +538,8 @@ Section "Uninstall"
Delete "$INSTDIR\icon1.ico"
Delete "$INSTDIR\libssh2.dll"
Delete "$INSTDIR\zlibwapi.dll"
- Delete "$INSTDIR\libcrypto-1_1.dll"
- Delete "$INSTDIR\libssl-1_1.dll"
+ Delete "$INSTDIR\libcrypto-*dll"
+ Delete "$INSTDIR\libssl-*dll"
Delete "$INSTDIR\npcap-*.exe"
Delete "$INSTDIR\zenmap.exe"
Delete "$INSTDIR\ndiff.exe"
diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1
index 8d43e7e37..cfee78197 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: 04/15/2022
+.\" Date: 08/31/2022
.\" Manual: Ncat Reference Guide
.\" Source: Ncat
.\" Language: English
.\"
-.TH "NCAT" "1" "04/15/2022" "Ncat" "Ncat Reference Guide"
+.TH "NCAT" "1" "08/31/2022" "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\&.92SVN ( https://nmap\&.org/ncat )
+Ncat 7\&.93 ( 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 9f54871a3..e445f0cba 100644
--- a/ncat/docs/ncat.usage.txt
+++ b/ncat/docs/ncat.usage.txt
@@ -1,4 +1,4 @@
-Ncat 7.92SVN ( https://nmap.org/ncat )
+Ncat 7.93 ( 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 238a5c048..efa15c1c0 100644
--- a/ncat/ncat.h
+++ b/ncat/ncat.h
@@ -80,7 +80,7 @@
/* Ncat information for output, etc. */
#define NCAT_NAME "Ncat"
#define NCAT_URL "https://nmap.org/ncat"
-#define NCAT_VERSION "7.92SVN"
+#define NCAT_VERSION "7.93"
#ifndef __GNUC__
#ifndef __attribute__
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index d0c169ad9..15e09dcc3 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: 04/15/2022
+.\" Date: 08/31/2022
.\" Manual: User Commands
.\" Source: Ndiff
.\" Language: English
.\"
-.TH "NDIFF" "1" "04/15/2022" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "08/31/2022" "Ndiff" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/nmap.h b/nmap.h
index 357dbaac1..df6fe7b00 100644
--- a/nmap.h
+++ b/nmap.h
@@ -125,7 +125,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 92
+#define NMAP_MINOR 93
#define NMAP_BUILD 1
/* SVN, BETA, etc. */
#define NMAP_SPECIAL "SVN"
diff --git a/nping/docs/nping.1 b/nping/docs/nping.1
index 3523b98f8..29d129cdc 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: 04/15/2022
+.\" Date: 08/31/2022
.\" Manual: Nping Reference Guide
.\" Source: Nping
.\" Language: English
.\"
-.TH "NPING" "1" "04/15/2022" "Nping" "Nping Reference Guide"
+.TH "NPING" "1" "08/31/2022" "Nping" "Nping Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -92,12 +92,12 @@ This options summary is printed when Nping is run with no arguments\&. It helps
.RS 4
.\}
.nf
-Nping 0\&.5\&.59BETA1 ( https://nmap\&.org/nping )
+Nping 0\&.7\&.92SVN ( https://nmap\&.org/nping )
Usage: nping [Probe mode] [Options] {target specification}
TARGET SPECIFICATION:
Targets may be specified as hostnames, IP addresses, networks, etc\&.
- Ex: scanme\&.nmap\&.org, microsoft\&.com/24, 192\&.168\&.0\&.1; 10\&.0\&.0\-255\&.1\-254
+ Ex: scanme\&.nmap\&.org, microsoft\&.com/24, 192\&.168\&.0\&.1; 10\&.0\&.*\&.1\-24
PROBE MODES:
\-\-tcp\-connect : Unprivileged TCP connect probe mode\&.
\-\-tcp : TCP probe mode\&.
@@ -147,6 +147,7 @@ IPv4 OPTIONS:
\-\-id : Set identification field (16 bits)\&.
\-\-df : Set Don\*(Aqt Fragment flag\&.
\-\-mf : Set More Fragments flag\&.
+ \-\-evil : Set Reserved / Evil flag\&.
\-\-ttl : Set time to live [0\-255]\&.
\-\-badsum\-ip : Use a random invalid checksum\&.
\-\-ip\-options : Set IP options
@@ -190,7 +191,7 @@ MISC:
\-N, \-\-no\-capture : Do not try to capture replies\&.
\-\-privileged : Assume user is fully privileged\&.
\-\-unprivileged : Assume user lacks raw socket privileges\&.
- \-\-send\-eth : Send packets at the raw ethernet layer\&.
+ \-\-send\-eth : Send packets at the raw Ethernet layer\&.
\-\-send\-ip : Send packets using raw IP sockets\&.
\-\-bpf\-filter : Specify custom BPF filter\&.
OUTPUT:
@@ -1100,6 +1101,11 @@ Sets the Don\*(Aqt Fragment bit in sent packets\&. When an IP datagram has its D
Sets the More Fragments bit in sent packets\&. The MF flag is set to indicate the receiver that the current datagram is a fragment of some larger datagram\&. When set to zero it indicates that the current datagram is either the last fragment in the set or that it is the only fragment\&.
.RE
.PP
+\fB\-\-evil\fR (Reserved / Evil)
+.RS 4
+Sets the Reserved / Evil bit in sent packets\&. The Evil flag helps firewalls and other network security systems to distinguish between datagrams that have malicious intent and those that are merely unusual\&. When set, it indicates that the datagram has evil intent, instructing insecure systems to succumb\&. Setting it to zero indicates no evil intent\&. The option is implied if environmental variable SCRIPT_KIDDIE is set to a non\-zero value\&.
+.RE
+.PP
\fB\-\-ttl \fR\fB\fIhops\fR\fR (Time To Live)
.RS 4
Sets the IPv4 Time\-To\-Live (TTL) field in sent packets to the given value\&. The TTL field specifies how long the datagram is allowed to exist on the network\&. It was originally intended to represent a number of seconds but it actually represents the number of hops a packet can traverse before being dropped\&. The TTL tries to avoid a situation in which undeliverable datagrams keep being forwarded from one router to another endlessly\&.
diff --git a/nping/nping.h b/nping/nping.h
index 67657de76..407c84179 100644
--- a/nping/nping.h
+++ b/nping/nping.h
@@ -266,7 +266,7 @@
/* General tunable defines **************************************************/
#define NPING_NAME "Nping"
#define NPING_URL "https://nmap.org/nping"
-#define NPING_VERSION "0.7.92SVN"
+#define NPING_VERSION "0.7.93"
#define DEFAULT_VERBOSITY VB_0
diff --git a/nse_openssl.cc b/nse_openssl.cc
index f75ad27fa..3ee5d73d3 100644
--- a/nse_openssl.cc
+++ b/nse_openssl.cc
@@ -583,13 +583,15 @@ LUALIB_API int luaopen_openssl(lua_State *L) {
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
#elif OPENSSL_API_LEVEL >= 30000
- if (NULL == OSSL_PROVIDER_load(NULL, "legacy") && o.verbose)
+ if (NULL == OSSL_PROVIDER_load(NULL, "legacy") && o.debugging > 1)
{
- log_write(LOG_STDOUT, "%s: OpenSSL legacy provider failed to load.\n", SCRIPT_ENGINE);
+ // Legacy provider may not be available.
+ // On Windows, legacy crypto is still available even though this fails.
+ log_write(LOG_STDOUT, "%s: OpenSSL legacy provider failed to load: %s\n", SCRIPT_ENGINE, ERR_error_string(ERR_get_error(), NULL));
}
if (NULL == OSSL_PROVIDER_load(NULL, "default") && o.verbose)
{
- log_write(LOG_STDOUT, "%s: OpenSSL default provider failed to load.\n", SCRIPT_ENGINE);
+ log_write(LOG_STDOUT, "%s: OpenSSL default provider failed to load: %s\n", SCRIPT_ENGINE, ERR_error_string(ERR_get_error(), NULL));
}
#endif
diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version
index 2dfd70c67..02932d3b2 100644
--- a/zenmap/share/zenmap/config/zenmap_version
+++ b/zenmap/share/zenmap/config/zenmap_version
@@ -1 +1 @@
-7.92SVN
+7.93
diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py
index 3bd3bcedf..d0b468bff 100644
--- a/zenmap/zenmapCore/Version.py
+++ b/zenmap/zenmapCore/Version.py
@@ -1 +1 @@
-VERSION = "7.92SVN"
+VERSION = "7.93"