SecurityPkg: INF/DEC file updates to EDK II packages

1. Usage information in INF file comment blocks are either incomplete or incorrect. This includes usage information for Protocols/PPIs/GUIDs/PCDs/HOBs/Events/BootModes. The syntax for usage information in comment blocks is defined in the EDK II Module Information (INF) Specification Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dong, Guo <guo.dong@intel.com> Reviewed-by: Gao, Liming <liming.gao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15950 6f19259b-4bc3-4df7-8a09-765794883524
2014-08-28 05:31:09 +00:00
parent 5841ba45f2
commit 60c944c7d6
48 changed files with 881 additions and 450 deletions
--- a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
+++ b/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
@@ -1,7 +1,11 @@
 ## @file
-#  The library instance provides security service of deferring image load.
+#  Provides security service of deferred image load
 #
-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+#  The platform may need to defer the execution of an image because of security 
+#  considerations. These deferred images will be recorded and then reported by 
+#  installing an instance of the EFI_DEFERRED_IMAGE_LOAD_PROTOCOL.
+#
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<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
@@ -13,7 +17,8 @@

 [Defines]
  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = DxeDeferImageLoadLib   
+  BASE_NAME                      = DxeDeferImageLoadLib
+  MODULE_UNI_FILE                = DxeDeferImageLoadLib.uni
  FILE_GUID                      = 5E2FAE1F-41DA-4fbd-BC81-603CE5CD8497
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -48,14 +53,16 @@
  PcdLib 

 [Protocols]
-  gEfiFirmwareVolume2ProtocolGuid
-  gEfiBlockIoProtocolGuid
-  gEfiSimpleFileSystemProtocolGuid
+  gEfiFirmwareVolume2ProtocolGuid                        ## SOMETIMES_CONSUMES
+  gEfiBlockIoProtocolGuid                                ## SOMETIMES_CONSUMES
+  gEfiSimpleFileSystemProtocolGuid                       ## SOMETIMES_CONSUMES
+  gEfiDeferredImageLoadProtocolGuid                      ## SOMETIMES_PRODUCES
+  ## SOMETIMES_CONSUMES
+  ## NOTIFY
  gEfiUserManagerProtocolGuid
-  gEfiDeferredImageLoadProtocolGuid
-  
+   
 [Guids]
-  gEfiGlobalVariableGuid
+  gEfiGlobalVariableGuid                                  ## SOMETIMES_CONSUMES  ## Variable:L"BootOrder"
  
 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdDeferImageLoadPolicy
+  gEfiSecurityPkgTokenSpaceGuid.PcdDeferImageLoadPolicy   ## SOMETIMES_CONSUMES
--- a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
+++ b/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
@@ -1,9 +1,9 @@
 ## @file
-#  The library instance provides security service of image authentication 
-#  status check in UEFI2.3.1.
+#  Provides security service of image authentication status check
+#
 #  Authentication Status Library module supports UEFI2.3.1
 #
-# Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<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
@@ -15,7 +15,8 @@

 [Defines]
  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = DxeImageAuthenticationStatusLib   
+  BASE_NAME                      = DxeImageAuthenticationStatusLib
+  MODULE_UNI_FILE                = DxeImageAuthenticationStatusLib.uni
  FILE_GUID                      = EB92D1DE-7C36-4680-BB88-A67E96049F72
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
@@ -1,13 +1,14 @@
 ## @file
-#  The library instance provides security service of image verification.
-#  Image verification Library module supports UEFI2.3.1
+#  Provides security service of image verification
+#
+#  This library hooks LoadImage() API to verify every image by the verification policy.
 #
 #  Caution: This module requires additional review when modified.
 #  This library will have external input - PE/COFF image.
-#  This external input must be validated carefully to avoid security issue like
-#  buffer overflow, integer overflow.
+#  This external input must be validated carefully to avoid security issues such as
+#  buffer overflow or integer overflow.
 #
-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<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
@@ -19,7 +20,8 @@

 [Defines]
  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = DxeImageVerificationLib   
+  BASE_NAME                      = DxeImageVerificationLib
+  MODULE_UNI_FILE                = DxeImageVerificationLib.uni
  FILE_GUID                      = 0CA970E1-43FA-4402-BC0A-81AF336BFFD6
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -58,20 +60,30 @@
  TpmMeasurementLib

 [Protocols]
