From b28d51167cd08f585dd307374538731c276c87b0 Mon Sep 17 00:00:00 2001 From: fyodor Date: Fri, 25 Aug 2006 01:47:49 +0000 Subject: [PATCH] Minor source code header improvements --- COPYING | 26 +- FingerPrintResults.cc | 26 +- FingerPrintResults.h | 26 +- MACLookup.cc | 26 +- MACLookup.h | 26 +- NmapOps.cc | 26 +- NmapOps.h | 26 +- NmapOutputTable.cc | 26 +- NmapOutputTable.h | 26 +- Target.cc | 26 +- Target.h | 26 +- TargetGroup.cc | 26 +- TargetGroup.h | 26 +- charpool.cc | 26 +- charpool.h | 26 +- config.h.in | 26 +- global_structures.h | 26 +- idle_scan.cc | 26 +- idle_scan.h | 26 +- main.cc | 26 +- mswin32/winclude.h | 26 +- mswin32/winfix.cc | 26 +- nmap-header-template.cc | 26 +- nmap.cc | 26 +- nmap.h | 26 +- nmap_amigaos.h | 26 +- nmap_dns.cc | 26 +- nmap_dns.h | 26 +- nmap_error.cc | 26 +- nmap_error.h | 26 +- nmap_rpc.cc | 26 +- nmap_rpc.h | 26 +- nmap_tty.cc | 26 +- nmap_tty.h | 26 +- nmap_winconfig.h | 26 +- nmapfe/nmapfe.c | 26 +- nmapfe/nmapfe.h | 26 +- nmapfe/nmapfe_error.c | 26 +- nmapfe/nmapfe_error.h | 26 +- nmapfe/nmapfe_sig.c | 26 +- nmapfe/nmapfe_sig.h | 26 +- osscan.cc | 26 +- osscan.h | 26 +- osscan2.cc | 26 +- osscan2.h | 26 +- output.cc | 41 +- output.h | 26 +- portlist.cc | 26 +- portlist.h | 26 +- protocols.cc | 26 +- protocols.h | 26 +- scan_engine.cc | 26 +- scan_engine.h | 26 +- scripts/fingerdiff.cc | 26 +- scripts/fingerfix.pl | 1191 ++++++++++++++++++++------------------ scripts/fingermatch.cc | 26 +- scripts/nmap.header.tmpl | 26 +- scripts/servicematch.cc | 26 +- service_scan.cc | 26 +- service_scan.h | 26 +- services.cc | 26 +- services.h | 26 +- targets.cc | 26 +- targets.h | 26 +- tcpip.cc | 26 +- tcpip.h | 26 +- timing.cc | 26 +- timing.h | 26 +- utils.cc | 26 +- utils.h | 26 +- 70 files changed, 1520 insertions(+), 1480 deletions(-) diff --git a/COPYING b/COPYING index b90afb9ea..b22c54c44 100644 --- a/COPYING +++ b/COPYING @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/FingerPrintResults.cc b/FingerPrintResults.cc index 7b7d2edd5..c7712c67d 100644 --- a/FingerPrintResults.cc +++ b/FingerPrintResults.cc @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/FingerPrintResults.h b/FingerPrintResults.h index 4557cb4b6..ce1d5de30 100644 --- a/FingerPrintResults.h +++ b/FingerPrintResults.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/MACLookup.cc b/MACLookup.cc index b6d7624a0..a1d3157fa 100644 --- a/MACLookup.cc +++ b/MACLookup.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/MACLookup.h b/MACLookup.h index 0f3031bfd..d0fdbeea2 100644 --- a/MACLookup.h +++ b/MACLookup.h @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/NmapOps.cc b/NmapOps.cc index e062719b9..5151e9934 100644 --- a/NmapOps.cc +++ b/NmapOps.cc @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/NmapOps.h b/NmapOps.h index bc67edbfe..ef0e15c7e 100644 --- a/NmapOps.h +++ b/NmapOps.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/NmapOutputTable.cc b/NmapOutputTable.cc index 894617e31..a7cd17c98 100644 --- a/NmapOutputTable.cc +++ b/NmapOutputTable.cc @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/NmapOutputTable.h b/NmapOutputTable.h index e60dfd7ed..ddaeec0c7 100644 --- a/NmapOutputTable.h +++ b/NmapOutputTable.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/Target.cc b/Target.cc index a80ae8387..ab1359a02 100644 --- a/Target.cc +++ b/Target.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/Target.h b/Target.h index 959524283..e0fcc8a63 100644 --- a/Target.h +++ b/Target.h @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/TargetGroup.cc b/TargetGroup.cc index 9902d7969..8ce807da1 100644 --- a/TargetGroup.cc +++ b/TargetGroup.cc @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/TargetGroup.h b/TargetGroup.h index 11a8c3d24..90bd72a71 100644 --- a/TargetGroup.h +++ b/TargetGroup.h @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/charpool.cc b/charpool.cc index be3df6401..2d227f3ce 100644 --- a/charpool.cc +++ b/charpool.cc @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/charpool.h b/charpool.h index 8b0162349..647e7ddcf 100644 --- a/charpool.h +++ b/charpool.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/config.h.in b/config.h.in index e60c9a4af..369a2caee 100644 --- a/config.h.in +++ b/config.h.in @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/global_structures.h b/global_structures.h index 5d2dd06f7..5aa4464b9 100644 --- a/global_structures.h +++ b/global_structures.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/idle_scan.cc b/idle_scan.cc index b1a3dd51b..869b61c8f 100644 --- a/idle_scan.cc +++ b/idle_scan.cc @@ -9,17 +9,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -55,7 +55,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/idle_scan.h b/idle_scan.h index 2bd4723dc..8a94baab2 100644 --- a/idle_scan.h +++ b/idle_scan.h @@ -9,17 +9,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -55,7 +55,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/main.cc b/main.cc index e195edeb7..beacd036f 100644 --- a/main.cc +++ b/main.cc @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/mswin32/winclude.h b/mswin32/winclude.h index 963521b47..5dd8cdd7d 100644 --- a/mswin32/winclude.h +++ b/mswin32/winclude.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc index dbd8c9918..cb2d7f5d7 100644 --- a/mswin32/winfix.cc +++ b/mswin32/winfix.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap-header-template.cc b/nmap-header-template.cc index 3ca583edb..362c5049f 100644 --- a/nmap-header-template.cc +++ b/nmap-header-template.cc @@ -4,17 +4,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -50,7 +50,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap.cc b/nmap.cc index 25e749c10..04e01cacf 100644 --- a/nmap.cc +++ b/nmap.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap.h b/nmap.h index 677359db6..20629c8a9 100644 --- a/nmap.h +++ b/nmap.h @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_amigaos.h b/nmap_amigaos.h index 0442f2939..8da90b50a 100644 --- a/nmap_amigaos.h +++ b/nmap_amigaos.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_dns.cc b/nmap_dns.cc index 8c118b5f9..dbbe2e7f1 100644 --- a/nmap_dns.cc +++ b/nmap_dns.cc @@ -4,17 +4,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -50,7 +50,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_dns.h b/nmap_dns.h index a4d5be766..ba9904da6 100644 --- a/nmap_dns.h +++ b/nmap_dns.h @@ -3,17 +3,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 +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://insecure.org/nmap/ 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 * @@ -49,7 +49,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_error.cc b/nmap_error.cc index ff593c60c..ff32d8a17 100644 --- a/nmap_error.cc +++ b/nmap_error.cc @@ -4,17 +4,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -50,7 +50,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_error.h b/nmap_error.h index 6a26af26d..03849d6cd 100644 --- a/nmap_error.h +++ b/nmap_error.h @@ -4,17 +4,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -50,7 +50,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_rpc.cc b/nmap_rpc.cc index 56dbc3be5..0c4cb3f21 100644 --- a/nmap_rpc.cc +++ b/nmap_rpc.cc @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_rpc.h b/nmap_rpc.h index 5637e4c0e..5d2f19cf5 100644 --- a/nmap_rpc.h +++ b/nmap_rpc.h @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_tty.cc b/nmap_tty.cc index a293a4819..83cc4cef2 100644 --- a/nmap_tty.cc +++ b/nmap_tty.cc @@ -4,17 +4,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -50,7 +50,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_tty.h b/nmap_tty.h index 73d3aa6db..485c04a76 100644 --- a/nmap_tty.h +++ b/nmap_tty.h @@ -4,17 +4,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -50,7 +50,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmap_winconfig.h b/nmap_winconfig.h index 44d3b1a25..f7c798725 100644 --- a/nmap_winconfig.h +++ b/nmap_winconfig.h @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmapfe/nmapfe.c b/nmapfe/nmapfe.c index 0d14d551b..c7aec826e 100644 --- a/nmapfe/nmapfe.c +++ b/nmapfe/nmapfe.c @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmapfe/nmapfe.h b/nmapfe/nmapfe.h index b8a1f3c09..02516143e 100644 --- a/nmapfe/nmapfe.h +++ b/nmapfe/nmapfe.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmapfe/nmapfe_error.c b/nmapfe/nmapfe_error.c index 171707dbc..f5c2d5835 100644 --- a/nmapfe/nmapfe_error.c +++ b/nmapfe/nmapfe_error.c @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmapfe/nmapfe_error.h b/nmapfe/nmapfe_error.h index 5e560c92a..34f2c92a6 100644 --- a/nmapfe/nmapfe_error.h +++ b/nmapfe/nmapfe_error.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmapfe/nmapfe_sig.c b/nmapfe/nmapfe_sig.c index 43c2bfd1f..2b9d962f2 100644 --- a/nmapfe/nmapfe_sig.c +++ b/nmapfe/nmapfe_sig.c @@ -4,17 +4,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -50,7 +50,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/nmapfe/nmapfe_sig.h b/nmapfe/nmapfe_sig.h index b025bebb9..30cf67266 100644 --- a/nmapfe/nmapfe_sig.h +++ b/nmapfe/nmapfe_sig.h @@ -4,17 +4,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -50,7 +50,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/osscan.cc b/osscan.cc index 94acc94c5..ccaa20bb0 100644 --- a/osscan.cc +++ b/osscan.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/osscan.h b/osscan.h index 99ebb7b05..7a23db595 100644 --- a/osscan.h +++ b/osscan.h @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/osscan2.cc b/osscan2.cc index 360cb81e8..ad4e7a889 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/osscan2.h b/osscan2.h index d5e898323..f45606f90 100644 --- a/osscan2.h +++ b/osscan2.h @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/output.cc b/output.cc index 3ee9ccd3b..5cc9a8175 100644 --- a/output.cc +++ b/output.cc @@ -9,17 +9,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -55,7 +55,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * @@ -1338,7 +1338,7 @@ void printosscanoutput(Target *currenths) { log_write(LOG_NORMAL|LOG_SKID|LOG_STDOUT, "\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://www.insecure.org/cgi-bin/nmap-submit.cgi).\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://insecure.org/nmap/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, @@ -1364,7 +1364,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://www.insecure.org/cgi-bin/nmap-submit.cgi).\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://insecure.org/nmap/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, @@ -1593,13 +1593,20 @@ void printfinaloutput() { gettimeofday(&tv, NULL); timep = time(NULL); - + if (o.numhosts_scanned == 0) fprintf(stderr, "WARNING: No targets were specified, so 0 hosts scanned.\n"); if (o.numhosts_scanned == 1 && o.numhosts_up == 0 && !o.listscan && o.pingtype != PINGTYPE_NONE) log_write(LOG_STDOUT, "Note: Host seems down. If it is really up, but blocking our ping probes, try -P0\n"); - /* log_write(LOG_NORMAL|LOG_SKID|LOG_STDOUT,"\n"); */ + + if (o.osscan && o.servicescan) + log_write(LOG_STDOUT|LOG_NORMAL|LOG_SKID, "OS and Service detection performed. Please report any incorrect results at http://insecure.org/nmap/submit/ .\n"); + else if (o.osscan) + log_write(LOG_STDOUT|LOG_NORMAL|LOG_SKID, "OS detection performed. Please report any incorrect results at http://insecure.org/nmap/submit/ .\n"); + else if (o.servicescan) + log_write(LOG_STDOUT|LOG_NORMAL|LOG_SKID, "Service detection performed. Please report any incorrect results at http://insecure.org/nmap/submit/ .\n"); + log_write(LOG_STDOUT|LOG_SKID, "Nmap finished: %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); if (o.verbose && o.isr00t && o.RawScan()) log_write(LOG_STDOUT|LOG_SKID, " %s\n", diff --git a/output.h b/output.h index b4048dc16..3f8c70ba1 100644 --- a/output.h +++ b/output.h @@ -9,17 +9,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -55,7 +55,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/portlist.cc b/portlist.cc index 672358c14..d8189c4a5 100644 --- a/portlist.cc +++ b/portlist.cc @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/portlist.h b/portlist.h index 016f1cae8..6f0068d5f 100644 --- a/portlist.h +++ b/portlist.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/protocols.cc b/protocols.cc index c0c70e5f3..4859dc91b 100644 --- a/protocols.cc +++ b/protocols.cc @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/protocols.h b/protocols.h index 8b910c91c..343638889 100644 --- a/protocols.h +++ b/protocols.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/scan_engine.cc b/scan_engine.cc index 2b2fb2fec..0db98a301 100644 --- a/scan_engine.cc +++ b/scan_engine.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/scan_engine.h b/scan_engine.h index 3e38c7a5f..a54f757b7 100644 --- a/scan_engine.h +++ b/scan_engine.h @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/scripts/fingerdiff.cc b/scripts/fingerdiff.cc index 8e3b03a60..56f421303 100644 --- a/scripts/fingerdiff.cc +++ b/scripts/fingerdiff.cc @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/scripts/fingerfix.pl b/scripts/fingerfix.pl index 91c3a80b7..c244e8fef 100755 --- a/scripts/fingerfix.pl +++ b/scripts/fingerfix.pl @@ -12,613 +12,646 @@ sub min($$) { return $b; } +sub fpunwrap($) { + my $fp = shift(); + $fp =~ s/^\s*OS://mg; + $fp =~ s/\n//g; + $fp =~ s/\s+$//g; + $fp =~ s/\)/\)\n/g; + return $fp; +} + +# first read in the fingerprint +my $printbuf = ""; +my $wrapped = 0; + while(<>) { chomp; $line = $_; - if ($line eq "." || $line eq "") { last; } + if (($line eq "." || $line eq "")) { + if ($printbuf) { last; } + } else { $printbuf .= "$line\n"; } + if ($line =~ /^\s*OS:/) { $wrapped = 1; } +} + +if ($wrapped) { + $printbuf = fpunwrap($printbuf); + print "Unwrapped fingerprint:\n$printbuf\n"; +} + +# At this point I have an unwrapped FP in $printbuf +foreach $line (split /\n/, $printbuf) { + chomp($line); + + # Itemize the lines we know how to deal with if (!$line =~ /(Fingerprint\s+\S)|(Class\s+\S)|(^SEQ)|(^OPS)|(^WIN)|(^ECN)|(^T[1-7])|(^U1)|(^IE)|(^Contributed by)/i) { next; } - + + # If this is coming from the submission form, there may already be a Contributor attached if ($line =~ /Contributed by (.*)/) { - if (!$fp{contrib}) { - $fp{contrib} = $1; - } else { $fp{contrib} .= ", $1"; } + if (!$fp{contrib}) { + $fp{contrib} = $1; + } else { $fp{contrib} .= ", $1"; } } - + + # We also get a Fingerprint line describing what this system (supposedly) is if it is coming from + # the submission CGI. elsif ($line =~ /Fingerprint\s+(.*)/i) { - $fp{os} = $1; + $fp{os} = $1; } - - elsif ($line =~ /Class\s+(.*)/i) { - if (!$fp{class} or !($fp{class} =~ /\Q$line\E/)) { - $fp{class} .= $line . "\n"; - } + + # If the submitter gave a classification, we have a Class line + elsif ($line =~ /Class\s+(.*)/i) { + if (!$fp{class} or !($fp{class} =~ /\Q$line\E/)) { + $fp{class} .= $line . "\n"; + } } - + + # OK, time for the first real fingerprint line! The SEQ line elsif ($line =~ /SEQ\(CL=([^%\)]+)(%SP=([^%]+)%GCD=([^%\)]+))?(%Val=([0-9A-F]+))?(%TI=([^%\)]+))?(%II=([^%\)]+))?(%SS=([^%\)]+))?(%TS=([^%\)]+))?\)/) { - # SEQ + # SEQ $cls = $1; - if ($cls ne "C") { - $sp = $3; - $gcd = hex($4); - } else { $cval=$6; } + if ($cls ne "C") { + $sp = $3; + $gcd = hex($4); + } else { $cval=$6; } $ti = $8; - $ii = $10; - $ss = $12; + $ii = $10; + $ss = $12; $ts = $14; - if (!($fp{seq}{cls} =~ /(^|\|)$cls($|\|)/)) { - if ($fp{seq}{cls}) { - $fp{seq}{cls} = $fp{seq}{cls} . qq^|$cls^; - } else { - $fp{seq}{cls} = $cls; - } - } - - if ($cls eq "C") { - print "*******************************************************\n" . - "* WARNING: CONSTANT ISN type -- check if value changes*\n" . - "*******************************************************\n"; - if (!($fp{seq}{cval} =~ /(^|\|)$cval($|\|)/)) { - if ($fp{seq}{cval}) { - $fp{seq}{cval} = $fp{seq}{cval} . qq^|$cval^; - } else { - $fp{seq}{cval} = $cval; - } - } + if (!($fp{seq}{cls} =~ /(^|\|)$cls($|\|)/)) { + if ($fp{seq}{cls}) { + $fp{seq}{cls} = $fp{seq}{cls} . qq^|$cls^; + } else { + $fp{seq}{cls} = $cls; + } + } + + if ($cls eq "C") { + print "*******************************************************\n" . + "* WARNING: CONSTANT ISN type -- check if value changes*\n" . + "*******************************************************\n"; + if (!($fp{seq}{cval} =~ /(^|\|)$cval($|\|)/)) { + if ($fp{seq}{cval}) { + $fp{seq}{cval} = $fp{seq}{cval} . qq^|$cval^; } else { - if ($fp{seq}{gcd} =~ /<([0-9A-F]+)/) { - $oldgcd = hex($1); - } else { $oldgcd = 6; } - - $newgcd = max($oldgcd, $gcd * 2 + 4); - $fp{seq}{gcd} = sprintf ("<%X", $newgcd); - - $newhighlim = $newlowlim = -1; - if ($sp =~ /([0-9A-F]+)-([0-9A-F]+)/) { - $newlowlim = hex($1); - $newhighlim = hex($2); - } elsif ($sp =~ /<([0-9A-F]+)/) { - $newhighlim = hex($1); - } - - # print "newhighlim: $newhighlim newlowlim: $newlowlim\n"; - - $oldhighlim = $oldlowlim = 0; - if ($fp{seq}{sp} =~ /([0-9A-F]+)-([0-9A-F]+)/) { - $oldlowlim = hex($1); - $oldhighlim = hex($2); - } elsif ($fp{seq}{sp} =~ /<([0-9A-F]+)/) { - $oldhighlim = hex($1); - } elsif ($fp{seq}{sp} =~ /^([0-9A-F]+)/) { - $oldhighlim = $oldlowlim = hex($1); - } - - # print "oldhighlim: $oldhighlim oldlowlim: $oldlowlim\n"; - - if ($oldlowlim) { - if ($newlowlim != -1) { $newlowlim = max(0, min($oldlowlim, $newlowlim)); } - else { $newlowlim = max(0, min($oldlowlim, hex($sp) - 3)); } - } else { - if ($newlowlim == -1) { $newlowlim = max(0, hex($sp) - 3); } - } - - if ($newhighlim == -1) { - $newhighlim = max($oldhighlim, hex($sp) + 3); - } else { - $newhighlim = max($oldhighlim, $newhighlim); - } - - # print "oldhighlim: $oldhighlim oldlowlim: $oldlowlim newhighlim: $newhighlim newlowlim: $newlowlim oldsp: $fp{seq}{sp}"; - - if ($newlowlim > 0) { - $fp{seq}{sp} = sprintf("%X-%X", $newlowlim, $newhighlim); - } else { - $fp{seq}{sp} = sprintf("<%X", $newhighlim); - } - - # print " newsp: $fp{seq}{sp}\n"; - + $fp{seq}{cval} = $cval; } - - if (!($fp{seq}{ti} =~ /(^|\|)$ti($|\|)/)) { + } + } else { + if ($fp{seq}{gcd} =~ /<([0-9A-F]+)/) { + $oldgcd = hex($1); + } else { $oldgcd = 6; } + + $newgcd = max($oldgcd, $gcd * 2 + 4); + $fp{seq}{gcd} = sprintf ("<%X", $newgcd); + + $newhighlim = $newlowlim = -1; + if ($sp =~ /([0-9A-F]+)-([0-9A-F]+)/) { + $newlowlim = hex($1); + $newhighlim = hex($2); + } elsif ($sp =~ /<([0-9A-F]+)/) { + $newhighlim = hex($1); + } + + # print "newhighlim: $newhighlim newlowlim: $newlowlim\n"; + + $oldhighlim = $oldlowlim = 0; + if ($fp{seq}{sp} =~ /([0-9A-F]+)-([0-9A-F]+)/) { + $oldlowlim = hex($1); + $oldhighlim = hex($2); + } elsif ($fp{seq}{sp} =~ /<([0-9A-F]+)/) { + $oldhighlim = hex($1); + } elsif ($fp{seq}{sp} =~ /^([0-9A-F]+)/) { + $oldhighlim = $oldlowlim = hex($1); + } + + # print "oldhighlim: $oldhighlim oldlowlim: $oldlowlim\n"; + + if ($oldlowlim) { + if ($newlowlim != -1) { $newlowlim = max(0, min($oldlowlim, $newlowlim)); } + else { $newlowlim = max(0, min($oldlowlim, hex($sp))); } + } else { + if ($newlowlim == -1) { $newlowlim = max(0, hex($sp)); } + } + + if ($newhighlim == -1) { + $newhighlim = max($oldhighlim, hex($sp)); + } else { + $newhighlim = max($oldhighlim, $newhighlim); + } + + # print "oldhighlim: $oldhighlim oldlowlim: $oldlowlim newhighlim: $newhighlim newlowlim: $newlowlim oldsp: $fp{seq}{sp}"; + + if ($newlowlim > 0) { + $fp{seq}{sp} = sprintf("%X-%X", $newlowlim, $newhighlim); + } else { + $fp{seq}{sp} = sprintf("<%X", $newhighlim); + } + + # print " newsp: $fp{seq}{sp}\n"; + + } + + if (!($fp{seq}{ti} =~ /(^|\|)$ti($|\|)/)) { if ($fp{seq}{ti}) { $fp{seq}{ti} = $fp{seq}{ti} . qq^|$ti^; } else { $fp{seq}{ti} = $ti; } } - - if (!($fp{seq}{ii} =~ /(^|\|)$ii($|\|)/)) { + + if (!($fp{seq}{ii} =~ /(^|\|)$ii($|\|)/)) { if ($fp{seq}{ii}) { $fp{seq}{ii} = $fp{seq}{ii} . qq^|$ii^; } else { $fp{seq}{ii} = $ii; } } - - if (!($fp{seq}{ss} =~ /(^|\|)$ss($|\|)/)) { + + if (!($fp{seq}{ss} =~ /(^|\|)$ss($|\|)/)) { if ($fp{seq}{ss}) { $fp{seq}{ss} = $fp{seq}{ss} . qq^|$ss^; } else { $fp{seq}{ss} = $ss; } } - - if (!($fp{seq}{ts} =~ /(^|\|)$ts($|\|)/)) { + + if (!($fp{seq}{ts} =~ /(^|\|)$ts($|\|)/)) { if ($fp{seq}{ts}) { $fp{seq}{ts} = $fp{seq}{ts} . qq^|$ts^; } else { $fp{seq}{ts} = $ts; } } - + } elsif ($line =~ /^OPS/) { - # OPS - foreach $num (1 .. 6) { - $o = ""; - $oi = "o$num"; - if ($line =~ /[(%]O$num=([0-9A-Z|]*)/) { - $o = $1; - if (!$o) { $o = "NULL"; } - } - - if (!($fp{ops}{$oi} =~ /(^|\|)$o($|\|)/)) { - if ($fp{ops}{$oi}) { - $fp{ops}{$oi} = $fp{ops}{$oi} . qq^|$o^; - } else { - $fp{ops}{$oi} = $o; - } - } + # Time for the second test line -- Ops (Options) + foreach $num (1 .. 6) { + $o = ""; + $oi = "o$num"; + if ($line =~ /[\(%]O$num=([0-9A-Z|]*)/) { + $o = $1; + if (!$o) { $o = "NULL"; } + } + + if (!($fp{ops}{$oi} =~ /(^|\|)$o($|\|)/)) { + if ($fp{ops}{$oi}) { + $fp{ops}{$oi} = $fp{ops}{$oi} . qq^|$o^; + } else { + $fp{ops}{$oi} = $o; } - } elsif ($line =~ /^WIN/) { - # WIN - foreach $num (1 .. 6) { - $w = ""; - $wi = "w$num"; - if ($line =~ /[(%]W$num=([0-9A-F|]*)/) { - $w = $1; - if (!$w) { $w = "NULL"; } - } - - if (!($fp{win}{$wi} =~ /(^|\|)$w($|\|)/)) { - if ($fp{win}{$wi}) { - $fp{win}{$wi} = $fp{win}{$wi} . qq^|$w^; - } else { - $fp{win}{$wi} = $w; - } - } + } + } + } elsif ($line =~ /^WIN/) { + # WIN - Window values + foreach $num (1 .. 6) { + $w = ""; + $wi = "w$num"; + if ($line =~ /[\(%]W$num=([0-9A-F|]*)/) { + $w = $1; + if (!$w) { $w = "NULL"; } + } + + if (!($fp{win}{$wi} =~ /(^|\|)$w($|\|)/)) { + if ($fp{win}{$wi}) { + $fp{win}{$wi} = $fp{win}{$wi} . qq^|$w^; + } else { + $fp{win}{$wi} = $w; } - } elsif ($line =~ /^ECN/) { - # ECN - $resp = $df = $ttl = $win = $ops = $cc = $quirk = ""; + } + } + } elsif ($line =~ /^ECN/) { + # ECN - Explicit Congestion Notification probe response + $resp = $df = $ttl = $win = $ops = $cc = $quirk = ""; + + if ($line =~ /R=([NY])/) { + $resp = $1; + } + if ($line =~ /[\(%]DF=([NY])/) { + $df = $1; + } + if ($line =~ /[\(%]TG?=([0-9A-F]+)/) { + $ttl = $1; + if (!$ttl) { $ttl = "NULL"; } + } + if ($line =~ /[\(%]W=([0-9A-F|]*)/) { + $win = $1; + if (!$win) { $win = "NULL"; } + } + if ($line =~ /[\(%]O=([0-9A-Z|]*)/) { + $ops = $1; + if (!$ops) { $ops = "NULL"; } + } + if ($line =~ /[\(%]CC=([NY])/) { + $cc = $1; + } + if ($line =~ /[\(%]Q=(R?U?)/) { + $quirk = $1; + if (!$quirk) { $quirk = "NULL"; } + } - if ($line =~ /R=([NY])/) { - $resp = $1; - } - if ($line =~ /[(%]DF=([NY])/) { - $df = $1; - } - if ($line =~ /[(%]TG?=([0-9A-F]+)/) { - $ttl = $1; - if (!$ttl) { $ttl = "NULL"; } - } - if ($line =~ /[(%]W=([0-9A-F|]*)/) { - $win = $1; - if (!$win) { $win = "NULL"; } - } - if ($line =~ /[(%]O=([0-9A-Z|]*)/) { - $ops = $1; - if (!$ops) { $ops = "NULL"; } - } - if ($line =~ /[(%]CC=([NY])/) { - $cc = $1; - } - if ($line =~ /[(%]Q=(R?U?)/) { - $quirk = $1; - if (!$quirk) { $quirk = "NULL"; } + if ($resp eq "Y" or !$resp) { + $fp{ecn}{resp} = "Y"; + if ($df and !($fp{ecn}{df} =~ /(^|\|)$df($|\|)/)) { + if ($fp{ecn}{df}) { + $fp{ecn}{df} .= qq^|$df^; + } else { + $fp{ecn}{df} = $df; } + } - if ($resp eq "Y" or !$resp) { - $fp{ecn}{resp} = "Y"; - if ($df and !($fp{ecn}{df} =~ /(^|\|)$df($|\|)/)) { - if ($fp{ecn}{df}) { - $fp{ecn}{df} .= qq^|$df^; - } else { - $fp{ecn}{df} = $df; - } - } - - if (!($fp{ecn}{ttl} =~ /(^|\|)$ttl($|\|)/)) { - if ($fp{ecn}{ttl}) { - $fp{ecn}{ttl} = $fp{ecn}{ttl} . qq^|$ttl^; - } else { - $fp{ecn}{ttl} = $ttl; - } - } - - if (!($fp{ecn}{win} =~ /(^|\|)$win($|\|)/)) { - if ($fp{ecn}{win}) { - $fp{ecn}{win} = $fp{ecn}{win} . qq^|$win^; - } else { - $fp{ecn}{win} = $win; - } - } - - if (!($fp{ecn}{ops} =~ /(^|\|)$ops($|\|)/)) { - if ($fp{ecn}{ops}) { - $fp{ecn}{ops} = $fp{ecn}{ops} . qq^|$ops^; - } else { - $fp{ecn}{ops} = $ops; - } - } - - if ($cc and !($fp{ecn}{cc} =~ /(^|\|)$cc($|\|)/)) { - if ($fp{ecn}{cc}) { - $fp{ecn}{cc} .= qq^|$cc^; - } else { - $fp{ecn}{cc} = $cc; - } - } - - if (!($fp{ecn}{quirk} =~ /(^|\|)$quirk($|\|)/)) { - if ($fp{ecn}{quirk}) { - $fp{ecn}{quirk} .= qq^|$quirk^; - } else { - $fp{ecn}{quirk} = $quirk; - } - } - - } elsif ($fp{ecn}{resp} ne "Y") { - $fp{ecn}{resp} = "N"; + if (!($fp{ecn}{ttl} =~ /(^|\|)$ttl($|\|)/)) { + if ($fp{ecn}{ttl}) { + $fp{ecn}{ttl} = $fp{ecn}{ttl} . qq^|$ttl^; + } else { + $fp{ecn}{ttl} = $ttl; } - } elsif ($line =~ /^T([1-7])/) { - $num = $1; - $test = "T$num"; - $resp = $df = $ttl = $win = $seq = $ack = $flags = $ops = $rd = $quirk = ""; + } - if ($line =~ /R=([NY])/) { - $resp = $1; - } - if ($line =~ /[(%]DF=([NY])/) { - $df = $1; - } - if ($line =~ /[(%]TG?=([0-9A-F]+)/) { - $ttl = $1; - if (!$ttl) { $ttl = "NULL"; } - } - if ($num != 1 and $line =~ /[(%]W=([0-9A-F|]*)/) { - $win = $1; - if (!$win) { $win = "NULL"; } - } - if ($line =~ /[(%]S=([^%]+)/) { - $seq = $1; - } - if ($line =~ /[(%]A=([^%]+)/) { - $ack = $1; - } - if ($line =~ /[(%]F=([^%]*)/) { - $flags = $1; - if (!$flags) { $flags = "NULL"; } - } - if ($num != 1 and $line =~ /[(%]O=([0-9A-Z|]*)/) { - $ops = $1; - if (!$ops) { $ops = "NULL"; } - } - if ($line =~ /[(%]RD=([0-9A-F]*)/) { - $rd = $1; - if (!$rd) { $rd = "NULL"; } - } - if ($line =~ /[(%]Q=(R?U?)/) { - $quirk = $1; - if (!$quirk) { $quirk = "NULL"; } + if (!($fp{ecn}{win} =~ /(^|\|)$win($|\|)/)) { + if ($fp{ecn}{win}) { + $fp{ecn}{win} = $fp{ecn}{win} . qq^|$win^; + } else { + $fp{ecn}{win} = $win; } + } - if ($resp eq "Y" or !$resp) { - $fp{$test}{resp} = "Y"; - if ($df and !($fp{$test}{df} =~ /(^|\|)$df($|\|)/)) { - if ($fp{$test}{df}) { - $fp{$test}{df} .= qq^|$df^; - } else { - $fp{$test}{df} = $df; - } - } - - if (!($fp{$test}{ttl} =~ /(^|\|)$ttl($|\|)/)) { - if ($fp{$test}{ttl}) { - $fp{$test}{ttl} = $fp{$test}{ttl} . qq^|$ttl^; - } else { - $fp{$test}{ttl} = $ttl; - } - } - - if ($num != 1 and !($fp{$test}{win} =~ /(^|\|)$win($|\|)/)) { - if ($fp{$test}{win}) { - $fp{$test}{win} = $fp{$test}{win} . qq^|$win^; - } else { - $fp{$test}{win} = $win; - } - } - - if ($seq and !($fp{$test}{seq} =~ /(^|\|)$seq($|\|)/)) { - if ($fp{$test}{seq}) { - $fp{$test}{seq} .= qq^|$seq^; - } else { - $fp{$test}{seq} = $seq; - } - } - - if ($ack and !($fp{$test}{ack} =~ /(^|\|)$ack($|\|)/)) { - if ($fp{$test}{ack}) { - $fp{$test}{ack} .= qq^|$ack^; - } else { - $fp{$test}{ack} = $ack; - } - } - - if (!($fp{$test}{flags} =~ /(^|\|)$flags($|\|)/)) { - if ($fp{$test}{flags}) { - $fp{$test}{flags} = $fp{$test}{flags} . qq^|$flags^; - } else { - $fp{$test}{flags} = $flags; - } - } - - if ($num != 1 and !($fp{$test}{ops} =~ /(^|\|)$ops($|\|)/)) { - if ($fp{$test}{ops}) { - $fp{$test}{ops} = $fp{$test}{ops} . qq^|$ops^; - } else { - $fp{$test}{ops} = $ops; - } - } - - if (!($fp{$test}{rd} =~ /(^|\|)$rd($|\|)/)) { - if ($fp{$test}{rd}) { - $fp{$test}{rd} = $fp{$test}{rd} . qq^|$rd^; - } else { - $fp{$test}{rd} = $rd; - } - } - - if (!($fp{$test}{quirk} =~ /(^|\|)$quirk($|\|)/)) { - if ($fp{$test}{quirk}) { - $fp{$test}{quirk} .= qq^|$quirk^; - } else { - $fp{$test}{quirk} = $quirk; - } - } - - } elsif ($fp{$test}{resp} ne "Y") { - $fp{$test}{resp} = "N"; + if (!($fp{ecn}{ops} =~ /(^|\|)$ops($|\|)/)) { + if ($fp{ecn}{ops}) { + $fp{ecn}{ops} = $fp{ecn}{ops} . qq^|$ops^; + } else { + $fp{ecn}{ops} = $ops; } + } + + if ($cc and !($fp{ecn}{cc} =~ /(^|\|)$cc($|\|)/)) { + if ($fp{ecn}{cc}) { + $fp{ecn}{cc} .= qq^|$cc^; + } else { + $fp{ecn}{cc} = $cc; + } + } + + if (!($fp{ecn}{quirk} =~ /(^|\|)$quirk($|\|)/)) { + if ($fp{ecn}{quirk}) { + $fp{ecn}{quirk} .= qq^|$quirk^; + } else { + $fp{ecn}{quirk} = $quirk; + } + } + + } elsif ($fp{ecn}{resp} ne "Y") { + $fp{ecn}{resp} = "N"; + } + } elsif ($line =~ /^T([1-7])/) { + $num = $1; + $test = "T$num"; + $resp = $df = $ttl = $win = $seq = $ack = $flags = $ops = $rd = $quirk = ""; + + if ($line =~ /R=([NY])/) { + $resp = $1; + } + if ($line =~ /[\(%]DF=([NY])/) { + $df = $1; + } + if ($line =~ /[\(%]TG?=([0-9A-F]+)/) { + $ttl = $1; + if (!$ttl) { $ttl = "NULL"; } + } + if ($num != 1 and $line =~ /[\(%]W=([0-9A-F|]*)/) { + $win = $1; + if (!$win) { $win = "NULL"; } + } + if ($line =~ /[\(%]S=([^%]+)/) { + $seq = $1; + } + if ($line =~ /[\(%]A=([^%]+)/) { + $ack = $1; + } + if ($line =~ /[\(%]F=([^%]*)/) { + $flags = $1; + if (!$flags) { $flags = "NULL"; } + } + if ($num != 1 and $line =~ /[\(%]O=([0-9A-Z|]*)/) { + $ops = $1; + if (!$ops) { $ops = "NULL"; } + } + if ($line =~ /[\(%]RD=([0-9A-F]*)/) { + $rd = $1; + if (!$rd) { $rd = "NULL"; } + } + if ($line =~ /[\(%]Q=(R?U?)/) { + $quirk = $1; + if (!$quirk) { $quirk = "NULL"; } + } + + if ($resp eq "Y" or !$resp) { + $fp{$test}{resp} = "Y"; + if ($df and !($fp{$test}{df} =~ /(^|\|)$df($|\|)/)) { + if ($fp{$test}{df}) { + $fp{$test}{df} .= qq^|$df^; + } else { + $fp{$test}{df} = $df; + } + } + + if (!($fp{$test}{ttl} =~ /(^|\|)$ttl($|\|)/)) { + if ($fp{$test}{ttl}) { + $fp{$test}{ttl} = $fp{$test}{ttl} . qq^|$ttl^; + } else { + $fp{$test}{ttl} = $ttl; + } + } + + if ($num != 1 and !($fp{$test}{win} =~ /(^|\|)$win($|\|)/)) { + if ($fp{$test}{win}) { + $fp{$test}{win} = $fp{$test}{win} . qq^|$win^; + } else { + $fp{$test}{win} = $win; + } + } + + if ($seq and !($fp{$test}{seq} =~ /(^|\|)$seq($|\|)/)) { + if ($fp{$test}{seq}) { + $fp{$test}{seq} .= qq^|$seq^; + } else { + $fp{$test}{seq} = $seq; + } + } + + if ($ack and !($fp{$test}{ack} =~ /(^|\|)$ack($|\|)/)) { + if ($fp{$test}{ack}) { + $fp{$test}{ack} .= qq^|$ack^; + } else { + $fp{$test}{ack} = $ack; + } + } + + if (!($fp{$test}{flags} =~ /(^|\|)$flags($|\|)/)) { + if ($fp{$test}{flags}) { + $fp{$test}{flags} = $fp{$test}{flags} . qq^|$flags^; + } else { + $fp{$test}{flags} = $flags; + } + } + + if ($num != 1 and !($fp{$test}{ops} =~ /(^|\|)$ops($|\|)/)) { + if ($fp{$test}{ops}) { + $fp{$test}{ops} = $fp{$test}{ops} . qq^|$ops^; + } else { + $fp{$test}{ops} = $ops; + } + } + + if (!($fp{$test}{rd} =~ /(^|\|)$rd($|\|)/)) { + if ($fp{$test}{rd}) { + $fp{$test}{rd} = $fp{$test}{rd} . qq^|$rd^; + } else { + $fp{$test}{rd} = $rd; + } + } + + if (!($fp{$test}{quirk} =~ /(^|\|)$quirk($|\|)/)) { + if ($fp{$test}{quirk}) { + $fp{$test}{quirk} .= qq^|$quirk^; + } else { + $fp{$test}{quirk} = $quirk; + } + } + + } elsif ($fp{$test}{resp} ne "Y") { + $fp{$test}{resp} = "N"; + } } elsif ($line =~ /^U1/) { - $resp = $df = $ttl = $tos = $ipl = $un = $ripl = $rid = $ripck = $ruck = $rul = $rud = ""; + $resp = $df = $ttl = $tos = $ipl = $un = $ripl = $rid = $ripck = $ruck = $rul = $rud = ""; - if ($line =~ /R=([NY])/) { - $resp = $1; + if ($line =~ /R=([NY])/) { + $resp = $1; + } + if ($line =~ /[\(%]DF=([NY])/) { + $df = $1; + } + if ($line =~ /[\(%]TG?=([0-9A-F]+)/) { + $ttl = $1; + if (!$ttl) { $ttl = "NULL"; } + } + if ($line =~ /[\(%]TOS=([^%]+)/) { + $tos = $1; + if (!$tos) { $tos = "NULL"; } + } + if ($line =~ /[\(%]IPL=([^%]+)/) { + $ipl = $1; + } + if ($line =~ /[\(%]UN=([0-9A-F]*)/) { + $un = $1; + if (!$un) { $un = "NULL"; } + } + if ($line =~ /[\(%]RIPL=([^%]+)/) { + $ripl = $1; + } + if ($line =~ /[\(%]RID=([^%]+)/) { + $rid = $1; + } + if ($line =~ /[\(%]RIPCK=([^%]+)/) { + $ripck = $1; + if (!$ripck) { $ripck = "NULL"; } + } + if ($line =~ /[\(%]RUCK=([^%]+)/) { + $ruck = $1; + if (!$ruck) { $ruck = "NULL"; } + } + if ($line =~ /[\(%]RUL=([^%]+)/) { + $rul = $1; + } + if ($line =~ /[\(%]RUD=([A-Z|]+)/) { + $rud = $1; + } + + if ($resp eq "Y" or !$resp) { + $fp{u1}{resp} = "Y"; + + if ($df and index($fp{u1}{df}, $df) == -1) { + if ($fp{u1}{df}) { + $fp{u1}{df} = $fp{u1}{df} . qq^|$df^; + } else { + $fp{u1}{df} = $df; } - if ($line =~ /[(%]DF=([NY])/) { - $df = $1; + } + + if (!($fp{u1}{ttl} =~ /(^|\|)$ttl($|\|)/)) { + if ($fp{u1}{ttl}) { + $fp{u1}{ttl} = $fp{u1}{ttl} . qq^|$ttl^; + } else { + $fp{u1}{ttl} = $ttl; } - if ($line =~ /[(%]TG?=([0-9A-F]+)/) { - $ttl = $1; - if (!$ttl) { $ttl = "NULL"; } + } + + if ($tos and index($fp{u1}{tos}, $tos) == -1) { + if ($fp{u1}{tos}) { + $fp{u1}{tos} = $fp{u1}{tos} . qq^|$tos^; + } else { + $fp{u1}{tos} = $tos; } - if ($line =~ /[(%]TOS=([^%]+)/) { - $tos = $1; - if (!$tos) { $tos = "NULL"; } + } + + if ($ipl and index($fp{u1}{ipl}, $ipl) == -1) { + if ($fp{u1}{ipl}) { + $fp{u1}{ipl} = $fp{u1}{ipl} . qq^|$ipl^; + } else { + $fp{u1}{ipl} = $ipl; } - if ($line =~ /[(%]IPL=([^%]+)/) { - $ipl = $1; + } + + if ($un and index($fp{u1}{un}, $un) == -1) { + if ($fp{u1}{un}) { + $fp{u1}{un} = $fp{u1}{un} . qq^|$un^; + } else { + $fp{u1}{un} = $un; } - if ($line =~ /[(%]UN=([0-9A-F]*)/) { - $un = $1; - if (!$un) { $un = "NULL"; } + } + + if ($ripl and index($fp{u1}{ripl}, $ripl) == -1) { + if ($fp{u1}{ripl}) { + $fp{u1}{ripl} = $fp{u1}{ripl} . qq^|$ripl^; + } else { + $fp{u1}{ripl} = $ripl; } - if ($line =~ /[(%]RIPL=([^%]+)/) { - $ripl = $1; + } + + if ($rid and index($fp{u1}{rid}, $rid) == -1) { + if ($fp{u1}{rid}) { + $fp{u1}{rid} = $fp{u1}{rid} . qq^|$rid^; + } else { + $fp{u1}{rid} = $rid; } - if ($line =~ /[(%]RID=([^%]+)/) { - $rid = $1; + } + + if ($ripck and index($fp{u1}{ripck}, $ripck) == -1) { + if ($fp{u1}{ripck}) { + $fp{u1}{ripck} = $fp{u1}{ripck} . qq^|$ripck^; + } else { + $fp{u1}{ripck} = $ripck; } - if ($line =~ /[(%]RIPCK=([^%]+)/) { - $ripck = $1; - if (!$ripck) { $ripck = "NULL"; } + } + + if ($ruck and index($fp{u1}{ruck}, $ruck) == -1) { + if ($fp{u1}{ruck}) { + $fp{u1}{ruck} = $fp{u1}{ruck} . qq^|$ruck^; + } else { + $fp{u1}{ruck} = $ruck; } - if ($line =~ /[(%]RUCK=([^%]+)/) { - $ruck = $1; - if (!$ruck) { $ruck = "NULL"; } + } + + if ($rul and index($fp{u1}{rul}, $rul) == -1) { + if ($fp{u1}{rul}) { + $fp{u1}{rul} = $fp{u1}{rul} . qq^|$rul^; + } else { + $fp{u1}{rul} = $rul; } - if ($line =~ /[(%]RUL=([^%]+)/) { - $rul = $1; - } - if ($line =~ /[(%]RUD=([A-Z|]+)/) { - $rud = $1; + } + + if ($rud and index($fp{u1}{rud}, $rud) == -1) { + if ($fp{u1}{rud}) { + $fp{u1}{rud} = $fp{u1}{rud} . qq^|$rud^; + } else { + $fp{u1}{rud} = $rud; } + } - if ($resp eq "Y" or !$resp) { - $fp{u1}{resp} = "Y"; - - if ($df and index($fp{u1}{df}, $df) == -1) { - if ($fp{u1}{df}) { - $fp{u1}{df} = $fp{u1}{df} . qq^|$df^; - } else { - $fp{u1}{df} = $df; - } - } - - if (!($fp{u1}{ttl} =~ /(^|\|)$ttl($|\|)/)) { - if ($fp{u1}{ttl}) { - $fp{u1}{ttl} = $fp{u1}{ttl} . qq^|$ttl^; - } else { - $fp{u1}{ttl} = $ttl; - } - } - - if ($tos and index($fp{u1}{tos}, $tos) == -1) { - if ($fp{u1}{tos}) { - $fp{u1}{tos} = $fp{u1}{tos} . qq^|$tos^; - } else { - $fp{u1}{tos} = $tos; - } - } - - if ($ipl and index($fp{u1}{ipl}, $ipl) == -1) { - if ($fp{u1}{ipl}) { - $fp{u1}{ipl} = $fp{u1}{ipl} . qq^|$ipl^; - } else { - $fp{u1}{ipl} = $ipl; - } - } - - if ($un and index($fp{u1}{un}, $un) == -1) { - if ($fp{u1}{un}) { - $fp{u1}{un} = $fp{u1}{un} . qq^|$un^; - } else { - $fp{u1}{un} = $un; - } - } - - if ($ripl and index($fp{u1}{ripl}, $ripl) == -1) { - if ($fp{u1}{ripl}) { - $fp{u1}{ripl} = $fp{u1}{ripl} . qq^|$ripl^; - } else { - $fp{u1}{ripl} = $ripl; - } - } - - if ($rid and index($fp{u1}{rid}, $rid) == -1) { - if ($fp{u1}{rid}) { - $fp{u1}{rid} = $fp{u1}{rid} . qq^|$rid^; - } else { - $fp{u1}{rid} = $rid; - } - } - - if ($ripck and index($fp{u1}{ripck}, $ripck) == -1) { - if ($fp{u1}{ripck}) { - $fp{u1}{ripck} = $fp{u1}{ripck} . qq^|$ripck^; - } else { - $fp{u1}{ripck} = $ripck; - } - } - - if ($ruck and index($fp{u1}{ruck}, $ruck) == -1) { - if ($fp{u1}{ruck}) { - $fp{u1}{ruck} = $fp{u1}{ruck} . qq^|$ruck^; - } else { - $fp{u1}{ruck} = $ruck; - } - } - - if ($rul and index($fp{u1}{rul}, $rul) == -1) { - if ($fp{u1}{rul}) { - $fp{u1}{rul} = $fp{u1}{rul} . qq^|$rul^; - } else { - $fp{u1}{rul} = $rul; - } - } - - if ($rud and index($fp{u1}{rud}, $rud) == -1) { - if ($fp{u1}{rud}) { - $fp{u1}{rud} = $fp{u1}{rud} . qq^|$rud^; - } else { - $fp{u1}{rud} = $rud; - } - } - - } elsif ($fp{u1}{resp} ne "Y") { - $fp{u1}{resp} = "N"; - } + } elsif ($fp{u1}{resp} ne "Y") { + $fp{u1}{resp} = "N"; + } } elsif ($line =~ /^IE/) { - $resp = $dfi = $ttl = $tosi = $cd = $si = $dli = ""; + $resp = $dfi = $ttl = $tosi = $cd = $si = $dli = ""; - if ($line =~ /R=([NY])/) { - $resp = $1; + if ($line =~ /R=([NY])/) { + $resp = $1; + } + if ($line =~ /[\(%]DFI=([^%]+)/) { + $dfi = $1; + } + if ($line =~ /[\(%]TG?=([0-9A-F]+)/) { + $ttl = $1; + if (!$ttl) { $ttl = "NULL"; } + } + if ($line =~ /[\(%]TOSI=([^%]+)/) { + $tosi = $1; + if (!$tosi) { $tosi = "NULL"; } + } + if ($line =~ /[\(%]CD=([^%]+)/) { + $cd = $1; + } + if ($line =~ /[\(%]SI=([^%]+)/) { + $si = $1; + } + if ($line =~ /[\(%]DLI=([A-Z|]+)/) { + $dli = $1; + } + + if ($resp eq "Y" or !$resp) { + $fp{ie}{resp} = "Y"; + + if ($dfi and index($fp{ie}{dfi}, $dfi) == -1) { + if ($fp{ie}{dfi}) { + $fp{ie}{dfi} = $fp{ie}{dfi} . qq^|$dfi^; + } else { + $fp{ie}{dfi} = $dfi; } - if ($line =~ /[(%]DFI=([^%]+)/) { - $dfi = $1; + } + + if (!($fp{ie}{ttl} =~ /(^|\|)$ttl($|\|)/)) { + if ($fp{ie}{ttl}) { + $fp{ie}{ttl} = $fp{ie}{ttl} . qq^|$ttl^; + } else { + $fp{ie}{ttl} = $ttl; } - if ($line =~ /[(%]TG?=([0-9A-F]+)/) { - $ttl = $1; - if (!$ttl) { $ttl = "NULL"; } + } + + if ($tosi and index($fp{ie}{tosi}, $tosi) == -1) { + if ($fp{ie}{tosi}) { + $fp{ie}{tosi} = $fp{ie}{tosi} . qq^|$tosi^; + } else { + $fp{ie}{tosi} = $tosi; } - if ($line =~ /[(%]TOSI=([^%]+)/) { - $tosi = $1; - if (!$tosi) { $tosi = "NULL"; } + } + + if ($cd and index($fp{ie}{cd}, $cd) == -1) { + if ($fp{ie}{cd}) { + $fp{ie}{cd} = $fp{ie}{cd} . qq^|$cd^; + } else { + $fp{ie}{cd} = $cd; } - if ($line =~ /[(%]CD=([^%]+)/) { - $cd = $1; + } + + if ($si and index($fp{ie}{si}, $si) == -1) { + if ($fp{ie}{si}) { + $fp{ie}{si} = $fp{ie}{si} . qq^|$si^; + } else { + $fp{ie}{si} = $si; } - if ($line =~ /[(%]SI=([^%]+)/) { - $si = $1; - } - if ($line =~ /[(%]DLI=([A-Z|]+)/) { - $dli = $1; + } + + if ($dli and index($fp{ie}{dli}, $dli) == -1) { + if ($fp{ie}{dli}) { + $fp{ie}{dli} = $fp{ie}{dli} . qq^|$dli^; + } else { + $fp{ie}{dli} = $dli; } + } - if ($resp eq "Y" or !$resp) { - $fp{ie}{resp} = "Y"; - - if ($dfi and index($fp{ie}{dfi}, $dfi) == -1) { - if ($fp{ie}{dfi}) { - $fp{ie}{dfi} = $fp{ie}{dfi} . qq^|$dfi^; - } else { - $fp{ie}{dfi} = $dfi; - } - } - - if (!($fp{ie}{ttl} =~ /(^|\|)$ttl($|\|)/)) { - if ($fp{ie}{ttl}) { - $fp{ie}{ttl} = $fp{ie}{ttl} . qq^|$ttl^; - } else { - $fp{ie}{ttl} = $ttl; - } - } - - if ($tosi and index($fp{ie}{tosi}, $tosi) == -1) { - if ($fp{ie}{tosi}) { - $fp{ie}{tosi} = $fp{ie}{tosi} . qq^|$tosi^; - } else { - $fp{ie}{tosi} = $tosi; - } - } - - if ($cd and index($fp{ie}{cd}, $cd) == -1) { - if ($fp{ie}{cd}) { - $fp{ie}{cd} = $fp{ie}{cd} . qq^|$cd^; - } else { - $fp{ie}{cd} = $cd; - } - } - - if ($si and index($fp{ie}{si}, $si) == -1) { - if ($fp{ie}{si}) { - $fp{ie}{si} = $fp{ie}{si} . qq^|$si^; - } else { - $fp{ie}{si} = $si; - } - } - - if ($dli and index($fp{ie}{dli}, $dli) == -1) { - if ($fp{ie}{dli}) { - $fp{ie}{dli} = $fp{ie}{dli} . qq^|$dli^; - } else { - $fp{ie}{dli} = $dli; - } - } - - } elsif ($fp{ie}{resp} ne "Y") { - $fp{ie}{resp} = "N"; - } + } elsif ($fp{ie}{resp} ne "Y") { + $fp{ie}{resp} = "N"; + } } } # OK, now it is time to print out the merged Fprint ... # Printing contributed by line was like a magnet for spammers and took -# up a substantial amount of space in the file. Plus may make -# licensees nervous. +# up a substantial amount of space in the file. # if ($fp{contrib}) { print "# Contributed by $fp{contrib}\n"; } + print "Fingerprint $fp{os}\n"; if ($fp{class}) { print $fp{class}; } else { print "Class \n"; } @@ -627,15 +660,15 @@ else { print "Class \n"; } if ($fp{seq}{cls}) { print("SEQ(CL=$fp{seq}{cls}"); if ($fp{seq}{cls} ne "64K" and $fp{seq}{cls} ne "i800" - and $fp{seq}{cls} ne "C") { - if ($fp{seq}{cls} ne "TR") { - if ($fp{seq}{sp}) { - print "%SP=$fp{seq}{sp}"; - } - } - if ($fp{seq}{gcd}) { - print "%GCD=$fp{seq}{gcd}"; - } + and $fp{seq}{cls} ne "C") { + if ($fp{seq}{cls} ne "TR") { + if ($fp{seq}{sp}) { + print "%SP=$fp{seq}{sp}"; + } + } + if ($fp{seq}{gcd}) { + print "%GCD=$fp{seq}{gcd}"; + } } if ($fp{seq}{cval}) {print "%Val=$fp{seq}{cval}"; } if ($fp{seq}{ti}) { print "%TI=$fp{seq}{ti}"; } @@ -647,72 +680,72 @@ if ($fp{seq}{cls}) { # OPS if ($fp{ops}{o1}) { - $fp{ops}{o1} =~ s/NULL//; - print "OPS(O1=$fp{ops}{o1}"; - foreach $num (2 .. 6) { - $oi = "o$num"; - $fp{ops}{$oi} =~ s/NULL//; - print "%O$num=$fp{ops}{$oi}"; - } + $fp{ops}{o1} =~ s/NULL//; + print "OPS(O1=$fp{ops}{o1}"; + foreach $num (2 .. 6) { + $oi = "o$num"; + $fp{ops}{$oi} =~ s/NULL//; + print "%O$num=$fp{ops}{$oi}"; + } print ")\n"; } # WIN if ($fp{win}{w1}) { - $fp{win}{w1} =~ s/NULL/0/; - print "WIN(W1=$fp{win}{w1}"; - foreach $num (2 .. 6) { - $wi = "w$num"; - $fp{win}{$wi} =~ s/NULL/0/; - print "%W$num=$fp{win}{$wi}"; - } + $fp{win}{w1} =~ s/NULL/0/; + print "WIN(W1=$fp{win}{w1}"; + foreach $num (2 .. 6) { + $wi = "w$num"; + $fp{win}{$wi} =~ s/NULL/0/; + print "%W$num=$fp{win}{$wi}"; + } print ")\n"; } # ECN if ($fp{ecn}{resp} eq "Y") { - print "ECN(R=Y%"; - $fp{ecn}{ttl} =~ s/NULL/0/; - $fp{ecn}{win} =~ s/NULL/0/; - $fp{ops}{win} =~ s/NULL//; - $fp{ecn}{quirk} =~ s/NULL//; - print "DF=$fp{ecn}{df}%T=$fp{ecn}{ttl}%TG=$fp{ecn}{ttl}%W=$fp{ecn}{win}%O=$fp{ecn}{ops}%CC=$fp{ecn}{cc}%Q=$fp{ecn}{quirk})\n"; + print "ECN(R=Y%"; + $fp{ecn}{ttl} =~ s/NULL/0/; + $fp{ecn}{win} =~ s/NULL/0/; + $fp{ops}{win} =~ s/NULL//; + $fp{ecn}{quirk} =~ s/NULL//; + print "DF=$fp{ecn}{df}%T=$fp{ecn}{ttl}%TG=$fp{ecn}{ttl}%W=$fp{ecn}{win}%O=$fp{ecn}{ops}%CC=$fp{ecn}{cc}%Q=$fp{ecn}{quirk})\n"; } else { - print "ECN(R=N)\n"; + print "ECN(R=N)\n"; } # T1-T7 foreach $t (1 .. 7) { - $test = "T$t"; - if ($fp{$test}{resp} eq "Y") { - print "$test(R=Y%"; - $fp{$test}{ttl} =~ s/NULL/0/; - $fp{$test}{win} =~ s/NULL/0/; - $fp{$test}{flags} =~ s/NULL//; - $fp{$test}{ops} =~ s/NULL//; - $fp{$test}{rd} =~ s/NULL/0/; - $fp{$test}{quirk} =~ s/NULL//; - if ($t == 1) { - print "DF=$fp{$test}{df}%T=$fp{$test}{ttl}%TG=$fp{$test}{ttl}%S=$fp{$test}{seq}%A=$fp{$test}{ack}%F=$fp{$test}{flags}%RD=$fp{$test}{rd}%Q=$fp{$test}{quirk})\n"; - } else { - print "DF=$fp{$test}{df}%T=$fp{$test}{ttl}%TG=$fp{$test}{ttl}%W=$fp{$test}{win}%S=$fp{$test}{seq}%A=$fp{$test}{ack}%F=$fp{$test}{flags}%O=$fp{$test}{ops}%RD=$fp{$test}{rd}%Q=$fp{$test}{quirk})\n"; - } + $test = "T$t"; + if ($fp{$test}{resp} eq "Y") { + print "$test(R=Y%"; + $fp{$test}{ttl} =~ s/NULL/0/; + $fp{$test}{win} =~ s/NULL/0/; + $fp{$test}{flags} =~ s/NULL//; + $fp{$test}{ops} =~ s/NULL//; + $fp{$test}{rd} =~ s/NULL/0/; + $fp{$test}{quirk} =~ s/NULL//; + if ($t == 1) { + print "DF=$fp{$test}{df}%T=$fp{$test}{ttl}%TG=$fp{$test}{ttl}%S=$fp{$test}{seq}%A=$fp{$test}{ack}%F=$fp{$test}{flags}%RD=$fp{$test}{rd}%Q=$fp{$test}{quirk})\n"; } else { - print "$test(R=N)\n"; + print "DF=$fp{$test}{df}%T=$fp{$test}{ttl}%TG=$fp{$test}{ttl}%W=$fp{$test}{win}%S=$fp{$test}{seq}%A=$fp{$test}{ack}%F=$fp{$test}{flags}%O=$fp{$test}{ops}%RD=$fp{$test}{rd}%Q=$fp{$test}{quirk})\n"; } + } else { + print "$test(R=N)\n"; + } } # U1 if ($fp{u1}{resp} eq "Y") { print "U1("; - $fp{u1}{ttl} =~ s/NULL/0/; + $fp{u1}{ttl} =~ s/NULL/0/; $fp{u1}{tos} =~ s/NULL/0/; $fp{u1}{uck} =~ s/NULL/0/; $fp{u1}{un} =~ s/NULL/0/; - $fp{u1}{ripck} =~ s/NULL/0/; + $fp{u1}{ripck} =~ s/NULL/0/; $fp{u1}{ruck} =~ s/NULL/0/; if ($fp{u1}{rid}) { - $rid = "RID=$fp{u1}{rid}\%"; + $rid = "RID=$fp{u1}{rid}\%"; } else { $ridwarning = 1; $rid = "RID=G\%"; } print "DF=$fp{u1}{df}%T=$fp{u1}{ttl}%TG=$fp{u1}{ttl}%TOS=$fp{u1}{tos}%IPL=$fp{u1}{ipl}%UN=$fp{u1}{un}%RIPL=$fp{u1}{ripl}%${rid}RIPCK=$fp{u1}{ripck}%RUCK=$fp{u1}{ruck}%RUL=$fp{u1}{rul}%RUD=$fp{u1}{rud})\n"; } else { @@ -722,7 +755,7 @@ if ($fp{u1}{resp} eq "Y") { # IE if ($fp{ie}{resp} eq "Y") { print "IE("; - $fp{ie}{ttl} =~ s/NULL/0/; + $fp{ie}{ttl} =~ s/NULL/0/; $fp{ie}{tosi} =~ s/NULL/0/; print "DFI=$fp{ie}{dfi}%T=$fp{ie}{ttl}%TG=$fp{ie}{ttl}%TOSI=$fp{ie}{tosi}%CD=$fp{ie}{cd}%SI=$fp{ie}{si}%DLI=$fp{ie}{dli})\n"; } else { @@ -732,8 +765,8 @@ if ($fp{ie}{resp} eq "Y") { if ($ridwarning == 1) { $ridwarning = 0; print "*******************************************************\n" . - "* WARNING: Missing U1 RID value -- this is normal for *\n" . - "* hosts submitted by Solaris or Windows boxes. You *\n" . - "* may want to get RID from similar fingerprints *\n" . - "*******************************************************\n"; + "* WARNING: Missing U1 RID value -- this is normal for *\n" . + "* hosts submitted by Solaris or Windows boxes. You *\n" . + "* may want to get RID from similar fingerprints *\n" . + "*******************************************************\n"; } diff --git a/scripts/fingermatch.cc b/scripts/fingermatch.cc index 18e16b56e..2d36f79c5 100644 --- a/scripts/fingermatch.cc +++ b/scripts/fingermatch.cc @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/scripts/nmap.header.tmpl b/scripts/nmap.header.tmpl index 39350c817..a9c1487f4 100644 --- a/scripts/nmap.header.tmpl +++ b/scripts/nmap.header.tmpl @@ -1,16 +1,16 @@ ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -33,7 +33,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://insecure.org/nmap/ 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 * @@ -46,7 +46,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/scripts/servicematch.cc b/scripts/servicematch.cc index 282982f06..93b47db52 100644 --- a/scripts/servicematch.cc +++ b/scripts/servicematch.cc @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/service_scan.cc b/service_scan.cc index 84739d1be..f9358362d 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/service_scan.h b/service_scan.h index 548e8350d..de85c7e79 100644 --- a/service_scan.h +++ b/service_scan.h @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/services.cc b/services.cc index 1987d0dc7..ec62710ca 100644 --- a/services.cc +++ b/services.cc @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/services.h b/services.h index 0c7575c14..1561058d8 100644 --- a/services.h +++ b/services.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/targets.cc b/targets.cc index ed1df9762..7f7045b6f 100644 --- a/targets.cc +++ b/targets.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/targets.h b/targets.h index 6607f9f35..b578c9fd1 100644 --- a/targets.h +++ b/targets.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/tcpip.cc b/tcpip.cc index 63617cefa..afedfd7db 100644 --- a/tcpip.cc +++ b/tcpip.cc @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/tcpip.h b/tcpip.h index 440c68fce..2fd5ee89a 100644 --- a/tcpip.h +++ b/tcpip.h @@ -6,17 +6,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -52,7 +52,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/timing.cc b/timing.cc index 66b430b4f..55154f4dc 100644 --- a/timing.cc +++ b/timing.cc @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/timing.h b/timing.h index d5a819979..2ba888fdf 100644 --- a/timing.h +++ b/timing.h @@ -7,17 +7,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -53,7 +53,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/utils.cc b/utils.cc index 06feba684..bc2747370 100644 --- a/utils.cc +++ b/utils.cc @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. * diff --git a/utils.h b/utils.h index 10999a709..8e8515f4b 100644 --- a/utils.h +++ b/utils.h @@ -5,17 +5,17 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2006 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-2006 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 * @@ -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://insecure.org/nmap/ 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 * @@ -51,7 +51,7 @@ * 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 dozens * - * of security vendors, and generally include a perpetual license as well * + * 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. *