diff --git a/nsock/include/nsock_winconfig.h b/nsock/include/nsock_winconfig.h index 8fcda56a4..7d3358223 100644 --- a/nsock/include/nsock_winconfig.h +++ b/nsock/include/nsock_winconfig.h @@ -7,86 +7,126 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2010 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. * + * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * + * Project"). Nmap is also a registered trademark of the Nmap Project. * + * 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 ("GPL"), BUT ONLY WITH ALL OF THE * + * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * + * Dozens of software vendors already license Nmap technology such as * + * host discovery, port scanning, OS detection, version detection, and * + * the Nmap Scripting Engine. * * * - * Note that the GPL places important restrictions on "derived works", yet * - * it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we consider an application to constitute a * - * "derivative work" for the purpose of this license if it does any of the * - * following: * - * o Integrates source code from Nmap * - * o Reads or includes Nmap copyrighted data files, such as * - * nmap-os-db or nmap-service-probes. * - * o Executes Nmap and parses the results (as opposed to typical shell or * - * execution-menu apps, which simply display raw Nmap output and so are * - * not derivative works.) * - * o Integrates/includes/aggregates Nmap into a proprietary executable * - * installer, such as those produced by InstallShield. * - * o Links to a library or executes a program that does any of the above * + * Note that the GPL places important restrictions on "derivative works", * + * yet it does not provide a detailed definition of that term. To avoid * + * misunderstandings, we interpret that term as broadly as copyright law * + * allows. For example, we consider an application to constitute a * + * derivative work for the purpose of this license if it does any of the * + * following with any software or content covered by this license * + * ("Covered Software"): * * * - * The term "Nmap" should be taken to also include any portions or derived * - * works of Nmap. This list is not exclusive, but is meant to clarify our * - * interpretation of derived works with some common examples. Our * - * interpretation applies only to Nmap--we don't speak for other people's * - * GPL works. * + * o Integrates source code from Covered Software. * * * - * If you have any questions about the GPL licensing restrictions on using * - * Nmap in non-GPL works, we would be happy to help. As mentioned above, * - * we also offer alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing for priority support and updates as well as helping to * - * fund the continued development of Nmap technology. Please email * - * sales@insecure.com for further information. * + * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * + * or nmap-service-probes. * * * - * As a special exception to the GPL terms, Insecure.Com LLC grants * + * o Is designed specifically to execute Covered Software and parse the * + * results (as opposed to typical shell or execution-menu apps, which will * + * execute anything you tell them to). * + * * + * o Includes Covered Software in a proprietary executable installer. The * + * installers produced by InstallShield are an example of this. Including * + * Nmap with other software in compressed or archival form does not * + * trigger this provision, provided appropriate open source decompression * + * or de-archiving software is widely available for no charge. For the * + * purposes of this license, an installer is considered to include Covered * + * Software even if it actually retrieves a copy of Covered Software from * + * another source during runtime (such as by downloading it from the * + * Internet). * + * * + * o Links (statically or dynamically) to a library which does any of the * + * above. * + * * + * o Executes a helper program, module, or script to do any of the above. * + * * + * This list is not exclusive, but is meant to clarify our interpretation * + * of derived works with some common examples. Other people may interpret * + * the plain GPL differently, so we consider this a special exception to * + * the GPL that we apply to Covered Software. Works which meet any of * + * these conditions must conform to all of the terms of this license, * + * particularly including the GPL Section 3 requirements of providing * + * source code and allowing free redistribution of the work as a whole. * + * * + * As another special exception to the GPL terms, the Nmap Project grants * * permission to link the code of this program with any version of the * * OpenSSL library which is distributed under a license identical to that * - * listed in the included COPYING.OpenSSL file, and distribute linked * - * combinations including the two. You must obey the GNU GPL in all * - * respects for all of the code used other than OpenSSL. If you modify * - * this file, you may extend this exception to your version of the file, * - * but you are not obligated to do so. * + * listed in the included docs/licenses/OpenSSL.txt file, and distribute * + * linked combinations including the two. * + * * + * The Nmap Project has permission to redistribute Npcap, a packet * + * capturing driver and library for the Microsoft Windows platform. * + * Npcap is a separate work with it's own license rather than this Nmap * + * license. Since the Npcap license does not permit redistribution * + * without special permission, our Nmap Windows binary packages which * + * contain Npcap may not be redistributed without special permission. * * * - * If you received these files with a written license agreement or * - * contract stating terms other than the terms above, then that * - * alternative license agreement takes precedence over these comments. * + * Any redistribution of Covered Software, including any derived works, * + * must obey and carry forward all of the terms of this license, including * + * obeying all GPL rules and restrictions. For example, source code of * + * the whole work must be provided and free redistribution must be * + * allowed. All GPL references to "this License", are to be treated as * + * including the terms and conditions of this license text as well. * + * * + * Because this license imposes special exceptions to the GPL, Covered * + * Work may not be combined (even as part of a larger work) with plain GPL * + * software. The terms, conditions, and exceptions of this license must * + * be included as well. This license is incompatible with some other open * + * source licenses as well. In some cases we can relicense portions of * + * Nmap or grant special permissions to use it in other open source * + * software. Please contact fyodor@nmap.org with any such requests. * + * Similarly, we don't incorporate incompatible open source software into * + * Covered Software without special permission from the copyright holders. * + * * + * If you have any questions about the licensing restrictions on using * + * Nmap in other works, are 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 software vendors, and generally include a perpetual license as well * + * as providing for priority support and updates. They also fund the * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * + * * + * If you have received a written license agreement or contract for * + * Covered Software stating terms other than these, you may choose to use * + * and redistribute Covered Software under those terms instead of these. * * * * Source is provided to this software because we believe users have a * * right to know exactly what a program is going to do before they run it. * - * This also allows you to audit the software for security holes (none * - * have been found so far). * + * This also allows you to audit the software for security holes. * * * * Source code also allows you to port Nmap to new platforms, fix bugs, * * and add new features. You are highly encouraged to send your changes * * to the dev@nmap.org mailing list for possible incorporation into the * * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, it is assumed that you are * - * offering the Nmap Project (Insecure.Com LLC) the unlimited, * + * Insecure.Org development mailing lists, or checking them into the Nmap * + * source code repository, it is understood (unless you specify * + * otherwise) that you are offering the Nmap Project the unlimited, * * non-exclusive right to reuse, modify, and relicense the code. Nmap * - * will always be available Open Source, but this is important because the * - * inability to relicense code has caused devastating problems for other * - * Free Software projects (such as KDE and NASM). We also occasionally * - * relicense the code to third parties as discussed above. If you wish to * - * specify special license conditions of your contributions, just say so * - * when you send them. * + * will always be available Open Source, but this is important because * + * the inability to relicense code has caused devastating problems for * + * other Free Software projects (such as KDE and NASM). We also * + * occasionally relicense the code to third parties as discussed above. * + * If you wish to specify special license conditions of your * + * contributions, just say so when you send them. * * * * This program is distributed in the hope that it will be useful, but * * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * General Public License v2.0 for more details at * - * http://www.gnu.org/licenses/gpl-2.0.html , or in the COPYING file * - * included with Nmap. * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * + * license file for more details (it's in a COPYING file included with * + * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * * * ***************************************************************************/ diff --git a/zenmap/install_scripts/utils/version_update.py b/zenmap/install_scripts/utils/version_update.py index 146293a4b..2352408bb 100644 --- a/zenmap/install_scripts/utils/version_update.py +++ b/zenmap/install_scripts/utils/version_update.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/__init__.py b/zenmap/radialnet/__init__.py index 659910c3b..c471a30e2 100644 --- a/zenmap/radialnet/__init__.py +++ b/zenmap/radialnet/__init__.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/bestwidgets/__init__.py b/zenmap/radialnet/bestwidgets/__init__.py index f88b1a69a..c74109ea5 100644 --- a/zenmap/radialnet/bestwidgets/__init__.py +++ b/zenmap/radialnet/bestwidgets/__init__.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/bestwidgets/boxes.py b/zenmap/radialnet/bestwidgets/boxes.py index cf117067a..a09884d40 100644 --- a/zenmap/radialnet/bestwidgets/boxes.py +++ b/zenmap/radialnet/bestwidgets/boxes.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/bestwidgets/buttons.py b/zenmap/radialnet/bestwidgets/buttons.py index 5c265c90c..dae82163a 100644 --- a/zenmap/radialnet/bestwidgets/buttons.py +++ b/zenmap/radialnet/bestwidgets/buttons.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/bestwidgets/comboboxes.py b/zenmap/radialnet/bestwidgets/comboboxes.py index 87c52f431..540b5f6d0 100644 --- a/zenmap/radialnet/bestwidgets/comboboxes.py +++ b/zenmap/radialnet/bestwidgets/comboboxes.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/bestwidgets/expanders.py b/zenmap/radialnet/bestwidgets/expanders.py index db77341ea..1464d6e47 100644 --- a/zenmap/radialnet/bestwidgets/expanders.py +++ b/zenmap/radialnet/bestwidgets/expanders.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/bestwidgets/frames.py b/zenmap/radialnet/bestwidgets/frames.py index 3c07635b6..2edce0e07 100644 --- a/zenmap/radialnet/bestwidgets/frames.py +++ b/zenmap/radialnet/bestwidgets/frames.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/bestwidgets/labels.py b/zenmap/radialnet/bestwidgets/labels.py index 37da1ea27..8a3ead13f 100644 --- a/zenmap/radialnet/bestwidgets/labels.py +++ b/zenmap/radialnet/bestwidgets/labels.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/bestwidgets/textview.py b/zenmap/radialnet/bestwidgets/textview.py index efe130b90..bbdfb1e52 100644 --- a/zenmap/radialnet/bestwidgets/textview.py +++ b/zenmap/radialnet/bestwidgets/textview.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/bestwidgets/windows.py b/zenmap/radialnet/bestwidgets/windows.py index e6a2f51f8..73c042423 100644 --- a/zenmap/radialnet/bestwidgets/windows.py +++ b/zenmap/radialnet/bestwidgets/windows.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/core/ArgvHandle.py b/zenmap/radialnet/core/ArgvHandle.py index c877dc7d8..99af401d5 100644 --- a/zenmap/radialnet/core/ArgvHandle.py +++ b/zenmap/radialnet/core/ArgvHandle.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/core/Coordinate.py b/zenmap/radialnet/core/Coordinate.py index 735851141..610a56fc3 100644 --- a/zenmap/radialnet/core/Coordinate.py +++ b/zenmap/radialnet/core/Coordinate.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/core/Graph.py b/zenmap/radialnet/core/Graph.py index be700148d..0e248aa92 100644 --- a/zenmap/radialnet/core/Graph.py +++ b/zenmap/radialnet/core/Graph.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/core/Info.py b/zenmap/radialnet/core/Info.py index 6f86a0abc..e71497961 100644 --- a/zenmap/radialnet/core/Info.py +++ b/zenmap/radialnet/core/Info.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/core/Interpolation.py b/zenmap/radialnet/core/Interpolation.py index 14b845a74..15b1ca6b9 100644 --- a/zenmap/radialnet/core/Interpolation.py +++ b/zenmap/radialnet/core/Interpolation.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/core/XMLHandler.py b/zenmap/radialnet/core/XMLHandler.py index 99ff323ea..6d17666c4 100644 --- a/zenmap/radialnet/core/XMLHandler.py +++ b/zenmap/radialnet/core/XMLHandler.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/core/__init__.py b/zenmap/radialnet/core/__init__.py index 8e6e0bcbf..6105a3ee3 100644 --- a/zenmap/radialnet/core/__init__.py +++ b/zenmap/radialnet/core/__init__.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/Application.py b/zenmap/radialnet/gui/Application.py index c95f8cfd9..9e39eaa73 100644 --- a/zenmap/radialnet/gui/Application.py +++ b/zenmap/radialnet/gui/Application.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/ControlWidget.py b/zenmap/radialnet/gui/ControlWidget.py index bf1dd090f..3462390fc 100644 --- a/zenmap/radialnet/gui/ControlWidget.py +++ b/zenmap/radialnet/gui/ControlWidget.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/Dialogs.py b/zenmap/radialnet/gui/Dialogs.py index dce78b817..56cb66842 100644 --- a/zenmap/radialnet/gui/Dialogs.py +++ b/zenmap/radialnet/gui/Dialogs.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/HostsViewer.py b/zenmap/radialnet/gui/HostsViewer.py index 6f1f922d6..4411df1fe 100644 --- a/zenmap/radialnet/gui/HostsViewer.py +++ b/zenmap/radialnet/gui/HostsViewer.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/Image.py b/zenmap/radialnet/gui/Image.py index b0c3d054e..4a97156f8 100644 --- a/zenmap/radialnet/gui/Image.py +++ b/zenmap/radialnet/gui/Image.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/LegendWindow.py b/zenmap/radialnet/gui/LegendWindow.py index d83b5c988..b61383c27 100644 --- a/zenmap/radialnet/gui/LegendWindow.py +++ b/zenmap/radialnet/gui/LegendWindow.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2015 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/NodeNotebook.py b/zenmap/radialnet/gui/NodeNotebook.py index 3640e89c9..a0b4707a4 100644 --- a/zenmap/radialnet/gui/NodeNotebook.py +++ b/zenmap/radialnet/gui/NodeNotebook.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/NodeWindow.py b/zenmap/radialnet/gui/NodeWindow.py index 05b2c7904..a8f28afc2 100644 --- a/zenmap/radialnet/gui/NodeWindow.py +++ b/zenmap/radialnet/gui/NodeWindow.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/RadialNet.py b/zenmap/radialnet/gui/RadialNet.py index 97695ecf5..eb34ebbfd 100644 --- a/zenmap/radialnet/gui/RadialNet.py +++ b/zenmap/radialnet/gui/RadialNet.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/SaveDialog.py b/zenmap/radialnet/gui/SaveDialog.py index e03369eeb..90d7922bc 100644 --- a/zenmap/radialnet/gui/SaveDialog.py +++ b/zenmap/radialnet/gui/SaveDialog.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/Toolbar.py b/zenmap/radialnet/gui/Toolbar.py index 92bd6d9c9..8fb750a63 100644 --- a/zenmap/radialnet/gui/Toolbar.py +++ b/zenmap/radialnet/gui/Toolbar.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/gui/__init__.py b/zenmap/radialnet/gui/__init__.py index 8e6e0bcbf..6105a3ee3 100644 --- a/zenmap/radialnet/gui/__init__.py +++ b/zenmap/radialnet/gui/__init__.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/radialnet.pyw b/zenmap/radialnet/radialnet.pyw index 83857e28a..bb195ff41 100755 --- a/zenmap/radialnet/radialnet.pyw +++ b/zenmap/radialnet/radialnet.pyw @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/util/__init__.py b/zenmap/radialnet/util/__init__.py index 8e6e0bcbf..6105a3ee3 100644 --- a/zenmap/radialnet/util/__init__.py +++ b/zenmap/radialnet/util/__init__.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/util/drawing.py b/zenmap/radialnet/util/drawing.py index c1f9c94f8..685097c0d 100644 --- a/zenmap/radialnet/util/drawing.py +++ b/zenmap/radialnet/util/drawing.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/util/geometry.py b/zenmap/radialnet/util/geometry.py index 3cd3e6830..bfac9b2cb 100644 --- a/zenmap/radialnet/util/geometry.py +++ b/zenmap/radialnet/util/geometry.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/util/integration.py b/zenmap/radialnet/util/integration.py index 60531ee0f..657ca4909 100644 --- a/zenmap/radialnet/util/integration.py +++ b/zenmap/radialnet/util/integration.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/radialnet/util/misc.py b/zenmap/radialnet/util/misc.py index dcad6890b..a52ef7654 100644 --- a/zenmap/radialnet/util/misc.py +++ b/zenmap/radialnet/util/misc.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/setup.py b/zenmap/setup.py index 3cc9b7c97..efb57592d 100755 --- a/zenmap/setup.py +++ b/zenmap/setup.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmap b/zenmap/zenmap index 0cd6ea8d7..929d05c83 100755 --- a/zenmap/zenmap +++ b/zenmap/zenmap @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/BasePaths.py b/zenmap/zenmapCore/BasePaths.py index af17a8792..914e816ea 100644 --- a/zenmap/zenmapCore/BasePaths.py +++ b/zenmap/zenmapCore/BasePaths.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/DelayedObject.py b/zenmap/zenmapCore/DelayedObject.py index 356823802..f5476c116 100644 --- a/zenmap/zenmapCore/DelayedObject.py +++ b/zenmap/zenmapCore/DelayedObject.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/Diff.py b/zenmap/zenmapCore/Diff.py index 6bd326c1c..56ad02f2d 100644 --- a/zenmap/zenmapCore/Diff.py +++ b/zenmap/zenmapCore/Diff.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/I18N.py b/zenmap/zenmapCore/I18N.py index 1b86fe2a7..d5662ea72 100644 --- a/zenmap/zenmapCore/I18N.py +++ b/zenmap/zenmapCore/I18N.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/NSEDocParser.py b/zenmap/zenmapCore/NSEDocParser.py index 55e1736ba..7edeb1993 100644 --- a/zenmap/zenmapCore/NSEDocParser.py +++ b/zenmap/zenmapCore/NSEDocParser.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/Name.py b/zenmap/zenmapCore/Name.py index dddbfe55d..a8300b027 100644 --- a/zenmap/zenmapCore/Name.py +++ b/zenmap/zenmapCore/Name.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/NetworkInventory.py b/zenmap/zenmapCore/NetworkInventory.py index d83156890..14a4cd70c 100644 --- a/zenmap/zenmapCore/NetworkInventory.py +++ b/zenmap/zenmapCore/NetworkInventory.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/NmapCommand.py b/zenmap/zenmapCore/NmapCommand.py index 5717f5a64..ad4b93050 100644 --- a/zenmap/zenmapCore/NmapCommand.py +++ b/zenmap/zenmapCore/NmapCommand.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/NmapParser.py b/zenmap/zenmapCore/NmapParser.py index 160891c16..5368933a0 100644 --- a/zenmap/zenmapCore/NmapParser.py +++ b/zenmap/zenmapCore/NmapParser.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/Paths.py b/zenmap/zenmapCore/Paths.py index 649eb6bb9..4b7aaebf1 100644 --- a/zenmap/zenmapCore/Paths.py +++ b/zenmap/zenmapCore/Paths.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/RecentScans.py b/zenmap/zenmapCore/RecentScans.py index ee3204d81..196b3fce9 100644 --- a/zenmap/zenmapCore/RecentScans.py +++ b/zenmap/zenmapCore/RecentScans.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/ScriptArgsParser.py b/zenmap/zenmapCore/ScriptArgsParser.py index e6f8d9082..10aad24b8 100644 --- a/zenmap/zenmapCore/ScriptArgsParser.py +++ b/zenmap/zenmapCore/ScriptArgsParser.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/ScriptMetadata.py b/zenmap/zenmapCore/ScriptMetadata.py index 7dc6c671d..bf0678b07 100644 --- a/zenmap/zenmapCore/ScriptMetadata.py +++ b/zenmap/zenmapCore/ScriptMetadata.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/SearchResult.py b/zenmap/zenmapCore/SearchResult.py index f88ee3037..cdb102912 100644 --- a/zenmap/zenmapCore/SearchResult.py +++ b/zenmap/zenmapCore/SearchResult.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/StringPool.py b/zenmap/zenmapCore/StringPool.py index 1e8a9717e..c133c5250 100644 --- a/zenmap/zenmapCore/StringPool.py +++ b/zenmap/zenmapCore/StringPool.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/TargetList.py b/zenmap/zenmapCore/TargetList.py index 0676f1cda..836c48604 100644 --- a/zenmap/zenmapCore/TargetList.py +++ b/zenmap/zenmapCore/TargetList.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/UmitConf.py b/zenmap/zenmapCore/UmitConf.py index 8fbcdb7cc..12fc39e6e 100644 --- a/zenmap/zenmapCore/UmitConf.py +++ b/zenmap/zenmapCore/UmitConf.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/UmitConfigParser.py b/zenmap/zenmapCore/UmitConfigParser.py index 5677fb77e..51605b39f 100644 --- a/zenmap/zenmapCore/UmitConfigParser.py +++ b/zenmap/zenmapCore/UmitConfigParser.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/UmitDB.py b/zenmap/zenmapCore/UmitDB.py index bc5ab660b..75c4edaee 100644 --- a/zenmap/zenmapCore/UmitDB.py +++ b/zenmap/zenmapCore/UmitDB.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/UmitLogging.py b/zenmap/zenmapCore/UmitLogging.py index f364a7e42..d62b5be33 100644 --- a/zenmap/zenmapCore/UmitLogging.py +++ b/zenmap/zenmapCore/UmitLogging.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/UmitOptionParser.py b/zenmap/zenmapCore/UmitOptionParser.py index b876bf4c8..130bcc0d0 100644 --- a/zenmap/zenmapCore/UmitOptionParser.py +++ b/zenmap/zenmapCore/UmitOptionParser.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapCore/__init__.py b/zenmap/zenmapCore/__init__.py index 9d9d1985c..a389e9d8d 100644 --- a/zenmap/zenmapCore/__init__.py +++ b/zenmap/zenmapCore/__init__.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/About.py b/zenmap/zenmapGUI/About.py index c46049531..09b6cc3a8 100644 --- a/zenmap/zenmapGUI/About.py +++ b/zenmap/zenmapGUI/About.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/App.py b/zenmap/zenmapGUI/App.py index b0cc7b2c1..64b514a57 100644 --- a/zenmap/zenmapGUI/App.py +++ b/zenmap/zenmapGUI/App.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/BugReport.py b/zenmap/zenmapGUI/BugReport.py index a3f25d84c..4a0da0d93 100644 --- a/zenmap/zenmapGUI/BugReport.py +++ b/zenmap/zenmapGUI/BugReport.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/CrashReport.py b/zenmap/zenmapGUI/CrashReport.py index 75ca82be2..d8936480e 100644 --- a/zenmap/zenmapGUI/CrashReport.py +++ b/zenmap/zenmapGUI/CrashReport.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/DiffCompare.py b/zenmap/zenmapGUI/DiffCompare.py index 1c6a9f76f..2bcc1383b 100644 --- a/zenmap/zenmapGUI/DiffCompare.py +++ b/zenmap/zenmapGUI/DiffCompare.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/FileChoosers.py b/zenmap/zenmapGUI/FileChoosers.py index 9aa0443b1..a5f154822 100644 --- a/zenmap/zenmapGUI/FileChoosers.py +++ b/zenmap/zenmapGUI/FileChoosers.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/Icons.py b/zenmap/zenmapGUI/Icons.py index e1abbe546..d8ed28fa3 100644 --- a/zenmap/zenmapGUI/Icons.py +++ b/zenmap/zenmapGUI/Icons.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/MainWindow.py b/zenmap/zenmapGUI/MainWindow.py index 3a41b65d9..27c33b13e 100644 --- a/zenmap/zenmapGUI/MainWindow.py +++ b/zenmap/zenmapGUI/MainWindow.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/NmapOutputProperties.py b/zenmap/zenmapGUI/NmapOutputProperties.py index 0bd3594e5..3cc2e8fd6 100644 --- a/zenmap/zenmapGUI/NmapOutputProperties.py +++ b/zenmap/zenmapGUI/NmapOutputProperties.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/NmapOutputViewer.py b/zenmap/zenmapGUI/NmapOutputViewer.py index 26b5cc9d2..3b7135156 100644 --- a/zenmap/zenmapGUI/NmapOutputViewer.py +++ b/zenmap/zenmapGUI/NmapOutputViewer.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/OptionBuilder.py b/zenmap/zenmapGUI/OptionBuilder.py index ebfa2a715..ca55f3747 100644 --- a/zenmap/zenmapGUI/OptionBuilder.py +++ b/zenmap/zenmapGUI/OptionBuilder.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/Print.py b/zenmap/zenmapGUI/Print.py index 547f18c5e..b37a980f4 100644 --- a/zenmap/zenmapGUI/Print.py +++ b/zenmap/zenmapGUI/Print.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ProfileCombo.py b/zenmap/zenmapGUI/ProfileCombo.py index e02d836c4..f04e9d993 100644 --- a/zenmap/zenmapGUI/ProfileCombo.py +++ b/zenmap/zenmapGUI/ProfileCombo.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ProfileEditor.py b/zenmap/zenmapGUI/ProfileEditor.py index 4b0b5938f..9a84f3bb3 100644 --- a/zenmap/zenmapGUI/ProfileEditor.py +++ b/zenmap/zenmapGUI/ProfileEditor.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ProfileHelp.py b/zenmap/zenmapGUI/ProfileHelp.py index 0ae88334d..2cf236f96 100644 --- a/zenmap/zenmapGUI/ProfileHelp.py +++ b/zenmap/zenmapGUI/ProfileHelp.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScanHostDetailsPage.py b/zenmap/zenmapGUI/ScanHostDetailsPage.py index c39fb9a63..b2df892e8 100644 --- a/zenmap/zenmapGUI/ScanHostDetailsPage.py +++ b/zenmap/zenmapGUI/ScanHostDetailsPage.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScanHostsView.py b/zenmap/zenmapGUI/ScanHostsView.py index fd69121b5..69e6ed254 100644 --- a/zenmap/zenmapGUI/ScanHostsView.py +++ b/zenmap/zenmapGUI/ScanHostsView.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScanInterface.py b/zenmap/zenmapGUI/ScanInterface.py index 57cd8e514..13db98d82 100644 --- a/zenmap/zenmapGUI/ScanInterface.py +++ b/zenmap/zenmapGUI/ScanInterface.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScanNmapOutputPage.py b/zenmap/zenmapGUI/ScanNmapOutputPage.py index 4e3ae6bd0..828935f2c 100644 --- a/zenmap/zenmapGUI/ScanNmapOutputPage.py +++ b/zenmap/zenmapGUI/ScanNmapOutputPage.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScanOpenPortsPage.py b/zenmap/zenmapGUI/ScanOpenPortsPage.py index 90646ed47..ccc3623fa 100644 --- a/zenmap/zenmapGUI/ScanOpenPortsPage.py +++ b/zenmap/zenmapGUI/ScanOpenPortsPage.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScanRunDetailsPage.py b/zenmap/zenmapGUI/ScanRunDetailsPage.py index ef2dc6580..277a26a8f 100644 --- a/zenmap/zenmapGUI/ScanRunDetailsPage.py +++ b/zenmap/zenmapGUI/ScanRunDetailsPage.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScanScanListPage.py b/zenmap/zenmapGUI/ScanScanListPage.py index c07d9e707..cd9e8c3fe 100644 --- a/zenmap/zenmapGUI/ScanScanListPage.py +++ b/zenmap/zenmapGUI/ScanScanListPage.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScanToolbar.py b/zenmap/zenmapGUI/ScanToolbar.py index f8a87d780..84d16cc40 100644 --- a/zenmap/zenmapGUI/ScanToolbar.py +++ b/zenmap/zenmapGUI/ScanToolbar.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScansListStore.py b/zenmap/zenmapGUI/ScansListStore.py index 709ac58d5..41189b42b 100644 --- a/zenmap/zenmapGUI/ScansListStore.py +++ b/zenmap/zenmapGUI/ScansListStore.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/ScriptInterface.py b/zenmap/zenmapGUI/ScriptInterface.py index a5111aae3..9bebeeabc 100644 --- a/zenmap/zenmapGUI/ScriptInterface.py +++ b/zenmap/zenmapGUI/ScriptInterface.py @@ -2,18 +2,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -55,12 +55,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -100,12 +107,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/SearchGUI.py b/zenmap/zenmapGUI/SearchGUI.py index 373559265..b937118d9 100644 --- a/zenmap/zenmapGUI/SearchGUI.py +++ b/zenmap/zenmapGUI/SearchGUI.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/SearchWindow.py b/zenmap/zenmapGUI/SearchWindow.py index 18acf51b9..34a970456 100644 --- a/zenmap/zenmapGUI/SearchWindow.py +++ b/zenmap/zenmapGUI/SearchWindow.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/TargetCombo.py b/zenmap/zenmapGUI/TargetCombo.py index c77a49634..45afb4e4b 100644 --- a/zenmap/zenmapGUI/TargetCombo.py +++ b/zenmap/zenmapGUI/TargetCombo.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/TopologyPage.py b/zenmap/zenmapGUI/TopologyPage.py index ca144f884..e9ac6113b 100644 --- a/zenmap/zenmapGUI/TopologyPage.py +++ b/zenmap/zenmapGUI/TopologyPage.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/__init__.py b/zenmap/zenmapGUI/__init__.py index 9d9d1985c..a389e9d8d 100644 --- a/zenmap/zenmapGUI/__init__.py +++ b/zenmap/zenmapGUI/__init__.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/__init__.py b/zenmap/zenmapGUI/higwidgets/__init__.py index fdd052185..9758bdf2c 100644 --- a/zenmap/zenmapGUI/higwidgets/__init__.py +++ b/zenmap/zenmapGUI/higwidgets/__init__.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/gtkutils.py b/zenmap/zenmapGUI/higwidgets/gtkutils.py index 8abab0590..0d238fa26 100644 --- a/zenmap/zenmapGUI/higwidgets/gtkutils.py +++ b/zenmap/zenmapGUI/higwidgets/gtkutils.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higboxes.py b/zenmap/zenmapGUI/higwidgets/higboxes.py index 7d30ae417..72262142c 100644 --- a/zenmap/zenmapGUI/higwidgets/higboxes.py +++ b/zenmap/zenmapGUI/higwidgets/higboxes.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higbuttons.py b/zenmap/zenmapGUI/higwidgets/higbuttons.py index 9be34fe69..dbdfafff0 100644 --- a/zenmap/zenmapGUI/higwidgets/higbuttons.py +++ b/zenmap/zenmapGUI/higwidgets/higbuttons.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higdialogs.py b/zenmap/zenmapGUI/higwidgets/higdialogs.py index 4b8963274..a68a9fbd0 100644 --- a/zenmap/zenmapGUI/higwidgets/higdialogs.py +++ b/zenmap/zenmapGUI/higwidgets/higdialogs.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higentries.py b/zenmap/zenmapGUI/higwidgets/higentries.py index 7668cd1f6..8b738ff51 100644 --- a/zenmap/zenmapGUI/higwidgets/higentries.py +++ b/zenmap/zenmapGUI/higwidgets/higentries.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higexpanders.py b/zenmap/zenmapGUI/higwidgets/higexpanders.py index fa7e2cbe6..9feba6dc5 100644 --- a/zenmap/zenmapGUI/higwidgets/higexpanders.py +++ b/zenmap/zenmapGUI/higwidgets/higexpanders.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higframe.py b/zenmap/zenmapGUI/higwidgets/higframe.py index 09afc9c12..9fa543298 100644 --- a/zenmap/zenmapGUI/higwidgets/higframe.py +++ b/zenmap/zenmapGUI/higwidgets/higframe.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higlabels.py b/zenmap/zenmapGUI/higwidgets/higlabels.py index bd2419468..9dc2cbac1 100644 --- a/zenmap/zenmapGUI/higwidgets/higlabels.py +++ b/zenmap/zenmapGUI/higwidgets/higlabels.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higlogindialogs.py b/zenmap/zenmapGUI/higwidgets/higlogindialogs.py index 6c3906a22..c20ba777a 100644 --- a/zenmap/zenmapGUI/higwidgets/higlogindialogs.py +++ b/zenmap/zenmapGUI/higwidgets/higlogindialogs.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/hignotebooks.py b/zenmap/zenmapGUI/higwidgets/hignotebooks.py index 40cf93cd5..5e7d2a7db 100644 --- a/zenmap/zenmapGUI/higwidgets/hignotebooks.py +++ b/zenmap/zenmapGUI/higwidgets/hignotebooks.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higprogressbars.py b/zenmap/zenmapGUI/higwidgets/higprogressbars.py index b926caaa3..7c9b15eb4 100644 --- a/zenmap/zenmapGUI/higwidgets/higprogressbars.py +++ b/zenmap/zenmapGUI/higwidgets/higprogressbars.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higscrollers.py b/zenmap/zenmapGUI/higwidgets/higscrollers.py index 7c10ac25c..550f0b02f 100644 --- a/zenmap/zenmapGUI/higwidgets/higscrollers.py +++ b/zenmap/zenmapGUI/higwidgets/higscrollers.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higspinner.py b/zenmap/zenmapGUI/higwidgets/higspinner.py index f349bf05c..eefca6194 100644 --- a/zenmap/zenmapGUI/higwidgets/higspinner.py +++ b/zenmap/zenmapGUI/higwidgets/higspinner.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higtables.py b/zenmap/zenmapGUI/higwidgets/higtables.py index 5c6ba92f8..dc5098bb7 100644 --- a/zenmap/zenmapGUI/higwidgets/higtables.py +++ b/zenmap/zenmapGUI/higwidgets/higtables.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higtextviewers.py b/zenmap/zenmapGUI/higwidgets/higtextviewers.py index d17ca40fb..6e7674540 100644 --- a/zenmap/zenmapGUI/higwidgets/higtextviewers.py +++ b/zenmap/zenmapGUI/higwidgets/higtextviewers.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/higwindows.py b/zenmap/zenmapGUI/higwidgets/higwindows.py index 7c268ee0f..99555f3e9 100644 --- a/zenmap/zenmapGUI/higwidgets/higwindows.py +++ b/zenmap/zenmapGUI/higwidgets/higwindows.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. * diff --git a/zenmap/zenmapGUI/higwidgets/utils.py b/zenmap/zenmapGUI/higwidgets/utils.py index 6f4aa9c72..b51656bdd 100644 --- a/zenmap/zenmapGUI/higwidgets/utils.py +++ b/zenmap/zenmapGUI/higwidgets/utils.py @@ -3,18 +3,18 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2016 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 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS * -# * AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). Dozens of software * -# * vendors already license Nmap technology such as host discovery, port * -# * scanning, OS detection, version detection, and the Nmap Scripting * -# * Engine. * +# * The Nmap Security Scanner is (C) 1996-2016 Insecure.Com LLC ("The Nmap * +# * Project"). Nmap is also a registered trademark of the Nmap Project. * +# * 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 ("GPL"), BUT ONLY WITH ALL OF THE * +# * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. 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@nmap.com). * +# * Dozens of software vendors already license Nmap technology such as * +# * host discovery, port scanning, OS detection, version detection, and * +# * the Nmap Scripting Engine. * # * * # * Note that the GPL places important restrictions on "derivative works", * # * yet it does not provide a detailed definition of that term. To avoid * @@ -56,12 +56,19 @@ # * particularly including the GPL Section 3 requirements of providing * # * source code and allowing free redistribution of the work as a whole. * # * * -# * As another special exception to the GPL terms, Insecure.Com LLC grants * +# * As another special exception to the GPL terms, the Nmap Project grants * # * permission to link the code of this program with any version of the * # * OpenSSL library which is distributed under a license identical to that * # * listed in the included docs/licenses/OpenSSL.txt file, and distribute * # * linked combinations including the two. * # * * +# * The Nmap Project has permission to redistribute Npcap, a packet * +# * capturing driver and library for the Microsoft Windows platform. * +# * Npcap is a separate work with it's own license rather than this Nmap * +# * license. Since the Npcap license does not permit redistribution * +# * without special permission, our Nmap Windows binary packages which * +# * contain Npcap may not be redistributed without special permission. * +# * * # * Any redistribution of Covered Software, including any derived works, * # * must obey and carry forward all of the terms of this license, including * # * obeying all GPL rules and restrictions. For example, source code of * @@ -101,12 +108,12 @@ # * to the dev@nmap.org mailing list for possible incorporation into the * # * main distribution. By sending these changes to Fyodor or one of the * # * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify otherwise) * -# * that you are offering the Nmap Project (Insecure.Com LLC) the * -# * unlimited, non-exclusive right to reuse, modify, and relicense the * -# * code. Nmap will always be available Open Source, but this is important * -# * because the inability to relicense code has caused devastating problems * -# * for other Free Software projects (such as KDE and NASM). We also * +# * source code repository, it is understood (unless you specify * +# * otherwise) that you are offering the Nmap Project the unlimited, * +# * non-exclusive right to reuse, modify, and relicense the code. Nmap * +# * will always be available Open Source, but this is important because * +# * the inability to relicense code has caused devastating problems for * +# * other Free Software projects (such as KDE and NASM). We also * # * occasionally relicense the code to third parties as discussed above. * # * If you wish to specify special license conditions of your * # * contributions, just say so when you send them. *