-  gEfiFirmwareVolume2ProtocolGuid
-  gEfiBlockIoProtocolGuid
-  gEfiSimpleFileSystemProtocolGuid
-  
+  gEfiFirmwareVolume2ProtocolGuid       ## SOMETIMES_CONSUMES
+  gEfiBlockIoProtocolGuid               ## SOMETIMES_CONSUMES
+  gEfiSimpleFileSystemProtocolGuid      ## SOMETIMES_CONSUMES
+
 [Guids]
-  gEfiCertTypeRsa2048Sha256Guid
+  ## SOMETIMES_CONSUMES   ## Variable:L"DB"
+  ## SOMETIMES_CONSUMES   ## Variable:L"DBX"
+  ## PRODUCES             ## SystemTable
+  ## CONSUMES             ## SystemTable
  gEfiImageSecurityDatabaseGuid
+
+  ## SOMETIMES_CONSUMES   ## GUID       # Unique ID for the type of the signature.
+  ## SOMETIMES_PRODUCES   ## GUID       # Unique ID for the type of the signature.
  gEfiCertSha1Guid
+  
+  ## SOMETIMES_CONSUMES   ## GUID       # Unique ID for the type of the signature.
+  ## SOMETIMES_PRODUCES   ## GUID       # Unique ID for the type of the signature.
  gEfiCertSha256Guid
-  gEfiCertX509Guid
-  gEfiCertRsa2048Guid
-  gEfiCertPkcs7Guid
+
+  gEfiCertX509Guid                      ## SOMETIMES_CONSUMES    ## GUID     # Unique ID for the type of the signature.
+  gEfiCertPkcs7Guid                     ## SOMETIMES_CONSUMES    ## GUID     # Unique ID for the type of the certificate.
  
 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy
-  gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy
-  gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy
+  gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy          ## SOMETIMES_CONSUMES
+  gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy     ## SOMETIMES_CONSUMES
+  gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy         ## SOMETIMES_CONSUMES
+  
--- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
+++ b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
@@ -1,12 +1,15 @@
 ## @file
-# TCG physical presence library instance. This library will lock
-# TPM after executing TPM request.
+#  Executes pending TPM 1.2 requests from OS or BIOS and Locks TPM
+#
+#  This library will check and execute TPM 1.2 request from OS or BIOS. The request may
+#  ask for user confirmation before execution. This Library will also lock TPM physical 
+#  presence at last.
 #
 #  Caution: This module requires additional review when modified.
 #  This driver will have external input - variable.
 #  This external input must be validated carefully to avoid security issue.
 #
-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<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
@@ -18,7 +21,8 @@

 [Defines]
  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = DxeTcgPhysicalPresenceLib   
+  BASE_NAME                      = DxeTcgPhysicalPresenceLib
+  MODULE_UNI_FILE                = DxeTcgPhysicalPresenceLib.uni
  FILE_GUID                      = EBC43A46-34AC-4F07-A7F5-A5394619361C
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -52,8 +56,13 @@
  HiiLib

 [Protocols]
-  gEfiTcgProtocolGuid
-  gEdkiiVariableLockProtocolGuid
+  gEfiTcgProtocolGuid                   ## CONSUMES
+  gEdkiiVariableLockProtocolGuid        ## CONSUMES

 [Guids]
+  ## CONSUMES           ## HII
+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"
+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresenceFlags"
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresenceFlags"
  gEfiPhysicalPresenceGuid
--- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
+++ b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
@@ -1,12 +1,15 @@
 ## @file
-#  The library instance provides security service of TPM2 measure boot.
+#  Provides security service for TPM 2.0 measured boot
+#
+#  This library instance hooks LoadImage() API to measure every image that 
+#  is not measured in PEI phase. And, it will also measure GPT partition.
 #
 #  Caution: This module requires additional review when modified.
 #  This library will have external input - PE/COFF image and GPT partition.
