PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

done updating libpcap and pcre

Browse Source
This commit is contained in:
fyodor
2005-09-11 10:55:03 +00:00
parent d821d2cd44
commit e93e746aa4
17 changed files with 12456 additions and 3179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CHANGELOG
View File

@@ -1,5 +1,23 @@
# Nmap Changelog ($Id$) # Nmap Changelog ($Id$)
o Fixed a crash on Windows when you -P0 scan an unused IP on a local
network (or a range that contains unused IPs). This could also
happen on UNIX if you specified the new --send_eth option. Thanks
to Jim Carras (JFCECL(a)engr.psu.edu) for reporting the problem.
o Fixed compilation on OpenBSD by applying a patch from Okan Demirmen
(okan(a)demirmen.com), who maintains Nmap in the OpenBSD Ports
collection.
o Updated nmap-mac-prefixes to include OUIs assigned by the IEEE since
April.
o Updated the included libpcre (used for version detection) from
version 4.3 to 6.3. A libpcre securty issue was fixed in 6.3, but
that issue never affected Nmap.
o Updated the included libpcap from 0.8.3 to 0.9.3.
Nmap 3.90 Nmap 3.90
o Added the ability for Nmap to send and properly route raw ethernet o Added the ability for Nmap to send and properly route raw ethernet
@@ -60,12 +78,24 @@ o Added 'leet ASCII art to the confugrator! ARTIST NOTE: If you think
only people compiling the UNIX source code get this. (ASCII artist only people compiling the UNIX source code get this. (ASCII artist
unknown). unknown).
o Added OS, device type, and hostname detection using the service
detection framework. Many services print a hostname, which may be
different than DNS. The services often give more away as well. If
Nmap detects IIS, it reports an OS family of "Windows". If it sees
HP JetDirect telnetd, it reports a device type of "printer". Rather
than try to combine TCP/IP stack fingerprinting and service OS
fingerprinting, they are both printed. After all, they could
legitimately be different. An IP that gives a stack fingerprint
match of "Linksys WRT54G broadband router" and a service fingerprint
of Windows based on Kazaa running is likely a common NAT setup rather
than an Nmap mistake.
o Nmap on Windows now compiles/links with the new WinPcap 3.1 o Nmap on Windows now compiles/links with the new WinPcap 3.1
header/lib files. So please upgrade to 3.1 from header/lib files. So please upgrade to 3.1 from
http://www.winpcap.org before installing this version of Nmap. http://www.winpcap.org before installing this version of Nmap.
While older versions may still work, they aren't supported with Nmap. While older versions may still work, they aren't supported with Nmap.
o The official Nmap RPM files are now compiled staticly for better o The official Nmap RPM files are now compiled statically for better
compatability with other systems. X86_64 (AMD Athlon64/Opteron) compatability with other systems. X86_64 (AMD Athlon64/Opteron)
binaries are now available in addition to the standard i386. NmapFE binaries are now available in addition to the standard i386. NmapFE
RPMs are no longer distributed by Insecure.Org. RPMs are no longer distributed by Insecure.Org.

2
Makefile.in
View File

@@ -1,4 +1,4 @@
export NMAP_VERSION = 3.90 export NMAP_VERSION = 3.91
NMAP_NAME= nmap NMAP_NAME= nmap
NMAP_URL= http://www.insecure.org/nmap/ NMAP_URL= http://www.insecure.org/nmap/
NMAP_PLATFORM=@host@ NMAP_PLATFORM=@host@

2
docs/nmap.usage.txt
View File

@@ -1,4 +1,4 @@
Nmap 3.90 Usage: nmap [Scan Type(s)] [Options] <host or net list> Nmap 3.91 Usage: nmap [Scan Type(s)] [Options] <host or net list>
Some Common Scan Types ('*' options require root privileges) Some Common Scan Types ('*' options require root privileges)
* -sS TCP SYN stealth port scan (default if privileged (root)) * -sS TCP SYN stealth port scan (default if privileged (root))
-sT TCP connect() port scan (default for unprivileged users) -sT TCP connect() port scan (default for unprivileged users)

1384
libpcap-possiblymodified/configure vendored
View File

File diff suppressed because it is too large Load Diff

1391
libpcap-possiblymodified/grammar.c
View File

File diff suppressed because it is too large Load Diff

4103
libpcap-possiblymodified/scanner.c
View File

File diff suppressed because it is too large Load Diff

