From da6cb1d19e26501a79f57d33de5c4e1df0f559ce Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 16 Apr 2009 09:38:13 +0000 Subject: [PATCH] o [Nbase] The checksum functions now have an nbase_ prefix. This should prevent name collisions with internal but exported functions in shared libraries Nmap links against (e.g. adler32() in zlib). Such collisions seem to confuse the runtime linker on some platforms. [Daniel Roethlisberger] --- CHANGELOG | 6 ++++++ osscan2.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index c1f7d5a2f..b24658cee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,11 @@ # Nmap Changelog ($Id$); -*-text-*- +o [Nbase] The checksum functions now have an nbase_ prefix. This + should prevent name collisions with internal but exported functions + in shared libraries Nmap links against (e.g. adler32() in zlib). + Such collisions seem to confuse the runtime linker on some platforms. + [Daniel Roethlisberger] + o [NSE] The Nmap Script Engine has been rewritten in Lua for better maintainibility and improved functionality. Please see http://seclists.org/nmap-dev/2009/q2/0090.html and diff --git a/osscan2.cc b/osscan2.cc index e44351d86..702117dde 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -2400,7 +2400,7 @@ bool HostOsScan::processT1_7Resp(HostOsScanStats *hss, struct ip *ip, int replyN AVs[current_testno].attribute = (char*)"RD"; length = (int) ntohs(ip->ip_len) - 4 * ip->ip_hl -4 * tcp->th_off; if ((tcp->th_flags & TH_RST) && length>0) { - sprintf(AVs[current_testno].value, "%08lX", crc32(((u8 *)tcp) + 4 * tcp->th_off, length)); + sprintf(AVs[current_testno].value, "%08lX", nbase_crc32(((u8 *)tcp) + 4 * tcp->th_off, length)); } else { strcpy(AVs[current_testno].value, "0");