-#  This external input must be validated carefully to avoid security issue like
-#  buffer overflow, integer overflow.
+#  This external input must be validated carefully to avoid security issues such 
+#  as buffer overflow or integer overflow.
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -19,6 +22,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeTpm2MeasureBootLib
+  MODULE_UNI_FILE                = DxeTpm2MeasureBootLib.uni
  FILE_GUID                      = 778CE4F4-36BD-4ae7-B8F0-10B420B0D174
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -53,11 +57,11 @@
  HobLib

 [Guids]
-  gMeasuredFvHobGuid
+  gMeasuredFvHobGuid                    ## SOMETIMES_CONSUMES ## HOB

 [Protocols]
-  gEfiTrEEProtocolGuid                   ## CONSUMES
-  gEfiFirmwareVolumeBlockProtocolGuid   ## CONSUMES
-  gEfiBlockIoProtocolGuid               ## CONSUMES
-  gEfiDiskIoProtocolGuid                ## CONSUMES
+  gEfiTrEEProtocolGuid                  ## SOMETIMES_CONSUMES
+  gEfiFirmwareVolumeBlockProtocolGuid   ## SOMETIMES_CONSUMES
+  gEfiBlockIoProtocolGuid               ## SOMETIMES_CONSUMES
+  gEfiDiskIoProtocolGuid                ## SOMETIMES_CONSUMES

--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
+++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
@@ -1,12 +1,15 @@
 ## @file
-#  The library instance provides security service of TPM measure boot.
+#  Provides security service for TPM 1.2 measured boot
+#
+#  This library instance hooks LoadImage() API to measure every image that 
+#  is not measured in PEI phase. And, it will also measure GPT partition.
 #
 #  Caution: This module requires additional review when modified.
 #  This library will have external input - PE/COFF image and GPT partition.
-#  This external input must be validated carefully to avoid security issue like
-#  buffer overflow, integer overflow.
+#  This external input must be validated carefully to avoid security issues such 
+#  as buffer overflow or integer overflow.
 #
-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<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
@@ -19,6 +22,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeTpmMeasureBootLib
+  MODULE_UNI_FILE                = DxeTpmMeasureBootLib.uni
  FILE_GUID                      = 6C60C7D0-922A-4b7c-87D7-E503EDD73BBF
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -53,11 +57,11 @@
  HobLib

 [Guids]
-  gMeasuredFvHobGuid
+  gMeasuredFvHobGuid                    ## SOMETIMES_CONSUMES ## HOB

 [Protocols]
-  gEfiTcgProtocolGuid                   ## CONSUMES
-  gEfiFirmwareVolumeBlockProtocolGuid   ## CONSUMES
-  gEfiBlockIoProtocolGuid               ## CONSUMES
-  gEfiDiskIoProtocolGuid                ## CONSUMES
+  gEfiTcgProtocolGuid                   ## SOMETIMES_CONSUMES
+  gEfiFirmwareVolumeBlockProtocolGuid   ## SOMETIMES_CONSUMES
+  gEfiBlockIoProtocolGuid               ## SOMETIMES_CONSUMES
+  gEfiDiskIoProtocolGuid                ## SOMETIMES_CONSUMES

--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+++ b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
@@ -1,7 +1,10 @@
 ## @file
-#  This library is used by other modules to measure data to TPM 1.2 or TPM 2.0.
+#  Provides TPM measurement functions for TPM1.2 and TPM 2.0
+# 
+#  This library provides TpmMeasureAndLogData() to to measure and log data, and 
+#  extend the measurement result into a specific PCR.
 #
-# Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<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
@@ -18,6 +21,7 @@
  MODULE_TYPE                    = UEFI_DRIVER
  VERSION_STRING                 = 1.0
  LIBRARY_CLASS                  = TpmMeasurementLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER 
+  MODULE_UNI_FILE                = DxeTpmMeasurementLib.uni

 #
 # The following information is for reference only and not required by the build tools.
@@ -40,5 +44,5 @@
  UefiBootServicesTableLib

 [Protocols]
-  gEfiTcgProtocolGuid
-  gEfiTrEEProtocolGuid
+  gEfiTcgProtocolGuid           ## SOMETIMES_CONSUMES
+  gEfiTrEEProtocolGuid          ## SOMETIMES_CONSUMES
--- a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
+++ b/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
@@ -1,11 +1,14 @@
 ## @file
