CryptoPkg/OpensslLib: Switch to upstream fix for OpenSSL RT#4175

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

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 20200c33f6218785c93d3a5288a220baeaf7ab75..9b6e860337a538fcedf845370513a4005daf5018 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This module provides openSSL Library implementation.\r
 #\r
-#  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2016, 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
@@ -20,7 +20,7 @@
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = OpensslLib\r
-  DEFINE OPENSSL_PATH            = openssl-1.0.2d\r
+  DEFINE OPENSSL_PATH            = openssl-1.0.2f\r
   DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE\r
 \r
 #\r
@@ -813,22 +813,22 @@
   #\r
   # PQUEUE\r
   #\r
-  $(OPENSSL_PATH)/crypto/pqueue/pqueue.c\r
+  #$(OPENSSL_PATH)/crypto/pqueue/pqueue.c\r
 \r
   #\r
   # TS\r
   #\r
-  $(OPENSSL_PATH)/crypto/ts/ts_err.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_req_utils.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_req_print.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_rsp_utils.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_rsp_print.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_rsp_sign.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_rsp_verify.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_verify_ctx.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_lib.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_conf.c\r
-  $(OPENSSL_PATH)/crypto/ts/ts_asn1.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_err.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_req_utils.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_req_print.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_rsp_utils.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_rsp_print.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_rsp_sign.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_rsp_verify.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_verify_ctx.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_lib.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_conf.c\r
+  #$(OPENSSL_PATH)/crypto/ts/ts_asn1.c\r
 \r
   #\r
   # SRP - Disabled by OPENSSL_NO_SRP\r
@@ -865,9 +865,10 @@
   # C4305: truncation from type1 to type2 of smaller size\r
   # C4306: conversion from type1 to type2 of greater size\r
   # C4702: Potentially uninitialized local variable name used\r
+  # C4311: pointer truncation from 'type' to 'type'\r
   #\r
   MSFT:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4244 /wd4701 /wd4702 /wd4706\r
-  MSFT:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706\r
+  MSFT:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706 /wd4311\r
   MSFT:*_*_IPF_CC_FLAGS     = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706\r
 \r
   INTEL:*_*_IA32_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w\r
@@ -892,6 +893,11 @@
   #  513: a value of type <type> cannot be assigned to an entity of type <type>\r
   #  188: enumerated type mixed with another type (i.e. passing an integer as an enum without a cast)\r
   # 1296: Extended constant initialiser used\r
-  RVCT:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) --library_interface=aeabi_clib99 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188\r
+  #  128: loop is not reachable - may be emitted inappropriately if code follows a conditional return\r
+  #       from the function that evaluates to true at compile time\r
+  #  546: transfer of control bypasses initialization - may be emitted inappropriately if the uninitialized\r
+  #       variable is never referenced after the jump\r
+  #    1: ignore "#1-D: last line of file ends without a newline"\r
+  RVCT:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) --library_interface=aeabi_clib99 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188,128,546,1 -JCryptoPkg/Include\r
   XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
   XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r