diff --git a/CHANGELOG b/CHANGELOG index e647a5932..b8b183283 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -74,7 +74,7 @@ o Added a new version detection probe for the Trend Micro OfficeScan 4.51BETA o We now have a detailed Zenmap Guide at - http://insecure.org/nmap/zenmapguide/ . Thanks to David for writing + http://nmap.org/zenmapguide/ . Thanks to David for writing it. o Added rpcinfo.nse script, which contacts a listening RPC portmapper @@ -118,7 +118,7 @@ o Fixed a bug that prevented the --resume option from working on mflags 000 00006: The parameter is incorrect.(87) [Fixed by David, reported by Rob Nicholls] -o Zenmap's new web page (http://insecure.org/nmap/zenmap/) is now +o Zenmap's new web page (http://nmap.org/zenmap/) is now shown in the Zenmap about dialogue. o On Windows, paths beginning with \ are now considered absolute when @@ -973,7 +973,7 @@ o Changed the IP protocol scan so that it sends proper IGMP headers when o Improved the algorithm for classifying the TCP timestamp frequency for OS detection. The new algorithm is described at - http://insecure.org/nmap/osdetect/osdetect-methods.html#osdetect-ts . + http://nmap.org/osdetect/osdetect-methods.html#osdetect-ts . o Fixed the way Nmap detects whether one of its data files (such as nmap-services) exists and has permissions which allow it to be read. @@ -1019,7 +1019,7 @@ o Integrated the Nmap Scripting Engine (NSE) into mainline Nmap. accepting (and writing) general purpose scripts to put into Nmap proper, and you can also write personal scripts to deal with issues specific to your environment. The system is documented at - http://insecure.org/nmap/nse/ . + http://nmap.org/nse/ . o Updated nmap-mac-prefixes to reflect the latest OUI DB from the IEEE (http://standards.ieee.org/regauth/oui/oui.txt) as of December 7. @@ -1136,7 +1136,7 @@ o Integrated the newly submitted OS fingerprints. The DB now contains o Nmap 2nd generation OS detection now has a more sophisticated mechanism for guessing a target OS when there is no exact match in the - database (see http://insecure.org/nmap/osdetect/osdetect-guess.html ) + database (see http://nmap.org/osdetect/osdetect-guess.html ) o Rewrote mswin32/nmap.rc to remove cruft and hopefully reduce some MFC-related compilation problems we've seen. Thanks to KX @@ -1185,14 +1185,14 @@ o Worked with Zhao to improve the new OS detection system with now ready to start growing the new database! If Nmap gives you fingerprints, please submit them at the given URL. The DB is still extremely small. The new system is extensively documented at - http://insecure.org/nmap/osdetect/ . + http://nmap.org/osdetect/ . o Nmap now supports IP options with the new --ip-options flag. You can specify any options in hex, or use "R" (record route), "T" (record timestamp), "U") (record route & timestamp), "S [route]" (strict source route), or "L [route]" (loose source route). Specify --packet-trace to display IP options of responses. For further - information and examples, see http://insecure.org/nmap/man/ and + information and examples, see http://nmap.org/man/ and http://seclists.org/nmap-dev/2006/q3/0052.html . Thanks to Marek Majkowski for writing and sending the patch. @@ -1307,7 +1307,7 @@ o Added a fix for the crash in the new OS detection which would come Nmap 4.20ALPHA1 o Integrated initial 2nd generation OS detection patch! The system is - documented at http://insecure.org/nmap/osdetect/ . Thanks to Zhao Lei + documented at http://nmap.org/osdetect/ . Thanks to Zhao Lei for helping with the coding and design. o portlist.cc was refactored to remove some code duplication. Thanks @@ -1406,7 +1406,7 @@ o Nmap now ignores certain ICMP error message rate limiting (rather limits when encountered. For a SYN scan, this may cause closed ports to be labeled 'filtered' becuase Nmap refused to slow down enough to correspond to the rate limiting. Learn more about this - new option at http://www.insecure.org/nmap/man/ . Thanks to Martin + new option at http://nmap.org/man/ . Thanks to Martin Macok (martin.macok(a)underground.cz) for writing the patch that these changes were based on. @@ -1415,7 +1415,7 @@ o Moved my Nmap development environment to Visual C++ 2005 Express 2003 users will no longer be able to compile Nmap using the new solution files. The compilation, installation, and execution instructions at - http://www.insecure.org/nmap/install/inst-windows.html have been + http://nmap.org/install/inst-windows.html have been upgraded. o Automated my Windows build system so that I just have to type a @@ -1725,7 +1725,7 @@ o Fixed compilation to again work with gcc-derivatives such as Nmap 3.98BETA1 o Added run time interaction as documented at - http://www.insecure.org/nmap/man/man-runtime-interaction.html . + http://nmap.org/man/man-runtime-interaction.html . While Nmap is running, you can now press 'v' to increase verbosity, 'd' to increase the debugging level, 'p' to enable packet tracing, or the capital versions (V,D,P) to do the opposite. Any other key @@ -1847,11 +1847,11 @@ o Made a change to libdnet so that Windows interfaces are listed as o Ceased including foreign translations in the Nmap tarball as they take up too much space. HTML versions can be found at - http://www.insecure.org/nmap/docs.html , while XML and NROFF versions - are available from http://www.insecure.org/nmap/data/man-xlate/ . + http://nmap.org/docs.html , while XML and NROFF versions + are available from http://nmap.org/data/man-xlate/ . o Changed INSTALL and README-WIN32 files to mostly just reference the - new Nmap Install Guide at http://www.insecure.org/nmap/install/ . + new Nmap Install Guide at http://nmap.org/install/ . o Included docs/nmap-man.xml in the tarball distribution, which is the DocBook XML source for the Nmap man page. Patches to Nmap that are @@ -1942,13 +1942,13 @@ Nmap 3.94ALPHA1 o Wrote a new man page from scratch. It is much more comprehensive (more than twice as long) and (IMHO) better organized than the - previous one. Read it online at http://www.insecure.org/nmap/man/ + previous one. Read it online at http://nmap.org/man/ or docs/nmap.1 from the Nmap distribution. Let me know if you have any ideas for improving it. o Wrote a new "help screen", which you get when running Nmap without arguments. It is also reproduced in the man page and at - http://www.insecure.org/nmap/data/nmap.usage.txt . I gave up trying + http://nmap.org/data/nmap.usage.txt . I gave up trying to fit it within a 25-line, 80-column terminal window. It is now 78 lines and summarizes all but the most obscure Nmap options. @@ -1969,7 +1969,7 @@ o Made the version detection "ports" directive (in bit. The patch was done by Doug Hoyte (doug(a)hcsw.org). o Added the --webxml option, which does the same thing as - --stylesheet http://www.insecure.org/nmap/data/nmap.xsl , without + --stylesheet http://nmap.org/data/nmap.xsl , without requiring you to remember the exact URL or type that whole thing. o Fixed a crash occurred when the --exclude option was used with @@ -2147,7 +2147,7 @@ o Nmap distribution signing has changed. Release files are now signed generated a new key for himself (KeyID 33599B5F). The Nmap key has been signed by Fyodor's new key, which has been signed by Fyodor's old key so that you know they are legit. The new keys are available - at http://www.insecure.org/nmap/data/nmap_gpgkeys.txt , as + at http://nmap.org/data/nmap_gpgkeys.txt , as docs/nmap_gpgkeys.txt in the Nmap source tarball, and on the public keyserver network. Here are the fingerprints: pub 1024D/33599B5F 2005-04-24 @@ -2413,7 +2413,7 @@ o Nmap now ships with and installs (in the same directory as other results), Nmap uses the local filesystem by default. If you would like the latest version of the stylesheet loaded from the web when rendering, specify - --stylesheet http://www.insecure.org/nmap/data/nmap.xsl . + --stylesheet http://nmap.org/data/nmap.xsl . o Fixed fragmentation option (-f). One -f now sets sends fragments with just 8 bytes after the IP header, while -ff sends 16 bytes to @@ -2592,7 +2592,7 @@ o Fixed nmap_fetchfile() to better find custom versions of data files o Changed XML output so that the MAC address [address] element comes right after the IPv4/IPv6 [address] element. Apparently this is needed to comply with the DTD ( - http://www.insecure.org/nmap/data/nmap.dtd ). Thanks to Adam Morgan + http://nmap.org/data/nmap.dtd ). Thanks to Adam Morgan (adam.morgan(a)Q1Labs.com) and Florian Ebner (Florian.Ebner(a)e-bros.de) for the problem reports. @@ -2876,7 +2876,7 @@ o Modified the mswine32/nmap_performance.reg Windows registry file to should apply the new registry changes by clicking on the .reg file. Or do it manually as described in README-WIN32. This file is also now available in the data directory at - http://www.insecure.org/nmap/data/nmap_performance.reg + http://nmap.org/data/nmap_performance.reg o Applied patch from Gisle Vanem (giva(a)bgnett.no) which allows the Windows version of Nmap to work with WinPCAP 3.1BETA (and probably @@ -3208,7 +3208,7 @@ o Applied a one-line patch from Dmitry V. Levin (ldv(a)altlinux.org) Nmap 3.40PVT17 o Wrote and posted a new paper on version scanning to - http://www.insecure.org/nmap/versionscan.html . Updated + http://nmap.org/versionscan.html . Updated nmap-service-probes and the Nmap man page to simply refer to this URL. @@ -4121,11 +4121,11 @@ o Applied patch by Max Schubert (nmap(a)webwizarddesign.com) which adds o Added German translation of Nmap man page by Marc Ruef (marc.ruef(a)computec.ch). It is also available at - http://www.insecure.org/nmap/data/nmap_manpage-de.html + http://nmap.org/data/nmap_manpage-de.html o Includes a brand new French translation of the man page by Sebastien Blanchet. You could probably guess that it is available at - http://www.insecure.org/nmap/data/nmap_manpage-fr.html + http://nmap.org/data/nmap_manpage-fr.html o Applied some patches from Chad Loder (cloder(a)loder.us) which update the random IP allocation pool and improve OpenBSD support. Some @@ -5399,7 +5399,7 @@ o Fixed strtol() integer overflow problem found by Renaud Deraison (deraison(a)cvs.nessus.org) o The HTML translation of the Man page at - http://www.insecure.org/nmap/nmap_manpage.html should now be + http://nmap.org/nmap_manpage.html should now be complete (man2html was dropping lines before). o Added a note in the man page that Nmap 2.0+ is believed to be diff --git a/COPYING b/COPYING index 042e5d943..6d4abbe6c 100644 --- a/COPYING +++ b/COPYING @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/FingerPrintResults.cc b/FingerPrintResults.cc index 9a7e9fd46..6d8dbc881 100644 --- a/FingerPrintResults.cc +++ b/FingerPrintResults.cc @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/FingerPrintResults.h b/FingerPrintResults.h index 994388984..21868aef7 100644 --- a/FingerPrintResults.h +++ b/FingerPrintResults.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/HACKING b/HACKING index a13059642..c43592a5e 100644 --- a/HACKING +++ b/HACKING @@ -12,22 +12,21 @@ it. This also allows you to audit the software for security holes Source code also allows you to port Nmap to new platforms, fix bugs, and add new features. You are highly encouraged to send your changes -to fyodor@insecure.org or nmap-dev@insecure.org for possible -incorporation into the main distribution. By sending these changes to -Fyodor or one the insecure.org development mailing lists, it is -assumed that you are offering Fyodor the unlimited, non-exclusive -right to reuse, modify, and relicense the code. This is important -because the inability to relicense code has caused devastating -problems for other Free Software projects (such as KDE and NASM). -Nmap will always be available Open Source. If you wish to specify -special license conditions of your contributions, just say so when you -send them. +to nmap-dev@insecure.org for possible incorporation into the main +distribution. By sending these changes to Fyodor or one the +insecure.org development mailing lists, it is assumed that you are +offering Fyodor the unlimited, non-exclusive right to reuse, modify, +and relicense the code. This is important because the inability to +relicense code has caused devastating problems for other Free Software +projects (such as KDE and NASM). Nmap will always be available Open +Source. If you wish to specify special license conditions of your +contributions, just say so when you send them. Nmap is a community project and has already benefitted greatly from -outside contributors ( for examples, see the CHANGELOG or -http://www.insecure.org/nmap/#thanks ). Bugfixes, and portability -changes will almost always be accepted. Even if you do not have time -to track down and patch a problem, bug reports are always welcome. +outside contributors (for examples, see the CHANGELOG at +http://nmap.org/changelog.html). Bugfixes, and portability changes +will almost always be accepted. Even if you do not have time to track +down and patch a problem, bug reports are always welcome. Hackers interested in something more major, such as a new feature, are encouraged to send a mail describing their plans to diff --git a/INSTALL b/INSTALL index 827a3fd24..122a9f489 100644 --- a/INSTALL +++ b/INSTALL @@ -5,6 +5,6 @@ make make install For far more in-depth compilation, installation, and removal notes, -read the Nmap Install Guide at http://www.insecure.org/nmap/install/ . +read the Nmap Install Guide at http://nmap.org/install/ . diff --git a/MACLookup.cc b/MACLookup.cc index 969aa6718..a1d908c00 100644 --- a/MACLookup.cc +++ b/MACLookup.cc @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/MACLookup.h b/MACLookup.h index 3de7bd9b5..c8b096b86 100644 --- a/MACLookup.h +++ b/MACLookup.h @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/Makefile.in b/Makefile.in index a7674fd54..0c9dba2d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ # Extract the version string from nmap.h. export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q') NMAP_NAME= Nmap -NMAP_URL= http://insecure.org +NMAP_URL= http://nmap.org NMAP_PLATFORM=@host@ prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/NmapOps.cc b/NmapOps.cc index 2b246a97d..3546b7dbe 100644 --- a/NmapOps.cc +++ b/NmapOps.cc @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/NmapOps.h b/NmapOps.h index 0a8da1ea3..120351bc9 100644 --- a/NmapOps.h +++ b/NmapOps.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/NmapOutputTable.cc b/NmapOutputTable.cc index f94152aca..c55befa77 100644 --- a/NmapOutputTable.cc +++ b/NmapOutputTable.cc @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/NmapOutputTable.h b/NmapOutputTable.h index 19cc7605f..528e3b330 100644 --- a/NmapOutputTable.h +++ b/NmapOutputTable.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/README-WIN32 b/README-WIN32 index 1c3b258a0..b309f93aa 100644 --- a/README-WIN32 +++ b/README-WIN32 @@ -1,4 +1,4 @@ Details on installation, compilation, and limitation of the Nmap Security Scanner on the Windows platform is now available in the Nmap -Installation Guide at http://www.insecure.org/nmap/install/ . +Installation Guide at http://nmap.org/install/ . diff --git a/Target.cc b/Target.cc index 27fccdab8..e6685fd6b 100644 --- a/Target.cc +++ b/Target.cc @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/Target.h b/Target.h index d7bcef353..417dbaee9 100644 --- a/Target.h +++ b/Target.h @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/TargetGroup.cc b/TargetGroup.cc index 9eed81dce..50fe95f98 100644 --- a/TargetGroup.cc +++ b/TargetGroup.cc @@ -40,7 +40,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/TargetGroup.h b/TargetGroup.h index 1f49d8d0a..d041c16bc 100644 --- a/TargetGroup.h +++ b/TargetGroup.h @@ -40,7 +40,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/charpool.cc b/charpool.cc index 42c54e4b3..4141bde33 100644 --- a/charpool.cc +++ b/charpool.cc @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/charpool.h b/charpool.h index 61f221cee..7df7ce6d1 100644 --- a/charpool.h +++ b/charpool.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/config.h.in b/config.h.in index 05bff162d..7711efdf9 100644 --- a/config.h.in +++ b/config.h.in @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/configure.ac b/configure.ac index e382c194f..144e6af36 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ AC_PROG_CXX fi AC_CHECK_PROG(CXXPROG, "$CXX", "AVAILABLE", "MISSING", "$PATH":/) if test $CXXPROG = "MISSING"; then - AC_MSG_ERROR([Could not locate a C++ compiler. If it exists, add it to your PATH or give configure the CXX=path_to_compiler argument. Otherwise, install a C++ compiler such as g++ or install a binary package of Nmap (see http://www.insecure.org/nmap/nmap_download.html ))]) + AC_MSG_ERROR([Could not locate a C++ compiler. If it exists, add it to your PATH or give configure the CXX=path_to_compiler argument. Otherwise, install a C++ compiler such as g++ or install a binary package of Nmap (see http://nmap.org/download.html ))]) fi AC_MSG_CHECKING([whether the compiler is gcc 4 or greater]) diff --git a/docs/README b/docs/README index 04fa7896a..11b2875bf 100644 --- a/docs/README +++ b/docs/README @@ -1,8 +1,3 @@ -Here are the docs for nmap. You would be better -off checking the website at http://www.insecure.org/nmap -for the latest information. Also if the man page is installed -correctly you should be able to 'man nmap'. The man page is more -up-to-date than the article. See nmap-manpage.html for an html version -of it. - --Fyodor +Here is some documentation for Nmap, but these files are much less +comprehensive than what you'll find at the actual Nmap documentation +site ( http://nmap.org ). diff --git a/docs/nmap.1 b/docs/nmap.1 index 1089935c0..1e9709501 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -1935,7 +1935,7 @@ or The term \(lqNmap\(rq should be taken to also include any portions or derived works of Nmap\. This list is not exclusive, but is just meant to clarify our interpretation of derived works with some common examples\. These restrictions only apply when you actually redistribute Nmap\. For example, nothing stops you from writing and selling a proprietary front\-end to Nmap\. Just distribute it by itself, and point people to -\fI\%http://insecure.org/nmap/\fR +\fI\%http://nmap.org\fR to download Nmap\. .PP We don\'t consider these to be added restrictions on top of the GPL, but just a clarification of how we interpret diff --git a/docs/nmap_gpgkeys.txt b/docs/nmap_gpgkeys.txt index 71559a9b0..69c6f7fbf 100644 --- a/docs/nmap_gpgkeys.txt +++ b/docs/nmap_gpgkeys.txt @@ -1,11 +1,11 @@ GPG detached signatures and MD5/SHA-1 hashes for each Nmap release are -available from http://www.insecure.org/nmap/dist/sigs/?C=M;O=D . The +available from http://nmap.org/dist/sigs/?C=M;O=D . The releases are signed by the Nmap project GPG key (KeyId 6B9355D0). Some messages to Nmap mailing lists may be signed by Nmap author and maintainer Fyodor. Fyodor's KeyID is 33599B5F. Those two keys and their fingerprints are reproduced below. The latest version of this file is always available at -http://www.insecure.org/nmap/data/nmap_gpgkeys.txt . +http://nmap.org/data/nmap_gpgkeys.txt . To verify a file with GPG, obtain and import the keys with a command such as "gpg --import nmap_gpgkeys.txt" and then verify the obtained diff --git a/docs/refguide.xml b/docs/refguide.xml index 6a974349d..9af6e4c85 100644 --- a/docs/refguide.xml +++ b/docs/refguide.xml @@ -27,8 +27,8 @@ This document describes the very latest version of Nmap available from or . Please + url="http://nmap.org/download.html" /> or . Please ensure you are using the latest version before reporting that a feature doesn't work as described. @@ -82,7 +82,7 @@ # nmap -A -T4 scanme.nmap.org playground -Starting nmap ( http://insecure.org/nmap/ ) +Starting nmap ( http://nmap.org ) Interesting ports on scanme.nmap.org (205.217.153.62): (The 1663 ports scanned but not shown below are in state: filtered) PORT STATE SERVICE VERSION @@ -119,9 +119,9 @@ Nmap finished: 2 IP addresses (2 hosts up) scanned in 88.392 seconds The newest version of Nmap can be obtained from . The newest version of the man +url="http://nmap.org" />. The newest version of the man page is available from . +url="http://nmap.org/man/"/>. @@ -130,7 +130,7 @@ url="http://insecure.org/nmap/man/"/>. This options summary is printed when Nmap is run with no arguments, and the latest version is always available at -. +. It helps people remember the most common options, but is no substitute for the in-depth documentation in the rest of this manual. Some obscure options aren't even included here. @@ -1310,7 +1310,7 @@ used. specify (which must be up and meet certain criteria). This fascinating scan type is too complex to fully describe in this reference guide, so I wrote and posted an informal paper with full details at - . + . Besides being extraordinarily stealthy (due to its blind nature), this scan type permits mapping out @@ -1574,7 +1574,7 @@ way. enables version detection among other things. A paper documenting the workings, usage, and customization of version detection is available at . + url="http://nmap.org/vscan/" />. When Nmap receives responses from a service but cannot match them to its database, it prints out a special fingerprint and @@ -1765,7 +1765,7 @@ way. A paper documenting the workings, usage, and customization of OS detection is available at . + url="http://nmap.org/osdetect/" />. OS detection is enabled and controlled with the following options: @@ -1852,7 +1852,7 @@ way. network handling with the versatility of the lightweight scripting language Lua, thus providing innumerable opportunities. A more extensive documentation of the NSE (including its - API) can be found at: . The + API) can be found at: . The target of the NSE is to provide Nmap with a flexible infrastructure for extending its capabilities and offering its users a simple way of creating customized tests. Uses for the NSE include (but definitely are not limited @@ -1925,7 +1925,7 @@ way. you are not required to follow this for the moment, this may change in the future. Nmap will issue a warning if a file has any other extension. More extensive documentation on the NSE, including a description of its API - can be found at . + can be found at . @@ -2912,7 +2912,7 @@ described below. output. The DTD defines the legal elements of the format, and often enumerates the attributes and values they can take on. The latest version is always available from . + url="http://nmap.org/data/nmap.dtd"/>. XML offers a stable format that is easily parsed by software. Free XML parsers are available for all major @@ -3238,7 +3238,7 @@ overwhelming requests. Specify to only see . You must pass the full pathname or URL. One common invocation is . This + http://nmap.org/data/nmap.xsl. This tells a browser to load the latest version of the stylesheet from Insecure.Org. The option does the same thing with less typing and memorization. @@ -3258,7 +3258,7 @@ overwhelming requests. Specify to only see This convenience option is simply an alias for - . + . @@ -3684,7 +3684,7 @@ overwhelming requests. Specify to only see it better by sending bug reports or even writing patches. If Nmap doesn't behave the way you expect, first upgrade to the latest version available from . If the problem persists, + url="http://nmap.org"/>. If the problem persists, do some research to determine whether it has already been discovered and addressed. Try Googling the error message or browsing the nmap-dev archives at --open to only see Code patches to fix bugs are even better than bug reports. Basic instructions for creating patch files with your changes are available at . Patches may + url="http://nmap.org/data/HACKING" />. Patches may be sent to nmap-dev (recommended) or to Fyodor directly. @@ -3715,7 +3715,7 @@ overwhelming requests. Specify to only see over the years. These are detailed in the CHANGELOG file which is distributed with Nmap and also available from . + url="http://nmap.org/changelog.html" />. diff --git a/docs/zenmap.xml b/docs/zenmap.xml index 60e9ec91f..cf93a0934 100644 --- a/docs/zenmap.xml +++ b/docs/zenmap.xml @@ -24,7 +24,7 @@ This document describes the very latest version of Zenmap available from . Please + url="http://nmap.org/download.html" />. Please ensure you are using the latest version before reporting that a feature doesn't work as described. @@ -37,7 +37,7 @@ Saved scan results can be compared with one another to see how they differ. The results of recent scans are stored in a searchable database. - This man page only describes the few Zenmap command-line options and some critical notes. A much more detailed Zenmap User's Guide is available at . Other documentation and information is available from the Zen web page at . + This man page only describes the few Zenmap command-line options and some critical notes. A much more detailed Zenmap User's Guide is available at . Other documentation and information is available from the Zen web page at . @@ -131,7 +131,7 @@ Like their authors, Nmap and Zenmap aren’t perfect. But you can help make them better by sending bug reports or even writing patches. If Nmap or Zenmap doesn’t behave the way you expect, first upgrade to the - latest version available from . If + latest version available from . If the problem persists, do some research to determine whether it has already been discovered and addressed. Try Googling the error message or browsing the nmap-dev archives at . Read this @@ -144,7 +144,7 @@ Code patches to fix bugs are even better than bug reports. Basic instructions for creating patch files with your changes are available at - . Patches may be sent + . Patches may be sent to nmap-dev (recommended) or to Fyodor directly. @@ -174,7 +174,7 @@ over the years. These are detailed in the CHANGELOG file which is distributed with Nmap and also available from . + url="http://nmap.org/changelog.html" />. diff --git a/global_structures.h b/global_structures.h index be0960d0f..814f7e831 100644 --- a/global_structures.h +++ b/global_structures.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/idle_scan.cc b/idle_scan.cc index c7ba1950c..2439c194a 100644 --- a/idle_scan.cc +++ b/idle_scan.cc @@ -42,7 +42,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/idle_scan.h b/idle_scan.h index 640f9fadc..e0d8f80dd 100644 --- a/idle_scan.h +++ b/idle_scan.h @@ -42,7 +42,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/main.cc b/main.cc index af956f799..b43add30b 100644 --- a/main.cc +++ b/main.cc @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * @@ -226,7 +226,7 @@ int main(int argc, char *argv[]) { } return nmap_main(argc, argv); } - /* printf("\nStarting nmap V. %s by fyodor@insecure.org ( www.insecure.org/nmap/ )\n", VERSION);*/ + printf("\nStarting %s V. %s ( %s )\n", NMAP_NAME, NMAP_VERSION, NMAP_URL); printf("Welcome to Interactive Mode -- press h for help\n"); diff --git a/mswin32/buildguide.txt b/mswin32/buildguide.txt index 6f6da5851..6fc11b297 100644 --- a/mswin32/buildguide.txt +++ b/mswin32/buildguide.txt @@ -28,7 +28,7 @@ II. OTHER REQUIREMENTS You'll need Microsoft Visual C++ 2005 and the Platform SDK for compilation. Directions for obtaining those are at: -http://insecure.org/nmap/install/inst-windows.html#inst-win-source +http://nmap.org/install/inst-windows.html#inst-win-source You'll also need Cygwin installed in order to build the Nmap installer (not required for normal compiling). You'll find it at http://www.cygwin.com diff --git a/mswin32/winclude.h b/mswin32/winclude.h index b063f5e7d..35f3227d2 100644 --- a/mswin32/winclude.h +++ b/mswin32/winclude.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc index 70563a872..4ec2b5aeb 100644 --- a/mswin32/winfix.cc +++ b/mswin32/winfix.cc @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap-header-template.cc b/nmap-header-template.cc index d89aa644c..9af7c8a08 100644 --- a/nmap-header-template.cc +++ b/nmap-header-template.cc @@ -37,7 +37,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap-os-db b/nmap-os-db index c3e900410..8c5f93157 100644 --- a/nmap-os-db +++ b/nmap-os-db @@ -4,7 +4,7 @@ # Contributions to this database are welcome. If Nmap obtains a new # fingerprint (and test conditions are favorable), it will print out a # URL you can use to submit the fingerprint. If Nmap guesses wrong, -# please see http://insecure.org/nmap/submit/ . +# please see http://nmap.org/submit/ . # # By submitting fingerprints you are transfering any and all copyright # interest in the data to Insecure.Com LLC so it can modified, @@ -13,7 +13,7 @@ # This collection of fingerprint data is (C) 1998-2006 by Insecure.Com # LLC. It is distributed under the Nmap open source license as # provided in the COPYING file of the source distribution or at -# http://insecure.org/nmap/data/COPYING . Note that this license +# http://nmap.org/data/COPYING . Note that this license # requires you to license your own work under a compatable open source # license. If you wish to embed Nmap technology into proprietary # software, we sell alternative licenses (contact sales@insecure.com). @@ -21,7 +21,7 @@ # host discovery, port scanning, OS detection, and version detection. # # For a complete description of Nmap OS detection and the format of -# fingerprints in this file, see http://insecure.org/nmap/osdetect/ +# fingerprints in this file, see http://nmap.org/osdetect/ # This first element provides the number of points every fingerprint # test is worth. Tests like TTL or Don't fragment are worth less diff --git a/nmap-protocols b/nmap-protocols index f135351e1..4d0338539 100644 --- a/nmap-protocols +++ b/nmap-protocols @@ -1,5 +1,5 @@ # This list of protocols is distributed with the -*- mode: fundamental; -*- -# Nmap Security Scanner ( http://www.insecure.org/nmap/ ) +# Nmap Security Scanner ( http://nmap.org ) # # This list is based on IEEE data at # http://www.iana.org/assignments/protocol-numbers and was last updated diff --git a/nmap-rpc b/nmap-rpc index 73dd83292..57b504f05 100644 --- a/nmap-rpc +++ b/nmap-rpc @@ -3,7 +3,7 @@ # This was created by Vik Bajaj with help # from various members of the nmap-hackers list. # To join nmap-hackers send mail to nmap-hackers-subscribe@insecure.org -# Nmap is available from http://www.insecure.org/nmap/ +# Nmap is available from http://nmap.org # All the rpc services we could find as of Feb26, 2005 # Tweaked a bit by Fyodor # diff --git a/nmap-service-probes b/nmap-service-probes index db37165e1..26663faf6 100644 --- a/nmap-service-probes +++ b/nmap-service-probes @@ -2,7 +2,7 @@ # $Id$ # # This is a database of custom probes and expected responses that the -# Nmap Security Scanner ( http://www.insecure.org/nmap/ ) uses to +# Nmap Security Scanner ( http://nmap.org ) uses to # identify what services (eg http, smtp, dns, etc.) are listening on # open ports. Contributions to this database are welcome. We hope to # create an automated submission system (as with OS fingerprints), but @@ -27,7 +27,7 @@ # For details on how Nmap version detection works, why it was added, # the grammar of this file, and how to detect and contribute new # services, see our paper at -# http://www.insecure.org/nmap/versionscan.html . +# http://nmap.org/vscan/ . # The Exclude directive takes a comma separated list of ports. # The format is exactly the same as the -p switch. diff --git a/nmap-services b/nmap-services index b33ed63f9..0bd3af53b 100644 --- a/nmap-services +++ b/nmap-services @@ -1,5 +1,5 @@ # Well known service port numbers -*- mode: fundamental; -*- -# From the Nmap security scanner ( http://www.insecure.org/nmap/ ) +# From the Nmap security scanner ( http://nmap.org ) # # $Id$ # For a HUGE list of services (including these and others), diff --git a/nmap.cc b/nmap.cc index cec1367f5..72a7af62d 100644 --- a/nmap.cc +++ b/nmap.cc @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * @@ -819,7 +819,7 @@ int nmap_main(int argc, char *argv[]) { } else if (optcmp(long_options[option_index].name, "log-errors") == 0) { o.log_errors = 1; } else if (strcmp(long_options[option_index].name, "webxml") == 0) { - o.setXSLStyleSheet("http://www.insecure.org/nmap/data/nmap.xsl"); + o.setXSLStyleSheet("http://nmap.org/data/nmap.xsl"); } else if (strcmp(long_options[option_index].name, "oN") == 0) { normalfilename = logfilename(optarg, tm); } else if (strcmp(long_options[option_index].name, "oG") == 0 || diff --git a/nmap.h b/nmap.h index 7533557bc..16acc6964 100644 --- a/nmap.h +++ b/nmap.h @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap.spec.in b/nmap.spec.in index d0bcc09e0..f320fb526 100644 --- a/nmap.spec.in +++ b/nmap.spec.in @@ -12,10 +12,10 @@ Name: %{name} Version: %{version} Release: %{release} Epoch: 2 -License: http://www.insecure.org/nmap/man/man-legal.html +License: http://nmap.org/man/man-legal.html Group: Applications/System -Source0: http://www.insecure.org/nmap/dist/%{name}-%{version}.tgz -URL: http://www.insecure.org/nmap/ +Source0: http://nmap.org/dist/%{name}-%{version}.tgz +URL: http://nmap.org # RPM can't be relocatable until I stop storing path info in the binary. # Prefix: %{_prefix} @@ -99,7 +99,7 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || : * Mon Dec 13 1999 Tim Powers - based on origional spec file from - http://www.insecure.org/nmap/index.html#download + http://nmap.org/download.html - general cleanups, removed lots of commenrts since it made the spec hard to read - changed group to Applications/System diff --git a/nmap_amigaos.h b/nmap_amigaos.h index ec44f21be..5813e12c3 100644 --- a/nmap_amigaos.h +++ b/nmap_amigaos.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap_dns.cc b/nmap_dns.cc index 6984e118f..807833008 100644 --- a/nmap_dns.cc +++ b/nmap_dns.cc @@ -37,7 +37,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap_dns.h b/nmap_dns.h index 274953bbb..8ee72ebce 100644 --- a/nmap_dns.h +++ b/nmap_dns.h @@ -36,7 +36,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap_error.cc b/nmap_error.cc index fb38bc0f3..92d6cfd71 100644 --- a/nmap_error.cc +++ b/nmap_error.cc @@ -37,7 +37,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap_error.h b/nmap_error.h index 50071c551..4d9d1fbe8 100644 --- a/nmap_error.h +++ b/nmap_error.h @@ -37,7 +37,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap_rpc.cc b/nmap_rpc.cc index ec9be84ad..fb38a9d18 100644 --- a/nmap_rpc.cc +++ b/nmap_rpc.cc @@ -40,7 +40,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap_rpc.h b/nmap_rpc.h index 46cd4398b..48cf58652 100644 --- a/nmap_rpc.h +++ b/nmap_rpc.h @@ -40,7 +40,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap_tty.cc b/nmap_tty.cc index 1ef7b27a3..8ce557e9f 100644 --- a/nmap_tty.cc +++ b/nmap_tty.cc @@ -37,7 +37,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * @@ -273,7 +273,7 @@ bool keyWasPressed() "d/D Increase/decrease debugging\n" "p/P Enable/disable packet tracing\n" "anything else Print status\n" - "More help: http://www.insecure.org/nmap/man/man-runtime-interaction.html\n"); + "More help: http://nmap.org/man/man-runtime-interaction.html\n"); } else { printStatusMessage(); return true; diff --git a/nmap_tty.h b/nmap_tty.h index ddc27edec..6b2dbc3d8 100644 --- a/nmap_tty.h +++ b/nmap_tty.h @@ -37,7 +37,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/nmap_winconfig.h b/nmap_winconfig.h index 186e84b61..bb02acd1f 100644 --- a/nmap_winconfig.h +++ b/nmap_winconfig.h @@ -40,7 +40,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/osscan.cc b/osscan.cc index 3bd7b42aa..6d092a29a 100644 --- a/osscan.cc +++ b/osscan.cc @@ -2,7 +2,7 @@ /*************************************************************************** * osscan.cc -- Routines used for OS detection via TCP/IP fingerprinting. * * For more information on how this works in Nmap, see my paper at * - * http://www.insecure.org/osdetect/ * + * http://nmap.org/osdetect/ * * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/osscan.h b/osscan.h index ac2f207e7..d518ea073 100644 --- a/osscan.h +++ b/osscan.h @@ -2,7 +2,7 @@ /*************************************************************************** * osscan.h -- Routines used for OS detection via TCP/IP fingerprinting. * * For more information on how this works in Nmap, see my paper at * - * http://www.insecure.org/nmap/nmap-fingerprinting-article.html * + * http://nmap.org/osdetect/ * * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/osscan2.cc b/osscan2.cc index 80cde2753..ecaaa20ab 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -2,7 +2,7 @@ /*************************************************************************** * osscan2.cc -- Routines used for 2nd Generation OS detection via * * TCP/IP fingerprinting. * For more information on how this works in * - * Nmap, see http://insecure.org/nmap/osdetect/ * + * Nmap, see http://nmap.org/osdetect/ * * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/osscan2.h b/osscan2.h index 8a2769ec8..e1aa69e8d 100644 --- a/osscan2.h +++ b/osscan2.h @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/output.cc b/output.cc index ef21b2027..0ad6e4b2c 100644 --- a/output.cc +++ b/output.cc @@ -42,7 +42,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * @@ -1582,7 +1582,7 @@ void printosscanoutput(Target *currenths) { log_write(LOG_PLAIN, "\n"); } if (osscanSys == 2 && !reason) { - log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"No exact OS matches for host (If you know what OS is running on it, see http://insecure.org/nmap/submit/ ).\nTCP/IP fingerprint:\n%s\n", + log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"No exact OS matches for host (If you know what OS is running on it, see http://nmap.org/submit/ ).\nTCP/IP fingerprint:\n%s\n", mergeFPs(FPR->FPs, FPR->numFPs, true, currenths->v4hostip(), distance, currenths->MACAddress(), FPR->osscan_opentcpport, FPR->osscan_closedtcpport, FPR->osscan_closedudpport, @@ -1617,7 +1617,7 @@ void printosscanoutput(Target *currenths) { if ((o.verbose > 1 || o.debugging) && reason) log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"OS fingerprint not ideal because: %s\n", reason); if (osscanSys == 2 && !reason) { - log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"No OS matches for host (If you know what OS is running on it, see http://insecure.org/nmap/submit/ ).\nTCP/IP fingerprint:\n%s\n", + log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT,"No OS matches for host (If you know what OS is running on it, see http://nmap.org/submit/ ).\nTCP/IP fingerprint:\n%s\n", mergeFPs(FPR->FPs, FPR->numFPs, true, currenths->v4hostip(), distance, currenths->MACAddress(), FPR->osscan_opentcpport, FPR->osscan_closedtcpport, FPR->osscan_closedudpport, @@ -1884,11 +1884,11 @@ void printfinaloutput() { log_write(LOG_STDOUT, "Note: Host seems down. If it is really up, but blocking our ping probes, try -PN\n"); else if (o.numhosts_up > 0) { if (o.osscan && o.servicescan) - log_write(LOG_PLAIN, "OS and Service detection performed. Please report any incorrect results at http://insecure.org/nmap/submit/ .\n"); + log_write(LOG_PLAIN, "OS and Service detection performed. Please report any incorrect results at http://nmap.org/submit/ .\n"); else if (o.osscan) - log_write(LOG_PLAIN, "OS detection performed. Please report any incorrect results at http://insecure.org/nmap/submit/ .\n"); + log_write(LOG_PLAIN, "OS detection performed. Please report any incorrect results at http://nmap.org/submit/ .\n"); else if (o.servicescan) - log_write(LOG_PLAIN, "Service detection performed. Please report any incorrect results at http://insecure.org/nmap/submit/ .\n"); + log_write(LOG_PLAIN, "Service detection performed. Please report any incorrect results at http://nmap.org/submit/ .\n"); } log_write(LOG_STDOUT|LOG_SKID, "Nmap done: %d %s (%d %s up) scanned in %.3f seconds\n", o.numhosts_scanned, (o.numhosts_scanned == 1)? "IP address" : "IP addresses", o.numhosts_up, (o.numhosts_up == 1)? "host" : "hosts", o.TimeSinceStartMS(&tv) / 1000.0); diff --git a/output.h b/output.h index 4270b1b4d..83653f370 100644 --- a/output.h +++ b/output.h @@ -42,7 +42,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/portlist.cc b/portlist.cc index 4481966be..752f75d5d 100644 --- a/portlist.cc +++ b/portlist.cc @@ -37,7 +37,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/portlist.h b/portlist.h index e3698f653..d55786f15 100644 --- a/portlist.h +++ b/portlist.h @@ -37,7 +37,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/portreasons.cc b/portreasons.cc index ae2de84d1..f3a2e5c3c 100644 --- a/portreasons.cc +++ b/portreasons.cc @@ -36,7 +36,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/portreasons.h b/portreasons.h index 89ff7b0d7..868f582c9 100644 --- a/portreasons.h +++ b/portreasons.h @@ -36,7 +36,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/protocols.cc b/protocols.cc index 24d5a083f..c7f6f4682 100644 --- a/protocols.cc +++ b/protocols.cc @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/protocols.h b/protocols.h index ad509f21e..7dfe9b948 100644 --- a/protocols.h +++ b/protocols.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/scan_engine.cc b/scan_engine.cc index 681eb6dc7..70fdc9938 100644 --- a/scan_engine.cc +++ b/scan_engine.cc @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/scan_engine.h b/scan_engine.h index 1488e6b32..07685970e 100644 --- a/scan_engine.h +++ b/scan_engine.h @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/service_scan.cc b/service_scan.cc index 06f7fde0a..89547ac7a 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/service_scan.h b/service_scan.h index aa7122340..4a70c631e 100644 --- a/service_scan.h +++ b/service_scan.h @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/services.cc b/services.cc index 495db56b4..8671cbbc5 100644 --- a/services.cc +++ b/services.cc @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/services.h b/services.h index de743a1e9..13497a624 100644 --- a/services.h +++ b/services.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/targets.cc b/targets.cc index d14eff2e1..db98c2451 100644 --- a/targets.cc +++ b/targets.cc @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/targets.h b/targets.h index 5d9933f5a..8f68b52e2 100644 --- a/targets.h +++ b/targets.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/tcpip.cc b/tcpip.cc index 930804617..42d8550b6 100644 --- a/tcpip.cc +++ b/tcpip.cc @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/tcpip.h b/tcpip.h index 2e457448b..19a81c0fb 100644 --- a/tcpip.h +++ b/tcpip.h @@ -39,7 +39,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/timing.cc b/timing.cc index 8c6f33329..968515b66 100644 --- a/timing.cc +++ b/timing.cc @@ -40,7 +40,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/timing.h b/timing.h index 55ab54cfd..7e07b53ee 100644 --- a/timing.h +++ b/timing.h @@ -40,7 +40,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/traceroute.cc b/traceroute.cc index 9ab3ec1a8..46b854d29 100644 --- a/traceroute.cc +++ b/traceroute.cc @@ -36,7 +36,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/traceroute.h b/traceroute.h index 6fe03183b..39202dd3c 100644 --- a/traceroute.h +++ b/traceroute.h @@ -1,19 +1,20 @@ + /*************************************************************************** - * traceroute.h -- Traces the route a packet takes to a host * + * traceroute.h -- Parallel multi-protocol traceroute feature * * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2004 Insecure.Com LLC. Nmap * - * is also a registered trademark of Insecure.Com LLC. This program is * - * free software; you may redistribute and/or modify it under the * - * terms of the GNU General Public License as published by the Free * - * Software Foundation; Version 2. This guarantees your right to use, * - * modify, and redistribute this software under certain conditions. If * - * you wish to embed Nmap technology into proprietary software, we may be * - * willing to sell alternative licenses (contact sales@insecure.com). * - * Many security scanner vendors already license Nmap technology such as * - * our remote OS fingerprinting database and code, service/version * - * detection system, and port scanning code. * + * The Nmap Security Scanner is (C) 1996-2008 Insecure.Com LLC. Nmap is * + * also a registered trademark of Insecure.Com LLC. This program is free * + * software; you may redistribute and/or modify it under the terms of the * + * GNU General Public License as published by the Free Software * + * Foundation; Version 2 with the clarifications and exceptions described * + * below. This guarantees your right to use, modify, and redistribute * + * this software under certain conditions. If you wish to embed Nmap * + * technology into proprietary software, we sell alternative licenses * + * (contact sales@insecure.com). Dozens of software vendors already * + * license Nmap technology such as host discovery, port scanning, OS * + * detection, and version detection. * * * * Note that the GPL places important restrictions on "derived works", yet * * it does not provide a detailed definition of that term. To avoid * @@ -36,7 +37,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://www.insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * @@ -48,10 +49,10 @@ * If you have any questions about the GPL licensing restrictions on using * * Nmap in non-GPL works, we would be happy to help. As mentioned above, * * we also offer alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to many * - * security vendors, and generally include a perpetual license as well as * - * providing for priority support and updates as well as helping to fund * - * the continued development of Nmap technology. Please email * + * applications and appliances. These contracts have been sold to dozens * + * of software vendors, and generally include a perpetual license as well * + * as providing for priority support and updates as well as helping to * + * fund the continued development of Nmap technology. Please email * * sales@insecure.com for further information. * * * * As a special exception to the GPL terms, Insecure.Com LLC grants * @@ -93,11 +94,9 @@ * http://www.gnu.org/copyleft/gpl.html , or in the COPYING file included * * with Nmap. * * * - *************************************************************************** - * - * Eddie Bell - * See Traceroute.cc for an indepth explanation - */ + ***************************************************************************/ + +/* $Id: nmap.h 6676 2008-01-12 22:39:34Z fyodor $ */ #include "Target.h" diff --git a/utils.cc b/utils.cc index 9f340bd53..1575139c1 100644 --- a/utils.cc +++ b/utils.cc @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/utils.h b/utils.h index c1f784f5b..9a1a681d5 100644 --- a/utils.h +++ b/utils.h @@ -38,7 +38,7 @@ * These restrictions only apply when you actually redistribute Nmap. For * * example, nothing stops you from writing and selling a proprietary * * front-end to Nmap. Just distribute it by itself, and point people to * - * http://insecure.org/nmap/ to download Nmap. * + * http://nmap.org to download Nmap. * * * * We don't consider these to be added restrictions on top of the GPL, but * * just a clarification of how we interpret "derived works" as it applies * diff --git a/zenmap.spec.in b/zenmap.spec.in index b5be1eb32..6fa7793b6 100644 --- a/zenmap.spec.in +++ b/zenmap.spec.in @@ -16,10 +16,10 @@ Name: %{name} Version: %{version} Release: %{release} Epoch: 2 -License: http://www.insecure.org/nmap/man/man-legal.html +License: http://nmap.org/man/man-legal.html Group: Applications/System -Source0: http://www.insecure.org/nmap/dist/nmap-%{version}.tgz -URL: http://www.insecure.org/nmap/ +Source0: http://nmap.org/dist/nmap-%{version}.tgz +URL: http://nmap.org BuildArch: noarch # Disable automatic dependency calculation because we want to provide