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

135 Commits

Author SHA1 Message Date
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
kris
89cc8091ba Upgrading shipped OpenSSL for Windows to 0.9.8i, which contains
some bug fixes and precautionary measures.  A 0.9.9 release is
already mentioned in their online changelog (with a whole lot
of entries), but there is no set release date that I've seen.

Tested on XP with Nmap and Ncat.
2008-09-18 21:47:45 +00:00
david
1073c8283a Merge from /nmap-exp/david/nmap-ndiff and /nmap-exp/david/zenmap-ndiff. 2008-09-18 15:51:40 +00:00
kris
58057e4b07 Copying over nsis changes for adding Ncat to the Windows installer.
Somehow I missed some Windows changes but not others...
2008-09-16 02:04:33 +00:00
kris
c74ce1f424 Adding Ncat to /nmap. This should have Ncat in the regular build systems for
Windows and UNIX, and install/distro system for the source tarball, RPM, OS X
installer (thanks to David) and the Windows installer.

configure --without-ncat keeps it out on Unix
2008-09-16 01:34:28 +00:00
david
3a6873fcbf Automatic update of version numbers in mswin32/nmap.rc and
mswin32/nsis/Nmap.nsi.
2008-09-15 19:18:58 +00:00
fyodor
fb1c9ce619 o Nmap's Windows self-installer now correctly registers/deletes the
npf (Winpcap) service during install/uninstall. Also the silent
  install mode was improved to avoid a case where the Winpcap
  uninstaller was (non-silently) shown. [Rob Nicholls]
2008-09-11 19:41:13 +00:00
david
ab4c4c141e Remove Psyco from the list of dependencies in mswin32/buildguide.txt. 2008-09-09 23:34:34 +00:00
fyodor
bb9ea123e2 o Nmap's Windows self-installer now checks whether the MS Visual C++
runtime components have already been installed to avoid running it
  again (which doesn't hurt anything, but slows down
  installation). [Rob Nicholls]
2008-09-09 07:26:53 +00:00
david
6aa016fb64 In Nmap.nsi, remove the nselib-bin directory before installing but not when
uninstalling (it would have already been removed). I put in a comment
explaining that nselib-bin used to be used but isn't any longer. Thanks to jah
for the suggestion.
2008-09-05 16:47:54 +00:00
david
fbceb0061b Remove bitlib from mswin32/nmap.sln. The patch is from Rob Nicholls. 2008-09-05 16:40:30 +00:00
david
b3eddfe90a Remove the nselib-bin directory. Almost all references to it have been removed
too. The section in scripting.xml about creating C modules is gone. (But maybe
it should be replaced with a tutorial on making static modules?) The only
places where nselib-bin is still referenced are in mswin32/nsis/Nmap.nsi, where
it is still removed on uninstallation; and in mswin32/nmap.vcproj, from where I
don't have the resources now to remove it.
2008-09-05 05:32:06 +00:00
fyodor
a6b976cc89 add xcopy command to post-build event to copy nselib/data directory in Windows builds. Patch from Jah. 2008-08-29 08:58:53 +00:00
batrick
684857c11c Fixed a syntax error in the VCPROJ file. 2008-08-27 22:24:59 +00:00
batrick
8a44c9432d Updated NSE's bit library to no longer be a shared library.
See this thread: http://seclists.org/nmap-dev/2008/q3/0404.html
2008-08-27 22:23:50 +00:00
pgpickering
f07cebb87f modified nmap.vcproj, added binlib and hashlib for NSE 2008-07-31 14:20:45 +00:00
david
4480ce022d Adjust licformat.sh to allow running it from a directory other than mswin32. 2008-07-11 20:52:17 +00:00
michael
1b9b15f45a The licence formatting sed scripts are now compatible with gnu and bsd sed, so they can now be used to build a macOSX installer 2008-07-11 20:02:09 +00:00
kris
3daeae2fc5 Instead of having my_close() in mswin32/winfix.cc (which only calls closesocket()),
and having close() #defined to my_close() in nbase_winunix.h, I'm just defining close()
to closesocket() in nbase_winunix.h and removing my_close() from winfix.cc.  I'm also
defining EWOULDBLOCK to WSAEWOULDBLOCK in nbase_winunix.h.

Nmap builds fine with these changes, and since it's just defining close() to something
that already exists, it shouldn't negatively affect other branches.

These are things I noticed while trying to cleanly "re-port" Ncat to VC++2008.
2008-07-10 03:20:38 +00:00
batrick
3ae4bcfa9e Removed nse_string. Equivalent procedures are placed in
nse_main and nse_nsock. nse_main now uses Lua to create printable output
while a cleaner hexify procedure has been placed in nsock.
nse_string is removed as a result.
2008-07-07 17:31:38 +00:00
fyodor
2c4f8d1a67 o The Nmap Windows self-installer now automatically installs the MS
Visual C++ 2008 runtime components if they aren't already installed
  on a system.  These are some reasonably small DLLs that are
  generally necessary for applications compiled with Visual C++ (with
  dynamic linking).  Many or most systems already have these installed
  from other software packages.  The lack of these components led to
  the error message "The Application failed to intialize properly
  (0xc0150002)." with Nmap 4.65.  A related change is that Nmap on
  Windows is now compiled with /MD rather than /MT so that it
  consistently uses these runtime libraries.  The patch was created by
  Rob Nicholls.
