diff options
| author | John Stultz <john.stultz@linaro.org> | 2017-10-30 12:19:50 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2017-10-30 12:19:50 -0700 |
| commit | 21de417bf7501457bbe383f551a5e012c11381ce (patch) | |
| tree | eeec888aa7b85c109be64d7393a8a983711bd4bc /tools/cert_create/include/sha.h | |
| parent | 8fa3096942d2faed55122efd47348dacca991141 (diff) | |
| parent | fd3bba4bd523ee622c448e64e946d2d3b1875d02 (diff) | |
| download | arm-trusted-firmware-21de417bf7501457bbe383f551a5e012c11381ce.tar.gz | |
Merge branch 'armtf/master/update' into bootloader-update
Big transition to upstream ARMTF code.
This merges the aosp/mater code with fd3bba4bd523 but merges
such that the tree should be identical with the fd3bba4bd523
side of the merge.
Change-Id: Ib416a13ce19c6c26fb62c38ccc6fdfbbdf9c4304
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'tools/cert_create/include/sha.h')
| -rw-r--r-- | tools/cert_create/include/sha.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/tools/cert_create/include/sha.h b/tools/cert_create/include/sha.h index 466d6689..6907fa19 100644 --- a/tools/cert_create/include/sha.h +++ b/tools/cert_create/include/sha.h @@ -1,31 +1,7 @@ /* * Copyright (c) 2015, ARM Limited and Contributors. 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 ARM 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 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. + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef SHA_H_ |