CryptoPkg: Add extra build option to disable VS build warning

openssl/include/openssl/lhash.h will bring C4090 build warning
issue, which is one known issue for OpenSSL under Visual Studio
toolchain.
Refer to https://github.com/openssl/openssl/issues/2214 for more
discussions against this.
Use /wd4090 to silence this build warning until OpenSSL fix this.

Cc: Ting Ye <ting.ye@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gary Lin <glin@suse.com>
Cc: Ronald Cron <ronald.cron@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qin Long <qin.long@intel.com>
Reviewed-by: Ting Ye <ting.ye@intel.com>

diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index 1a8c41fd11317a452418cd33d4652aaf5bd2628a..bb91f899ffb4e94e82f64156f92f064693bde0bf 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -6,7 +6,7 @@
 #  This external input must be validated carefully to avoid security issues such as\r
 #  buffer overflow or integer overflow.\r
 #\r
-#  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 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
@@ -93,9 +93,12 @@
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r
 [BuildOptions]\r
+  #\r
   # suppress the following warnings so we do not break the build with warnings-as-errors:\r
-  #   C4305: truncation from type1 to type2 (Introduced by RFC3161 Timestamp ASN.1 declarations)\r
-  MSFT:*_*_*_CC_FLAGS = /wd4305\r
+  # C4090: 'function' : different 'const' qualifiers\r
+  #\r
+  MSFT:*_*_*_CC_FLAGS = /wd4090\r
+\r
   GCC:*_GCC44_IA32_CC_FLAGS = "-D__cdecl=__attribute__((cdecl))" "-D__declspec(t)=__attribute__((t))"\r
 \r
   # -JCryptoPkg/Include : To disable the use of the system includes provided by RVCT\r

diff --git a/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h b/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
index 4f9f308a7d85c03fd233cf87883fbd1131f284ab..8cccf72567de358c5fd61489681d10e9830950c6 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
+++ b/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
@@ -1,4 +1,4 @@
-/** @file  \r
+/** @file\r
   Internal include file for BaseCryptLib.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
@@ -15,6 +15,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __INTERNAL_CRYPT_LIB_H__\r
 #define __INTERNAL_CRYPT_LIB_H__\r
 \r
+#undef _WIN32\r
+#undef _WIN64\r
+\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
@@ -31,4 +34,3 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #endif\r
 \r
 #endif\r
-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
index f56f90e26ef1bafc5b8c1a48219bacdf1268014b..fdcd8b95f5cb683171caff3b41fbb8eca3d7776e 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
@@ -13,7 +13,7 @@
 #  PEM handler functions, and pseudorandom number generator functions are not \r
 #  supported in this instance.\r
 #\r
-#  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\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
@@ -86,6 +86,12 @@
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r
 [BuildOptions]\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
   GCC:*_GCC44_IA32_CC_FLAGS = "-D__cdecl=__attribute__((cdecl))" "-D__declspec(t)=__attribute__((t))"\r
 \r
   # -JCryptoPkg/Include : To disable the use of the system includes provided by RVCT\r

diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
index e6daadef9dfe618b44e9a0f80ae9827854070461..05cd31674f0852bc58f753202bad302416b98fcf 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
@@ -11,7 +11,7 @@
 #  functions, PKCS#7 SignedData sign functions, Diffie-Hellman functions, and \r
 #  authenticode signature verification functions are not supported in this instance.\r
 #\r
-#  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 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
@@ -99,6 +99,12 @@
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r
 [BuildOptions]\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
   GCC:*_GCC44_IA32_CC_FLAGS = "-D__cdecl=__attribute__((cdecl))" "-D__declspec(t)=__attribute__((t))"\r
 \r
   # -JCryptoPkg/Include : To disable the use of the system includes provided by RVCT\r

diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
index e00a230cbcfa353e3ad70ab126d0b57c04147598..5674714ceab0bc9996d00f1720d9ba42a08bc83d 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
@@ -97,5 +97,11 @@
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r
 [BuildOptions]\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
   GCC:*_GCC44_IA32_CC_FLAGS = "-D__cdecl=__attribute__((cdecl))" "-D__declspec(t)=__attribute__((t))"\r
   XCODE:*_*_*_CC_FLAGS = -mmmx -msse\r

diff --git a/CryptoPkg/Library/TlsLib/TlsLib.inf b/CryptoPkg/Library/TlsLib/TlsLib.inf
index 2122b3b5954acf19e86681e3d60462c64fdca183..d4ce6465914ff75bccb63e75a0d9c879a3e605a2 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsLib.inf
+++ b/CryptoPkg/Library/TlsLib/TlsLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  SSL/TLS Wrapper Library Instance based on OpenSSL.
 #
-#  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -47,3 +47,10 @@
   OpensslLib
   IntrinsicLib
   PrintLib
+
+[BuildOptions]
+  #
+  # suppress the following warnings so we do not break the build with warnings-as-errors:
+  # C4090: 'function' : different 'const' qualifiers
+  #
+  MSFT:*_*_*_CC_FLAGS = /wd4090