Commit 19d90b86 authored by Julien Cristau's avatar Julien Cristau

More debian/copyright tweaks

parent ce5a310e
......@@ -15,9 +15,9 @@ shim (0.9+1474479173.6c180c6-1) unstable; urgency=medium
[ Julien Cristau ]
* Add some missing copyright holders in d/copyright, update
Upstream-Contact.
Upstream-Contact. Thanks to Helen Koike for the help.
-- Julien Cristau <jcristau@debian.org> Thu, 13 Oct 2016 09:07:20 +0200
-- Julien Cristau <jcristau@debian.org> Sat, 15 Oct 2016 15:17:34 +0200
shim (0.9+1474479173.6c180c6-0ubuntu1) UNRELEASED; urgency=medium
......
......@@ -13,6 +13,7 @@ Copyright: 2016 Canonical Ltd.
License: BSD-2-Clause
Files: crypt_blowfish.*
Copyright: none
License: public-domain
No copyright is claimed, and the software is hereby placed in the public
domain. In case this attempt to disclaim copyright and place the software
......@@ -43,6 +44,7 @@ Files: lib/*.c
Copyright: 2011-2012 Intel Corporation
2012 <James.Bottomley@HansenPartnership.com>
2012-2013 Red Hat, Inc
License: BSD-2-Clause
Files: Cryptlib/OpenSSL/* Cryptlib/Include/openssl/*
Copyright: 1998-2016 The OpenSSL Project
......@@ -166,7 +168,7 @@ License: BSD-2-Clause
Files: Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c Cryptlib/OpenSSL/crypto/x509v3/v3_pcia.c
Copyright: 2004 Kungliga Tekniska Högskolan
License: BSD-3-Clause
License: BSD-3-Clause-Institute
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
......@@ -194,6 +196,37 @@ License: BSD-3-Clause
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Files: Cryptlib/OpenSSL/crypto/bn/rsaz_exp.h
Copyright: 2012, Intel Corporation
License: BSD-3-Clause-Intel
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.
.
* Neither the name of the Intel Corporation nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION ""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 INTEL CORPORATION 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.
License: BSD-2-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment