CryptoPkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / CryptoPkg / Library / BaseCryptLib / PeiCryptLib.inf

diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
index fdcd8b95f5cb683171caff3b41fbb8eca3d7776e..e701c3d2f84cee36e15f7fb2050d9e2418ba90b0 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
@@ -6,21 +6,15 @@
 #  This external input must be validated carefully to avoid security issues such as\r
 #  buffer overflow or integer overflow.\r
 #\r
-#  Note: MD4 Digest functions, SHA-384 Digest functions, SHA-512 Digest functions,\r
+#  Note: MD4 Digest functions,\r
 #  HMAC-MD5 functions, HMAC-SHA1/SHA256 functions, AES/TDES/ARC4 functions, RSA external\r
-#  functions, PKCS#7 SignedData sign functions, Diffie-Hellman functions, X.509 \r
-#  certificate handler functions, authenticode signature verification functions, \r
-#  PEM handler functions, and pseudorandom number generator functions are not \r
+#  functions, PKCS#7 SignedData sign functions, Diffie-Hellman functions, X.509\r
+#  certificate handler functions, authenticode signature verification functions,\r
+#  PEM handler functions, and pseudorandom number generator functions are not\r
 #  supported in this instance.\r
 #\r
-#  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
 \r
@@ -44,7 +38,7 @@
   Hash/CryptMd5.c\r
   Hash/CryptSha1.c\r
   Hash/CryptSha256.c\r
-  Hash/CryptSha512Null.c\r
+  Hash/CryptSha512.c\r
   Hmac/CryptHmacMd5Null.c\r
   Hmac/CryptHmacSha1Null.c\r
   Hmac/CryptHmacSha256Null.c\r
@@ -56,7 +50,8 @@
   Pk/CryptRsaExtNull.c\r
   Pk/CryptPkcs5Pbkdf2Null.c\r
   Pk/CryptPkcs7SignNull.c\r
-  Pk/CryptPkcs7Verify.c\r
+  Pk/CryptPkcs7VerifyCommon.c\r
+  Pk/CryptPkcs7VerifyBase.c\r
 \r
   Pk/CryptDhNull.c\r
   Pk/CryptX509Null.c\r
@@ -89,10 +84,9 @@
   #\r
   # suppress the following warnings so we do not break the build with warnings-as-errors:\r
   # C4090: 'function' : different 'const' qualifiers\r
+  # C4718: 'function call' : recursive call has no side effects, deleting\r
   #\r
-  MSFT:*_*_*_CC_FLAGS = /wd4090\r
-\r
-  GCC:*_GCC44_IA32_CC_FLAGS = "-D__cdecl=__attribute__((cdecl))" "-D__declspec(t)=__attribute__((t))"\r
+  MSFT:*_*_*_CC_FLAGS = /wd4090 /wd4718\r
 \r
   # -JCryptoPkg/Include : To disable the use of the system includes provided by RVCT\r
   # --diag_remark=1     : Reduce severity of "#1-D: last line of file ends without a newline"\r