-# TrEE physical presence library instance. This library will execute TPM2 request.
+#  Executes TPM 2.0 requests from OS or BIOS
+#
+#  This library will check and execute TPM 2.0 request from OS or BIOS. The request may
+#  ask for user confirmation before execution.
 #
 #  Caution: This module requires additional review when modified.
 #  This driver will have external input - variable.
 #  This external input must be validated carefully to avoid security issue.
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -17,7 +20,8 @@

 [Defines]
  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = DxeTrEEPhysicalPresenceLib   
+  BASE_NAME                      = DxeTrEEPhysicalPresenceLib
+  MODULE_UNI_FILE                = DxeTrEEPhysicalPresenceLib.uni
  FILE_GUID                      = 601ECB06-7874-489e-A280-805780F6C861
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -52,8 +56,13 @@
  Tpm2CommandLib

 [Protocols]
-  gEfiTrEEProtocolGuid
-  gEdkiiVariableLockProtocolGuid
+  gEfiTrEEProtocolGuid                 ## CONSUMES
+  gEdkiiVariableLockProtocolGuid       ## CONSUMES

 [Guids]
+  ## CONSUMES           ## HII
+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"
+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresenceFlags"
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresenceFlags"
  gEfiTrEEPhysicalPresenceGuid
--- a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
+++ b/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
@@ -1,8 +1,9 @@
 ## @file
-#  Ihis library is BaseCrypto SHA1 hash instance.
-#  It can be registered to BaseCrypto router, to serve as hash engine.
+#  Provides BaseCrypto SHA1 hash service
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  This library can be registered to BaseCrypto router, to serve as hash engine.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -15,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = HashInstanceLibSha1
+  MODULE_UNI_FILE                = HashInstanceLibSha1.uni
  FILE_GUID                      = 9A7A6AB4-9DA6-4aa4-90CB-6D4B79EDA7B9
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
--- a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
+++ b/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
@@ -1,8 +1,9 @@
 ## @file
-#  Ihis library is BaseCrypto SHA256 hash instance.
-#  It can be registered to BaseCrypto router, to serve as hash engine.
+#  Provides BaseCrypto SHA256 hash service
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  This library can be registered to BaseCrypto router, to serve as hash engine.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -15,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = HashInstanceLibSha256
+  MODULE_UNI_FILE                = HashInstanceLibSha256.uni
  FILE_GUID                      = 5810798A-ED30-4080-8DD7-B9667A748C02
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
@@ -1,9 +1,11 @@
 ## @file
-#  Ihis library is BaseCrypto router. It will redirect hash request to each individual
-#  hash handler registerd, such as SHA1, SHA256.
-#  Platform can use PcdTpm2HashMask to mask some hash engines.
+#  Provides hash service by registered hash handler
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  Ihis library is BaseCrypto router. It will redirect hash request to each individual
+#  hash handler registered, such as SHA1, SHA256. Platform can use PcdTpm2HashMask to 
+#  mask some hash engines.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -16,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = HashLibBaseCryptoRouterDxe
+  MODULE_UNI_FILE                = HashLibBaseCryptoRouterDxe.uni
  FILE_GUID                      = 158DC712-F15A-44dc-93BB-1675045BE066
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -45,5 +48,5 @@
  PcdLib

 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask       ## CONSUMES

--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
@@ -1,7 +1,9 @@
 ## @file
+#  Provides hash service by registered hash handler
+#
 #  Ihis library is BaseCrypto router. It will redirect hash request to each individual
-#  hash handler registerd, such as SHA1, SHA256.
-#  Platform can use PcdTpm2HashMask to mask some hash engines.
+#  hash handler registered, such as SHA1, SHA256. Platform can use PcdTpm2HashMask to 
+#  mask some hash engines.
 #
 # Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
@@ -16,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = HashLibBaseCryptoRouterPei
+  MODULE_UNI_FILE                = HashLibBaseCryptoRouterPei.uni
  FILE_GUID                      = DDCBCFBA-8EEB-488a-96D6-097831A6E50B
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0
@@ -46,5 +49,5 @@
  HobLib

 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask        ## CONSUMES

