CryptoPkg: Fix possible build problem with Clang

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

diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index a6e6dcafab3be262f495d9b4a693a37e4d64d354..2a581ceac70c0531f892ddc94210e6716bb1eb4a 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -3,18 +3,12 @@
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This library will have external input - signature.\r
-#  This external input must be validated carefully to avoid security issues such as \r
+#  This external input must be validated carefully to avoid security issues such as\r
 #  buffer overflow or integer overflow.\r
 #\r
-#  Copyright (c) 2009 - 2014, 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
-#  \r
+#  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
+#\r
 ##\r
 \r
 [Defines]\r
@@ -29,7 +23,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64\r
+#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64\r
 #\r
 \r
 [Sources]\r
@@ -38,18 +32,25 @@
   Hash/CryptMd5.c\r
   Hash/CryptSha1.c\r
   Hash/CryptSha256.c\r
+  Hash/CryptSha512.c\r
   Hmac/CryptHmacMd5.c\r
   Hmac/CryptHmacSha1.c\r
+  Hmac/CryptHmacSha256.c\r
   Cipher/CryptAes.c\r
   Cipher/CryptTdes.c\r
   Cipher/CryptArc4.c\r
   Pk/CryptRsaBasic.c\r
   Pk/CryptRsaExt.c\r
+  Pk/CryptPkcs1Oaep.c\r
+  Pk/CryptPkcs5Pbkdf2.c\r
   Pk/CryptPkcs7Sign.c\r
-  Pk/CryptPkcs7Verify.c\r
+  Pk/CryptPkcs7VerifyCommon.c\r
+  Pk/CryptPkcs7VerifyBase.c\r
+  Pk/CryptPkcs7VerifyEku.c\r
   Pk/CryptDh.c\r
   Pk/CryptX509.c\r
   Pk/CryptAuthenticode.c\r
+  Pk/CryptTs.c\r
   Pem/CryptPem.c\r
 \r
   SysCall/CrtWrapper.c\r
@@ -57,32 +58,11 @@
   SysCall/BaseMemAllocation.c\r
 \r
 [Sources.Ia32]\r
-  SysCall/Ia32/MathMultS64x64.c     | MSFT\r
-  SysCall/Ia32/MathDivU64x64.c      | MSFT\r
-  SysCall/Ia32/MathReminderU64x64.c | MSFT\r
-  SysCall/Ia32/MathLShiftS64.c      | MSFT\r
-  SysCall/Ia32/MathRShiftU64.c      | MSFT\r
-\r
-  SysCall/Ia32/MathMultS64x64.c     | INTEL\r
-  SysCall/Ia32/MathDivU64x64.c      | INTEL\r
-  SysCall/Ia32/MathReminderU64x64.c | INTEL\r
-  SysCall/Ia32/MathLShiftS64.c      | INTEL\r
-  SysCall/Ia32/MathRShiftU64.c      | INTEL\r
-\r
-  SysCall/Ia32/MathMultS64x64.S     | GCC\r
-  SysCall/Ia32/MathDivU64x64.S      | GCC\r
-  SysCall/Ia32/MathReminderU64x64.S | GCC\r
-  SysCall/Ia32/MathLShiftS64.S      | GCC\r
-  SysCall/Ia32/MathRShiftU64.S      | GCC\r
-\r
   Rand/CryptRandTsc.c\r
 \r
 [Sources.X64]\r
   Rand/CryptRandTsc.c\r
 \r
-[Sources.IPF]\r
-  Rand/CryptRandItc.c\r
-\r
 [Sources.ARM]\r
   Rand/CryptRand.c\r
 \r
@@ -107,4 +87,14 @@
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r
 [BuildOptions]\r
-  GCC:*_GCC44_IA32_CC_FLAGS = "-D__cdecl=__attribute__((cdecl))" "-D__declspec(t)=__attribute__((t))"\r
+  #\r
+  # suppress the following warnings so we do not break the build with warnings-as-errors:\r
+  # C4090: 'function' : different 'const' qualifiers\r
+  #\r
+  MSFT:*_*_*_CC_FLAGS = /wd4090\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
+  RVCT:*_*_ARM_CC_FLAGS = -JCryptoPkg/Include --diag_remark=1\r
+\r
+  GCC:*_CLANG38_*_CC_FLAGS = -std=c99\r