CryptoPkg/OpensslLib: Update OpenSSL version to 1.1.0g

[mirror_edk2.git] / CryptoPkg / Library / OpensslLib / OpensslLibCrypto.inf

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 6fc8884da492e84f8c9b3a6ac46ef73c5b9923e9..0c7f9e9e66f4004eb7ba87c8a5f6d3581ed54a0b 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -95,6 +95,7 @@
   $(OPENSSL_PATH)/crypto/asn1/x_algor.c\r
   $(OPENSSL_PATH)/crypto/asn1/x_bignum.c\r
   $(OPENSSL_PATH)/crypto/asn1/x_info.c\r
+  $(OPENSSL_PATH)/crypto/asn1/x_int64.c\r
   $(OPENSSL_PATH)/crypto/asn1/x_long.c\r
   $(OPENSSL_PATH)/crypto/asn1/x_pkey.c\r
   $(OPENSSL_PATH)/crypto/asn1/x_sig.c\r
@@ -500,10 +501,11 @@
   #   C4389: 'operator' : signed/unsigned mismatch (xxxx)\r
   #   C4702: unreachable code\r
   #   C4706: assignment within conditional expression\r
+  #   C4819: The file contains a character that cannot be represented in the current code page\r
   #\r
-  MSFT:*_*_IA32_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706\r
-  MSFT:*_*_X64_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4306 /wd4389 /wd4702 /wd4706\r
-  MSFT:*_*_IPF_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4306 /wd4389 /wd4702 /wd4706\r
+  MSFT:*_*_IA32_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706 /wd4819\r
+  MSFT:*_*_X64_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4306 /wd4389 /wd4702 /wd4706 /wd4819\r
+  MSFT:*_*_IPF_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4306 /wd4389 /wd4702 /wd4706 /wd4819\r
 \r
   INTEL:*_*_IA32_CC_FLAGS  = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w\r
   INTEL:*_*_X64_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w\r
@@ -512,10 +514,12 @@
   #\r
   # Suppress the following build warnings in openssl so we don't break the build with -Werror\r
   #   -Werror=maybe-uninitialized: there exist some other paths for which the variable is not initialized.\r
+  #   -Werror=format: Check calls to printf and scanf, etc., to make sure that the arguments supplied have\r
+  #                   types appropriate to the format string specified.\r
   #\r
   GCC:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized\r
-  GCC:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -DNO_MSABI_VA_FUNCS\r
-  GCC:*_*_IPF_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized\r
+  GCC:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -DNO_MSABI_VA_FUNCS\r
+  GCC:*_*_IPF_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format\r
   GCC:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS)\r
   GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS)\r
 \r