2008-06-29 04:52:00 +00:00
kris
bc0826654a The WinPcap Windows installer now has x64 npf.sys support. Thanks for Rob Nicholls for the patch. 2008-06-17 21:02:40 +00:00
kris
3ddaa848eb Recompiled OpenSSL with VC++2008 and updated upgrade-guide.txt to reflect build changes between VC++2005 and 2008. I meant to do this sooner, but it slipped my mind. Thanks to Thomas and Jah for discussing it. 2008-06-15 02:36:15 +00:00
kris
44f6087b94 Merging changes from my vc2008-testing branch. This moves Windows development
to VC++2008.
2008-06-13 05:58:11 +00:00
kris
32e8249c80 Upgrading shipped mswin32 OpenSSL headers and libraries to newest 0.9.8h (thanks to Jah for noticing the new release) 2008-06-01 15:09:17 +00:00
fyodor
cdcf26d420 Win32 installer improvements:
o Our WinPcap installer now starts the NPF driver running as a
  service immediately upon installation and after restarts. You can
  disable this with new checkboxes. This behavior is important for
  Vista and Windows Server 2008 machines when User Account
  Control (UAC) is enabled. [Rob Nicholls]

o Nmap and Nmap-Winpcap silent installation now works.  Nmap can
  be silently installed with the /S option to the installer.
  If you install Nmap from the zip file, you can install just
  Winpcap silently with the /S option to that
  installer. [Rob Nicholls]

o Our WinPcap installer is now included with the Nmap Win32 zip
  file. [Fyodor]

o Numerous miscellaneous improvements were made to our Win32
  installer, such as using the "Modern" NSIS UI for WinPcap,
  improving the option description labels, and showing a finish
  page in all cases. [Rob Nicholls]
2008-06-01 03:18:35 +00:00
batrick
d0bc640db8 Large recode of nse_init.cc
Now does most of it's work through Lua:

From Nmap-dev: "Many of the changes consist of changing how Nmap interfaces
with Lua that were sometimes awkward or inflexible. Most of the functions 
have been made to be callable directly by Lua which offers many technical
advantages: stack management is alleviated, errors are handled cleanly and
are more descriptive, and there is increased reusability."

Additionally:
   -- Moved all lua_State * symbols from "l" to "L". This is to maintain
      consistency with other Lua libraries (convention) and to make our macros portable.
   -- Moved file system manipulation over to nse_fs.cc (from nse_init.cc)
2008-05-31 02:39:27 +00:00
batrick
742ff67100 Removed nse_auxiliar. Updated Script Argument parsing. Fixed typos in
documentation. Improved MySQLinfo.nse. Nsock/dnet metatabels are now
protected.
2008-05-31 02:19:24 +00:00
fyodor
779b96a197 trivial copyright text tweak: filename nmap-os-fingerprints has changed to nmap-os-db 2008-05-22 20:45:32 +00:00
kris
2b825faa17 Nmap now ships and links with OpenSSL (currently the newest 0.9.8g) on Windows.
The necessary libraries (lib and dll) and headers required for compilation and
linking are in mswin32/OpenSSL.  A detailed upgrade guide is available in
mswin32/OpenSSL/upgrade-guide.txt.

Thanks to Thomas Buchanan for doing the initial work and writing up the initial
build guide.

My openssl-testing branch has been posted on nmap-dev for 12 days and has been
tested by (at least) Thomas, Jah and I, with no reports of failure.

http://seclists.org/nmap-dev/2008/q2/0249.html
2008-05-20 20:22:50 +00:00
fyodor
10b54b773b minor license template updates from Kris--fix gnu.org link to GPLv2 (moved) and openssl license filename (COPYING.OpenSSL) 2008-05-05 04:10:00 +00:00
kris
85edc7a005 Merging over from /nmap-exp/kris/assert-testing
Ensuring the safety of assert() calls by keeping NDEBUG undefined throughout
Nmap, Nbase and Nsock.

I've tested this on Linux and Windows XP without problems.  On Windows I've
removed the definitions of _DEBUG and NDEBUG from the *.vcproj files.
2008-05-03 17:58:48 +00:00
fyodor
70eac662f4 o Reformat Nmap COPYING file (e.g. remove C comment markers, reduce
line length) during Nmap windows build so that it looks much better
  when presented by the Windows executable (NSIS) installer.  Thanks
  to Jah for the patch (which was modified slightly by Fyodor).
2008-03-21 01:05:09 +00:00