diff --git a/COPYING b/COPYING index 530b5d622..04db55e24 100644 --- a/COPYING +++ b/COPYING @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/FPEngine.cc b/FPEngine.cc index 281f1c998..e0427def6 100644 --- a/FPEngine.cc +++ b/FPEngine.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/FPEngine.h b/FPEngine.h index b35840ca1..656255257 100644 --- a/FPEngine.h +++ b/FPEngine.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/FingerPrintResults.cc b/FingerPrintResults.cc index c8a8e5e12..edbd03c7b 100644 --- a/FingerPrintResults.cc +++ b/FingerPrintResults.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/FingerPrintResults.h b/FingerPrintResults.h index df9dfa61d..8f0488891 100644 --- a/FingerPrintResults.h +++ b/FingerPrintResults.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/MACLookup.cc b/MACLookup.cc index c2505b837..8733a08a2 100644 --- a/MACLookup.cc +++ b/MACLookup.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/MACLookup.h b/MACLookup.h index 9e04344ea..3804fb3b9 100644 --- a/MACLookup.h +++ b/MACLookup.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/NmapOps.cc b/NmapOps.cc index e0f5bc515..a8a5c19b4 100644 --- a/NmapOps.cc +++ b/NmapOps.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/NmapOps.h b/NmapOps.h index 10aa746be..d905d0db7 100644 --- a/NmapOps.h +++ b/NmapOps.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/NmapOutputTable.cc b/NmapOutputTable.cc index 38e0a8b1b..1f89bd3a2 100644 --- a/NmapOutputTable.cc +++ b/NmapOutputTable.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/NmapOutputTable.h b/NmapOutputTable.h index a7aeac76e..ec9ec9501 100644 --- a/NmapOutputTable.h +++ b/NmapOutputTable.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/Target.cc b/Target.cc index a99ba3098..5afd1e1e0 100644 --- a/Target.cc +++ b/Target.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/Target.h b/Target.h index 6ffae95f9..9a8441748 100644 --- a/Target.h +++ b/Target.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/TargetGroup.cc b/TargetGroup.cc index 3db324120..4db2406ac 100644 --- a/TargetGroup.cc +++ b/TargetGroup.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/TargetGroup.h b/TargetGroup.h index 8caad431e..dc218a2ce 100644 --- a/TargetGroup.h +++ b/TargetGroup.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/charpool.cc b/charpool.cc index 688e1ed86..8134d00de 100644 --- a/charpool.cc +++ b/charpool.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/charpool.h b/charpool.h index 783f9b450..86e7d51ba 100644 --- a/charpool.h +++ b/charpool.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/global_structures.h b/global_structures.h index c385d7f98..f6ae4f9a6 100644 --- a/global_structures.h +++ b/global_structures.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/idle_scan.cc b/idle_scan.cc index b74e25b66..f0d4c78ff 100644 --- a/idle_scan.cc +++ b/idle_scan.cc @@ -17,7 +17,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -73,7 +73,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -91,12 +91,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/idle_scan.h b/idle_scan.h index bf950a6e0..987ea61cc 100644 --- a/idle_scan.h +++ b/idle_scan.h @@ -17,7 +17,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -73,7 +73,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -91,12 +91,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ARPHeader.cc b/libnetutil/ARPHeader.cc index 4eb8ae247..05ac15956 100644 --- a/libnetutil/ARPHeader.cc +++ b/libnetutil/ARPHeader.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ARPHeader.h b/libnetutil/ARPHeader.h index 690d1b618..1fffc8c55 100644 --- a/libnetutil/ARPHeader.h +++ b/libnetutil/ARPHeader.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ApplicationLayerElement.h b/libnetutil/ApplicationLayerElement.h index 61782dc3d..71fe1384a 100644 --- a/libnetutil/ApplicationLayerElement.h +++ b/libnetutil/ApplicationLayerElement.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/DataLinkLayerElement.h b/libnetutil/DataLinkLayerElement.h index 8a51b0313..569c392c4 100755 --- a/libnetutil/DataLinkLayerElement.h +++ b/libnetutil/DataLinkLayerElement.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/DestOptsHeader.cc b/libnetutil/DestOptsHeader.cc index a24ecb3ef..28b67683f 100644 --- a/libnetutil/DestOptsHeader.cc +++ b/libnetutil/DestOptsHeader.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/DestOptsHeader.h b/libnetutil/DestOptsHeader.h index 9937bbeb8..b8b6df687 100644 --- a/libnetutil/DestOptsHeader.h +++ b/libnetutil/DestOptsHeader.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/EthernetHeader.cc b/libnetutil/EthernetHeader.cc index a4a2771bd..6aac214b7 100755 --- a/libnetutil/EthernetHeader.cc +++ b/libnetutil/EthernetHeader.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/EthernetHeader.h b/libnetutil/EthernetHeader.h index ba4fbc7b7..b73c2526b 100755 --- a/libnetutil/EthernetHeader.h +++ b/libnetutil/EthernetHeader.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/FragmentHeader.cc b/libnetutil/FragmentHeader.cc index af462f47e..2e3a7f310 100644 --- a/libnetutil/FragmentHeader.cc +++ b/libnetutil/FragmentHeader.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/FragmentHeader.h b/libnetutil/FragmentHeader.h index 98498693c..5ce7f202e 100644 --- a/libnetutil/FragmentHeader.h +++ b/libnetutil/FragmentHeader.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/HopByHopHeader.cc b/libnetutil/HopByHopHeader.cc index de930d1bf..8e361e1d7 100644 --- a/libnetutil/HopByHopHeader.cc +++ b/libnetutil/HopByHopHeader.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/HopByHopHeader.h b/libnetutil/HopByHopHeader.h index c212d2a0f..893e3d863 100644 --- a/libnetutil/HopByHopHeader.h +++ b/libnetutil/HopByHopHeader.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ICMPHeader.h b/libnetutil/ICMPHeader.h index 6b54a03b4..41f17aca6 100644 --- a/libnetutil/ICMPHeader.h +++ b/libnetutil/ICMPHeader.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ICMPv4Header.cc b/libnetutil/ICMPv4Header.cc index e782bc151..f258d65e6 100755 --- a/libnetutil/ICMPv4Header.cc +++ b/libnetutil/ICMPv4Header.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ICMPv4Header.h b/libnetutil/ICMPv4Header.h index 5bc5bc006..dc34fa125 100755 --- a/libnetutil/ICMPv4Header.h +++ b/libnetutil/ICMPv4Header.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ICMPv6Header.cc b/libnetutil/ICMPv6Header.cc index 1ea64dd56..06573a806 100755 --- a/libnetutil/ICMPv6Header.cc +++ b/libnetutil/ICMPv6Header.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ICMPv6Header.h b/libnetutil/ICMPv6Header.h index 99d3c1ab9..e8537b7d6 100755 --- a/libnetutil/ICMPv6Header.h +++ b/libnetutil/ICMPv6Header.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ICMPv6Option.cc b/libnetutil/ICMPv6Option.cc index 4164be9da..b21a42a88 100755 --- a/libnetutil/ICMPv6Option.cc +++ b/libnetutil/ICMPv6Option.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ICMPv6Option.h b/libnetutil/ICMPv6Option.h index 98ceea181..ebc95fa1b 100755 --- a/libnetutil/ICMPv6Option.h +++ b/libnetutil/ICMPv6Option.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ICMPv6RRBody.cc b/libnetutil/ICMPv6RRBody.cc index 24c19ed69..cc6a0b0ec 100755 --- a/libnetutil/ICMPv6RRBody.cc +++ b/libnetutil/ICMPv6RRBody.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/ICMPv6RRBody.h b/libnetutil/ICMPv6RRBody.h index e221ed064..3f48b8bbe 100755 --- a/libnetutil/ICMPv6RRBody.h +++ b/libnetutil/ICMPv6RRBody.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/IPv4Header.cc b/libnetutil/IPv4Header.cc index 5979ad007..df9e9c1aa 100644 --- a/libnetutil/IPv4Header.cc +++ b/libnetutil/IPv4Header.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/IPv4Header.h b/libnetutil/IPv4Header.h index 7d29ad4d5..1ebd9e1f4 100644 --- a/libnetutil/IPv4Header.h +++ b/libnetutil/IPv4Header.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/IPv6ExtensionHeader.h b/libnetutil/IPv6ExtensionHeader.h index 423665b53..2ce032520 100644 --- a/libnetutil/IPv6ExtensionHeader.h +++ b/libnetutil/IPv6ExtensionHeader.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/IPv6Header.cc b/libnetutil/IPv6Header.cc index b3aa7a222..1d6000a48 100755 --- a/libnetutil/IPv6Header.cc +++ b/libnetutil/IPv6Header.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/IPv6Header.h b/libnetutil/IPv6Header.h index c36f6b3a5..f17aefe78 100644 --- a/libnetutil/IPv6Header.h +++ b/libnetutil/IPv6Header.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/NetworkLayerElement.cc b/libnetutil/NetworkLayerElement.cc index 1bb869a9f..667f51c22 100644 --- a/libnetutil/NetworkLayerElement.cc +++ b/libnetutil/NetworkLayerElement.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/NetworkLayerElement.h b/libnetutil/NetworkLayerElement.h index 3026ae2ba..dddd3e20b 100644 --- a/libnetutil/NetworkLayerElement.h +++ b/libnetutil/NetworkLayerElement.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/PacketElement.cc b/libnetutil/PacketElement.cc index 3eea6b3a0..4de6a365c 100644 --- a/libnetutil/PacketElement.cc +++ b/libnetutil/PacketElement.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/PacketElement.h b/libnetutil/PacketElement.h index f00ccf875..9b8a0bc83 100644 --- a/libnetutil/PacketElement.h +++ b/libnetutil/PacketElement.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/PacketParser.cc b/libnetutil/PacketParser.cc index 8611616b1..e0f47efc2 100644 --- a/libnetutil/PacketParser.cc +++ b/libnetutil/PacketParser.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/PacketParser.h b/libnetutil/PacketParser.h index aca867ca6..15e85e1c4 100644 --- a/libnetutil/PacketParser.h +++ b/libnetutil/PacketParser.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/RawData.cc b/libnetutil/RawData.cc index df3072878..693cde00b 100644 --- a/libnetutil/RawData.cc +++ b/libnetutil/RawData.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/RawData.h b/libnetutil/RawData.h index 33a2719c6..c121f26ad 100644 --- a/libnetutil/RawData.h +++ b/libnetutil/RawData.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/RoutingHeader.cc b/libnetutil/RoutingHeader.cc index e5732765a..2ef190c4a 100644 --- a/libnetutil/RoutingHeader.cc +++ b/libnetutil/RoutingHeader.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/RoutingHeader.h b/libnetutil/RoutingHeader.h index c3868939e..b449c4bc6 100644 --- a/libnetutil/RoutingHeader.h +++ b/libnetutil/RoutingHeader.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/TCPHeader.cc b/libnetutil/TCPHeader.cc index 9c42d2972..bea7433b9 100644 --- a/libnetutil/TCPHeader.cc +++ b/libnetutil/TCPHeader.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/TCPHeader.h b/libnetutil/TCPHeader.h index 1e785fb58..8a146307b 100644 --- a/libnetutil/TCPHeader.h +++ b/libnetutil/TCPHeader.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/TransportLayerElement.cc b/libnetutil/TransportLayerElement.cc index 23a6a0a99..4a7f016da 100644 --- a/libnetutil/TransportLayerElement.cc +++ b/libnetutil/TransportLayerElement.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/TransportLayerElement.h b/libnetutil/TransportLayerElement.h index 7fbb0d4fb..a0347a15f 100644 --- a/libnetutil/TransportLayerElement.h +++ b/libnetutil/TransportLayerElement.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/UDPHeader.cc b/libnetutil/UDPHeader.cc index 20807da16..fbada4f6a 100644 --- a/libnetutil/UDPHeader.cc +++ b/libnetutil/UDPHeader.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/UDPHeader.h b/libnetutil/UDPHeader.h index 3609c5ccd..2da90b316 100644 --- a/libnetutil/UDPHeader.h +++ b/libnetutil/UDPHeader.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc index 67e3399b1..371b1b251 100644 --- a/libnetutil/netutil.cc +++ b/libnetutil/netutil.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/netutil.h b/libnetutil/netutil.h index a4aac5d55..9a188b281 100644 --- a/libnetutil/netutil.h +++ b/libnetutil/netutil.h @@ -16,7 +16,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -72,7 +72,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -90,12 +90,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/libnetutil/npacket.h b/libnetutil/npacket.h index 56c6710c4..cb85e12d0 100644 --- a/libnetutil/npacket.h +++ b/libnetutil/npacket.h @@ -16,7 +16,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -72,7 +72,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -90,12 +90,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/main.cc b/main.cc index 8f8b34cfa..8b44692ec 100644 --- a/main.cc +++ b/main.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/mswin32/winclude.h b/mswin32/winclude.h index 3ad122cce..05b0f9e4f 100644 --- a/mswin32/winclude.h +++ b/mswin32/winclude.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc index 73c62d93b..b04de1182 100644 --- a/mswin32/winfix.cc +++ b/mswin32/winfix.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/getaddrinfo.c b/nbase/getaddrinfo.c index 205ef7ae8..a80f49895 100644 --- a/nbase/getaddrinfo.c +++ b/nbase/getaddrinfo.c @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/getnameinfo.c b/nbase/getnameinfo.c index 77b463b19..6bf4ba295 100644 --- a/nbase/getnameinfo.c +++ b/nbase/getnameinfo.c @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase.h b/nbase/nbase.h index 39fa802e1..207f52b94 100644 --- a/nbase/nbase.h +++ b/nbase/nbase.h @@ -17,7 +17,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -73,7 +73,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -91,12 +91,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_addrset.c b/nbase/nbase_addrset.c index c15b5df7a..65e33829a 100644 --- a/nbase/nbase_addrset.c +++ b/nbase/nbase_addrset.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_addrset.h b/nbase/nbase_addrset.h index b6ceb2d6d..d88ed4de9 100644 --- a/nbase/nbase_addrset.h +++ b/nbase/nbase_addrset.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_config.h.in b/nbase/nbase_config.h.in index eef1f247f..892c1e7a0 100644 --- a/nbase/nbase_config.h.in +++ b/nbase/nbase_config.h.in @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_crc32ct.h b/nbase/nbase_crc32ct.h index 6b415f958..5d86d66c0 100644 --- a/nbase/nbase_crc32ct.h +++ b/nbase/nbase_crc32ct.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_ipv6.h b/nbase/nbase_ipv6.h index 7b37d6dc1..10e780fd3 100644 --- a/nbase/nbase_ipv6.h +++ b/nbase/nbase_ipv6.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_memalloc.c b/nbase/nbase_memalloc.c index 91e445de5..a38462495 100644 --- a/nbase/nbase_memalloc.c +++ b/nbase/nbase_memalloc.c @@ -16,7 +16,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -72,7 +72,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -90,12 +90,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_misc.c b/nbase/nbase_misc.c index 3a9db8762..16a60d6aa 100644 --- a/nbase/nbase_misc.c +++ b/nbase/nbase_misc.c @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_rnd.c b/nbase/nbase_rnd.c index 3f83cbaf9..ac19c03bf 100644 --- a/nbase/nbase_rnd.c +++ b/nbase/nbase_rnd.c @@ -19,7 +19,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -75,7 +75,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -93,12 +93,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_str.c b/nbase/nbase_str.c index 0bda887c4..8dbf3d9f7 100644 --- a/nbase/nbase_str.c +++ b/nbase/nbase_str.c @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_time.c b/nbase/nbase_time.c index 3d8e9a1c0..cb24dcbb4 100644 --- a/nbase/nbase_time.c +++ b/nbase/nbase_time.c @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_winconfig.h b/nbase/nbase_winconfig.h index e169aeda1..327c9a8f6 100644 --- a/nbase/nbase_winconfig.h +++ b/nbase/nbase_winconfig.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_winunix.c b/nbase/nbase_winunix.c index 8e46fefe5..953bf6f02 100644 --- a/nbase/nbase_winunix.c +++ b/nbase/nbase_winunix.c @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/nbase_winunix.h b/nbase/nbase_winunix.h index fad15fd2f..c17480837 100644 --- a/nbase/nbase_winunix.h +++ b/nbase/nbase_winunix.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nbase/strcasecmp.c b/nbase/strcasecmp.c index f4807ba19..ef93d632b 100644 --- a/nbase/strcasecmp.c +++ b/nbase/strcasecmp.c @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/base64.c b/ncat/base64.c index a0de2f7e9..b87c1ac20 100644 --- a/ncat/base64.c +++ b/ncat/base64.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/base64.h b/ncat/base64.h index 6a9a5448c..7d7e3d8b4 100644 --- a/ncat/base64.h +++ b/ncat/base64.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/config_win.h b/ncat/config_win.h index c17950189..a07f3d6f2 100644 --- a/ncat/config_win.h +++ b/ncat/config_win.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/http.c b/ncat/http.c index 27abcc6c5..99a1da473 100644 --- a/ncat/http.c +++ b/ncat/http.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/http.h b/ncat/http.h index 61d2c9d92..1602aeceb 100644 --- a/ncat/http.h +++ b/ncat/http.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/http_digest.c b/ncat/http_digest.c index 2cfeb92c8..6c6a5cda1 100644 --- a/ncat/http_digest.c +++ b/ncat/http_digest.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat.h b/ncat/ncat.h index d2b993af1..34ab4994a 100644 --- a/ncat/ncat.h +++ b/ncat/ncat.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_config.h b/ncat/ncat_config.h index 14b26ef16..8bb17abf0 100644 --- a/ncat/ncat_config.h +++ b/ncat/ncat_config.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c index b222a199e..b2bc7a192 100644 --- a/ncat/ncat_connect.c +++ b/ncat/ncat_connect.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_connect.h b/ncat/ncat_connect.h index 9288732f1..374670ff8 100644 --- a/ncat/ncat_connect.h +++ b/ncat/ncat_connect.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_core.c b/ncat/ncat_core.c index d40a292d3..3a2c25ede 100644 --- a/ncat/ncat_core.c +++ b/ncat/ncat_core.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_core.h b/ncat/ncat_core.h index 9ee618acf..c523a9b89 100644 --- a/ncat/ncat_core.h +++ b/ncat/ncat_core.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_exec.h b/ncat/ncat_exec.h index e79905ffb..4d13b96a2 100644 --- a/ncat/ncat_exec.h +++ b/ncat/ncat_exec.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_exec_win.c b/ncat/ncat_exec_win.c index 2a1335f13..620d7cb10 100644 --- a/ncat/ncat_exec_win.c +++ b/ncat/ncat_exec_win.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_listen.c b/ncat/ncat_listen.c index 5ce365081..1ece9cbf4 100644 --- a/ncat/ncat_listen.c +++ b/ncat/ncat_listen.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_listen.h b/ncat/ncat_listen.h index add4dcba8..6b72e1906 100644 --- a/ncat/ncat_listen.h +++ b/ncat/ncat_listen.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_lua.c b/ncat/ncat_lua.c index a668034d6..0f74e275f 100644 --- a/ncat/ncat_lua.c +++ b/ncat/ncat_lua.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_lua.h b/ncat/ncat_lua.h index ac33f7b28..b2e80ce2a 100644 --- a/ncat/ncat_lua.h +++ b/ncat/ncat_lua.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c index 9b844f404..80ae72962 100644 --- a/ncat/ncat_main.c +++ b/ncat/ncat_main.c @@ -11,7 +11,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -67,7 +67,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -85,12 +85,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_posix.c b/ncat/ncat_posix.c index 807390de9..c83e4c9cf 100644 --- a/ncat/ncat_posix.c +++ b/ncat/ncat_posix.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_proxy.c b/ncat/ncat_proxy.c index 4eb9220ab..818f4082b 100644 --- a/ncat/ncat_proxy.c +++ b/ncat/ncat_proxy.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_proxy.h b/ncat/ncat_proxy.h index 121724b60..2e4164bdf 100644 --- a/ncat/ncat_proxy.h +++ b/ncat/ncat_proxy.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_ssl.c b/ncat/ncat_ssl.c index 183b030ab..b066695f0 100644 --- a/ncat/ncat_ssl.c +++ b/ncat/ncat_ssl.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_ssl.h b/ncat/ncat_ssl.h index 11d0b01f2..44242941a 100644 --- a/ncat/ncat_ssl.h +++ b/ncat/ncat_ssl.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/ncat_win.c b/ncat/ncat_win.c index 3469743e6..7e6186ebf 100644 --- a/ncat/ncat_win.c +++ b/ncat/ncat_win.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/sockaddr_u.h b/ncat/sockaddr_u.h index bcda9df64..d2c3099aa 100644 --- a/ncat/sockaddr_u.h +++ b/ncat/sockaddr_u.h @@ -11,7 +11,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -67,7 +67,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -85,12 +85,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/sys_wrap.c b/ncat/sys_wrap.c index 10f6ff27a..ce5aa5f0c 100644 --- a/ncat/sys_wrap.c +++ b/ncat/sys_wrap.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/sys_wrap.h b/ncat/sys_wrap.h index c5a0a2263..3f2c4c989 100644 --- a/ncat/sys_wrap.h +++ b/ncat/sys_wrap.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/util.c b/ncat/util.c index 1358b8fa4..4b97ca48c 100644 --- a/ncat/util.c +++ b/ncat/util.c @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/ncat/util.h b/ncat/util.h index 58898700b..67e8e786c 100644 --- a/ncat/util.h +++ b/ncat/util.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap-header-template.cc b/nmap-header-template.cc index 466a3518a..ea29392e9 100644 --- a/nmap-header-template.cc +++ b/nmap-header-template.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap.cc b/nmap.cc index 0a569490f..2853d9725 100644 --- a/nmap.cc +++ b/nmap.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap.h b/nmap.h index 64f736dbd..05ead5d53 100644 --- a/nmap.h +++ b/nmap.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap_amigaos.h b/nmap_amigaos.h index b353d21dc..9b91f90b2 100644 --- a/nmap_amigaos.h +++ b/nmap_amigaos.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap_config.h.in b/nmap_config.h.in index ea3e518c9..efeabf75f 100644 --- a/nmap_config.h.in +++ b/nmap_config.h.in @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap_dns.cc b/nmap_dns.cc index 71f3d75c1..0d3c811a8 100644 --- a/nmap_dns.cc +++ b/nmap_dns.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap_dns.h b/nmap_dns.h index 773807e1e..3c9c897de 100644 --- a/nmap_dns.h +++ b/nmap_dns.h @@ -11,7 +11,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -67,7 +67,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -85,12 +85,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap_error.cc b/nmap_error.cc index 5b6a975c1..c09187d83 100644 --- a/nmap_error.cc +++ b/nmap_error.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap_error.h b/nmap_error.h index f258fac50..95118de40 100644 --- a/nmap_error.h +++ b/nmap_error.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap_tty.cc b/nmap_tty.cc index 591703601..2220ecdef 100644 --- a/nmap_tty.cc +++ b/nmap_tty.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap_tty.h b/nmap_tty.h index f9a94ad87..3185e2511 100644 --- a/nmap_tty.h +++ b/nmap_tty.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nmap_winconfig.h b/nmap_winconfig.h index 75292b1de..232c1591a 100644 --- a/nmap_winconfig.h +++ b/nmap_winconfig.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/ArgParser.cc b/nping/ArgParser.cc index 7c1b37687..34e62cf5f 100644 --- a/nping/ArgParser.cc +++ b/nping/ArgParser.cc @@ -16,7 +16,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -72,7 +72,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -90,12 +90,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/ArgParser.h b/nping/ArgParser.h index ac2661357..f88cf8a85 100644 --- a/nping/ArgParser.h +++ b/nping/ArgParser.h @@ -16,7 +16,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -72,7 +72,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -90,12 +90,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/COPYING b/nping/COPYING index 530b5d622..04db55e24 100644 --- a/nping/COPYING +++ b/nping/COPYING @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/Crypto.cc b/nping/Crypto.cc index 48432ad79..12d766b4d 100755 --- a/nping/Crypto.cc +++ b/nping/Crypto.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/Crypto.h b/nping/Crypto.h index 486a130b6..975852ea8 100755 --- a/nping/Crypto.h +++ b/nping/Crypto.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/EchoClient.cc b/nping/EchoClient.cc index 93063cffe..40e0f4c01 100644 --- a/nping/EchoClient.cc +++ b/nping/EchoClient.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/EchoClient.h b/nping/EchoClient.h index c92e02528..c60baa059 100644 --- a/nping/EchoClient.h +++ b/nping/EchoClient.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/EchoHeader.cc b/nping/EchoHeader.cc index 3a7f14296..ee4d7b342 100755 --- a/nping/EchoHeader.cc +++ b/nping/EchoHeader.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/EchoHeader.h b/nping/EchoHeader.h index 973abbe92..98353ac6f 100755 --- a/nping/EchoHeader.h +++ b/nping/EchoHeader.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc index a8e4da8c3..dbbd350db 100644 --- a/nping/EchoServer.cc +++ b/nping/EchoServer.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/EchoServer.h b/nping/EchoServer.h index 7d34c1735..b4a09805c 100644 --- a/nping/EchoServer.h +++ b/nping/EchoServer.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/NEPContext.cc b/nping/NEPContext.cc index 858b35312..5462a758b 100644 --- a/nping/NEPContext.cc +++ b/nping/NEPContext.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/NEPContext.h b/nping/NEPContext.h index b8fda99ea..f4b8e84fc 100644 --- a/nping/NEPContext.h +++ b/nping/NEPContext.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/NpingOps.cc b/nping/NpingOps.cc index 8359015c0..f7f084fb0 100644 --- a/nping/NpingOps.cc +++ b/nping/NpingOps.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/NpingOps.h b/nping/NpingOps.h index 929d4f126..df07f2eec 100644 --- a/nping/NpingOps.h +++ b/nping/NpingOps.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/NpingTarget.cc b/nping/NpingTarget.cc index da75a65a6..61a38a71a 100644 --- a/nping/NpingTarget.cc +++ b/nping/NpingTarget.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/NpingTarget.h b/nping/NpingTarget.h index 6c2da69e0..bd3149f6a 100644 --- a/nping/NpingTarget.h +++ b/nping/NpingTarget.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/NpingTargets.cc b/nping/NpingTargets.cc index a74d31ec7..4e52c5470 100644 --- a/nping/NpingTargets.cc +++ b/nping/NpingTargets.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/NpingTargets.h b/nping/NpingTargets.h index f90699da5..de045ff41 100644 --- a/nping/NpingTargets.h +++ b/nping/NpingTargets.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/PacketDiff.cc b/nping/PacketDiff.cc index f31aeca01..8c10112ba 100644 --- a/nping/PacketDiff.cc +++ b/nping/PacketDiff.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/PacketDiff.h b/nping/PacketDiff.h index d22c014c6..659076df9 100644 --- a/nping/PacketDiff.h +++ b/nping/PacketDiff.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/ProbeMode.cc b/nping/ProbeMode.cc index f5da31941..99086f79a 100644 --- a/nping/ProbeMode.cc +++ b/nping/ProbeMode.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/ProbeMode.h b/nping/ProbeMode.h index dbd18d3fa..0e4ebe385 100644 --- a/nping/ProbeMode.h +++ b/nping/ProbeMode.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/common.cc b/nping/common.cc index 5de5f05e8..dfaa4a262 100644 --- a/nping/common.cc +++ b/nping/common.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/common.h b/nping/common.h index 24dede68f..14ad0cd4e 100644 --- a/nping/common.h +++ b/nping/common.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/common_modified.cc b/nping/common_modified.cc index 91bf2fc0c..87c69c135 100644 --- a/nping/common_modified.cc +++ b/nping/common_modified.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/common_modified.h b/nping/common_modified.h index 003b2e875..7cedb1d69 100644 --- a/nping/common_modified.h +++ b/nping/common_modified.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/nping.cc b/nping/nping.cc index fc759e66a..93af71aff 100644 --- a/nping/nping.cc +++ b/nping/nping.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/nping.h b/nping/nping.h index 51a8981f1..0ce326a64 100644 --- a/nping/nping.h +++ b/nping/nping.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/nping_config.h.in b/nping/nping_config.h.in index 1b92febd1..87208efcc 100644 --- a/nping/nping_config.h.in +++ b/nping/nping_config.h.in @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/nping_winconfig.h b/nping/nping_winconfig.h index 1999980c1..e5ab4612f 100644 --- a/nping/nping_winconfig.h +++ b/nping/nping_winconfig.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/output.cc b/nping/output.cc index cc8a92207..55e1f6da0 100644 --- a/nping/output.cc +++ b/nping/output.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/output.h b/nping/output.h index 5a52daa3d..b67dea378 100644 --- a/nping/output.h +++ b/nping/output.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/stats.cc b/nping/stats.cc index 345bff642..7580dc6ef 100644 --- a/nping/stats.cc +++ b/nping/stats.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/stats.h b/nping/stats.h index 93c55c601..1b841408c 100644 --- a/nping/stats.h +++ b/nping/stats.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/utils.cc b/nping/utils.cc index 15b21af66..6eba40d55 100644 --- a/nping/utils.cc +++ b/nping/utils.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/utils.h b/nping/utils.h index 63c25d3b1..692028a06 100644 --- a/nping/utils.h +++ b/nping/utils.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/utils_net.cc b/nping/utils_net.cc index a188e4873..d551ddcdf 100644 --- a/nping/utils_net.cc +++ b/nping/utils_net.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/utils_net.h b/nping/utils_net.h index bbf3cdca3..7c2bf4767 100644 --- a/nping/utils_net.h +++ b/nping/utils_net.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/winclude.h b/nping/winclude.h index 3acab033b..8c92c7258 100644 --- a/nping/winclude.h +++ b/nping/winclude.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nping/winfix.cc b/nping/winfix.cc index 4ea9c88ce..9dba39bef 100644 --- a/nping/winfix.cc +++ b/nping/winfix.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc index 8089159f5..2f3ab9feb 100644 --- a/nse_ssl_cert.cc +++ b/nse_ssl_cert.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/nse_ssl_cert.h b/nse_ssl_cert.h index 43e3df639..55e2937b0 100644 --- a/nse_ssl_cert.h +++ b/nse_ssl_cert.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/osscan.cc b/osscan.cc index 5889e2bd7..77a273302 100644 --- a/osscan.cc +++ b/osscan.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/osscan.h b/osscan.h index 4978f195c..ffaceef02 100644 --- a/osscan.h +++ b/osscan.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/osscan2.cc b/osscan2.cc index bfc7e9965..3f0ed4fcf 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/osscan2.h b/osscan2.h index b40d0f2ab..359f6ae42 100644 --- a/osscan2.h +++ b/osscan2.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/output.cc b/output.cc index d18347fd2..d07fb416e 100644 --- a/output.cc +++ b/output.cc @@ -17,7 +17,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -73,7 +73,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -91,12 +91,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/output.h b/output.h index c629c08f9..a5d224a8f 100644 --- a/output.h +++ b/output.h @@ -17,7 +17,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -73,7 +73,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -91,12 +91,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/payload.cc b/payload.cc index 6bf411b75..157c1cdc7 100644 --- a/payload.cc +++ b/payload.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/payload.h b/payload.h index 1bf944046..6e0147333 100644 --- a/payload.h +++ b/payload.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/portlist.cc b/portlist.cc index 80ec8b09b..49c7e89c1 100644 --- a/portlist.cc +++ b/portlist.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/portlist.h b/portlist.h index 479b62b70..5ff43c4f1 100644 --- a/portlist.h +++ b/portlist.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/portreasons.cc b/portreasons.cc index 07d2d3bb8..f3c1b6a79 100644 --- a/portreasons.cc +++ b/portreasons.cc @@ -11,7 +11,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -67,7 +67,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -85,12 +85,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/portreasons.h b/portreasons.h index b9ef78dcd..65d281597 100644 --- a/portreasons.h +++ b/portreasons.h @@ -11,7 +11,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -67,7 +67,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -85,12 +85,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/protocols.cc b/protocols.cc index 13838f8d7..5b908d793 100644 --- a/protocols.cc +++ b/protocols.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/protocols.h b/protocols.h index acf7106b1..3f7417b0a 100644 --- a/protocols.h +++ b/protocols.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/scan_engine.cc b/scan_engine.cc index 8b5eaae54..aed2f1d86 100644 --- a/scan_engine.cc +++ b/scan_engine.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/scan_engine.h b/scan_engine.h index a652a5c0d..1f0751863 100644 --- a/scan_engine.h +++ b/scan_engine.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/service_scan.cc b/service_scan.cc index 35cd214be..43e459187 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/service_scan.h b/service_scan.h index 177cb5a22..e6984c7a9 100644 --- a/service_scan.h +++ b/service_scan.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/services.cc b/services.cc index fefbf83c9..b1df320d8 100644 --- a/services.cc +++ b/services.cc @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/services.h b/services.h index 996a4fc22..486034ceb 100644 --- a/services.h +++ b/services.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/targets.cc b/targets.cc index 167bb7ea9..7f3e7092f 100644 --- a/targets.cc +++ b/targets.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/targets.h b/targets.h index 63803f1fe..c9f74a2d2 100644 --- a/targets.h +++ b/targets.h @@ -13,7 +13,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -69,7 +69,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -87,12 +87,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/tcpip.cc b/tcpip.cc index 104a4cba9..ca438d387 100644 --- a/tcpip.cc +++ b/tcpip.cc @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/tcpip.h b/tcpip.h index 809c07ff7..ef4270557 100644 --- a/tcpip.h +++ b/tcpip.h @@ -14,7 +14,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -70,7 +70,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -88,12 +88,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/timing.cc b/timing.cc index afd64308a..1593ec793 100644 --- a/timing.cc +++ b/timing.cc @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/timing.h b/timing.h index 39a96501b..6e8ed9e26 100644 --- a/timing.h +++ b/timing.h @@ -15,7 +15,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -71,7 +71,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -89,12 +89,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/traceroute.cc b/traceroute.cc index 92a96ce4e..506d37ce1 100644 --- a/traceroute.cc +++ b/traceroute.cc @@ -11,7 +11,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -67,7 +67,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -85,12 +85,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/traceroute.h b/traceroute.h index d39d0db78..dd78467d6 100644 --- a/traceroute.h +++ b/traceroute.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/utils.cc b/utils.cc index e5a021c86..6cb21dba1 100644 --- a/utils.cc +++ b/utils.cc @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/utils.h b/utils.h index 896319d38..a7cfabfe6 100644 --- a/utils.h +++ b/utils.h @@ -12,7 +12,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -68,7 +68,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -86,12 +86,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/xml.cc b/xml.cc index 6004504a1..ccd401db7 100644 --- a/xml.cc +++ b/xml.cc @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/xml.h b/xml.h index d58704550..fd5b5838c 100644 --- a/xml.h +++ b/xml.h @@ -10,7 +10,7 @@ * 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@insecure.com). Dozens of software * + * 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. * @@ -66,7 +66,7 @@ * 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 special and conditions of the license text as well. * + * 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 * @@ -84,12 +84,12 @@ * 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@insecure.com for * - * further information. * + * continued development of Nmap. Please email sales@nmap.com for further * + * information. * * * - * 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. * + * 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. * diff --git a/zenmap/install_scripts/utils/version_update.py b/zenmap/install_scripts/utils/version_update.py index 89081684b..1f6ff1832 100644 --- a/zenmap/install_scripts/utils/version_update.py +++ b/zenmap/install_scripts/utils/version_update.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/__init__.py b/zenmap/radialnet/__init__.py index 2b8af8991..b597cd922 100644 --- a/zenmap/radialnet/__init__.py +++ b/zenmap/radialnet/__init__.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/bestwidgets/__init__.py b/zenmap/radialnet/bestwidgets/__init__.py index 6a3495a44..8f4c0dd1e 100644 --- a/zenmap/radialnet/bestwidgets/__init__.py +++ b/zenmap/radialnet/bestwidgets/__init__.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/bestwidgets/boxes.py b/zenmap/radialnet/bestwidgets/boxes.py index 8bf0bad5b..e181ef8a4 100644 --- a/zenmap/radialnet/bestwidgets/boxes.py +++ b/zenmap/radialnet/bestwidgets/boxes.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/bestwidgets/buttons.py b/zenmap/radialnet/bestwidgets/buttons.py index c96d715b6..734d8e7a8 100644 --- a/zenmap/radialnet/bestwidgets/buttons.py +++ b/zenmap/radialnet/bestwidgets/buttons.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/bestwidgets/comboboxes.py b/zenmap/radialnet/bestwidgets/comboboxes.py index 9be3c6a92..f54cff655 100644 --- a/zenmap/radialnet/bestwidgets/comboboxes.py +++ b/zenmap/radialnet/bestwidgets/comboboxes.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/bestwidgets/expanders.py b/zenmap/radialnet/bestwidgets/expanders.py index 0de531be5..b97cc3f4c 100644 --- a/zenmap/radialnet/bestwidgets/expanders.py +++ b/zenmap/radialnet/bestwidgets/expanders.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/bestwidgets/frames.py b/zenmap/radialnet/bestwidgets/frames.py index 37f34bd13..d46b9e39f 100644 --- a/zenmap/radialnet/bestwidgets/frames.py +++ b/zenmap/radialnet/bestwidgets/frames.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/bestwidgets/labels.py b/zenmap/radialnet/bestwidgets/labels.py index 17570d573..4a697df43 100644 --- a/zenmap/radialnet/bestwidgets/labels.py +++ b/zenmap/radialnet/bestwidgets/labels.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/bestwidgets/textview.py b/zenmap/radialnet/bestwidgets/textview.py index 54d5a8325..a6572d2e5 100644 --- a/zenmap/radialnet/bestwidgets/textview.py +++ b/zenmap/radialnet/bestwidgets/textview.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/bestwidgets/windows.py b/zenmap/radialnet/bestwidgets/windows.py index 9acbde088..372e88adc 100644 --- a/zenmap/radialnet/bestwidgets/windows.py +++ b/zenmap/radialnet/bestwidgets/windows.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/core/ArgvHandle.py b/zenmap/radialnet/core/ArgvHandle.py index e0cd922e1..939be80c3 100644 --- a/zenmap/radialnet/core/ArgvHandle.py +++ b/zenmap/radialnet/core/ArgvHandle.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/core/Coordinate.py b/zenmap/radialnet/core/Coordinate.py index bd91f4c85..4da0f170a 100644 --- a/zenmap/radialnet/core/Coordinate.py +++ b/zenmap/radialnet/core/Coordinate.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/core/Graph.py b/zenmap/radialnet/core/Graph.py index 82a5d1130..a86caf7a0 100644 --- a/zenmap/radialnet/core/Graph.py +++ b/zenmap/radialnet/core/Graph.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/core/Info.py b/zenmap/radialnet/core/Info.py index ac3e231b7..753f69d2c 100644 --- a/zenmap/radialnet/core/Info.py +++ b/zenmap/radialnet/core/Info.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/core/Interpolation.py b/zenmap/radialnet/core/Interpolation.py index b51ff28ba..bdad61701 100644 --- a/zenmap/radialnet/core/Interpolation.py +++ b/zenmap/radialnet/core/Interpolation.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/core/XMLHandler.py b/zenmap/radialnet/core/XMLHandler.py index e8f0e6007..03f73b896 100644 --- a/zenmap/radialnet/core/XMLHandler.py +++ b/zenmap/radialnet/core/XMLHandler.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/core/__init__.py b/zenmap/radialnet/core/__init__.py index 0614b2afa..2603cc24d 100644 --- a/zenmap/radialnet/core/__init__.py +++ b/zenmap/radialnet/core/__init__.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/Application.py b/zenmap/radialnet/gui/Application.py index 78e0ed339..ed645d5c7 100644 --- a/zenmap/radialnet/gui/Application.py +++ b/zenmap/radialnet/gui/Application.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/ControlWidget.py b/zenmap/radialnet/gui/ControlWidget.py index 91dba4610..a7abb7d0f 100644 --- a/zenmap/radialnet/gui/ControlWidget.py +++ b/zenmap/radialnet/gui/ControlWidget.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/Dialogs.py b/zenmap/radialnet/gui/Dialogs.py index 8790304b4..c95134a76 100644 --- a/zenmap/radialnet/gui/Dialogs.py +++ b/zenmap/radialnet/gui/Dialogs.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/HostsViewer.py b/zenmap/radialnet/gui/HostsViewer.py index 2f4a840ac..c5526c6c3 100644 --- a/zenmap/radialnet/gui/HostsViewer.py +++ b/zenmap/radialnet/gui/HostsViewer.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/Image.py b/zenmap/radialnet/gui/Image.py index 72de394b0..e94357552 100644 --- a/zenmap/radialnet/gui/Image.py +++ b/zenmap/radialnet/gui/Image.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/NodeNotebook.py b/zenmap/radialnet/gui/NodeNotebook.py index 68a888190..93ba1fe9a 100644 --- a/zenmap/radialnet/gui/NodeNotebook.py +++ b/zenmap/radialnet/gui/NodeNotebook.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/NodeWindow.py b/zenmap/radialnet/gui/NodeWindow.py index b7a9d7d64..ffdd2cb53 100644 --- a/zenmap/radialnet/gui/NodeWindow.py +++ b/zenmap/radialnet/gui/NodeWindow.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/RadialNet.py b/zenmap/radialnet/gui/RadialNet.py index ff23b4daa..4fc307155 100644 --- a/zenmap/radialnet/gui/RadialNet.py +++ b/zenmap/radialnet/gui/RadialNet.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/SaveDialog.py b/zenmap/radialnet/gui/SaveDialog.py index 14911cab0..987e4b41f 100644 --- a/zenmap/radialnet/gui/SaveDialog.py +++ b/zenmap/radialnet/gui/SaveDialog.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/Toolbar.py b/zenmap/radialnet/gui/Toolbar.py index 8b6e48f6d..c504aede3 100644 --- a/zenmap/radialnet/gui/Toolbar.py +++ b/zenmap/radialnet/gui/Toolbar.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/gui/__init__.py b/zenmap/radialnet/gui/__init__.py index 0614b2afa..2603cc24d 100644 --- a/zenmap/radialnet/gui/__init__.py +++ b/zenmap/radialnet/gui/__init__.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/radialnet.pyw b/zenmap/radialnet/radialnet.pyw index 61c28e9dd..966393fd5 100755 --- a/zenmap/radialnet/radialnet.pyw +++ b/zenmap/radialnet/radialnet.pyw @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/util/__init__.py b/zenmap/radialnet/util/__init__.py index 0614b2afa..2603cc24d 100644 --- a/zenmap/radialnet/util/__init__.py +++ b/zenmap/radialnet/util/__init__.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/util/drawing.py b/zenmap/radialnet/util/drawing.py index c2606b39e..77ad96b71 100644 --- a/zenmap/radialnet/util/drawing.py +++ b/zenmap/radialnet/util/drawing.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/util/geometry.py b/zenmap/radialnet/util/geometry.py index d2d86ddd8..9cdbf7223 100644 --- a/zenmap/radialnet/util/geometry.py +++ b/zenmap/radialnet/util/geometry.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/util/integration.py b/zenmap/radialnet/util/integration.py index 1c7440a15..241002451 100644 --- a/zenmap/radialnet/util/integration.py +++ b/zenmap/radialnet/util/integration.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/radialnet/util/misc.py b/zenmap/radialnet/util/misc.py index 5feb6ac32..343d6e15f 100644 --- a/zenmap/radialnet/util/misc.py +++ b/zenmap/radialnet/util/misc.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/setup.py b/zenmap/setup.py index 934ba57da..0b87a4eb1 100755 --- a/zenmap/setup.py +++ b/zenmap/setup.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmap b/zenmap/zenmap index fc2f26be0..16d277660 100755 --- a/zenmap/zenmap +++ b/zenmap/zenmap @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/BasePaths.py b/zenmap/zenmapCore/BasePaths.py index 6751761f1..5c1181692 100644 --- a/zenmap/zenmapCore/BasePaths.py +++ b/zenmap/zenmapCore/BasePaths.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/Diff.py b/zenmap/zenmapCore/Diff.py index 3621d6e29..29fd22c47 100644 --- a/zenmap/zenmapCore/Diff.py +++ b/zenmap/zenmapCore/Diff.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/I18N.py b/zenmap/zenmapCore/I18N.py index 29994c367..d5ae79c02 100644 --- a/zenmap/zenmapCore/I18N.py +++ b/zenmap/zenmapCore/I18N.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/NSEDocParser.py b/zenmap/zenmapCore/NSEDocParser.py index ccd3801f6..af43c0d59 100644 --- a/zenmap/zenmapCore/NSEDocParser.py +++ b/zenmap/zenmapCore/NSEDocParser.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/Name.py b/zenmap/zenmapCore/Name.py index 2b25117a7..2da0e2329 100644 --- a/zenmap/zenmapCore/Name.py +++ b/zenmap/zenmapCore/Name.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/NetworkInventory.py b/zenmap/zenmapCore/NetworkInventory.py index 706cc90e0..ea9d9d659 100644 --- a/zenmap/zenmapCore/NetworkInventory.py +++ b/zenmap/zenmapCore/NetworkInventory.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/NmapCommand.py b/zenmap/zenmapCore/NmapCommand.py index 1a75b21ce..aca59a1ae 100644 --- a/zenmap/zenmapCore/NmapCommand.py +++ b/zenmap/zenmapCore/NmapCommand.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/NmapParser.py b/zenmap/zenmapCore/NmapParser.py index 35d0d700c..a517b8338 100644 --- a/zenmap/zenmapCore/NmapParser.py +++ b/zenmap/zenmapCore/NmapParser.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/Paths.py b/zenmap/zenmapCore/Paths.py index fb357ec0d..95ed5d636 100644 --- a/zenmap/zenmapCore/Paths.py +++ b/zenmap/zenmapCore/Paths.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/RecentScans.py b/zenmap/zenmapCore/RecentScans.py index 1e12e7360..ea37ded22 100644 --- a/zenmap/zenmapCore/RecentScans.py +++ b/zenmap/zenmapCore/RecentScans.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/ScriptArgsParser.py b/zenmap/zenmapCore/ScriptArgsParser.py index c2d3cc699..b331086df 100644 --- a/zenmap/zenmapCore/ScriptArgsParser.py +++ b/zenmap/zenmapCore/ScriptArgsParser.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/ScriptMetadata.py b/zenmap/zenmapCore/ScriptMetadata.py index 895789a96..090e57160 100644 --- a/zenmap/zenmapCore/ScriptMetadata.py +++ b/zenmap/zenmapCore/ScriptMetadata.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/SearchResult.py b/zenmap/zenmapCore/SearchResult.py index f774fb356..ce713fd7c 100644 --- a/zenmap/zenmapCore/SearchResult.py +++ b/zenmap/zenmapCore/SearchResult.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/StringPool.py b/zenmap/zenmapCore/StringPool.py index 89d0feb1f..dd68e32d1 100644 --- a/zenmap/zenmapCore/StringPool.py +++ b/zenmap/zenmapCore/StringPool.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/TargetList.py b/zenmap/zenmapCore/TargetList.py index 2f86b26d2..4cfd33188 100644 --- a/zenmap/zenmapCore/TargetList.py +++ b/zenmap/zenmapCore/TargetList.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/UmitConf.py b/zenmap/zenmapCore/UmitConf.py index fd38a00dd..8e49af515 100644 --- a/zenmap/zenmapCore/UmitConf.py +++ b/zenmap/zenmapCore/UmitConf.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/UmitConfigParser.py b/zenmap/zenmapCore/UmitConfigParser.py index e69a75215..0323a23c6 100644 --- a/zenmap/zenmapCore/UmitConfigParser.py +++ b/zenmap/zenmapCore/UmitConfigParser.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/UmitDB.py b/zenmap/zenmapCore/UmitDB.py index 72e194912..5eb6e5c29 100644 --- a/zenmap/zenmapCore/UmitDB.py +++ b/zenmap/zenmapCore/UmitDB.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/UmitLogging.py b/zenmap/zenmapCore/UmitLogging.py index e121632f9..dfa46ab2f 100644 --- a/zenmap/zenmapCore/UmitLogging.py +++ b/zenmap/zenmapCore/UmitLogging.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/UmitOptionParser.py b/zenmap/zenmapCore/UmitOptionParser.py index 38122ee78..d78695406 100644 --- a/zenmap/zenmapCore/UmitOptionParser.py +++ b/zenmap/zenmapCore/UmitOptionParser.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapCore/__init__.py b/zenmap/zenmapCore/__init__.py index 5ddf5773f..d3681de99 100644 --- a/zenmap/zenmapCore/__init__.py +++ b/zenmap/zenmapCore/__init__.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/About.py b/zenmap/zenmapGUI/About.py index 83ba67830..87d8bc94b 100644 --- a/zenmap/zenmapGUI/About.py +++ b/zenmap/zenmapGUI/About.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/App.py b/zenmap/zenmapGUI/App.py index 3c2744c89..045f6b09e 100644 --- a/zenmap/zenmapGUI/App.py +++ b/zenmap/zenmapGUI/App.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/BugReport.py b/zenmap/zenmapGUI/BugReport.py index b231f8f42..a250bd288 100644 --- a/zenmap/zenmapGUI/BugReport.py +++ b/zenmap/zenmapGUI/BugReport.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/CrashReport.py b/zenmap/zenmapGUI/CrashReport.py index 66a15d5f8..16da7fb72 100644 --- a/zenmap/zenmapGUI/CrashReport.py +++ b/zenmap/zenmapGUI/CrashReport.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/DiffCompare.py b/zenmap/zenmapGUI/DiffCompare.py index e3818fd17..967504ea6 100644 --- a/zenmap/zenmapGUI/DiffCompare.py +++ b/zenmap/zenmapGUI/DiffCompare.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/FileChoosers.py b/zenmap/zenmapGUI/FileChoosers.py index ddfc1e8f1..8d9447164 100644 --- a/zenmap/zenmapGUI/FileChoosers.py +++ b/zenmap/zenmapGUI/FileChoosers.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/Icons.py b/zenmap/zenmapGUI/Icons.py index decefe5a6..a8714e158 100644 --- a/zenmap/zenmapGUI/Icons.py +++ b/zenmap/zenmapGUI/Icons.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/MainWindow.py b/zenmap/zenmapGUI/MainWindow.py index 0e5dbd648..ffd843068 100644 --- a/zenmap/zenmapGUI/MainWindow.py +++ b/zenmap/zenmapGUI/MainWindow.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/NmapOutputProperties.py b/zenmap/zenmapGUI/NmapOutputProperties.py index f449915c1..a72b16d3b 100644 --- a/zenmap/zenmapGUI/NmapOutputProperties.py +++ b/zenmap/zenmapGUI/NmapOutputProperties.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/NmapOutputViewer.py b/zenmap/zenmapGUI/NmapOutputViewer.py index 7238968df..8225b294b 100644 --- a/zenmap/zenmapGUI/NmapOutputViewer.py +++ b/zenmap/zenmapGUI/NmapOutputViewer.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/OptionBuilder.py b/zenmap/zenmapGUI/OptionBuilder.py index d36700782..14124229f 100644 --- a/zenmap/zenmapGUI/OptionBuilder.py +++ b/zenmap/zenmapGUI/OptionBuilder.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/Print.py b/zenmap/zenmapGUI/Print.py index 50da0ed2f..51f739b19 100644 --- a/zenmap/zenmapGUI/Print.py +++ b/zenmap/zenmapGUI/Print.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ProfileCombo.py b/zenmap/zenmapGUI/ProfileCombo.py index 32df73ad1..4695a64ee 100644 --- a/zenmap/zenmapGUI/ProfileCombo.py +++ b/zenmap/zenmapGUI/ProfileCombo.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ProfileEditor.py b/zenmap/zenmapGUI/ProfileEditor.py index a3b3e3202..9eb5913e6 100644 --- a/zenmap/zenmapGUI/ProfileEditor.py +++ b/zenmap/zenmapGUI/ProfileEditor.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ProfileHelp.py b/zenmap/zenmapGUI/ProfileHelp.py index 3882d37af..04be3b078 100644 --- a/zenmap/zenmapGUI/ProfileHelp.py +++ b/zenmap/zenmapGUI/ProfileHelp.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScanHostDetailsPage.py b/zenmap/zenmapGUI/ScanHostDetailsPage.py index e9c2ed394..d204ed37d 100644 --- a/zenmap/zenmapGUI/ScanHostDetailsPage.py +++ b/zenmap/zenmapGUI/ScanHostDetailsPage.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScanHostsView.py b/zenmap/zenmapGUI/ScanHostsView.py index c9a475a36..379ac3330 100644 --- a/zenmap/zenmapGUI/ScanHostsView.py +++ b/zenmap/zenmapGUI/ScanHostsView.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScanInterface.py b/zenmap/zenmapGUI/ScanInterface.py index f85c6b9e3..d261d2153 100644 --- a/zenmap/zenmapGUI/ScanInterface.py +++ b/zenmap/zenmapGUI/ScanInterface.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScanNmapOutputPage.py b/zenmap/zenmapGUI/ScanNmapOutputPage.py index 53f50a3d0..35e84a4c7 100644 --- a/zenmap/zenmapGUI/ScanNmapOutputPage.py +++ b/zenmap/zenmapGUI/ScanNmapOutputPage.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScanOpenPortsPage.py b/zenmap/zenmapGUI/ScanOpenPortsPage.py index 27ab209f3..ddef313b2 100644 --- a/zenmap/zenmapGUI/ScanOpenPortsPage.py +++ b/zenmap/zenmapGUI/ScanOpenPortsPage.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScanRunDetailsPage.py b/zenmap/zenmapGUI/ScanRunDetailsPage.py index b1a91ee98..e76d18fe8 100644 --- a/zenmap/zenmapGUI/ScanRunDetailsPage.py +++ b/zenmap/zenmapGUI/ScanRunDetailsPage.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScanScanListPage.py b/zenmap/zenmapGUI/ScanScanListPage.py index 7f2499412..2b70d447c 100644 --- a/zenmap/zenmapGUI/ScanScanListPage.py +++ b/zenmap/zenmapGUI/ScanScanListPage.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScanToolbar.py b/zenmap/zenmapGUI/ScanToolbar.py index cf8982ec7..b5ae80f44 100644 --- a/zenmap/zenmapGUI/ScanToolbar.py +++ b/zenmap/zenmapGUI/ScanToolbar.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScansListStore.py b/zenmap/zenmapGUI/ScansListStore.py index 16baad570..644cc42c2 100644 --- a/zenmap/zenmapGUI/ScansListStore.py +++ b/zenmap/zenmapGUI/ScansListStore.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/ScriptInterface.py b/zenmap/zenmapGUI/ScriptInterface.py index 01ad8c5e6..6c3ab5dba 100644 --- a/zenmap/zenmapGUI/ScriptInterface.py +++ b/zenmap/zenmapGUI/ScriptInterface.py @@ -2,62 +2,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/SearchGUI.py b/zenmap/zenmapGUI/SearchGUI.py index dba74a3b1..19562e298 100644 --- a/zenmap/zenmapGUI/SearchGUI.py +++ b/zenmap/zenmapGUI/SearchGUI.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/SearchWindow.py b/zenmap/zenmapGUI/SearchWindow.py index 460e1d996..686be3e90 100644 --- a/zenmap/zenmapGUI/SearchWindow.py +++ b/zenmap/zenmapGUI/SearchWindow.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/TargetCombo.py b/zenmap/zenmapGUI/TargetCombo.py index 5b5eafb45..8f5a15074 100644 --- a/zenmap/zenmapGUI/TargetCombo.py +++ b/zenmap/zenmapGUI/TargetCombo.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/TopologyPage.py b/zenmap/zenmapGUI/TopologyPage.py index a5866bb3d..a4fc1044e 100644 --- a/zenmap/zenmapGUI/TopologyPage.py +++ b/zenmap/zenmapGUI/TopologyPage.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/__init__.py b/zenmap/zenmapGUI/__init__.py index 5ddf5773f..d3681de99 100644 --- a/zenmap/zenmapGUI/__init__.py +++ b/zenmap/zenmapGUI/__init__.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/__init__.py b/zenmap/zenmapGUI/higwidgets/__init__.py index db520e81b..fa5198e80 100644 --- a/zenmap/zenmapGUI/higwidgets/__init__.py +++ b/zenmap/zenmapGUI/higwidgets/__init__.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/gtkutils.py b/zenmap/zenmapGUI/higwidgets/gtkutils.py index 1c6353f4a..cf6e9e93a 100644 --- a/zenmap/zenmapGUI/higwidgets/gtkutils.py +++ b/zenmap/zenmapGUI/higwidgets/gtkutils.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higboxes.py b/zenmap/zenmapGUI/higwidgets/higboxes.py index fae9abbe1..8b0eb32ee 100644 --- a/zenmap/zenmapGUI/higwidgets/higboxes.py +++ b/zenmap/zenmapGUI/higwidgets/higboxes.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higbuttons.py b/zenmap/zenmapGUI/higwidgets/higbuttons.py index a226549dc..79143ca7e 100644 --- a/zenmap/zenmapGUI/higwidgets/higbuttons.py +++ b/zenmap/zenmapGUI/higwidgets/higbuttons.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higdialogs.py b/zenmap/zenmapGUI/higwidgets/higdialogs.py index 435eb07cc..8dbe1200f 100644 --- a/zenmap/zenmapGUI/higwidgets/higdialogs.py +++ b/zenmap/zenmapGUI/higwidgets/higdialogs.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higentries.py b/zenmap/zenmapGUI/higwidgets/higentries.py index 4d12183f7..679150e98 100644 --- a/zenmap/zenmapGUI/higwidgets/higentries.py +++ b/zenmap/zenmapGUI/higwidgets/higentries.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higexpanders.py b/zenmap/zenmapGUI/higwidgets/higexpanders.py index 6121f90ac..1d21af8b5 100644 --- a/zenmap/zenmapGUI/higwidgets/higexpanders.py +++ b/zenmap/zenmapGUI/higwidgets/higexpanders.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higframe.py b/zenmap/zenmapGUI/higwidgets/higframe.py index 6ec4fb1cd..6564daa34 100644 --- a/zenmap/zenmapGUI/higwidgets/higframe.py +++ b/zenmap/zenmapGUI/higwidgets/higframe.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higlabels.py b/zenmap/zenmapGUI/higwidgets/higlabels.py index 5278702f9..b368e5545 100644 --- a/zenmap/zenmapGUI/higwidgets/higlabels.py +++ b/zenmap/zenmapGUI/higwidgets/higlabels.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higlogindialogs.py b/zenmap/zenmapGUI/higwidgets/higlogindialogs.py index 44df0376e..f3c5eabec 100644 --- a/zenmap/zenmapGUI/higwidgets/higlogindialogs.py +++ b/zenmap/zenmapGUI/higwidgets/higlogindialogs.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/hignotebooks.py b/zenmap/zenmapGUI/higwidgets/hignotebooks.py index 86787df91..9425d1f52 100644 --- a/zenmap/zenmapGUI/higwidgets/hignotebooks.py +++ b/zenmap/zenmapGUI/higwidgets/hignotebooks.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higprogressbars.py b/zenmap/zenmapGUI/higwidgets/higprogressbars.py index 65fd018b3..5b16707af 100644 --- a/zenmap/zenmapGUI/higwidgets/higprogressbars.py +++ b/zenmap/zenmapGUI/higwidgets/higprogressbars.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higscrollers.py b/zenmap/zenmapGUI/higwidgets/higscrollers.py index 86a9ca73d..974d2f6e5 100644 --- a/zenmap/zenmapGUI/higwidgets/higscrollers.py +++ b/zenmap/zenmapGUI/higwidgets/higscrollers.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higspinner.py b/zenmap/zenmapGUI/higwidgets/higspinner.py index 46a9fe212..04c7247e8 100644 --- a/zenmap/zenmapGUI/higwidgets/higspinner.py +++ b/zenmap/zenmapGUI/higwidgets/higspinner.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higtables.py b/zenmap/zenmapGUI/higwidgets/higtables.py index 7b23a5acf..6ae9d873e 100644 --- a/zenmap/zenmapGUI/higwidgets/higtables.py +++ b/zenmap/zenmapGUI/higwidgets/higtables.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higtextviewers.py b/zenmap/zenmapGUI/higwidgets/higtextviewers.py index 1dddc8628..0e3e51a37 100644 --- a/zenmap/zenmapGUI/higwidgets/higtextviewers.py +++ b/zenmap/zenmapGUI/higwidgets/higtextviewers.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/higwindows.py b/zenmap/zenmapGUI/higwidgets/higwindows.py index 56ffebfe0..5806dcbb3 100644 --- a/zenmap/zenmapGUI/higwidgets/higwindows.py +++ b/zenmap/zenmapGUI/higwidgets/higwindows.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. * diff --git a/zenmap/zenmapGUI/higwidgets/utils.py b/zenmap/zenmapGUI/higwidgets/utils.py index 167196e8d..0b0aa9ada 100644 --- a/zenmap/zenmapGUI/higwidgets/utils.py +++ b/zenmap/zenmapGUI/higwidgets/utils.py @@ -3,62 +3,94 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * +# * The Nmap Security Scanner is (C) 1996-2013 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, version detection, and the Nmap Scripting Engine. * +# * 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 * +# * 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: * -# * 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 * +# * 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, as well as other software we distribute under this * -# * license such as Zenmap, Ncat, and Nping. 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. They also fund the * -# * continued development of Nmap. 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, Insecure.Com LLC 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. 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. * +# * linked combinations including the two. * # * * -# * 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. *