172
libpcap-possiblymodified/tokdefs.h
View File

@@ -9,88 +9,95 @@
#define NET 261 #define NET 261
#define NETMASK 262 #define NETMASK 262
#define PORT 263 #define PORT 263
#define LESS 264 #define PORTRANGE 264
#define GREATER 265 #define LESS 265
#define PROTO 266 #define GREATER 266
#define PROTOCHAIN 267 #define PROTO 267
#define CBYTE 268 #define PROTOCHAIN 268
#define ARP 269 #define CBYTE 269
#define RARP 270 #define ARP 270
#define IP 271 #define RARP 271
#define SCTP 272 #define IP 272
#define TCP 273 #define SCTP 273
#define UDP 274 #define TCP 274
#define ICMP 275 #define UDP 275
#define IGMP 276 #define ICMP 276
#define IGRP 277 #define IGMP 277
#define PIM 278 #define IGRP 278
#define VRRP 279 #define PIM 279
#define ATALK 280 #define VRRP 280
#define AARP 281 #define ATALK 281
#define DECNET 282 #define AARP 282
#define LAT 283 #define DECNET 283
#define SCA 284 #define LAT 284
#define MOPRC 285 #define SCA 285
#define MOPDL 286 #define MOPRC 286
#define TK_BROADCAST 287 #define MOPDL 287
#define TK_MULTICAST 288 #define TK_BROADCAST 288
#define NUM 289 #define TK_MULTICAST 289
#define INBOUND 290 #define NUM 290
#define OUTBOUND 291 #define INBOUND 291
#define PF_IFNAME 292 #define OUTBOUND 292
#define PF_RSET 293 #define PF_IFNAME 293
#define PF_RNR 294 #define PF_RSET 294
#define PF_SRNR 295 #define PF_RNR 295
#define PF_REASON 296 #define PF_SRNR 296
#define PF_ACTION 297 #define PF_REASON 297
#define LINK 298 #define PF_ACTION 298
#define GEQ 299 #define LINK 299
#define LEQ 300 #define GEQ 300
#define NEQ 301 #define LEQ 301
#define ID 302 #define NEQ 302
#define EID 303 #define ID 303
#define HID 304 #define EID 304
#define HID6 305 #define HID 305
#define AID 306 #define HID6 306
#define LSH 307 #define AID 307
#define RSH 308 #define LSH 308
#define LEN 309 #define RSH 309
#define IPV6 310 #define LEN 310
#define ICMPV6 311 #define IPV6 311
#define AH 312 #define ICMPV6 312
#define ESP 313 #define AH 313
#define VLAN 314 #define ESP 314
#define ISO 315 #define VLAN 315
#define ESIS 316 #define MPLS 316
#define CLNP 317 #define ISO 317
#define ISIS 318 #define ESIS 318
#define L1 319 #define CLNP 319
#define L2 320 #define ISIS 320
#define IIH 321 #define L1 321
#define LSP 322 #define L2 322
#define SNP 323 #define IIH 323
#define CSNP 324 #define LSP 324
#define PSNP 325 #define SNP 325
#define STP 326 #define CSNP 326
#define IPX 327 #define PSNP 327
#define NETBEUI 328 #define STP 328
#define LANE 329 #define IPX 329
#define LLC 330 #define NETBEUI 330
#define METAC 331 #define LANE 331
#define BCC 332 #define LLC 332
#define SC 333 #define METAC 333
#define ILMIC 334 #define BCC 334
#define OAMF4EC 335 #define SC 335
#define OAMF4SC 336 #define ILMIC 336
#define OAM 337 #define OAMF4EC 337
#define OAMF4 338 #define OAMF4SC 338
#define CONNECTMSG 339 #define OAM 339
#define METACONNECT 340 #define OAMF4 340
#define VPI 341 #define CONNECTMSG 341
#define VCI 342 #define METACONNECT 342
#define OR 343 #define VPI 343
#define AND 344 #define VCI 344
#define UMINUS 345 #define RADIO 345
#define SIO 346
#define OPC 347
#define DPC 348
#define SLS 349
#define OR 350
#define AND 351
#define UMINUS 352
typedef union { typedef union {
int i; int i;
bpf_u_int32 h; bpf_u_int32 h;
@@ -101,6 +108,7 @@ typedef union {
struct { struct {
struct qual q; struct qual q;
int atmfieldtype; int atmfieldtype;
int mtp3fieldtype;
struct block *b; struct block *b;
} blk; } blk;
struct block *rblk; struct block *rblk;

2
libpcap-possiblymodified/version.h
View File

@@ -1 +1 @@
static const char pcap_version_string[] = "libpcap version 0.8.3"; static const char pcap_version_string[] = "libpcap version 0.9.2";

61
libpcre/libpcre.vcproj
View File

@@ -100,16 +100,58 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File <File
RelativePath=".\get.c"> RelativePath=".\pcre_chartables.c">
</File> </File>
<File <File
RelativePath=".\maketables.c"> RelativePath=".\pcre_compile.c">
</File> </File>
<File <File
RelativePath=".\pcre.c"> RelativePath=".\pcre_config.c">
</File> </File>
<File <File
RelativePath=".\study.c"> RelativePath=".\pcre_dfa_exec.c">
</File>
<File
RelativePath=".\pcre_exec.c">
</File>
<File
RelativePath=".\pcre_fullinfo.c">
</File>
<File
RelativePath=".\pcre_get.c">
</File>
<File
RelativePath=".\pcre_globals.c">
</File>
<File
RelativePath=".\pcre_info.c">
</File>
<File
RelativePath=".\pcre_maketables.c">
</File>
<File
RelativePath=".\pcre_printint.c">
</File>
<File
RelativePath=".\pcre_refcount.c">
</File>
<File
RelativePath=".\pcre_study.c">
</File>
<File
RelativePath=".\pcre_tables.c">
</File>
<File
RelativePath=".\pcre_try_flipped.c">
</File>
<File
RelativePath=".\pcre_version.c">
</File>
<File
RelativePath=".\pcre_xclass.c">
</File>
<File
RelativePath=".\pcreposix.c">
</File> </File>
</Filter> </Filter>
<Filter <Filter
@@ -117,7 +159,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File <File
RelativePath=".\internal.h"> RelativePath=".\pcre.h">
</File>
<File
RelativePath=".\pcre_internal.h">
</File> </File>
<File <File
RelativePath=".\pcre_win.h"> RelativePath=".\pcre_win.h">
@@ -125,6 +170,12 @@
<File <File
RelativePath=".\pcre_winconfig.h"> RelativePath=".\pcre_winconfig.h">
</File> </File>
<File
RelativePath=".\pcreposix.h">
</File>
<File
RelativePath=".\ucp.h">
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

12
libpcre/pcre.h
View File

@@ -48,17 +48,7 @@ make changes to pcre.in. */
/* Win32 uses DLL by default; it needs special stuff for exported functions. */ /* Win32 uses DLL by default; it needs special stuff for exported functions. */
#ifdef _WIN32 /* Removed -- Fyodor */
# ifdef PCRE_DEFINITION
# ifdef DLL_EXPORT
# define PCRE_DATA_SCOPE __declspec(dllexport)
# endif
# else
# ifndef PCRE_STATIC
# define PCRE_DATA_SCOPE extern __declspec(dllimport)
# endif
# endif
#endif
/* For other operating systems, we use the standard "extern". */ /* For other operating systems, we use the standard "extern". */

1
libpcre/pcre_winconfig.h
View File

@@ -1,3 +1,4 @@
#define EXPORT
#define HAVE_STRERROR 1 #define HAVE_STRERROR 1
#define HAVE_MEMMOVE 1 #define HAVE_MEMMOVE 1

1011
nmap-mac-prefixes
View File

File diff suppressed because it is too large Load Diff

2
nmap_winconfig.h
View File

@@ -104,7 +104,7 @@
#ifndef NMAP_WINCONFIG_H #ifndef NMAP_WINCONFIG_H
#define NMAP_WINCONFIG_H #define NMAP_WINCONFIG_H
#define NMAP_VERSION "3.90" #define NMAP_VERSION "3.91"
#define NMAP_NAME "nmap" #define NMAP_NAME "nmap"
#define NMAP_URL "http://www.insecure.org/nmap" #define NMAP_URL "http://www.insecure.org/nmap"
#define NMAP_PLATFORM "i686-pc-windows-windows" #define NMAP_PLATFORM "i686-pc-windows-windows"

20
scripts/Makefile
View File

@@ -135,15 +135,17 @@ distro:
*.c *.h CHANGELOG /usr/tmp/nmap-$(NMAP_VERSION)/nbase *.c *.h CHANGELOG /usr/tmp/nmap-$(NMAP_VERSION)/nbase
$(SHTOOL) mkdir /usr/tmp/nmap-$(NMAP_VERSION)/libpcre $(SHTOOL) mkdir /usr/tmp/nmap-$(NMAP_VERSION)/libpcre
cd ../libpcre; cp -ra AUTHORS chartables.c config.guess config.in \ cd ../libpcre; cp -ra AUTHORS config.guess config.in config.sub \
config.sub configure configure.ac COPYING dftables.c \ configure configure.ac dftables.c INSTALL install-sh \
get.c INSTALL install-sh internal.h libpcre.vcproj \ libpcre.vcproj LICENCE Makefile.in makevp.bat mkinstalldirs \
LICENCE ltmain.sh Makefile.in maketables.c makevp.bat \ NMAP_MODIFICATIONS NON-UNIX-USE pcre_chartables.c \
mkinstalldirs NEWS NMAP_MODIFICATIONS NON-UNIX-USE \ pcre_compile.c pcre_config.c pcre_dfa_exec.c pcre_exec.c \
pcre.c pcre-config.in pcre.def pcre.h pcre.in \ pcre_fullinfo.c pcre_get.c pcre_globals.c pcre.h pcre.in \
pcre_win.h pcre_winconfig.h pcreposix.c pcreposix.h \ pcre_info.c pcre_internal.h pcre_maketables.c pcreposix.c \
perltest printint.c README study.c \ pcreposix.h pcre_printint.c pcre_refcount.c pcre_study.c \
/usr/tmp/nmap-$(NMAP_VERSION)/libpcre pcre_tables.c pcre_try_flipped.c pcre_version.c \
pcre_winconfig.h pcre_xclass.c README ucp.h \
/usr/tmp/nmap-$(NMAP_VERSION)/libpcre
$(SHTOOL) mkdir /usr/tmp/nmap-$(NMAP_VERSION)/libdnet-stripped $(SHTOOL) mkdir /usr/tmp/nmap-$(NMAP_VERSION)/libdnet-stripped
cd ../$(LIBDNETDIR); cp -ra NMAP_MODIFICATIONS \ cd ../$(LIBDNETDIR); cp -ra NMAP_MODIFICATIONS \

7432
scripts/oui.txt
View File

File diff suppressed because it is too large Load Diff

2
targets.cc
View File

@@ -423,7 +423,7 @@ if (hs->randomize) {
/* TODO: Maybe I should allow real ping scan of directly connected /* TODO: Maybe I should allow real ping scan of directly connected
ethernet hosts? */ ethernet hosts? */
/* Then we do the mass ping (if required - IP-level pings) */ /* Then we do the mass ping (if required - IP-level pings) */
if (*pingtype == PINGTYPE_NONE || hs->hostbatch[0]->ifType() == devt_loopback) { if ((*pingtype == PINGTYPE_NONE && !arpping_done) || hs->hostbatch[0]->ifType() == devt_loopback) {
for(i=0; i < hs->current_batch_sz; i++) { for(i=0; i < hs->current_batch_sz; i++) {
initialize_timeout_info(&hs->hostbatch[i]->to); initialize_timeout_info(&hs->hostbatch[i]->to);
hs->hostbatch[i]->flags |= HOST_UP; /*hostbatch[i].up = 1;*/ hs->hostbatch[i]->flags |= HOST_UP; /*hostbatch[i].up = 1;*/

6
tcpip.cc
View File

@@ -1607,7 +1607,8 @@ if (timedout) {
gettimeofday(&tv_end, NULL); gettimeofday(&tv_end, NULL);
*rcvdtime = tv_end; *rcvdtime = tv_end;
#else #else
*rcvdtime = head.ts; rcvdtime->tv_sec = head.ts.tv_sec;
rcvdtime->tv_usec = head.ts.tv_usec;
assert(head.ts.tv_sec); assert(head.ts.tv_sec);
#endif #endif
} }
@@ -1778,7 +1779,8 @@ int read_arp_reply_pcap(pcap_t *pd, u8 *sendermac, struct in_addr *senderIP,
gettimeofday(&tv_end, NULL); gettimeofday(&tv_end, NULL);
*rcvdtime = tv_end; *rcvdtime = tv_end;
#else #else
*rcvdtime = head.ts; rcvdtime->tv_sec = head.ts.tv_sec;
rcvdtime->tv_usec = head.ts.tv_usec;
assert(head.ts.tv_sec); assert(head.ts.tv_sec);
#endif #endif
} }