From 176bbd3fb702f94076802680ba69fd205c467843 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Fri, 4 Sep 2020 22:58:12 +0200 Subject: [PATCH] Documentation: Added 3rd party licenses to docs/license_libs --- docs/changes.txt | 1 + docs/license.txt | 3 +++ docs/license_libs/LZMA_SDK_LICENSE.txt | 8 +++++++ docs/license_libs/OPENCL_HEADERS_LICENSE.txt | 25 ++++++++++++++++++++ docs/license_libs/XXHASH_LICENSE.txt | 24 +++++++++++++++++++ docs/license_libs/ZLIB_LICENSE.txt | 20 ++++++++++++++++ src/usage.c | 5 ++++ 7 files changed, 86 insertions(+) create mode 100644 docs/license_libs/LZMA_SDK_LICENSE.txt create mode 100644 docs/license_libs/OPENCL_HEADERS_LICENSE.txt create mode 100644 docs/license_libs/XXHASH_LICENSE.txt create mode 100644 docs/license_libs/ZLIB_LICENSE.txt diff --git a/docs/changes.txt b/docs/changes.txt index 960718f2d..c73c62b46 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -34,6 +34,7 @@ ## Technical ## +- Documentation: Added 3rd party licenses to docs/license_libs - Module Structure: Add 3rd party library hook management functions. This also requires an update to all existing module_init() - Hash-Mode 13200 (AxCrypt): Changed the name to AxCrypt 1 to avoid confusion - Hash-Mode 13300 (AxCrypt in-memory SHA1): Changed the name to AxCrypt 1 in-memory SHA1 diff --git a/docs/license.txt b/docs/license.txt index 48d77100c..5a8e6bf7e 100644 --- a/docs/license.txt +++ b/docs/license.txt @@ -20,3 +20,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +hashcat uses some third party software and libraries whose license terms and +license holders can be found in the docs/license_libs/ folder. diff --git a/docs/license_libs/LZMA_SDK_LICENSE.txt b/docs/license_libs/LZMA_SDK_LICENSE.txt new file mode 100644 index 000000000..4ffb20350 --- /dev/null +++ b/docs/license_libs/LZMA_SDK_LICENSE.txt @@ -0,0 +1,8 @@ +Copyright (c) 1999-2018 Igor Pavlov + +LZMA SDK is written and placed in the public domain by Igor Pavlov. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute the original LZMA SDK code, either in source code form or +as a compiled binary, for any purpose, commercial or non-commercial, +and by any means. diff --git a/docs/license_libs/OPENCL_HEADERS_LICENSE.txt b/docs/license_libs/OPENCL_HEADERS_LICENSE.txt new file mode 100644 index 000000000..020ce65fc --- /dev/null +++ b/docs/license_libs/OPENCL_HEADERS_LICENSE.txt @@ -0,0 +1,25 @@ +Copyright (c) 2008-2015 The Khronos Group Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and/or associated documentation files (the +"Materials"), to deal in the Materials without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Materials, and to +permit persons to whom the Materials are furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Materials. + +MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS +KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS +SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT + https://www.khronos.org/registry/ + +THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. diff --git a/docs/license_libs/XXHASH_LICENSE.txt b/docs/license_libs/XXHASH_LICENSE.txt new file mode 100644 index 000000000..7de801ed1 --- /dev/null +++ b/docs/license_libs/XXHASH_LICENSE.txt @@ -0,0 +1,24 @@ +xxHash Library +Copyright (c) 2012-2014, Yann Collet +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/docs/license_libs/ZLIB_LICENSE.txt b/docs/license_libs/ZLIB_LICENSE.txt new file mode 100644 index 000000000..48c40a4b1 --- /dev/null +++ b/docs/license_libs/ZLIB_LICENSE.txt @@ -0,0 +1,20 @@ +Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +Jean-loup Gailly Mark Adler +jloup@gzip.org madler@alumni.caltech.edu diff --git a/src/usage.c b/src/usage.c index 0f30e2109..e494950fc 100644 --- a/src/usage.c +++ b/src/usage.c @@ -214,6 +214,11 @@ static const char *const USAGE_BIG_POST_HASHMODES[] = " 3 | High | 96 ms | High | Unresponsive", " 4 | Nightmare | 480 ms | Insane | Headless", "", + "- [ License ] -", + "", + " hashcat is licensed under the MIT license", + " Copyright and license terms are listed in docs/license.txt", + "", "- [ Basic Examples ] -", "", " Attack- | Hash- |",