1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 22:21:29 +00:00
Commit Graph

167 Commits

Author SHA1 Message Date
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
ithilgore
860686e001 Changed the Makefile default paths according to the discussion here: http://seclists.org/nmap-dev/2009/q3/0449.html
Unfortunately, it seems cygwin doesn't know how to expand a variable like %ProgramFiles% so that the Makefile would be locale-agnostic, so I just modified it for the most common version of "Program Files".
2009-08-08 01:33:21 +00:00
jah
bfa1e3ef9b Added a note that the registry details for Redist package need updating
whenever the Redist package is upgraded.
2009-07-15 22:27:34 +00:00
jah
b1ca97694d Update the uninstall registry key for the upgraded vcredist_x86.exe package
(r13075).
(See http://seclists.org/nmap-dev/2009/q3/0164.html )
2009-07-15 22:04:53 +00:00
david
73fd225180 Add payload.cc and payload.h to the Windows build file. 2009-07-08 21:47:35 +00:00
batrick
68bf664db6 [NSE] Applied change to remove the old nse_macros.h header file.
Here is a mostly exhaustive list of the changes:

o Removes the SCRIPT_ENGINE_* status defines and replaces the
  instances with regular boolean integer returns or changes the
  procedure to return void. The latter case is better generally because
  the caller ignores any status return (e.g. nmap.cc calling open_nse)
  and/or the procedure raises a fatal error when unsuccessful.

o Moves the SCRIPT_ENGINE_LUA_DIR and the like to the nse_main.h header file.

o Removes the use of the SCRIPT_ENGINE_TRY (there was only one left)
  and thus changes the call to l_dnet_open to a void function called
  directly by luaopen_nsock (in nse_nsock.cc) instead of luaopen_nmap
  (in nse_nmaplib.cc). I felt moving the function was also an
  appropriate (but somewhat unrelated to the intent of the patch) change
  as opening the dnet metatable is very related to opening up the
  nsock library. This confines errors in opening the nsock library, including
  opening the dnet metatable, to the call to luaopen_nsock.

o The FILES and DIRS defines are moved in to nse_fs.h where they are
  more appropriate and localalized.
2009-06-07 01:25:53 +00:00
david
5cb872a499 Fix a typo in a comment. 2009-05-25 01:49:27 +00:00
jah
4f1e6e743c Added uninstall entry for ca-bundle.crt (CAs for Ncat on Win32) to NSIS script. 2009-05-16 15:30:57 +00:00
david
b4243e23f2 Fix all the compiler warnings when building with Visual C++ 2008. 2009-04-29 17:56:30 +00:00
david
79fa5e0e1d Add a default bundle of trusted CA certificates for Ncat, extracted from
Windows. Use this bundle if no other was specified with --ssl-trustfile.
Instructions for extracting the certificates are included. I have to go back
now and make this compile on Unix.
2009-04-29 03:36:26 +00:00
fyodor
5cdff73553 latest version number 2009-04-25 21:20:53 +00:00
fyodor
bc7fc4399e Upgrade vcredist_x86.exe from the Visual C++ 2008 version to Visual C++ 2008 SP1. I'm currently testing compilation with that compiler version. If it causes problems, I'll revert this change. 2009-04-25 20:23:50 +00:00
fyodor
d0e21e1d03 Suggest that people send patches to nmap-dev rather than to me directly 2009-04-15 00:37:03 +00:00
jah
7a23fa793e Added nse_main.lua to NSIS installer and zip package. 2009-04-05 20:09:51 +00:00
jah
8017d98f9f Remove nse_init.cc and nse_init.h from nmap.vcproj - files deleted during
nse-lua-merge in r12887
2009-04-05 19:50:32 +00:00
fyodor
eccc235d5a Increase copyright year to 2009, simplify/reword some derivative works text, and remove a confusing clause about selling proprietary front-ends to Nmap 2009-03-31 04:16:12 +00:00
fyodor
5e5d997335 Add back the -r option to zip so that it recurses into the directory 2009-03-15 23:29:03 +00:00
fyodor
5924490adf Include the brief Ncat/Ndiff descriptions 2009-02-27 09:24:24 +00:00
david
827bf68360 Remove nmap-$(NMAP_VERSION)-win32.zip before rebuilding. If this isn't done,
then old files that were in a previous build can be in the zip file of a new
build that doesn't have those files anymore. When the zip command sees an
existing archive, it modifies the archive rather than rebuilding it from
scratch.
2009-02-16 19:04:41 +00:00
david
de3b94ac54 Remove the /OPT:NOWIN98 option from the Windows linker options. This gets rid
of a warning:
6>Linking...
6>LINK : warning LNK4224: /OPT:NOWIN98 is no longer supported;  ignored
2009-02-16 18:50:36 +00:00
david
eaccd9175e Use a command chain after the endlocal in python-wrap.bat to allow ndiff's exit
code to propagate.
2009-02-05 01:39:02 +00:00
david
7f3effda4a o [Ndiff] Ndiff is now included in the Windows zip distribution. For
space reasons, it is not an executable compiled with py2exe as in
  the executable installer, rather it is the Ndiff source code
  (ndiff.py) and a batch file wrapper (ndiff.bat). Because it's not
  precompiled, it's necessary to have a Python interpreter
  installed. [David]
2009-02-04 22:48:21 +00:00
david
d830039182 Remove the creation of the obsolete zenmap directory. It wasn't copied into the
installed files anyway.
2009-02-03 19:41:36 +00:00
fyodor
c23d98cae5 o Revert the temporary GTK DLL workaround (r11899) which added
duplicate DLL files to the distribution.  David found that using a
  different GTK download fixed the problem (see
  docs/win32-installer-zenmap-buildguide.txt) and Fyodor was able to
  reproduce and implement.
2009-02-03 02:03:48 +00:00
kris
006b5b863b Upgrading shipped OpenSSL for Windows to 0.9.8j 2009-02-02 18:41:34 +00:00
fyodor
f8ef303b3a as a temporary hack measure until we find a better solution, include extra copies of some GTK DLLs 2009-01-30 04:47:57 +00:00
fyodor
f55cfe34a3 move the win32 build guide to the docs directory 2009-01-24 20:38:50 +00:00
fyodor
bc40f29c12 Update Zenmap build guide for latest requirements 2009-01-24 20:22:37 +00:00
fyodor
c3dd2ca0f9 Remove msvcr71.dll stuff since I'm not sure we need it and my new py2exe doesn't copy it over 2009-01-24 02:02:38 +00:00
fyodor
127e05713b change the python25.dll to python26.dll 2009-01-24 00:06:28 +00:00
fyodor
8daf8b1474 o Update Windows installer to handle Windows 7 (tested with the Beta
build 7000) [Rob Nicholls]
2009-01-22 19:38:29 +00:00
david
b87ef8aabd Give a better error message "requires root privileges" when trying to run a raw
scan on Windows with --unprivileged. Previously Nmap assumed that the only way
o.isr00t could be false on Windows was if pcap functions were not available, so
the user would get the false message "requires that WinPcap version 3.1 or
higher...". NmapOps now has a state variable have_pcap so the meaning of isr00t
isn't overloaded.
2008-11-20 00:15:42 +00:00
david
66c775ad96 Remove some commented-out code from mswin32/nsis/Nmap.nsi that associated the
file extension .usr with Zenmap. We don't use .usr any more.
2008-10-08 22:51:05 +00:00
sven
d8714befb1 merging nse_openssl branch 2008-10-08 22:21:41 +00:00
david
8d6a1c4df1 Make ncat depend on nsock in nmap.sln. Previously it depended on liblua for
some reason. I needed this because I got

6>LINK : fatal error LNK1104: cannot open file 'nsock.lib'
6>Build log was saved at "file://c:\cygwin\home\david\nmap\ncat\Release\BuildLog.htm"
6>ncat - 1 error(s), 1 warning(s)

the first time I built the solution after cleaning. I had to build it a second
time to let ncat find nsock.lib.
2008-09-19 18:59:11 +00:00