Skip to content

Commit 9529327

Browse files
bonsaivikingbonsaiviking
committed
Merge changes from Nmap 7.91 release branch
1 parent 009b63b commit 9529327

File tree

11 files changed

+37
-19
lines changed

11 files changed

+37
-19
lines changed

‎CHANGELOG

+21-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
11
#Nmap Changelog ($Id$); -*-text-*-
22

3-
o [NSE][GH#2136][GH#2137] Rectify error "time result cannot be represented..."
4-
in the AFP library. [Clément Notin]
3+
o [NSE] Script mysql-audit now defaults to the bundled mysql-cis.audit for
4+
the audit rule base. [nnposter]
55

66
o [NSE][GH#1473] It is now possible to control whether the SNMP library uses
77
v1 (default) or v2c by setting script argument snmp.version. [nnposter]
8-
8+
9+
Nmap 7.91 [2020-10-09]
10+
11+
o [GH#2148][Zenmap] Fix a crash in the profile editor due to a missing import.
12+
13+
o [GH#2139][Nsock][Windows] Demote the IOCP Nsock engine because of some known
14+
issues that will take longer to resolve. The previous default "poll" engine
15+
will be used instead.
16+
17+
o [GH#2138][Nsock][Windows] Fix a crash in service scan due to a previously-unknown
18+
error being returned from the IOCP Nsock engine. [Daniel Miller]
19+
20+
o [NSE][GH#2136][GH#2137] Fix several places where Lua's os.time was being used
21+
to represent dates prior to January 1, 1970, which fails on Windows. Notably,
22+
NSE refused to run in UTC+X timezones with the error "time result cannot be
23+
represented in this installation" [Clément Notin, nnposter, Daniel Miller]
24+
925
o [NSE][GH#2128] MySQL library was not properly parsing server responses,
1026
resulting in script crashes. [nnposter]
1127

12-
o [NSE] Script mysql-audit now defaults to the bundled mysql-cis.audit for
13-
the audit rule base. [nnposter]
28+
o [GH#2135] Silence the irrelevant warning, "Your ports include 'T:' but you
29+
haven't specified any TCP scan type" when running nmap -sUV
1430

1531
Nmap 7.90 [2020-10-03]
1632

‎docs/nmap.usage.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Nmap 7.90SVN ( https://nmap.org )
1+
Nmap 7.91SVN ( https://nmap.org )
22
Usage: nmap [Scan Type(s)] [Options] {target specification}
33
TARGET SPECIFICATION:
44
Can pass hostnames, IP addresses, networks, etc.

‎macosx/openssl.modules

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
makeargs='OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" LIBSSL="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a" LIBZ="${JHBUILD_LIBDIR}/libz.a"'
3131
makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"'
3232
>
33-
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
33+
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
3434
<dependencies>
3535
<dep package="openssl" />
3636
</dependencies>
@@ -42,7 +42,7 @@
4242
makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
4343
makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
4444
>
45-
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
45+
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
4646
<dependencies>
4747
<dep package="openssl" />
4848
</dependencies>
@@ -54,7 +54,7 @@
5454
makeargs='build-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
5555
makeinstallargs='install-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
5656
>
57-
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
57+
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
5858
<dependencies>
5959
<dep package="openssl" />
6060
</dependencies>
@@ -66,7 +66,7 @@
6666
makeargs='OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" LIBSSL="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a" LIBZ="${JHBUILD_LIBDIR}/libz.a"'
6767
makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"'
6868
>
69-
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
69+
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
7070
<dependencies>
7171
<dep package="openssl" />
7272
</dependencies>
@@ -78,7 +78,7 @@
7878
makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
7979
makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
8080
>
81-
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
81+
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
8282
<dependencies>
8383
<dep package="openssl" />
8484
</dependencies>

‎mswin32/nmap.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
<AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
138138
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
139139
<DelayLoadDLLs>packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
140+
<GenerateDebugInformation>true</GenerateDebugInformation>
140141
<ProgramDatabaseFile>.\$(Configuration)/nmap.pdb</ProgramDatabaseFile>
141142
<SubSystem>Console</SubSystem>
142143
<RandomizedBaseAddress>true</RandomizedBaseAddress>
@@ -174,6 +175,7 @@
174175
<AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
175176
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
176177
<DelayLoadDLLs>packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
178+
<GenerateDebugInformation>true</GenerateDebugInformation>
177179
<ProgramDatabaseFile>.\$(Configuration)/nmap.pdb</ProgramDatabaseFile>
178180
<SubSystem>Console</SubSystem>
179181
<RandomizedBaseAddress>true</RandomizedBaseAddress>

‎ncat/docs/ncat.usage.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Ncat 7.90SVN ( https://nmap.org/ncat )
1+
Ncat 7.91SVN ( https://nmap.org/ncat )
22
Usage: ncat [options] [hostname] [port]
33

44
Options taking a time assume seconds. Append 'ms' for milliseconds,

‎ncat/ncat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
/* Ncat information for output, etc. */
8585
#define NCAT_NAME "Ncat"
8686
#define NCAT_URL "https://nmap.org/ncat"
87-
#define NCAT_VERSION "7.90SVN"
87+
#define NCAT_VERSION "7.91SVN"
8888

8989
#ifndef __GNUC__
9090
#ifndef __attribute__

‎nmap.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@
121121
#ifndef NMAP_VERSION
122122
/* Edit this definition only within the quotes, because it is read from this
123123
file by the makefiles. */
124-
#define NMAP_VERSION "7.90SVN"
125-
#define NMAP_NUM_VERSION "7.0.90.1"
124+
#define NMAP_VERSION "7.91SVN"
125+
#define NMAP_NUM_VERSION "7.91.1.0"
126126
#endif
127127

128128
#define NMAP_XMLOUTPUTVERSION "1.05"

‎nping/nping.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
/* General tunable defines **************************************************/
267267
#define NPING_NAME "Nping"
268268
#define NPING_URL "https://nmap.org/nping"
269-
#define NPING_VERSION "0.7.90SVN"
269+
#define NPING_VERSION "0.7.91SVN"
270270

271271

272272
#define DEFAULT_VERBOSITY VB_0

‎nsock/src/nsock_engines.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ extern struct io_engine engine_select;
100100
static struct io_engine *available_engines[] = {
101101
ENGINE_EPOLL
102102
ENGINE_KQUEUE
103-
ENGINE_IOCP
104103
ENGINE_POLL
104+
ENGINE_IOCP
105105
ENGINE_SELECT
106106
NULL
107107
};

‎zenmap/share/zenmap/config/zenmap_version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.90SVN
1+
7.91SVN

‎zenmap/zenmapCore/Version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = "7.90SVN"
1+
VERSION = "7.91SVN"

0 commit comments

Comments
 (0)