diff options
| author | David Benjamin <davidben@google.com> | 2018-02-01 16:49:18 -0500 |
|---|---|---|
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2018-02-12 21:44:27 +0000 |
| commit | 6e4ff114fc5e372b0a282359190049d14bb57c2b (patch) | |
| tree | 6993b2578a33c3dfb3ab5527d5ac5520f94b1e46 /LICENSE | |
| parent | f6cf8bbc84b4f6c82b784a229ba360afbaea6332 (diff) | |
| download | boringssl-6e4ff114fc5e372b0a282359190049d14bb57c2b.zip boringssl-6e4ff114fc5e372b0a282359190049d14bb57c2b.tar.gz boringssl-6e4ff114fc5e372b0a282359190049d14bb57c2b.tar.bz2 | |
Merge Intel copyright notice into standard
This was done by OpenSSL with the kind permission of Intel. This change
is imported from upstream's commit
dcf6e50f48e6bab92dcd2dacb27fc17c0de34199.
Change-Id: Ie8d3b700cd527a6e8cf66e0728051b2acd8cc6b9
Reviewed-on: https://boringssl-review.googlesource.com/25588
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 43 |
1 files changed, 3 insertions, 40 deletions
@@ -5,10 +5,9 @@ license. This license is reproduced at the bottom of this file. Contributors to BoringSSL are required to follow the CLA rules for Chromium: https://cla.developers.google.com/clas -Some files from Intel are under yet another license, which is also included -underneath. Files in third_party/ have their own licenses, as described -therein. The MIT license, for third_party/fiat, which, unlike other third_party -directories, is compiled into non-test libraries, is included below. +Files in third_party/ have their own licenses, as described therein. The MIT +license, for third_party/fiat, which, unlike other third_party directories, is +compiled into non-test libraries, is included below. The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit. See below @@ -158,42 +157,6 @@ ISC license used for completely new code in BoringSSL: * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -Some files from Intel carry the following license: - -# Copyright (c) 2012, Intel Corporation -# -# 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. -# -# * 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. - - The code in third_party/fiat carries the MIT license: Copyright (c) 2015-2016 the fiat-crypto authors (see |