1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Commit Graph

38 Commits

Author SHA1 Message Date
dmiller
ef8213a36c Reintegrate Nmap 7.90 release branch 2020-10-05 23:00:30 +00:00
dmiller
74e9104173 OpenSSL 1.1.X renamed libs: libeay32->libcrypto ssleay32->libssl 2020-09-03 17:49:21 +00:00
dmiller
e2cb529b7a include string_pool in Windows build 2020-08-31 15:20:50 +00:00
dmiller
f05296d7f7 Merge changes from Nmap 7.80 release branch 2019-08-11 05:30:19 +00:00
dmiller
77421962aa Remove mostly-unused winclude.h 2019-05-29 15:11:13 +00:00
dmiller
8490cad95d Copy zlib DLL during staging. Avoid building nmap-update 2018-11-08 15:30:15 +00:00
dmiller
89a1714580 Fix Windows build for zlib update: use DLL instead of static 2018-11-08 14:51:33 +00:00
dmiller
d8c1d935f1 Move Npcap headers and lib stuff to nmap-mswin32-aux 2018-10-18 03:28:39 +00:00
dmiller
aaf5075c67 Move probespec to its own header to reduce includes of scan_engine.h 2018-07-13 18:18:28 +00:00
dmiller
3c91ad69b4 Add zlib includes and libs to Debug Windows build 2017-09-30 19:36:06 +00:00
dmiller
008edb6698 Fix Windows build: missing files, static zlib 2017-09-21 03:58:40 +00:00
dmiller
afe978dfb9 Add static zlib dependency in vcxproj needed for nse_zlib.cc 2017-09-21 01:43:08 +00:00
dmiller
b57d23f005 Add zlib binding for NSE. Fixes #532 2017-09-13 01:54:19 +00:00
evangel
0c142333bb Merged gsoc-ssh branch. Closes #910 2017-06-29 21:27:35 +00:00
dmiller
4725c98f5e Backport some Windows build fixes from release branch 2017-06-11 20:01:02 +00:00
dmiller
af13cef717 Upgrade to Npcap 0.08 (libpcap 1.8.0 headers for Windows) 2016-08-13 20:04:05 +00:00
batrick
7f5ec526fe Merge branch 'nse-lua53'
Lua 5.3 adds several awesome features of particular interest to nmap including
bitwise operators and integers, a utf8 library, and standard binary pack/unpack
functions.

In addition to adding Lua 5.3, this branch changes:

o Complete removal of the NSE bit library (in C), It has been replaced with
  a new Lua library wrapping Lua 5.3's bit-wise operators.

o Complete removal of the NSE bin library (in C). It has been replaced with a
  new Lua library wrapping Lua 5.3's string.pack|unpack functions.

o The bin.pack "B" format specifier (which has never worked correctly) is
  unimplemented.  All scripts/libraries which use it have been updated. Most
  usage of this option was to allow string based bit-wise operations which are no
  longer necessary now that Lua 5.3 provides integers and bit-wise operators.

o The base32/base64 libraries have been reimplemented using Lua 5.3's new
  bitwise operators. (This library was the main user of the bin.pack "B" format
  specifier.)

o A new "bits" library has been added for common bit hacks. Currently only has
  a reverse function.

Thanks to David Fifield, Daniel Miller, Jacek Wielemborek, and  Paulino
Calderon for testing this branch.
2016-07-02 17:02:27 +00:00
dmiller
50054e6ed7 Update platform toolset to remove XP compatibility 2016-06-04 02:46:11 +00:00
dmiller
37d517b32e Use XP compatibility SDK, because users are complaining 2015-11-10 16:47:35 +00:00
dmiller
40dc3c5830 Move global_structures.h back into nmap.h now that things are sorted out better 2015-07-02 03:09:29 +00:00
dmiller
0952bed032 Merge final changes to support VS2013 build
Changes:

* Fix a collision of the name PS_NONE with a different constant in shlobj.h
* Update solution and project files for VS2013
* Update the NSIS installer to reference the VC 2013 redistributable
2015-01-17 04:35:01 +00:00
d33tah
1c10f5f926 Keep the file list in order and add a header file for nse_lpeg.h as
well.
2014-09-03 14:34:54 +00:00
batrick
2b36d23f01 Include missing nse_lpeg.cc file for mswin32. 2014-09-03 14:30:06 +00:00
d33tah
c86b862501 Introduce scan_engine_connect.cc, scan_engine_connect.h,
scan_engine_raw.cc, scan_engine_raw.h and add them to Windows and Unix
build systems.
2014-09-03 14:27:00 +00:00
dmiller
d1304e602c Fix windows build breakage from r32558 2014-01-06 20:19:21 +00:00
david
ce51d8c4da Use the default value of MultiThreadedDLL where possible. 2013-02-09 20:30:01 +00:00
david
6b095f42d2 Use MultiThreadedDebugDLL (/MDd) in place of MultiThreadedDebug (/MTd).
This is to match r8507, which did the analogous thing for the Release
configuration.
http://seclists.org/nmap-dev/2013/q1/120
2013-02-09 20:29:55 +00:00
david
2f2e826487 Remove OpenSSL directory, moved to /nmap-mswin32-aux. 2012-10-02 00:53:12 +00:00
david
a8c51eeda0 Remove vestiges of WinIP library.
This was an old library removed in r2811 and r2812, of which a few
traces remained.

I don't know the purpose of this in nbase_misc.c:
  if(sd != 501) // Hack related to WinIP Raw Socket support
    ioctlsocket (sd, FIONBIO, &one);
2012-10-01 19:54:17 +00:00
david
d7479cfa94 Make nmap AdditionalIncludeDirectories the same for Debug and Release. 2012-10-01 19:54:14 +00:00
kroosec
f3e24f440b Removed nmap_rpc imports from windows vc++ build file. 2012-08-17 18:47:23 +00:00
sean
896bcc520b Fixed the warning liblinear.lib(linear.obj) : MSIL .netmodule or module compiled with /GL found; restarting link with /LTCG; add /LTCG to the link command line to improve linker performance by just adding the /LTCG flag. 2012-06-21 03:48:40 +00:00
sean
35aa0812fd Deleted the incremental flags instead. 2012-06-21 03:32:49 +00:00
sean
af7191e954 Fixed the link error http://msdn.microsoft.com/en-us/library/3ec25010(v=vs.80).aspx (LNK4075). Essentially setting Incremental to YES is redundent and therefore ignored http://msdn.microsoft.com/en-US/library/4khtbfyf(v=vs.80) says that Incremental defaults to yes. 2012-06-21 03:17:36 +00:00
david
51209ae64d Make the post-build commands the same for Release and Debug.
Debug was missing the copying of the nselib/data directory.
2012-01-21 19:18:47 +00:00
david
9bf2ec3884 Merge from /nmap-exp/luis/nmap-os6.
svn merge --ignore-ancestry svn://svn.insecure.org/nmap@26621 svn://svn.insecure.org/nmap-exp/luis/nmap-os6

This is the IPv6 OS detection branch. "nmap -6 -O" works now, though at
this point it only prints fingerprints and not OS guesses, because we
need to collect more submissions.
2011-09-19 18:31:46 +00:00
david
a70cdf46b9 Remove nonexistent or unnecessary header files from Windows build.
Some subset of these was causing the nmap project to always appear out
of date when beginning debugging. At any rate, they don't appear to be
necessary. Compare r25068.
2011-08-30 17:23:46 +00:00
david
6ce7c2e34d Upgrade the Windows build files using the Visual C++ 2010 Express conversion
wizard. At this point the solution doesn't build.
2010-11-04 18:16:40 +00:00