diff options
author | Nick Bofferding <bofferdn@us.ibm.com> | 2017-05-18 16:05:16 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-05-24 23:34:00 -0400 |
commit | fcaea7edd10cc3a0f4535437af3fc1d91f827404 (patch) | |
tree | f4fa37935e7df27e70409e941a70cb118e66c8fe /src/securerom | |
parent | 77cb3c7e269c5fa9d0687d19c3b9908493e4b17c (diff) | |
download | talos-hostboot-fcaea7edd10cc3a0f4535437af3fc1d91f827404.tar.gz talos-hostboot-fcaea7edd10cc3a0f4535437af3fc1d91f827404.zip |
Update sha512 algorithm to correct license
Change-Id: Ib671bc08cf7912ef1bee11505c9c5d4dc662b453
RTC: 172339
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40731
Reviewed-by: Timothy R. Block <block@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/securerom')
-rwxr-xr-x | src/securerom/contrib/LICENSE_PROLOG | 49 | ||||
-rw-r--r-- | src/securerom/contrib/sha512.C (renamed from src/securerom/sha512.C) | 31 | ||||
-rw-r--r-- | src/securerom/makefile | 2 |
3 files changed, 81 insertions, 1 deletions
diff --git a/src/securerom/contrib/LICENSE_PROLOG b/src/securerom/contrib/LICENSE_PROLOG new file mode 100755 index 000000000..25de7a314 --- /dev/null +++ b/src/securerom/contrib/LICENSE_PROLOG @@ -0,0 +1,49 @@ +This is an automatically generated prolog. + +$SOURCE_BEGIN_TAG $filename $SOURCE_END_TAG + +OpenPOWER $projectName Project + +$copyrightStr $copyrightYear +$copyright_Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied. See the License for the specific language governing +permissions and limitations under the License. + +Copyright (c) 2000-2001, Aaron D. Gifford +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. 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. +3. Neither the name of the copyright holder nor the names of + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``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 AUTHOR OR +CONTRIBUTOR(S) 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/src/securerom/sha512.C b/src/securerom/contrib/sha512.C index 9ec230f4f..6ce16ce1c 100644 --- a/src/securerom/sha512.C +++ b/src/securerom/contrib/sha512.C @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/securerom/sha512.C $ */ +/* $Source: src/securerom/contrib/sha512.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ @@ -21,6 +21,35 @@ /* implied. See the License for the specific language governing */ /* permissions and limitations under the License. */ /* */ +/* Copyright (c) 2000-2001, Aaron D. Gifford */ +/* All rights reserved. */ +/* */ +/* Redistribution and use in source and binary forms, with or without */ +/* modification, are permitted provided that the following conditions */ +/* are met: */ +/* 1. Redistributions of source code must retain the above copyright */ +/* notice, this list of conditions and the following disclaimer. */ +/* 2. 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. */ +/* 3. Neither the name of the copyright holder nor the names of */ +/* contributors may be used to endorse or promote products derived */ +/* from this software without specific prior written permission. */ +/* */ +/* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``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 AUTHOR OR */ +/* CONTRIBUTOR(S) 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. */ +/* */ +/* */ /* IBM_PROLOG_END_TAG */ /******************************************************************** * SHA-512 BIG-Endian Version diff --git a/src/securerom/makefile b/src/securerom/makefile index 9c9f42017..295330217 100644 --- a/src/securerom/makefile +++ b/src/securerom/makefile @@ -45,6 +45,8 @@ OBJS += hw_utils.o OBJS += rom_entry.o OBJS += secureromasm.o +VPATH += contrib + OPT_LEVEL = -Os include ${ROOTPATH}/config.mk |