1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-14 11:49:01 +00:00
Commit Graph

186 Commits

Author SHA1 Message Date
fyodor
f6f59a7cd7 Auto regeneration with latest template files, etc. 2014-08-13 22:57:43 +00:00
dmiller
36425f55a6 Fix make ndiff_check spurious failure
The code involving imp is equivalent to "from ndiff import *", and ndiff
imports StringIO.StringIO as StringIO, which meant that while ndifftest
intended the name to be the module, it was really the class. Just moved
the import later to be sure the name was the one we intend.
2014-05-22 02:25:47 +00:00
dmiller
2f23d996bd Prevent PyXML from importing, causing crashes
http://seclists.org/nmap-dev/2014/q2/318

Essentially, we import the xml name, then override its search path,
stripping out the _xmlplus paths that PyXML uses. This leaves only the
Python 2 standard library path, which is what Zenmap was written for.
2014-05-21 03:53:58 +00:00
fyodor
b23000e08e Update Nmap version number from 6.45 to 6.46 and regen docs 2014-04-18 04:36:33 +00:00
dmiller
5087947a42 Prevent Ndiff from looking up remote/system entities 2014-04-16 20:37:50 +00:00
fyodor
52dc994b05 regenerate man pages and resort nmap-os-db 2014-04-12 08:12:04 +00:00
fyodor
d7ab6f2001 I think INSTALL_LIB should be set to None by default so it is only used if the installer has set it to something specific. Otherwise I run into issues on Windows 2014-04-12 06:12:01 +00:00
fyodor
96eb55e419 Add some features from Zenmap's setup.pl to ndiff one. The main feature is adding the ndiff.py Python module install directory to ndiff script so it can always (we hope) be found even if the dir isn't in the user's PYTHONPATH. 2014-04-12 01:24:32 +00:00
fyodor
93e857ee81 Add code (taken from Zenmap) to make sure the install location of the Ndiff module can be found by the ndiff script 2014-04-12 00:16:30 +00:00
fyodor
6bf513b42a Update Nmap version number from 6.41SVN to 6.45 and rebuild docs 2014-04-11 02:59:07 +00:00
dmiller
a72faf3906 Spellcheck on all Python files 2014-02-20 21:22:30 +00:00
dmiller
da0c947004 Enforce PEP 8 style on Ndiff
Issues fixed:

