From: Ian Lance Taylor Date: Wed, 10 Jan 2018 23:45:18 +0000 (-0800) Subject: crypto: clarify that some files come from CRYPTOGAMS X-Git-Tag: go1.10beta2~4 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=40a17eed9392cea198726d7a5a507b3596417fc9;p=gostls13.git crypto: clarify that some files come from CRYPTOGAMS and that they are covered by the CRYPTOGAMS license. Fixes #22637 Change-Id: I75b8e08d3a8b569edf383c078bb11c796b766c81 Reviewed-on: https://go-review.googlesource.com/87315 Reviewed-by: Brad Fitzpatrick --- diff --git a/src/crypto/aes/asm_ppc64le.s b/src/crypto/aes/asm_ppc64le.s index 05e0018a3e..a69cb78c8b 100644 --- a/src/crypto/aes/asm_ppc64le.s +++ b/src/crypto/aes/asm_ppc64le.s @@ -2,21 +2,23 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// This is a derived work from OpenSSL of AES using assembly optimizations. The -// original code was written by Andy Polyakov and it's dual -// licensed under OpenSSL and CRYPTOGAMS licenses depending on where you obtain -// it. For further details see http://www.openssl.org/~appro/cryptogams/. +// Based on CRYPTOGAMS code with the following comment: +// # ==================================================================== +// # Written by Andy Polyakov for the OpenSSL +// # project. The module is, however, dual licensed under OpenSSL and +// # CRYPTOGAMS licenses depending on where you obtain it. For further +// # details see http://www.openssl.org/~appro/cryptogams/. +// # ==================================================================== // Original code can be found at the link below: -// https://git.openssl.org/?p=openssl.git;a=blob;f=crypto/aes/asm/aesp8-ppc.pl - -// The code is based on 627c953376 from 4 Jun 2016. I changed some function -// names in order to be more likely to go standards. For instance, function -// aes_p8_set_{en,de}crypt_key become set{En,De}cryptKeyAsm. I also split -// setEncryptKeyAsm in two parts and a new session was created -// (doEncryptKeyAsm). This was necessary to avoid arguments overwriting when -// setDecryptKeyAsm calls setEncryptKeyAsm. There were other modifications as -// well but kept the same functionality. +// https://github.com/dot-asm/cryptogams/blob/master/ppc/aesp8-ppc.pl + +// I changed some function names in order to be more likely to go standards. +// For instance, function aes_p8_set_{en,de}crypt_key become +// set{En,De}cryptKeyAsm. I also split setEncryptKeyAsm in two parts +// and a new session was created (doEncryptKeyAsm). This was necessary to +// avoid arguments overwriting when setDecryptKeyAsm calls setEncryptKeyAsm. +// There were other modifications as well but kept the same functionality. #include "textflag.h" diff --git a/src/crypto/sha256/sha256block_ppc64le.s b/src/crypto/sha256/sha256block_ppc64le.s index 9ffa5f8269..f5435602fe 100644 --- a/src/crypto/sha256/sha256block_ppc64le.s +++ b/src/crypto/sha256/sha256block_ppc64le.s @@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// This is a derived work from OpenSSL of SHA-2 using assembly optimizations. The -// original code was written by Andy Polyakov and it's dual -// licensed under OpenSSL and CRYPTOGAMS licenses depending on where you obtain -// it. For further details see http://www.openssl.org/~appro/cryptogams/. +// Based on CRYPTOGAMS code with the following comment: +// # ==================================================================== +// # Written by Andy Polyakov for the OpenSSL +// # project. The module is, however, dual licensed under OpenSSL and +// # CRYPTOGAMS licenses depending on where you obtain it. For further +// # details see http://www.openssl.org/~appro/cryptogams/. +// # ==================================================================== #include "textflag.h" diff --git a/src/crypto/sha512/sha512block_ppc64le.s b/src/crypto/sha512/sha512block_ppc64le.s index 4419c00bf9..170e3a6456 100644 --- a/src/crypto/sha512/sha512block_ppc64le.s +++ b/src/crypto/sha512/sha512block_ppc64le.s @@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// This is a derived work from OpenSSL of SHA-2 using assembly optimizations. The -// original code was written by Andy Polyakov and it's dual -// licensed under OpenSSL and CRYPTOGAMS licenses depending on where you obtain -// it. For further details see http://www.openssl.org/~appro/cryptogams/. +// Based on CRYPTOGAMS code with the following comment: +// # ==================================================================== +// # Written by Andy Polyakov for the OpenSSL +// # project. The module is, however, dual licensed under OpenSSL and +// # CRYPTOGAMS licenses depending on where you obtain it. For further +// # details see http://www.openssl.org/~appro/cryptogams/. +// # ==================================================================== #include "textflag.h"