1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 06:01:28 +00:00
Commit Graph

401 Commits

Author SHA1 Message Date
david
ce075558de Include third-part license notices in Windows packages. 2010-10-14 05:22:42 +00:00
david
8d6d0c1c17 Revert r20239 (OpenSSL 1.0.0a upgrade) in mswin32/nmap.vcproj. This was an unrelated change not to discard preprocessor files. 2010-09-23 02:38:34 +00:00
batrick
de4ba536de Merge from /nmap-exp/patrick/nse-nsock-maintenance.
This is a maintenance fix for the NSE Nsock library binding. The patch focuses
on code correctness and simplicity. The patch also brings some initial updates
with an eye towards the upcoming Lua 5.2 release. See [1] for a post concerning
this branch.

[1] http://seclists.org/nmap-dev/2010/q3/710
2010-09-18 20:35:09 +00:00
david
745a49d24a Upgrade the included Windows OpenSSL to version 1.0.0a. 2010-09-16 03:49:43 +00:00
david
1ff33d9d50 Update version numbers in Windows build files. 2010-09-15 23:58:10 +00:00
david
47bc61d69d Restrict the search path for DLLs to prevent DLL hijacking. If the
SetDllDirectory function is available, as it is on Windows XP SP1 and later,
use it to remove the current directory from the DLL search path. If the
function is not available, call SetCurrentDirectory to the directory containing
the executable.

