CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 14:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Report appropriate zlib/libssh2 versions. Closes #957

Browse source
This commit is contained in:
dmiller 2017-08-03 15:16:49 +00:00
parent f784d350e4
commit fd0db09749
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG
View file

@ -1,5 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*-
o [GH#957] Fix reporting of zlib and libssh2 versions in "nmap --version". We
were always reporting the version number of the included source, even when a
different version was linked. [Pavel Zhukov]
o Add a new helper function for nmap-service-probes match lines: $I(1,">") will
unpack an unsigned big-endian integer value up to 8 bytes wide from capture
1. The second option can be "<" for little-endian. [Daniel Miller]

12
nmap.cc
View file

@ -182,11 +182,11 @@
#endif
#if HAVE_LIBSSH2
#include "libssh2/libssh2v.h"
#include <libssh2.h>
#endif
#if HAVE_LIBZ
#include "libz/libzv.h"
#include <zlib.h>
#endif
/* To get the version number only. */
@ -2720,9 +2720,9 @@ static void display_nmap_version() {
#if HAVE_LIBSSH2
#ifdef LIBSSH2_INCLUDED
with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0));
#else
with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0));
#endif
#else
without.push_back("libssh2");
@ -2730,9 +2730,9 @@ static void display_nmap_version() {
#if HAVE_LIBZ
#ifdef ZLIB_INCLUDED
with.push_back(std::string("nmap-libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
with.push_back(std::string("nmap-libz-") + get_word_or_quote(ZLIB_VERSION, 0));
#else
with.push_back(std::string("libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
with.push_back(std::string("libz-") + get_word_or_quote(ZLIB_VERSION, 0));
#endif
#else
without.push_back("libz");