1       E111 indentation is not a multiple of four
1       E201 whitespace after '['
14      E251 no spaces around keyword / parameter equals
7       E301 expected 1 blank line, found 0
55      E302 expected 2 blank lines, found 1
69      E501 line too long (80 characters)
3       W291 trailing whitespace
4       W601 .has_key() is deprecated, use 'in'
2014-01-10 20:43:32 +00:00
dmiller
338dcb115c [Ndiff] Fix DeprecationWarning under python -3
Classes that inherit __hash__ and comparison functions like __eq__ (e.g.
from object) but only override one of them will break under Python 3.
This is because a class shouldn't use one criterion for equality and a
different one for hashing. Explicitly discarding the inherited __hash__
method disables this warning and makes the class unhashable (not a
problem in this case).
2013-12-23 20:12:40 +00:00
dmiller
1e6db2b22c Make Ndiff install as a Python module as well as script
Discussion: http://seclists.org/nmap-dev/2013/q4/19
2013-10-17 19:20:49 +00:00
fyodor
85e74c4075 Regen man pages 2013-08-17 20:09:25 +00:00
fyodor
fa6db96c73 Update the man page to use the latest text from COPYING file and regenerate 2013-07-29 23:57:40 +00:00
fyodor
b01fd55cb6 Change version number to 6.41SVN and regenerate auto-generated files such as man page, script.db, etc. 2013-07-29 06:00:07 +00:00
henri
f8da38fab5 Performance improvement.
Replaced try/except sequences by a dict.get()/if not None.
This simple change improves parsing time by 1s on a ~150MB file.
2012-12-23 08:35:32 +00:00
henri
36f8adf2a6 Improved XML parsing speed.
Replaced long if/elif/else sequence of checks by a direct access
data structure based on an element_name -> callback mapping.
2012-12-23 08:35:28 +00:00
fyodor
a90d961f51 auto-generated files (nroff versions of man pages) 2012-12-10 01:17:51 +00:00
david
ec53dc049a Update with new mailing list addresses. 2012-12-06 02:23:34 +00:00
fyodor
e09125e010 Update CHANGELOG to note 6.25 release and also bumped up Nmap SVN version number to avoid confusion and rebuilt files accordingly 2012-11-29 23:40:26 +00:00
fyodor
89d84932de Regenerated the man pages with today's date 2012-11-16 19:09:59 +00:00
fyodor
ea05ae2586 Latest auto-generated files in prep for upcoming 6.20BETA1 release 2012-11-16 00:54:16 +00:00
david
77fbcc8bc5 Get rid of ndiff.py symlink.
This existed only to allow importing the ndiff program as a module for
the ndifftest.py program. I found another way to do that.
2012-08-02 18:35:36 +00:00
fyodor
b70e4f71cf Bump the Nmap version number in SVN up to 6.02 2012-06-16 19:44:58 +00:00
fyodor
528c87ddb3 Latest builds of man pages 2012-05-30 21:56:09 +00:00
fyodor
22c7faa94b move the svn version number up to 6.01 and rebuild 2012-05-22 09:51:42 +00:00
fyodor
426a8f03d2 Update version number for 5.61TEST5 release 2012-03-09 02:17:53 +00:00
fyodor
e96a7b7b24 Update the headers for each code file. This updates code copyright dates to 2012, notes the awesome NSE in the list of technology, and slightly rewords the derivative works clarification 2012-03-01 06:32:23 +00:00
fyodor
158b912bf8 Some more improvements to the CHANGELOG 2012-01-02 00:35:16 +00:00
david
5be27e7aad Do output as a byproduct of calculating the diff.
This doesn't require keeping the whole diff in memory until the end.
2011-12-21 06:59:46 +00:00
david
d08bb02073 Use a more efficient method of finding pairs of hosts to diff.
This is O(n) rather than O(n^2).
2011-12-21 04:54:27 +00:00
david
e4beb1ab48 Use XMLWriter for output.
This avoids having to build a whole DOM tree in memory.
2011-12-21 04:54:26 +00:00
david
d6f867cdb5 Add an XMLWriter abstraction. 2011-12-21 04:54:25 +00:00
david
e2d5d41b28 Add event-based write_nmaprun_open and write_nmaprun_close.
These allow beginning and ending an nmaprun without having to keep its
children in memory.
2011-12-21 04:54:24 +00:00
fyodor
5c2ddb3c6e latest generated docs 2011-12-19 21:07:38 +00:00
fyodor
308650bbdb Update version num, sort nmap-os-db, etc. 2011-11-14 22:23:24 +00:00
fyodor
ee3b6e99d8 Update version number to 5.61TEST2 in prep for release 2011-09-30 06:25:57 +00:00
fyodor
6ed56140bd Update version number to 5.61TEST1 2011-09-19 21:52:08 +00:00
fyodor
5b516e982d Update svn version number to 5.59BETA3. There isn't an imminent release or anything, but I think bumping it will reduce confusion. Plus, I accidentally checked in a modified version number to some of the externals (when meaning to just modify a branch), so this will make the version consistent 2011-08-25 06:47:10 +00:00
fyodor
e8b422e09a latest generated man pages 2011-06-30 22:38:52 +00:00
fyodor
832d1e91fa Update version number for next release (5.59BETA1) 2011-06-28 22:19:31 +00:00
fyodor
76da3c9e38 Update version number to 5.52.IPv6.Beta2 for experimental raw-IPv6 release 2011-06-08 06:08:00 +00:00
fyodor
86d9802343 Autogenerated stuff - sort nmap-os-db and regen some man pages 2011-05-17 17:33:24 +00:00
david
da51bd5fa8 Include one <nmaprun> element if they don't differ in the input when
verbose (was previously omitted). Refactor a bit.
2011-04-29 03:56:05 +00:00
david
79ae90e80f Add nmaprun information to Ndiff output.
Patch by Daniel Miller.
2011-04-29 03:56:03 +00:00
david
9a65f4e010 Fix Ndiff unit test failure code found by Daniel Miller.
I guess this means the test was passing.
2011-04-28 22:14:54 +00:00
david
7ddf10f388 Capitalization. 2011-04-28 02:13:19 +00:00
david
ce23a35715 o [Ndiff] The Nmap banner (with the version number and date of the scan)
is not printed unless there were other differences. This makes Nidff
  produce no output when there wre no differences other than the version
  number and date. Dr. Jesus contributed an initial patch. [David]
2011-03-22 18:59:02 +00:00