I believe that such an attack is not currently possible against Nmap, because
it doesn't register any file type associations. This protects us in case such
associations are added in the future.
2010-09-04 04:52:23 +00:00
david
11a738ab33 Define dependencies for the nping project. 2010-09-04 02:13:54 +00:00
david
5246761a67 Fix a couple of typos. 2010-09-04 01:10:56 +00:00
robert
4ce404f214 Enabled ASLR and DEP for Nmap.exe, Ncat.exe and Nping.exe on Windows Vista and above. Visual C++ will set the /DYNAMICBASE and /NXCOMPAT flags in the PE header. Executables generated using py2exe or NSIS and third party binaries (OpenSSL, WinPcap) still don't support ASLR or DEP. Support for DEP on XP SP3, using SetProcessDEPPolicy(), could still be implemented. See http://seclists.org/nmap-dev/2010/q3/328 2010-08-12 14:01:16 +00:00
robert
e8aab6daac Nmap's version of the WinPcap installer has been updated to 4.1.2. 2010-07-15 17:25:24 +00:00
david
d8f2dd538a Use lzma compression in the winpcap-nmap.nsi too. This reduces the size of the
winpcap-nmap installer itself from 720288 to 433535 bytes (60%) and the nmap
installer from 14225186 to 13947278 bytes (98%).
2010-06-30 15:04:42 +00:00
david
cd29377b15 Use lzma whole-file compression in the Windows installer, instead of the
default zlib. The lzma-compressed installer is 15% smaller than the zlib one.
See http://seclists.org/nmap-dev/2010/q2/1011 for test results.
2010-06-30 14:55:12 +00:00
david
6df527a98c Update version number in nmap.rc and Nmap.nsi. 2010-06-30 14:50:00 +00:00
luis
da126c8b78 Merged nmap-dedup branch from nmap-exp/luis/nmap-dedup. This completes the Nmap/Nping code de-duplication phase. 2010-06-22 17:24:34 +00:00
david
82e2cc323d Copy the nselib directory as we do in the POSIX makefile, to avoid installing
.svn directories. These were previously present in the Windows zip file, in the
nselib/data and nselib/data/psexec directories.
2010-06-11 22:39:10 +00:00
david
7c790dbf3b Update pcap-int.h from http://www.winpcap.org/install/bin/WpcapSrc_4_1_1.zip.
We use this file to get at the LPADAPTER member of struct pcap on Windows,
which we need in order to pass to PacketSetReadTimeout in a few places.
(Normally pcap_t is an opaque type so we're not supposed to see inside it.) I
don't see an easy way to get rid of the calls to PacketSetReadTimeout right
now.
2010-06-07 20:34:33 +00:00
david
2501b14e23 Remove nbase/Gnuc.h. This doesn't seem to actually be required for anything. It
was originally part of WinPcap, currently at
http://www.winpcap.org/install/bin/WpcapSrc_4_1_1.zip in
winpcap/wpcap/libpcap/Win32/Include/Gnuc.h.
2010-06-07 19:43:41 +00:00
robert
3859e3dc64 Latest version number. 2010-06-07 07:05:48 +00:00
fyodor
247d4ef9fb I don't think the mswin32/ARPA directory is required. At least none of our files seem to include nameser.h or tftp.h, and it compiles fine without this on my Windows 7 box. If it turns out there is some need for it, we can put it back 2010-05-28 02:06:08 +00:00
fyodor
10a083501f Update to latest version of pcap include files from the official pcap developer pack version 4.1.1 (http://www.winpcap.org/install/bin/WpdPack_4_1_1.zip) include directory. Keeping pcap-int.h for now as we currently need it for compilation, though it seems a bit sketchy. I'm going to add a TODO task related to that 2010-05-28 01:50:37 +00:00
fyodor
bb100f1bbc Moved Gnuc.h from mswin32/pcap-include to nbase, since it is a portability file for Windows and I don't think it is really related to pcap (at least it isn't included in 4.1.1 official Pcap developer pack 2010-05-28 01:42:14 +00:00
david
7b1a1d46f8 Add nmap-payloads to the Windows build. 2010-05-25 18:51:44 +00:00
david
63e86580e5 Use $INSTDIR instead of a hardcoded $PROGRAMFILES/WinPcap or
$PROGRAMFILES64/WinPcap. Set $INSTDIR to $PROGRAMFILES/WinPcap or
$PROGRAMFILES64/WinPcap depending, but don't modify it if it already has a
value (from /D= on the command line). These changes make /D= work to install a
few files into an alternate directory.
2010-05-05 20:38:57 +00:00
david
07f3164937 Expand tabs and remove trailing whitespace in winpcap-nmap.nsi. 2010-05-05 17:43:20 +00:00
fyodor
1aecac420f Update copyright year from 2009 to 2010 2010-05-03 21:20:25 +00:00
david
5fdf2aed63 Document the /D option in Nmap.nsi. It is a built-in NSIS option to set the
installation directory, but it has some restrictions:

;;  It must be the last parameter used in the command line and must not
;;  contain any quotes, even if the path contains spaces. Only absolute
;;  paths are supported.
2010-04-30 13:55:08 +00:00
david
df2344e6d4 Add new options to the Windows setup.exe installer.
;;   /NMAP=NO          don't install Nmap
;;   /REGISTERPATH=NO  don't add the installation directory to PATH
;;   /WINPCAP=NO       don't install WinPcap
;;   /REGISTRYMODS=NO  don't install performance-related registry mods
;;   /ZENMAP=NO        don't install Zenmap
;;   /NCAT=NO          don't install Ncat
;;   /NDIFF=NO         don't install Ndiff
;;   /NPING=NO         don't install Nping
2010-04-27 18:02:41 +00:00
david
8767fb6659 Fix typo. 2010-04-26 19:21:54 +00:00
david
522fe57eac Document options in Nmap.nsi. 2010-04-26 19:21:39 +00:00
robert
f5e3cee4ac Simplified call to WinPcap installer during silent installs, now that the installation directory is no longer required (our WinPcap installer handles it all internally). 2010-04-24 20:48:57 +00:00
david
859ef5ecaf Merge r17202:17298 from /nmap-exp/david/nmap-xml. This brings in
structured XML output, automatic closing of XML elements on error, and
inclusion of error messages in XML output.
2010-04-14 01:05:51 +00:00
david
68f3bca589 Add new packaging of x64 WinPcap drivers from Rob Nicholls. He observed that
64-bit applications wouldn't work using Nmap's installed WinPcap. This fixes
that.
2010-03-17 05:19:08 +00:00
david
eb15f3ae27 Update vcredist_x86.exe to version 9.0.30729.4148. Axel Pettinger reported that
the previous version, 9.0.30729.17, causes a Windows Update when installed on
Windows 7 because the old version was the subject of security advisory
MS09-035. See http://seclists.org/nmap-dev/2010/q1/528 for lots of links and
details.

The file I downloaded was from

"Microsoft Visual C++ 2008 Service Pack 1 Redistributable Package ATL Security Update"
http://www.microsoft.com/downloads/details.aspx?familyid=2051a0c1-c9b5-4b0a-a8f5-770a549fd78c&displaylang=en

Specifically,

http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/vcredist_x86.exe
2010-03-03 00:25:28 +00:00
david
a669c3a39f Merge r16779:16804 from /nmap-exp/david/nmap-nping. This adds Nping
into the standard distribution.
2010-02-17 01:46:34 +00:00
david
fb56e85681 Remove an NSI label that's now unused. 2010-01-15 20:15:49 +00:00
david
d7b920cae6 Initialize our NPF/Start registry key with the value 3 (SERVICE_DEMAND_START)
before possibly changing it to 2 (SERVICE_AUTO_START) at the user's request.
This ensures that if the "Start NPF service at boot" option is unchecked, the
NPF service will not start at boot, even if WinPcap was previously installed
that way. The patch is by Rob Nicholls.
2010-01-15 20:14:15 +00:00
david
26016007a2 o Fixed a bug in the WinPcap installer: If the "Start the WinPcap
service 'NPF' at startup" box was unchecked and the "Start the
  WinPcap service 'NPF' now" box was checked, the second checkbox
  would be ignored (the service would not be started now). [Rob
  Nicholls]
2010-01-15 20:06:15 +00:00
david
ab3b1f409d Don't try to start NPF if o.isr00t is false (in other words, the --unprivileged
option was used). This idea was from Michael Pattrick.
2010-01-15 19:58:57 +00:00
david
15c2f0368b Add the /NPFSTARTUP=NO option to the Nmap installer, to be passed to the
WinPcap installer if appropriate.
2010-01-15 06:24:11 +00:00
david
598b9e5a77 Add an option /NPFSTARTUP=NO to the WinPcap installer. During a silent install,
this option stops NPF from being started and from being installed to start at
startup.
2010-01-15 06:11:08 +00:00
david
d541e795ba Give more information about possible causes and solutions when WinPcap fails to
load on Windows, in particular information about the NPF service and UAC.
2010-01-15 05:39:25 +00:00
david
ecca7974a9 Add a function to winfix.cc that checks if the NPF service is running and tries
to start it (with elevated privileges) if not.
2010-01-15 03:54:26 +00:00
david
ae74adfd8d Add the /s and /e options to xcopy when copying the nselib/data directory, so
we get the contents of the psexec subdirectory.
2010-01-01 05:39:15 +00:00
fyodor
a2b0f3b0fe grab VC express install location from registry rather than hard coding it, as even the default differs by platform 2009-11-16 08:30:04 +00:00
fyodor
a78bcee9b9 Applied patch rom Rob Nicholls which updates our Winpcap installer to
set some Windows registry keys for compatibility with the official
Winpcap project installer.  See this thread:
http://seclists.org/nmap-dev/2009/q4/237
2009-11-09 08:32:01 +00:00
fyodor
36ff94f9b1 Made some changes suggested by Jah at http://seclists.org/nmap-dev/2009/q4/173, but I didn't make all of them because the file has also been changed by Rob and I'm not sure which still apply 2009-10-25 23:45:51 +00:00
fyodor
cef7b83a8a Delete WanPacket.dll as it is apparently no longer used 2009-10-25 23:42:27 +00:00
fyodor
9cd76905a1 Applied Winpcap installer patch from Rob Nicholls which:
o UPgrades to latest version of WinPcap (4.1.1)

o corrects a long-standing bug in our WinPcap installer (we surrounded
  the install path in the registry with double quotes, which meant we
  wouldn't uninstall our older versions during an install)

o removed the GUI option to select where the WinPcap files are
  installed (all of the important ones end up in the Windows directory
  anyway).  WinPcap folder is installed in the same Program Files
  location on x64 platforms as the official WinPcap installer uses
  (although we're not sure that is the best place)

o Rob notes that he's successfully tested the installer on XP SP3,
  2003 SP2 x86, Vista SP2 x86 and Windows 7 x64
2009-10-25 23:26:40 +00:00
fyodor
aee2d3825a Add some extra debug information related to the Windows version detected
by the installer.  Also notes that we recommend starting the WinPcap service at system startup for Windows 7 as well as vista.  The patch is from Rob Nicholls.
2009-09-23 00:31:17 +00:00
david
4768c00631 Make some changes to nse_ssl_cert.cc for Windows compilation. 2009-08-14 04:44:19 +00:00