diff --git a/docs/legal-notices.xml b/docs/legal-notices.xml index 746710361..7d172bb1b 100644 --- a/docs/legal-notices.xml +++ b/docs/legal-notices.xml @@ -130,7 +130,7 @@ before doing even a light scan of a network. -Third-Party Software +Third-Party Software and Funding Notices This product includes software developed by the Apache Software @@ -166,6 +166,10 @@ the packages.) A listing of these support libraries and their licenses is included in the LICENSES files. + +This software was supported in part through the Google Summer of Code and the DARPA CINDER program (DARPA-BAA-10-84). + + United States Export Control<indexterm><primary>export control</primary></indexterm> diff --git a/docs/nmap.1 b/docs/nmap.1 index 253bdb373..336647ecc 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 06/30/2011 +.\" Date: 07/25/2011 .\" Manual: Nmap Reference Guide .\" Source: Nmap .\" Language: English .\" -.TH "NMAP" "1" "06/30/2011" "Nmap" "Nmap Reference Guide" +.TH "NMAP" "1" "07/25/2011" "Nmap" "Nmap Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -2492,7 +2492,7 @@ unless you are prepared to suffer downtime\&. We acknowledge here that Nmap may Because of the slight risk of crashes and because a few black hats like to use Nmap for reconnaissance prior to attacking systems, there are administrators who become upset and may complain when their system is scanned\&. Thus, it is often advisable to request permission before doing even a light scan of a network\&. .PP Nmap should never be installed with special privileges (e\&.g\&. suid root) for security reasons\&..\" setuid, why Nmap shouldn't be -.SS "Third\-Party Software" +.SS "Third\-Party Software and Funding Notices" .PP This product includes software developed by the \m[blue]\fBApache Software Foundation\fR\m[]\&\s-2\u[20]\d\s+2\&. A modified version of the @@ -2514,16 +2514,22 @@ All of the third\-party software described in this paragraph is freely redistrib Binary packages for Windows and Mac OS X include support libraries necessary to run Zenmap and Ndiff with Python and PyGTK\&. (Unix platforms commonly make these libraries easy to install, so they are not part of the packages\&.) A listing of these support libraries and their licenses is included in the LICENSES files\&. +.PP +This software was supported in part through the +\m[blue]\fBGoogle Summer of Code\fR\m[]\&\s-2\u[27]\d\s+2 +and the +\m[blue]\fBDARPA CINDER program\fR\m[]\&\s-2\u[28]\d\s+2 +(DARPA\-BAA\-10\-84)\&. .SS "United States Export Control.\" export control" .PP Nmap only uses encryption when compiled with the optional OpenSSL support and linked with OpenSSL\&. When compiled without OpenSSL support, Insecure\&.Com LLC believes that Nmap is not subject to U\&.S\&. -\m[blue]\fBExport Administration Regulations (EAR)\fR\m[]\&\s-2\u[27]\d\s+2 +\m[blue]\fBExport Administration Regulations (EAR)\fR\m[]\&\s-2\u[29]\d\s+2 export control\&. As such, there is no applicable ECCN (export control classification number) and exportation does not require any special license, permit, or other governmental authorization\&. .PP When compiled with OpenSSL support or distributed as source code, Insecure\&.Com LLC believes that Nmap falls under U\&.S\&. ECCN -\m[blue]\fB5D002\fR\m[]\&\s-2\u[28]\d\s+2 +\m[blue]\fB5D002\fR\m[]\&\s-2\u[30]\d\s+2 (\(lqInformation Security Software\(rq)\&. We distribute Nmap under the TSU exception for publicly available encryption software defined in -\m[blue]\fBEAR 740\&.13(e)\fR\m[]\&\s-2\u[29]\d\s+2\&. +\m[blue]\fBEAR 740\&.13(e)\fR\m[]\&\s-2\u[31]\d\s+2\&. .SH "NOTES" .IP " 1." 4 Nmap Network Scanning: The Official Nmap Project Guide to Network Discovery and Security Scanning @@ -2656,16 +2662,26 @@ Lua programming language \%http://www.lua.org .RE .IP "27." 4 +Google Summer of Code +.RS 4 +\%http://nmap.org/soc/ +.RE +.IP "28." 4 +DARPA CINDER program +.RS 4 +\%https://www.fbo.gov/index?s=opportunity&mode=form&id=585e02a51f77af5cb3c9e06b9cc82c48&tab=core&_cview=1 +.RE +.IP "29." 4 Export Administration Regulations (EAR) .RS 4 \%http://www.access.gpo.gov/bis/ear/ear_data.html .RE -.IP "28." 4 +.IP "30." 4 5D002 .RS 4 \%http://www.access.gpo.gov/bis/ear/pdf/ccl5-pt2.pdf .RE -.IP "29." 4 +.IP "31." 4 EAR 740.13(e) .RS 4 \%http://www.access.gpo.gov/bis/ear/pdf/740.pdf