FatBinPkg: Update EBC/IA32/X64/IPF binaries

[mirror_edk2.git] / SecurityPkg / SecurityPkg.dec

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 48f714f28973d9fa6b2ab9820a04492172c810b5..959acf06b4c2e7826f61871b25fe84df202f361a 100644 (file)
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -6,6 +6,7 @@
 #  and libraries instances, which are used for those features.\r
 #\r
 # Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# (C) Copyright 2015 Hewlett Packard Enterprise Development LP <BR>\r
 # This program and the accompanying materials are licensed and made available under\r
 # the terms and conditions of the BSD License which accompanies this distribution.\r
 # The full text of the license may be found at\r
@@ -21,7 +22,7 @@
   PACKAGE_NAME                   = SecurityPkg\r
   PACKAGE_UNI_FILE               = SecurityPkg.uni\r
   PACKAGE_GUID                   = 4EFC4F66-6219-4427-B780-FB99F470767F\r
-  PACKAGE_VERSION                = 0.95\r
+  PACKAGE_VERSION                = 0.96\r
 \r
 [Includes]\r
   Include\r
@@ -70,6 +71,15 @@
   ##  @libraryclass  Provides support for TrEE PP >= 128 Vendor Specific PPI Operation.\r
   #\r
   TrEEPpVendorLib|Include/Library/TrEEPpVendorLib.h\r
+  \r
+  ##  @libraryclass  Provides support for TCG Physical Presence Interface (PPI) specification \r
+  #   >= 128 Vendor Specific PPI Operation.\r
+  #\r
+  Tcg2PpVendorLib|Include/Library/TcgPpVendorLib.h\r
+  \r
+  ##  @libraryclass  Handle TPM 2.0 physical presence request from OS.\r
+  #\r
+  Tcg2PhysicalPresenceLib|Include/Library/Tcg2PhysicalPresenceLib.h\r
 \r
 [Guids]\r
   ## Security package token space guid.\r
@@ -354,17 +364,6 @@
   # @Prompt TPM device type identifier\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid |{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x0001000F\r
 \r
-  ## This PCD indicates Hash mask for TPM 2.0.<BR><BR>\r
-  #  If this bit is set, that means this algorithm is needed to extend to PCR.<BR>\r
-  #  If this bit is clear, that means this algorithm is NOT needed to extend to PCR.<BR>\r
-  #    BIT0  -  SHA1.<BR>\r
-  #    BIT1  -  SHA256.<BR>\r
-  #    BIT2  -  SHA384.<BR>\r
-  #    BIT3  -  SHA512.<BR>\r
-  # @Prompt Hash mask for TPM 2.0\r
-  # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F \r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010\r
-\r
   ## This PCD indicates if BIOS auto detect TPM1.2 or dTPM2.0.<BR><BR>\r
   #  FALSE - No auto detection.<BR>\r
   #  TRUE  - Auto detection.<BR>\r
@@ -375,13 +374,9 @@
   # @Prompt TPM device address.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0xFED40000|UINT64|0x00010012\r
 \r
-  ## This PCD indicated final BIOS supported Hash mask.\r
-  #    Bios may choose to register a subset of PcdTpm2HashMask.\r
-  #    So this PCD is final value of how many hash algo is extended to PCR.\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap|0xFFFFFFFF|UINT32|0x00010016\r
-\r
   ## This PCR means the OEM configurated number of PCR banks.\r
   #  0 means dynamic get from supported HASH algorithm\r
+  # @Prompt OEM configurated number of PCR banks.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTcg2NumberOfPCRBanks|0x0|UINT32|0x00010015\r
   \r
   ## Provides one or more SHA 256 Hashes of the RSA 2048 public keys used to verify Recovery and Capsule Update images\r
@@ -389,6 +384,25 @@
   # @Prompt One or more SHA 256 Hashes of RSA 2048 bit public keys used to verify Recovery and Capsule Update images\r
   #\r
   gEfiSecurityPkgTokenSpaceGuid.PcdRsa2048Sha256PublicKeyBuffer|{0x91, 0x29, 0xc4, 0xbd, 0xea, 0x6d, 0xda, 0xb3, 0xaa, 0x6f, 0x50, 0x16, 0xfc, 0xdb, 0x4b, 0x7e, 0x3c, 0xd6, 0xdc, 0xa4, 0x7a, 0x0e, 0xdd, 0xe6, 0x15, 0x8c, 0x73, 0x96, 0xa2, 0xd4, 0xa6, 0x4d}|VOID*|0x00010013\r
+\r
+[PcdsDynamic, PcdsDynamicEx]\r
+\r
+  ## This PCD indicates Hash mask for TPM 2.0.<BR><BR>\r
+  #  If this bit is set, that means this algorithm is needed to extend to PCR.<BR>\r
+  #  If this bit is clear, that means this algorithm is NOT needed to extend to PCR.<BR>\r
+  #    BIT0  -  SHA1.<BR>\r
+  #    BIT1  -  SHA256.<BR>\r
+  #    BIT2  -  SHA384.<BR>\r
+  #    BIT3  -  SHA512.<BR>\r
+  # @Prompt Hash mask for TPM 2.0\r
+  # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F \r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010\r
+\r
+  ## This PCD indicated final BIOS supported Hash mask.\r
+  #    Bios may choose to register a subset of PcdTpm2HashMask.\r
+  #    So this PCD is final value of how many hash algo is extended to PCR.\r
+  # @Prompt Hash Algorithm bitmap.\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap|0xFFFFFFFF|UINT32|0x00010016\r
   \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   SecurityPkgExtra.uni\r