--- a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf
+++ b/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf
@@ -1,7 +1,10 @@
 ## @file
-#  Ihis library uses TPM2 device to calculation hash.
+#  Provides hash service using TPM2 device
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  This library uses TPM2 device to calculate hash. Platform can use PcdTpm2HashMask to 
+#  mask some hash calculation.
+#
+# Copyright (c) 2014, Intel Corporation. All rights reserved.<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
@@ -14,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = HashLibTpm2
+  MODULE_UNI_FILE                = HashLibTpm2.uni
  FILE_GUID                      = 1317F0D5-7842-475c-B1CA-6EDC20DCBE7D
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
@@ -42,4 +46,4 @@
  PcdLib

 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask         ## CONSUMES
--- a/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
+++ b/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
@@ -1,10 +1,12 @@
 ## @file
+#  NULL platform secure library instance that alway returns TRUE for a user physical present
+#
 #  NULL PlatformSecureLib instance does NOT really detect whether a physical present 
-#  user exists but return TRUE directly. This instance can be used to verify security
+#  user exists but returns TRUE directly. This instance can be used to verify security
 #  related features during platform enabling and development. It should be replaced
 #  by a platform-specific method(e.g. Button pressed) in a real platform for product.
 #
-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<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
@@ -17,6 +19,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = PlatformSecureLibNull
+  MODULE_UNI_FILE                = PlatformSecureLibNull.uni
  FILE_GUID                      = 7FA68D82-10A4-4e71-9524-D3D9500D3CDF
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
+++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
@@ -1,7 +1,9 @@
 ## @file
-#  This library is used by other modules to send TPM12 command.
+#  Provides some TPM 1.2 commands
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  This library is used by other modules to send TPM 1.2 command.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -14,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = Tpm12CommandLib
+  MODULE_UNI_FILE                = Tpm12CommandLib.uni
  FILE_GUID                      = C595047C-70B3-4731-99CC-A014E956D7A7
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
--- a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
+++ b/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
@@ -1,8 +1,11 @@
 ## @file
-#  Ihis library is TPM2 DTPM device lib.
-#  Choosing this library means platform uses and only uses DTPM device as TPM2 engine.
+#  Provides TPM 1.2 TIS functions
+#  
+#  This library implements TIS (TPM Interface Specification) functions which is 
+#  used for every TPM 1.2 command. Choosing this library means platform uses and 
+#  only uses TPM 1.2 device.
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -15,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = Tpm12DeviceLibDTpm
+  MODULE_UNI_FILE                = Tpm12DeviceLibDTpm.uni
  FILE_GUID                      = BC2B7672-A48B-4d58-B39E-AEE3707B5A23
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
@@ -41,4 +45,4 @@
  DebugLib

 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress               ## CONSUMES
--- a/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
+++ b/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
@@ -1,7 +1,10 @@
 ## @file
-#  Ihis library is TPM12 TCG protocol lib.
+#  Provides function interfaces to communicate with TPM 1.2 device
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  This library helps to use TPM 1.2 device in library function API
+#  based on TCG protocol.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -14,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = Tpm12DeviceLibTcg
+  MODULE_UNI_FILE                = Tpm12DeviceLibTcg.uni
  FILE_GUID                      = 4D8B77D9-E923-48f8-B070-4053D78B7E56
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
@@ -1,7 +1,9 @@
 ## @file
-#  This library is used by other modules to send TPM2 command.
+#  Provides some TPM 2.0 commands
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  This library is used by other modules to send TPM 2.0 command.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -14,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = Tpm2CommandLib
+  MODULE_UNI_FILE                = Tpm2CommandLib.uni
  FILE_GUID                      = 2F572F32-8BE5-4868-BD1D-7438AD97DC27
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
@@ -1,8 +1,11 @@
 ## @file
