PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-20 22:49:01 +00:00
Code Issues Projects Releases Wiki Activity

o Made the interface gathering loop work on Linux when an interface

Browse Source 
index is more than two digits in /proc/sys/if_inet6. Joe McEachern
  tracked down the problem and provided the fix.
This commit is contained in:
david
2011-09-25 19:14:33 +00:00
parent 0fe496bcbc
commit 032caee6ac
3 changed files with 19 additions and 1 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-*- # Nmap Changelog ($Id$); -*-text-*-
o Made the interface gathering loop work on Linux when an interface
index is more than two digits in /proc/sys/if_inet6. Joe McEachern
tracked down the problem and provided the fix.
o [NSE] Added ssl-google-cert-catalog.nse which queries the Google SSL o [NSE] Added ssl-google-cert-catalog.nse which queries the Google SSL
certificates catalog for each discovered certificate. [Vasiliy Kulikov] certificates catalog for each discovered certificate. [Vasiliy Kulikov]

14
libdnet-stripped/NMAP_MODIFICATIONS
View File

@@ -561,6 +561,20 @@ Index: include/dnet/sctp.h
/* empty */ /* empty */
} __attribute__((__packed__)); } __attribute__((__packed__));
o Allowed reading interface indexes that exceed 255 on Linux.
--- libdnet-stripped/src/intf.c
+++ libdnet-stripped/src/intf.c
@@ -560,7 +560,7 @@ _intf_get_aliases(intf_t *intf, struct intf_entry *entry)
if ((f = fopen(PROC_INET6_FILE, "r")) != NULL) {
while (ap < lap &&
fgets(buf, sizeof(buf), f) != NULL) {
- sscanf(buf, "%04s%04s%04s%04s%04s%04s%04s%04s %02x %02x %02x %02x %32s\n",
+ sscanf(buf, "%04s%04s%04s%04s%04s%04s%04s%04s %x %02x %02x %02x %32s\n",
s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7],
&idx, &bits, &scope, &flags, name);
if (strcmp(name, entry->intf_name) == 0) {
===CHANGES ALREADY MERGED TO UPSTREAM LIBDNET GO BELOW THIS LINE=== ===CHANGES ALREADY MERGED TO UPSTREAM LIBDNET GO BELOW THIS LINE===
o Fixed the ip6_pack_hdr macro with respect to traffic class and flow o Fixed the ip6_pack_hdr macro with respect to traffic class and flow

2
libdnet-stripped/src/intf.c
View File

@@ -560,7 +560,7 @@ _intf_get_aliases(intf_t *intf, struct intf_entry *entry)
if ((f = fopen(PROC_INET6_FILE, "r")) != NULL) { if ((f = fopen(PROC_INET6_FILE, "r")) != NULL) {
while (ap < lap && while (ap < lap &&
fgets(buf, sizeof(buf), f) != NULL) { fgets(buf, sizeof(buf), f) != NULL) {
sscanf(buf, "%04s%04s%04s%04s%04s%04s%04s%04s %02x %02x %02x %02x %32s\n", sscanf(buf, "%04s%04s%04s%04s%04s%04s%04s%04s %x %02x %02x %02x %32s\n",
s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7], s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7],
&idx, &bits, &scope, &flags, name); &idx, &bits, &scope, &flags, name);
if (strcmp(name, entry->intf_name) == 0) { if (strcmp(name, entry->intf_name) == 0) {