X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=SecurityPkg%2FSecurityPkg.dec;h=959acf06b4c2e7826f61871b25fe84df202f361a;hb=b29910d6563926f32a1388da5bb6b6f1ff16f948;hp=48f714f28973d9fa6b2ab9820a04492172c810b5;hpb=1abfa4ce4835639c66ae82cc0d72cffcf3f28b6b;p=mirror_edk2.git

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 48f714f289..959acf06b4 100644
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -6,6 +6,7 @@
 #  and libraries instances, which are used for those features.
 #
 # Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+# (C) Copyright 2015 Hewlett Packard Enterprise Development LP <BR>
 # 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
@@ -21,7 +22,7 @@
   PACKAGE_NAME                   = SecurityPkg
   PACKAGE_UNI_FILE               = SecurityPkg.uni
   PACKAGE_GUID                   = 4EFC4F66-6219-4427-B780-FB99F470767F
-  PACKAGE_VERSION                = 0.95
+  PACKAGE_VERSION                = 0.96
 
 [Includes]
   Include
@@ -70,6 +71,15 @@
   ##  @libraryclass  Provides support for TrEE PP >= 128 Vendor Specific PPI Operation.
   #
   TrEEPpVendorLib|Include/Library/TrEEPpVendorLib.h
+  
+  ##  @libraryclass  Provides support for TCG Physical Presence Interface (PPI) specification 
+  #   >= 128 Vendor Specific PPI Operation.
+  #
+  Tcg2PpVendorLib|Include/Library/TcgPpVendorLib.h
+  
+  ##  @libraryclass  Handle TPM 2.0 physical presence request from OS.
+  #
+  Tcg2PhysicalPresenceLib|Include/Library/Tcg2PhysicalPresenceLib.h
 
 [Guids]
   ## Security package token space guid.
@@ -354,17 +364,6 @@
   # @Prompt TPM device type identifier
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid |{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x0001000F
 
-  ## This PCD indicates Hash mask for TPM 2.0.<BR><BR>
-  #  If this bit is set, that means this algorithm is needed to extend to PCR.<BR>
-  #  If this bit is clear, that means this algorithm is NOT needed to extend to PCR.<BR>
-  #    BIT0  -  SHA1.<BR>
-  #    BIT1  -  SHA256.<BR>
-  #    BIT2  -  SHA384.<BR>
-  #    BIT3  -  SHA512.<BR>
-  # @Prompt Hash mask for TPM 2.0
-  # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F 
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010
-
   ## This PCD indicates if BIOS auto detect TPM1.2 or dTPM2.0.<BR><BR>
   #  FALSE - No auto detection.<BR>
   #  TRUE  - Auto detection.<BR>
@@ -375,13 +374,9 @@
   # @Prompt TPM device address.
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0xFED40000|UINT64|0x00010012
 
-  ## This PCD indicated final BIOS supported Hash mask.
-  #    Bios may choose to register a subset of PcdTpm2HashMask.
-  #    So this PCD is final value of how many hash algo is extended to PCR.
-  gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap|0xFFFFFFFF|UINT32|0x00010016
-
   ## This PCR means the OEM configurated number of PCR banks.
   #  0 means dynamic get from supported HASH algorithm
+  # @Prompt OEM configurated number of PCR banks.
   gEfiSecurityPkgTokenSpaceGuid.PcdTcg2NumberOfPCRBanks|0x0|UINT32|0x00010015
   
   ## Provides one or more SHA 256 Hashes of the RSA 2048 public keys used to verify Recovery and Capsule Update images
@@ -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
   #
   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
+
+[PcdsDynamic, PcdsDynamicEx]
+
+  ## This PCD indicates Hash mask for TPM 2.0.<BR><BR>
+  #  If this bit is set, that means this algorithm is needed to extend to PCR.<BR>
+  #  If this bit is clear, that means this algorithm is NOT needed to extend to PCR.<BR>
+  #    BIT0  -  SHA1.<BR>
+  #    BIT1  -  SHA256.<BR>
+  #    BIT2  -  SHA384.<BR>
+  #    BIT3  -  SHA512.<BR>
+  # @Prompt Hash mask for TPM 2.0
+  # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F 
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010
+
+  ## This PCD indicated final BIOS supported Hash mask.
+  #    Bios may choose to register a subset of PcdTpm2HashMask.
+  #    So this PCD is final value of how many hash algo is extended to PCR.
+  # @Prompt Hash Algorithm bitmap.
+  gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap|0xFFFFFFFF|UINT32|0x00010016
   
 [UserExtensions.TianoCore."ExtraFiles"]
   SecurityPkgExtra.uni