CryptoPkg: fix build support under RVCT

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

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index a6d511e839229a411ab54fc7d12f1d1cf066480a..54ac055a43ca605c00385acedae0f6a95da2a0ad 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -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.2e\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
@@ -893,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