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

Merge changes from Nmap 7.91 release branch

Browse Source
This commit is contained in:
dmiller
2020-10-13 19:27:40 +00:00
parent 009b63b6a9
commit 9529327f59
11 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CHANGELOG
View File

@@ -1,16 +1,32 @@
#Nmap Changelog ($Id$); -*-text-*-
o [NSE][GH#2136][GH#2137] Rectify error "time result cannot be represented..."
in the AFP library. [Clément Notin]
o [NSE] Script mysql-audit now defaults to the bundled mysql-cis.audit for
the audit rule base. [nnposter]
o [NSE][GH#1473] It is now possible to control whether the SNMP library uses
v1 (default) or v2c by setting script argument snmp.version. [nnposter]
Nmap 7.91 [2020-10-09]
o [GH#2148][Zenmap] Fix a crash in the profile editor due to a missing import.
o [GH#2139][Nsock][Windows] Demote the IOCP Nsock engine because of some known
issues that will take longer to resolve. The previous default "poll" engine
will be used instead.
o [GH#2138][Nsock][Windows] Fix a crash in service scan due to a previously-unknown
error being returned from the IOCP Nsock engine. [Daniel Miller]
o [NSE][GH#2136][GH#2137] Fix several places where Lua's os.time was being used
to represent dates prior to January 1, 1970, which fails on Windows. Notably,
NSE refused to run in UTC+X timezones with the error "time result cannot be
represented in this installation" [Clément Notin, nnposter, Daniel Miller]
o [NSE][GH#2128] MySQL library was not properly parsing server responses,
resulting in script crashes. [nnposter]
o [NSE] Script mysql-audit now defaults to the bundled mysql-cis.audit for
the audit rule base. [nnposter]
o [GH#2135] Silence the irrelevant warning, "Your ports include 'T:' but you
haven't specified any TCP scan type" when running nmap -sUV
Nmap 7.90 [2020-10-03]

2
docs/nmap.usage.txt
View File

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

10
macosx/openssl.modules
View File

@@ -30,7 +30,7 @@
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"'
makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"'
>
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
<dependencies>
<dep package="openssl" />
</dependencies>
@@ -42,7 +42,7 @@
makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
>
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
<dependencies>
<dep package="openssl" />
</dependencies>
@@ -54,7 +54,7 @@
makeargs='build-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
makeinstallargs='install-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
>
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
<dependencies>
<dep package="openssl" />
</dependencies>
@@ -66,7 +66,7 @@
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"'
makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"'
>
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
<dependencies>
<dep package="openssl" />
</dependencies>
@@ -78,7 +78,7 @@
makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
>
<branch repo="nmap-local" module="nmap-7.90.tar.gz" version="7.90"/>
<branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
<dependencies>
<dep package="openssl" />
</dependencies>

2
mswin32/nmap.vcxproj
View File

@@ -137,6 +137,7 @@
<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>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DelayLoadDLLs>packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\$(Configuration)/nmap.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
@@ -174,6 +175,7 @@
<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>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DelayLoadDLLs>packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\$(Configuration)/nmap.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>true</RandomizedBaseAddress>

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

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

2
ncat/ncat.h
View File

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

4
nmap.h
View File

@@ -121,8 +121,8 @@
#ifndef NMAP_VERSION
/* Edit this definition only within the quotes, because it is read from this
file by the makefiles. */
#define NMAP_VERSION "7.90SVN"
#define NMAP_NUM_VERSION "7.0.90.1"
#define NMAP_VERSION "7.91SVN"
#define NMAP_NUM_VERSION "7.91.1.0"
#endif
#define NMAP_XMLOUTPUTVERSION "1.05"

2
nping/nping.h
View File

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

2
nsock/src/nsock_engines.c
View File

@@ -100,8 +100,8 @@ extern struct io_engine engine_select;
static struct io_engine *available_engines[] = {
ENGINE_EPOLL
ENGINE_KQUEUE
ENGINE_IOCP
ENGINE_POLL
ENGINE_IOCP
ENGINE_SELECT
NULL
};

2
zenmap/share/zenmap/config/zenmap_version
View File

@@ -1 +1 @@
7.90SVN
7.91SVN

2
zenmap/zenmapCore/Version.py
View File

@@ -1 +1 @@
VERSION = "7.90SVN"
VERSION = "7.91SVN"