Upgrade OpenSSL to 1.1.0j

[mirror_edk2.git] / CryptoPkg / CryptoPkg.dsc

diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 2ea3b00fa2925f1ff71d5d1b76beb2750d0f99f0..321abe4d4c22026a0adae12b64593acbed499020 100644 (file)
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -1,15 +1,15 @@
 ## @file\r
 #  Cryptographic Library Package for UEFI Security Implementation.\r
 #\r
-#  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, 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
 #  http://opensource.org/licenses/bsd-license.php\r
-#  \r
+#\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#  \r
+#\r
 ##\r
 \r
 ################################################################################\r
@@ -20,11 +20,11 @@
 [Defines]\r
   PLATFORM_NAME                  = CryptoPkg\r
   PLATFORM_GUID                  = E1063286-6C8C-4c25-AEF0-67A9A5B6E6B6\r
-  PLATFORM_VERSION               = 0.91\r
+  PLATFORM_VERSION               = 0.98\r
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/CryptoPkg\r
-  SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|ARM\r
-  BUILD_TARGETS                  = DEBUG|RELEASE\r
+  SUPPORTED_ARCHITECTURES        = IA32|X64|ARM|AARCH64\r
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
 ################################################################################\r
@@ -38,7 +38,7 @@
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
-  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf  \r
+  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
@@ -51,14 +51,21 @@
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
 \r
-[LibraryClasses.ARM]\r
+[LibraryClasses.ARM, LibraryClasses.AARCH64]\r
   #\r
   # It is not possible to prevent the ARM compiler for generic intrinsic functions.\r
   # This library provides the instrinsic functions generate by a given compiler.\r
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.\r
+  # [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this library\r
+  # into all ARM and AARCH64 images.\r
   #\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
 \r
+  # Add support for stack protector\r
+  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf\r
+\r
+[LibraryClasses.ARM]\r
+  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf\r
+\r
 [LibraryClasses.common.PEIM]\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r
 \r
@@ -71,9 +78,6 @@
 [LibraryClasses.common.DXE_SMM_DRIVER]\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf\r
 \r
-[LibraryClasses.common.DXE_SAL_DRIVER]\r
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/BaseCryptLibRuntimeCryptProtocol.inf\r
-\r
 [LibraryClasses.common.UEFI_DRIVER]\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
 \r
@@ -116,13 +120,11 @@
   CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
   CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r
   CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf\r
-\r
-  CryptoPkg/Application/Cryptest/Cryptest.inf\r
-\r
-  CryptoPkg/CryptRuntimeDxe/CryptRuntimeDxe.inf\r
+  CryptoPkg/Library/TlsLib/TlsLib.inf\r
+  CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
 \r
 [Components.IA32, Components.X64]\r
   CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf\r
 \r
-[Components.IPF]\r
-  CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/BaseCryptLibRuntimeCryptProtocol.inf\r
+[BuildOptions]\r
+  *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r