From 56818d1db8e23e4f08232a3966253bdd572a3e65 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Tue, 20 Dec 2016 18:04:38 +0100 Subject: [PATCH] Credit the excellent work of these people in AUTHORS --- AUTHORS | 18 ++++++++++++++++++ src/borg/_crc32/clmul.c | 18 ++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index bc7a8c7c..46cbc447 100644 --- a/AUTHORS +++ b/AUTHORS @@ -31,3 +31,21 @@ Attic Patches and Suggestions - Johann Klähn - Petros Moisiadis - Thomas Waldmann + +BLAKE2 +------ + +Borg includes BLAKE2: Copyright 2012, Samuel Neves , licensed under the terms +of the CC0, the OpenSSL Licence, or the Apache Public License 2.0. + +Slicing CRC32 +------------- + +Borg includes a fast slice-by-8 implementation of CRC32, Copyright 2011-2015 Stephan Brumme, +licensed under the terms of a zlib license. See http://create.stephan-brumme.com/crc32/ + +Folding CRC32 +------------- + +Borg includes an extremely fast folding implementation of CRC32, Copyright 2013 Intel Corporation, +licensed under the terms of the zlib license. diff --git a/src/borg/_crc32/clmul.c b/src/borg/_crc32/clmul.c index 64fa613a..4b84b035 100644 --- a/src/borg/_crc32/clmul.c +++ b/src/borg/_crc32/clmul.c @@ -13,9 +13,23 @@ * Erdinc Ozturk * Jim Kukunas * - * For conditions of distribution and use, see copyright notice in zlib.h - * * Copyright (c) 2016 Marian Beermann (add support for initial value, restructuring) + * + * 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. */ #include