diff options
author | Greg Hudson <ghudson@mit.edu> | 2020-10-10 11:18:12 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2020-10-17 16:25:10 -0400 |
commit | cb5f190056ef4d123c5fe5d4923982b830288438 (patch) | |
tree | 3ed48b6b5d1f02964291bbbca5e011cddfaab1be /doc | |
parent | ad1c56d9b7dc3ce37b50cb3d72ff98513bf84073 (diff) | |
download | krb5-cb5f190056ef4d123c5fe5d4923982b830288438.tar.gz |
Update Gladman AES code
Update lib/crypto/builtin/aes to commit
8798ad829374cd5ff312f55ba3ccccfcf586fa11 of
https://github.com/BrianGladman/aes .
The following changes are made to the upstream code:
* In aes.h, #defines are added to give the linker-visible symbols a
prefix.
* In aes.h, AES_192 is undefined, since we only need AES-128 and
AES-256.
* In aesopt.h, USE_INTEL_AES_IF_PRESENT and USE_VIA_ACE_IF_PRESENT are
suppressed by changing the corresponding "#if 1"s to "#if 0"s.
* In aesopt.h, the conditionals for ENC_UNROLL, DEC_UNROLL, ENC_ROUND,
LAST_ENC_ROUND, DEC_ROUND, LAST_DEC_ROUND, and KEY_SCHED are changed
from "#if 1" to "#if !defined(CONFIG_SMALL) ||
defined(CONFIG_SMALL_NO_CRYPTO)".
bigredbutton: whitespace
ticket: 8954
Diffstat (limited to 'doc')
-rw-r--r-- | doc/notice.rst | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/doc/notice.rst b/doc/notice.rst index 45bb7a6ad..b8d62bdca 100644 --- a/doc/notice.rst +++ b/doc/notice.rst @@ -134,27 +134,22 @@ Portions of ``src/lib/crypto`` have the following copyright: The implementation of the AES encryption algorithm in ``src/lib/crypto/builtin/aes`` has the following copyright: - | Copyright |copy| 2001, Dr Brian Gladman ``brg@gladman.uk.net``, - Worcester, UK. - | All rights reserved. - - LICENSE TERMS + | Copyright |copy| 1998-2013, Brian Gladman, Worcester, UK. All + | rights reserved. - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: + The redistribution and use of this software (with or without + changes) is allowed without the payment of fees or royalties + provided that: - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. + source code distributions include the above copyright notice, + this list of conditions and the following disclaimer; - DISCLAIMER + binary distributions include the above copyright notice, this + list of conditions and the following disclaimer in their + documentation. - This software is provided 'as is' with no explcit or implied warranties - in respect of any properties, including, but not limited to, correctness + This software is provided 'as is' with no explicit or implied warranties + in respect of its operation, including, but not limited to, correctness and fitness for purpose. ------------------- |