-#  Ihis library is TPM2 DTPM device lib.
-#  Choosing this library means platform uses and only uses DTPM device as TPM2 engine.
+#  Provides TPM 2.0 TIS functions for DTPM
+#  
+#  This library implements TIS (TPM Interface Specification) functions which is 
+#  used for every TPM 2.0 command. Choosing this library means platform uses and 
+#  only uses TPM 2.0 DTPM device.
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -15,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = Tpm2DeviceLibDTpm
+  MODULE_UNI_FILE                = Tpm2DeviceLibDTpm.uni
  FILE_GUID                      = E54A3327-A345-4068-8842-70AC0D519855
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
@@ -42,4 +46,4 @@
  DebugLib

 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress            ## CONSUMES
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
@@ -1,9 +1,10 @@
 ## @file
-#  Ihis library is TPM2 DTPM instance.
-#  It can be registered to Tpm2 Device router, to be active TPM2 engine,
-#  based on platform setting.
+#  Provides a DTPM instance for TPM 2.0
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  This library can be registered to Tpm 2.0 device router, to be active TPM 2.0 
+#  engine, based on platform setting.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -16,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = Tpm2InstanceLibDTpm
+  MODULE_UNI_FILE                = Tpm2InstanceLibDTpm.uni
  FILE_GUID                      = 286BF25A-C2C3-408c-B3B4-25E6758B7317
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
@@ -44,4 +46,4 @@
  DebugLib

 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress        ## CONSUMES
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
@@ -1,9 +1,11 @@
 ## @file
-#  Ihis library is TPM2 device router. Platform can register multi TPM2 instance to it
-#  via PcdTpmInstanceGuid. Platform need make choice that which one will be final one.
-#  At most one TPM2 instance can be finally registered, and other will return unsupported.
+#  Provides TPM 2.0 TIS functions
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  Ihis library is TPM 2.0 device router. Platform can register multi TPM 2.0 instance to
+#  it via PcdTpmInstanceGuid. Platform need make choice that which one will be final one.
+#  At most one TPM 2.0 instance can be finally registered, and other will return unsupported.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -16,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = Tpm2DeviceLibRouterDxe
+  MODULE_UNI_FILE                = Tpm2DeviceLibRouterDxe.uni
  FILE_GUID                      = C3D69D87-5200-4aab-A6DB-2569BA1A92FC
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -41,4 +44,4 @@
  PcdLib

 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid           ## CONSUMES
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
@@ -1,9 +1,11 @@
 ## @file
-#  Ihis library is TPM2 device router. Platform can register multi TPM2 instance to it
-#  via PcdTpmInstanceGuid. Platform need make choice that which one will be final one.
-#  At most one TPM2 instance can be finally registered, and other will return unsupported.
+#  Provides TPM 2.0 TIS functions
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  Ihis library is TPM 2.0 device router. Platform can register multi TPM 2.0 instance to
+#  it via PcdTpmInstanceGuid. Platform need make choice that which one will be final one.
+#  At most one TPM 2.0 instance can be finally registered, and other will return unsupported.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -16,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = Tpm2DeviceLibRouterPei
+  MODULE_UNI_FILE                = Tpm2DeviceLibRouterPei.uni
  FILE_GUID                      = 97CDCF04-4C8E-42fe-8015-11CC8A6E9D81
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0
@@ -42,5 +45,5 @@
  PcdLib

 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid        ## CONSUMES
  
--- a/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf
@@ -1,7 +1,10 @@
 ## @file
-#  Ihis library is TPM2 TREE protocol lib.
+#  Provides function interfaces to communicate with TPM 2.0 device
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  This library helps to use TPM 2.0 device in library function API
+#  based on TrEE protocol.
+#
+# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<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
@@ -14,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = Tpm2DeviceLibTrEE
+  MODULE_UNI_FILE                = Tpm2DeviceLibTrEE.uni
  FILE_GUID                      = BBCB6F85-303C-4eb9-8182-AF98D4B3020C
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
--- a/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
+++ b/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
@@ -1,7 +1,10 @@
 ## @file
-#  TpmCommLib instance implements basis TPM Interface Specification (TIS) and TPM command functions.
+#  Provides some common functions for the TCG feature
 #
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#  This instance provides basic TPM Interface Specification (TIS) functions 
+#  and TPM hashall function.
+#
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<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
@@ -14,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = TpmCommLib
+  MODULE_UNI_FILE                = TpmCommLib.uni
  FILE_GUID                      = 7d9fe32e-a6a9-4cdf-abff-10cc7f22e1c9
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0