X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=CryptoPkg%2FLibrary%2FOpensslLib%2FOpensslLib.inf;h=9b6e860337a538fcedf845370513a4005daf5018;hp=28d3aec00e2a0fe7c8c8c174e90c1c5d2dd79ecc;hb=e6b2c99121963f84b847120044075e7b6ce374cb;hpb=d5b5b8f8aa956266289ad9c523a410419fea87f8
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 28d3aec00e..9b6e860337 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -1,7 +1,7 @@
## @file
# This module provides openSSL Library implementation.
#
-# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
@@ -20,37 +20,8 @@
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = OpensslLib
- DEFINE OPENSSL_PATH = openssl-1.0.2d
- DEFINE OPENSSL_FLAGS = -DOPENSSL_SYSNAME_UWIN -DOPENSSL_SYS_UEFI -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DGETPID_IS_MEANINGLESS -DOPENSSL_NO_STDIO -DOPENSSL_NO_POSIX_IO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_ASM
- DEFINE OPENSSL_EXFLAGS = -DOPENSSL_SMALL_FOOTPRINT -DOPENSSL_NO_SHA0 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_RIPEMD -DOPENSSL_NO_RC2 -DOPENSSL_NO_IDEA -DOPENSSL_NO_BF -DOPENSSL_NO_CAST -DOPENSSL_NO_WHIRLPOOL -DOPENSSL_NO_DSA -DOPENSSL_NO_EC -DOPENSSL_NO_ECDH -DOPENSSL_NO_ECDSA -DOPENSSL_NO_SRP -DOPENSSL_NO_ENGINE
-
-#
-# OPENSSL_FLAGS is set to define the following flags to be compatible with
-# EDK II build system and UEFI executiuon environment
-#
-# OPENSSL_SYSNAME_UWIN
-# OPENSSL_SYS_UEFI
-# L_ENDIAN
-# _CRT_SECURE_NO_DEPRECATE
-# _CRT_NONSTDC_NO_DEPRECATE
-# OPENSSL_NO_CAMELLIA
-# OPENSSL_NO_SEED
-# OPENSSL_NO_RC5
-# OPENSSL_NO_MDC2
-# OPENSSL_NO_SOCK
-# OPENSSL_NO_CMS
-# OPENSSL_NO_JPAKE
-# OPENSSL_NO_CAPIENG
-# OPENSSL_NO_ERR
-# OPENSSL_NO_KRB5
-# OPENSSL_NO_DYNAMIC_ENGINE
-# GETPID_IS_MEANINGLESS
-# OPENSSL_NO_STDIO
-# OPENSSL_NO_POSIX_IO
-# OPENSSL_NO_FP_API
-# OPENSSL_NO_DGRAM
-# OPENSSL_NO_ASM
-#
+ DEFINE OPENSSL_PATH = openssl-1.0.2f
+ DEFINE OPENSSL_FLAGS = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
#
# VALID_ARCHITECTURES = IA32 X64 IPF ARM AARCH64
@@ -842,22 +813,22 @@
#
# PQUEUE
#
- $(OPENSSL_PATH)/crypto/pqueue/pqueue.c
+ #$(OPENSSL_PATH)/crypto/pqueue/pqueue.c
#
# TS
#
- $(OPENSSL_PATH)/crypto/ts/ts_err.c
- $(OPENSSL_PATH)/crypto/ts/ts_req_utils.c
- $(OPENSSL_PATH)/crypto/ts/ts_req_print.c
- $(OPENSSL_PATH)/crypto/ts/ts_rsp_utils.c
- $(OPENSSL_PATH)/crypto/ts/ts_rsp_print.c
- $(OPENSSL_PATH)/crypto/ts/ts_rsp_sign.c
- $(OPENSSL_PATH)/crypto/ts/ts_rsp_verify.c
- $(OPENSSL_PATH)/crypto/ts/ts_verify_ctx.c
- $(OPENSSL_PATH)/crypto/ts/ts_lib.c
- $(OPENSSL_PATH)/crypto/ts/ts_conf.c
- $(OPENSSL_PATH)/crypto/ts/ts_asn1.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_err.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_req_utils.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_req_print.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_rsp_utils.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_rsp_print.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_rsp_sign.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_rsp_verify.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_verify_ctx.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_lib.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_conf.c
+ #$(OPENSSL_PATH)/crypto/ts/ts_asn1.c
#
# SRP - Disabled by OPENSSL_NO_SRP
@@ -879,6 +850,9 @@
[LibraryClasses]
DebugLib
+[LibraryClasses.ARM]
+ ArmSoftFloatLib
+
[BuildOptions]
#
# Disables the following Visual Studio compiler warnings brought by openssl source, so we do not break the build with /WX option:
@@ -891,20 +865,21 @@
# C4305: truncation from type1 to type2 of smaller size
# C4306: conversion from type1 to type2 of greater size
# C4702: Potentially uninitialized local variable name used
+ # C4311: pointer truncation from 'type' to 'type'
#
- MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -DTHIRTY_TWO_BIT /wd4244 /wd4701 /wd4702 /wd4706
- MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -DSIXTY_FOUR_BIT /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706
- MSFT:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -DSIXTY_FOUR_BIT /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706
+ MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4244 /wd4701 /wd4702 /wd4706
+ MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706 /wd4311
+ MSFT:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706
- INTEL:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w -DTHIRTY_TWO_BIT
- INTEL:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w -DSIXTY_FOUR_BIT
- INTEL:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w -DSIXTY_FOUR_BIT
+ INTEL:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w
+ INTEL:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w
+ INTEL:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w
- GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT
- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG
- GCC:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG
- GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT
- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG
+ GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
+ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -UNO_BUILTIN_VA_FUNCS
+ GCC:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
+ GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -w
+ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -w
# suppress the following warnings in openssl so we don't break the build with warnings-as-errors:
# 1295: Deprecated declaration - give arg types
@@ -918,6 +893,11 @@
# 513: a value of type cannot be assigned to an entity of type
# 188: enumerated type mixed with another type (i.e. passing an integer as an enum without a cast)
# 1296: Extended constant initialiser used
- RVCT:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3 -DTHIRTY_TWO_BIT --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188
- XCODE:*_*_IA32_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT
- XCODE:*_*_X64_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG
+ # 128: loop is not reachable - may be emitted inappropriately if code follows a conditional return
+ # from the function that evaluates to true at compile time
+ # 546: transfer of control bypasses initialization - may be emitted inappropriately if the uninitialized
+ # variable is never referenced after the jump
+ # 1: ignore "#1-D: last line of file ends without a newline"
+ 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
+ XCODE:*_*_IA32_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
+ XCODE:*_*_X64_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w