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

diff --git a/SecurityPkg/Application/RngTest/RngTest.inf b/SecurityPkg/Application/RngTest/RngTest.inf
index bec78a4c995d51b360c61c7c51a04ea047bc101f..334cff45b0e5a44e3ff1c4b0c5ef5d0db958ba0c 100644 (file)
--- a/SecurityPkg/Application/RngTest/RngTest.inf
+++ b/SecurityPkg/Application/RngTest/RngTest.inf
@@ -1,7 +1,10 @@
 ## @file\r
 #  UEFI RNG (Random Number Generator) Protocol test application.\r
 ## @file\r
 #  UEFI RNG (Random Number Generator) Protocol test application.\r

+#  \r
+#  This application can print out the supported RNG algorithm in UEFI RNG Protocol. \r
+#  And then it will do a generation test on the supported RNG algorithm.  \r

 #\r
 #\r

-#  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2013 - 2014, 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
 #  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


@@ -19,6 +22,7 @@
   MODULE_TYPE                    = UEFI_APPLICATION\r
   VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = UefiMain\r
   MODULE_TYPE                    = UEFI_APPLICATION\r
   VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = UefiMain\r

+  MODULE_UNI_FILE                = RngTest.uni\r

 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r


@@ -39,12 +43,15 @@
   UefiLib\r
 \r
 [Protocols]\r
   UefiLib\r
 \r
 [Protocols]\r

-  gEfiRngProtocolGuid\r
+  gEfiRngProtocolGuid            ## CONSUMES\r

 \r
 [Guids]\r
 \r
 [Guids]\r

-  gEfiRngAlgorithmSp80090Hash256Guid\r
-  gEfiRngAlgorithmSp80090Hmac256Guid\r
-  gEfiRngAlgorithmSp80090Ctr256Guid\r
-  gEfiRngAlgorithmX9313DesGuid\r
-  gEfiRngAlgorithmX931AesGuid\r
-  gEfiRngAlgorithmRaw
\ No newline at end of file
+  gEfiRngAlgorithmSp80090Hash256Guid    ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG\r
+  gEfiRngAlgorithmSp80090Hmac256Guid    ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG\r
+  gEfiRngAlgorithmSp80090Ctr256Guid     ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG\r
+  gEfiRngAlgorithmX9313DesGuid          ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG\r
+  gEfiRngAlgorithmX931AesGuid           ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG\r
+  gEfiRngAlgorithmRaw                   ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG\r
+  \r
+  [UserExtensions.TianoCore."ExtraFiles"]\r
+  RngTestExtra.uni
\ No newline at end of file

diff --git a/SecurityPkg/Application/VariableInfo/VariableInfo.inf b/SecurityPkg/Application/VariableInfo/VariableInfo.inf
index 902ed7f1c5738873c6f3a71a86b61b22552992c5..d4a771a908dd3b4f89f4b0af60d52cc5b5150610 100644 (file)
--- a/SecurityPkg/Application/VariableInfo/VariableInfo.inf
+++ b/SecurityPkg/Application/VariableInfo/VariableInfo.inf
@@ -1,11 +1,12 @@
 ## @file\r
 ## @file\r

-#  This is a shell application that will display statistical information \r
-#  about variable usage.\r
-#  Note that if Variable Dxe driver doesn't enable the feature by setting \r
-#  PcdVariableCollectStatistics as TRUE, The application will not display \r
-#  variable statistical information.\r
+#  A shell application that displays statistical information about variable usage\r

 #\r
 #\r

-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#  This application can display statistical information about variable usage for SMM variable\r
+#  driver and non-SMM variable driver.\r
+#  Note that if Variable Dxe driver doesn't enable the feature by setting PcdVariableCollectStatistics\r
+#  as TRUE, the application will not display variable statistical information.\r
+#\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -18,6 +19,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VariableInfo\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VariableInfo\r

+  MODULE_UNI_FILE                = VariableInfo.uni\r

   FILE_GUID                      = B9EF901F-A2A2-4fc8-8D2B-3A2E07B301CC\r
   MODULE_TYPE                    = UEFI_APPLICATION\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = B9EF901F-A2A2-4fc8-8D2B-3A2E07B301CC\r
   MODULE_TYPE                    = UEFI_APPLICATION\r
   VERSION_STRING                 = 1.0\r


@@ -46,9 +48,16 @@
   MemoryAllocationLib\r
 \r
 [Protocols]\r
   MemoryAllocationLib\r
 \r
 [Protocols]\r

-  gEfiSmmCommunicationProtocolGuid\r
-  gEfiSmmVariableProtocolGuid\r
+  gEfiSmmCommunicationProtocolGuid     ## SOMETIMES_CONSUMES\r
+  \r
+    ## UNDEFINED           # Used to do smm communication\r
+    ## SOMETIMES_CONSUMES \r
+  gEfiSmmVariableProtocolGuid \r

   \r
 [Guids]\r
   \r
 [Guids]\r

-  gEfiAuthenticatedVariableGuid        ## CONSUMES ## Configuration Table Guid\r
-  gEfiVariableGuid                     ## CONSUMES ## Configuration Table Guid\r
+  gEfiAuthenticatedVariableGuid        ## SOMETIMES_CONSUMES    ## SystemTable\r
+  gEfiVariableGuid                     ## CONSUMES              ## SystemTable\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  VariableInfoExtra.uni\r
+  
\ No newline at end of file

diff --git a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf b/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
index dcd5c6128e5b21acce1780e297252931345744c3..8297230bed08e68a0c8549cf59343ca3e16f8dcd 100644 (file)
--- a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
+++ b/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
@@ -1,7 +1,11 @@
 ## @file\r
 ## @file\r

-#  The library instance provides security service of deferring image load.\r
+#  Provides security service of deferred image load\r

 #\r
 #\r

-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  The platform may need to defer the execution of an image because of security \r
+#  considerations. These deferred images will be recorded and then reported by \r
+#  installing an instance of the EFI_DEFERRED_IMAGE_LOAD_PROTOCOL.\r
+#\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -13,7 +17,8 @@
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r

-  BASE_NAME                      = DxeDeferImageLoadLib   \r
+  BASE_NAME                      = DxeDeferImageLoadLib\r
+  MODULE_UNI_FILE                = DxeDeferImageLoadLib.uni\r

   FILE_GUID                      = 5E2FAE1F-41DA-4fbd-BC81-603CE5CD8497\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 5E2FAE1F-41DA-4fbd-BC81-603CE5CD8497\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -48,14 +53,16 @@
   PcdLib \r
 \r
 [Protocols]\r
   PcdLib \r
 \r
 [Protocols]\r

-  gEfiFirmwareVolume2ProtocolGuid\r
-  gEfiBlockIoProtocolGuid\r
-  gEfiSimpleFileSystemProtocolGuid\r
+  gEfiFirmwareVolume2ProtocolGuid                        ## SOMETIMES_CONSUMES\r
+  gEfiBlockIoProtocolGuid                                ## SOMETIMES_CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid                       ## SOMETIMES_CONSUMES\r
+  gEfiDeferredImageLoadProtocolGuid                      ## SOMETIMES_PRODUCES\r
+  ## SOMETIMES_CONSUMES\r
+  ## NOTIFY\r

   gEfiUserManagerProtocolGuid\r
   gEfiUserManagerProtocolGuid\r

-  gEfiDeferredImageLoadProtocolGuid\r
-  \r
+   \r

 [Guids]\r
 [Guids]\r

-  gEfiGlobalVariableGuid\r
+  gEfiGlobalVariableGuid                                  ## SOMETIMES_CONSUMES  ## Variable:L"BootOrder"\r

   \r
 [Pcd]\r
   \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdDeferImageLoadPolicy\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdDeferImageLoadPolicy   ## SOMETIMES_CONSUMES\r

diff --git a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf b/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
index 43608007e91428bd4d7ccc448a8231a6a397a2ac..62fcdaacc6a5686b285021ed94ae91fdc206cd0f 100644 (file)
--- a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
+++ b/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
@@ -1,9 +1,9 @@
 ## @file\r
 ## @file\r

-#  The library instance provides security service of image authentication \r
-#  status check in UEFI2.3.1.\r
+#  Provides security service of image authentication status check\r
+#\r

 #  Authentication Status Library module supports UEFI2.3.1\r
 #\r
 #  Authentication Status Library module supports UEFI2.3.1\r
 #\r

-# Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2012 - 2014, 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
 # 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


@@ -15,7 +15,8 @@
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r

-  BASE_NAME                      = DxeImageAuthenticationStatusLib   \r
+  BASE_NAME                      = DxeImageAuthenticationStatusLib\r
+  MODULE_UNI_FILE                = DxeImageAuthenticationStatusLib.uni\r

   FILE_GUID                      = EB92D1DE-7C36-4680-BB88-A67E96049F72\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = EB92D1DE-7C36-4680-BB88-A67E96049F72\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
index 0e6a5d1ce6a41e03afabdd18f1ab8c32e5843ee6..ab580aaf57fdb357a2c64832ab6df724d3824843 100644 (file)
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
@@ -1,13 +1,14 @@
 ## @file\r
 ## @file\r

-#  The library instance provides security service of image verification.\r
-#  Image verification Library module supports UEFI2.3.1\r
+#  Provides security service of image verification\r
+#\r
+#  This library hooks LoadImage() API to verify every image by the verification policy.\r

 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This library will have external input - PE/COFF image.\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This library will have external input - PE/COFF image.\r

-#  This external input must be validated carefully to avoid security issue like\r
-#  buffer overflow, integer overflow.\r
+#  This external input must be validated carefully to avoid security issues such as\r
+#  buffer overflow or integer overflow.\r

 #\r
 #\r

-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -19,7 +20,8 @@
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r

-  BASE_NAME                      = DxeImageVerificationLib   \r
+  BASE_NAME                      = DxeImageVerificationLib\r
+  MODULE_UNI_FILE                = DxeImageVerificationLib.uni\r

   FILE_GUID                      = 0CA970E1-43FA-4402-BC0A-81AF336BFFD6\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 0CA970E1-43FA-4402-BC0A-81AF336BFFD6\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -58,20 +60,30 @@
   TpmMeasurementLib\r
 \r
 [Protocols]\r
   TpmMeasurementLib\r
 \r
 [Protocols]\r

-  gEfiFirmwareVolume2ProtocolGuid\r
-  gEfiBlockIoProtocolGuid\r
-  gEfiSimpleFileSystemProtocolGuid\r
-  \r
+  gEfiFirmwareVolume2ProtocolGuid       ## SOMETIMES_CONSUMES\r
+  gEfiBlockIoProtocolGuid               ## SOMETIMES_CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid      ## SOMETIMES_CONSUMES\r
+\r

 [Guids]\r
 [Guids]\r

-  gEfiCertTypeRsa2048Sha256Guid\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DB"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DBX"\r
+  ## PRODUCES             ## SystemTable\r
+  ## CONSUMES             ## SystemTable\r

   gEfiImageSecurityDatabaseGuid\r
   gEfiImageSecurityDatabaseGuid\r

+\r
+  ## SOMETIMES_CONSUMES   ## GUID       # Unique ID for the type of the signature.\r
+  ## SOMETIMES_PRODUCES   ## GUID       # Unique ID for the type of the signature.\r

   gEfiCertSha1Guid\r
   gEfiCertSha1Guid\r

+  \r
+  ## SOMETIMES_CONSUMES   ## GUID       # Unique ID for the type of the signature.\r
+  ## SOMETIMES_PRODUCES   ## GUID       # Unique ID for the type of the signature.\r

   gEfiCertSha256Guid\r
   gEfiCertSha256Guid\r

-  gEfiCertX509Guid\r
-  gEfiCertRsa2048Guid\r
-  gEfiCertPkcs7Guid\r
+\r
+  gEfiCertX509Guid                      ## SOMETIMES_CONSUMES    ## GUID     # Unique ID for the type of the signature.\r
+  gEfiCertPkcs7Guid                     ## SOMETIMES_CONSUMES    ## GUID     # Unique ID for the type of the certificate.\r

   \r
 [Pcd]\r
   \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy          ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy     ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy         ## SOMETIMES_CONSUMES\r
+  
\ No newline at end of file

diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
index d700ed2e83caaf7ea5bf1115649dc78dfdd2dea1..ed6b03f958b7c7df90cec5d6015b3a50ce078b26 100644 (file)
--- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
+++ b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
@@ -1,12 +1,15 @@
 ## @file\r
 ## @file\r

-# TCG physical presence library instance. This library will lock\r
-# TPM after executing TPM request.\r
+#  Executes pending TPM 1.2 requests from OS or BIOS and Locks TPM\r
+#\r
+#  This library will check and execute TPM 1.2 request from OS or BIOS. The request may\r
+#  ask for user confirmation before execution. This Library will also lock TPM physical \r
+#  presence at last.\r

 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable.\r
 #  This external input must be validated carefully to avoid security issue.\r
 #\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable.\r
 #  This external input must be validated carefully to avoid security issue.\r
 #\r

-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -18,7 +21,8 @@
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r

-  BASE_NAME                      = DxeTcgPhysicalPresenceLib   \r
+  BASE_NAME                      = DxeTcgPhysicalPresenceLib\r
+  MODULE_UNI_FILE                = DxeTcgPhysicalPresenceLib.uni\r

   FILE_GUID                      = EBC43A46-34AC-4F07-A7F5-A5394619361C\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = EBC43A46-34AC-4F07-A7F5-A5394619361C\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -52,8 +56,13 @@
   HiiLib\r
 \r
 [Protocols]\r
   HiiLib\r
 \r
 [Protocols]\r

-  gEfiTcgProtocolGuid\r
-  gEdkiiVariableLockProtocolGuid\r
+  gEfiTcgProtocolGuid                   ## CONSUMES\r
+  gEdkiiVariableLockProtocolGuid        ## CONSUMES\r

 \r
 [Guids]\r
 \r
 [Guids]\r

+  ## CONSUMES           ## HII\r
+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"\r
+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresenceFlags"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresenceFlags"\r

   gEfiPhysicalPresenceGuid\r
   gEfiPhysicalPresenceGuid\r

diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
index 4dfd62bd7747cf9238ba96a9b979ccce2a2b51a6..c007d7cf5d962974aa31b387603c0e20ee6c907f 100644 (file)
--- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
+++ b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
@@ -1,12 +1,15 @@
 ## @file\r
 ## @file\r

-#  The library instance provides security service of TPM2 measure boot.\r
+#  Provides security service for TPM 2.0 measured boot\r
+#\r
+#  This library instance hooks LoadImage() API to measure every image that \r
+#  is not measured in PEI phase. And, it will also measure GPT partition.\r

 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This library will have external input - PE/COFF image and GPT partition.\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This library will have external input - PE/COFF image and GPT partition.\r

-#  This external input must be validated carefully to avoid security issue like\r
-#  buffer overflow, integer overflow.\r
+#  This external input must be validated carefully to avoid security issues such \r
+#  as buffer overflow or integer overflow.\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -19,6 +22,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DxeTpm2MeasureBootLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DxeTpm2MeasureBootLib\r

+  MODULE_UNI_FILE                = DxeTpm2MeasureBootLib.uni\r

   FILE_GUID                      = 778CE4F4-36BD-4ae7-B8F0-10B420B0D174\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 778CE4F4-36BD-4ae7-B8F0-10B420B0D174\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -53,11 +57,11 @@
   HobLib\r
 \r
 [Guids]\r
   HobLib\r
 \r
 [Guids]\r

-  gMeasuredFvHobGuid\r
+  gMeasuredFvHobGuid                    ## SOMETIMES_CONSUMES ## HOB\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiTrEEProtocolGuid                   ## CONSUMES\r
-  gEfiFirmwareVolumeBlockProtocolGuid   ## CONSUMES\r
-  gEfiBlockIoProtocolGuid               ## CONSUMES\r
-  gEfiDiskIoProtocolGuid                ## CONSUMES\r
+  gEfiTrEEProtocolGuid                  ## SOMETIMES_CONSUMES\r
+  gEfiFirmwareVolumeBlockProtocolGuid   ## SOMETIMES_CONSUMES\r
+  gEfiBlockIoProtocolGuid               ## SOMETIMES_CONSUMES\r
+  gEfiDiskIoProtocolGuid                ## SOMETIMES_CONSUMES\r

 \r
 \r

diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
index 8552c1299665038b5334cebe81a9826f18afde58..57a0108e1d16ca6af550969d065c8f3a3eb1d70b 100644 (file)
--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
+++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
@@ -1,12 +1,15 @@
 ## @file\r
 ## @file\r

-#  The library instance provides security service of TPM measure boot.\r
+#  Provides security service for TPM 1.2 measured boot\r
+#\r
+#  This library instance hooks LoadImage() API to measure every image that \r
+#  is not measured in PEI phase. And, it will also measure GPT partition.\r

 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This library will have external input - PE/COFF image and GPT partition.\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This library will have external input - PE/COFF image and GPT partition.\r

-#  This external input must be validated carefully to avoid security issue like\r
-#  buffer overflow, integer overflow.\r
+#  This external input must be validated carefully to avoid security issues such \r
+#  as buffer overflow or integer overflow.\r

 #\r
 #\r

-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -19,6 +22,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DxeTpmMeasureBootLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DxeTpmMeasureBootLib\r

+  MODULE_UNI_FILE                = DxeTpmMeasureBootLib.uni\r

   FILE_GUID                      = 6C60C7D0-922A-4b7c-87D7-E503EDD73BBF\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 6C60C7D0-922A-4b7c-87D7-E503EDD73BBF\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -53,11 +57,11 @@
   HobLib\r
 \r
 [Guids]\r
   HobLib\r
 \r
 [Guids]\r

-  gMeasuredFvHobGuid\r
+  gMeasuredFvHobGuid                    ## SOMETIMES_CONSUMES ## HOB\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiTcgProtocolGuid                   ## CONSUMES\r
-  gEfiFirmwareVolumeBlockProtocolGuid   ## CONSUMES\r
-  gEfiBlockIoProtocolGuid               ## CONSUMES\r
-  gEfiDiskIoProtocolGuid                ## CONSUMES\r
+  gEfiTcgProtocolGuid                   ## SOMETIMES_CONSUMES\r
+  gEfiFirmwareVolumeBlockProtocolGuid   ## SOMETIMES_CONSUMES\r
+  gEfiBlockIoProtocolGuid               ## SOMETIMES_CONSUMES\r
+  gEfiDiskIoProtocolGuid                ## SOMETIMES_CONSUMES\r

 \r
 \r

diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
index 75cc7730700b96f83aeb160089278264faba9c23..d99e48cea8a417248134dff9bb525cc32852370f 100644 (file)
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+++ b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
@@ -1,7 +1,10 @@
 ## @file\r
 ## @file\r

-#  This library is used by other modules to measure data to TPM 1.2 or TPM 2.0.\r
+#  Provides TPM measurement functions for TPM1.2 and TPM 2.0\r
+# \r
+#  This library provides TpmMeasureAndLogData() to to measure and log data, and \r
+#  extend the measurement result into a specific PCR.\r

 #\r
 #\r

-# Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2012 - 2014, 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
 # 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


@@ -18,6 +21,7 @@
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = TpmMeasurementLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = TpmMeasurementLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r

+  MODULE_UNI_FILE                = DxeTpmMeasurementLib.uni\r

 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r


@@ -40,5 +44,5 @@
   UefiBootServicesTableLib\r
 \r
 [Protocols]\r
   UefiBootServicesTableLib\r
 \r
 [Protocols]\r

-  gEfiTcgProtocolGuid\r
-  gEfiTrEEProtocolGuid\r
+  gEfiTcgProtocolGuid           ## SOMETIMES_CONSUMES\r
+  gEfiTrEEProtocolGuid          ## SOMETIMES_CONSUMES\r

diff --git a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf b/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
index 3ef9a82a4f1b5e74e12697057e7b5b3947ec9560..5d062ae72b41a738b979b8c673bbff66fcabdb6e 100644 (file)
--- a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
+++ b/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
@@ -1,11 +1,14 @@
 ## @file\r
 ## @file\r

-# TrEE physical presence library instance. This library will execute TPM2 request.\r
+#  Executes TPM 2.0 requests from OS or BIOS\r
+#\r
+#  This library will check and execute TPM 2.0 request from OS or BIOS. The request may\r
+#  ask for user confirmation before execution.\r

 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable.\r
 #  This external input must be validated carefully to avoid security issue.\r
 #\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable.\r
 #  This external input must be validated carefully to avoid security issue.\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -17,7 +20,8 @@
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r

-  BASE_NAME                      = DxeTrEEPhysicalPresenceLib   \r
+  BASE_NAME                      = DxeTrEEPhysicalPresenceLib\r
+  MODULE_UNI_FILE                = DxeTrEEPhysicalPresenceLib.uni\r

   FILE_GUID                      = 601ECB06-7874-489e-A280-805780F6C861\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 601ECB06-7874-489e-A280-805780F6C861\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -52,8 +56,13 @@
   Tpm2CommandLib\r
 \r
 [Protocols]\r
   Tpm2CommandLib\r
 \r
 [Protocols]\r

-  gEfiTrEEProtocolGuid\r
-  gEdkiiVariableLockProtocolGuid\r
+  gEfiTrEEProtocolGuid                 ## CONSUMES\r
+  gEdkiiVariableLockProtocolGuid       ## CONSUMES\r

 \r
 [Guids]\r
 \r
 [Guids]\r

+  ## CONSUMES           ## HII\r
+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"\r
+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresenceFlags"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresenceFlags"\r

   gEfiTrEEPhysicalPresenceGuid\r
   gEfiTrEEPhysicalPresenceGuid\r

diff --git a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf b/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
index d5fe6fe2b7aa3fdebac62947793d0cb4fd113f72..588c5f1ac4e63d0e866d42c190eba155f9a23534 100644 (file)
--- a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
+++ b/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
@@ -1,8 +1,9 @@
 ## @file\r
 ## @file\r

-#  Ihis library is BaseCrypto SHA1 hash instance.\r
-#  It can be registered to BaseCrypto router, to serve as hash engine.\r
+#  Provides BaseCrypto SHA1 hash service\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  This library can be registered to BaseCrypto router, to serve as hash engine.\r
+#\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -15,6 +16,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashInstanceLibSha1\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashInstanceLibSha1\r

+  MODULE_UNI_FILE                = HashInstanceLibSha1.uni\r

   FILE_GUID                      = 9A7A6AB4-9DA6-4aa4-90CB-6D4B79EDA7B9\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 9A7A6AB4-9DA6-4aa4-90CB-6D4B79EDA7B9\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

diff --git a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf b/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
index a1fb891242fd9493b69e9f57306f8f8c0662498e..a4b2ccf9e215a023b8f103ccf65582ff18c9003a 100644 (file)
--- a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
+++ b/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
@@ -1,8 +1,9 @@
 ## @file\r
 ## @file\r

-#  Ihis library is BaseCrypto SHA256 hash instance.\r
-#  It can be registered to BaseCrypto router, to serve as hash engine.\r
+#  Provides BaseCrypto SHA256 hash service\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  This library can be registered to BaseCrypto router, to serve as hash engine.\r
+#\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -15,6 +16,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashInstanceLibSha256\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashInstanceLibSha256\r

+  MODULE_UNI_FILE                = HashInstanceLibSha256.uni\r

   FILE_GUID                      = 5810798A-ED30-4080-8DD7-B9667A748C02\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 5810798A-ED30-4080-8DD7-B9667A748C02\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
index a797c0563524461ac66238481ab9baa3bad8089f..133ef09ba5013306bc50d6bce7d01ce06197c9ca 100644 (file)
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
@@ -1,9 +1,11 @@
 ## @file\r
 ## @file\r

+#  Provides hash service by registered hash handler\r
+#\r

 #  Ihis library is BaseCrypto router. It will redirect hash request to each individual\r
 #  Ihis library is BaseCrypto router. It will redirect hash request to each individual\r

-#  hash handler registerd, such as SHA1, SHA256.\r
-#  Platform can use PcdTpm2HashMask to mask some hash engines.\r
+#  hash handler registered, such as SHA1, SHA256. Platform can use PcdTpm2HashMask to \r
+#  mask some hash engines.\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -16,6 +18,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashLibBaseCryptoRouterDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashLibBaseCryptoRouterDxe\r

+  MODULE_UNI_FILE                = HashLibBaseCryptoRouterDxe.uni\r

   FILE_GUID                      = 158DC712-F15A-44dc-93BB-1675045BE066\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 158DC712-F15A-44dc-93BB-1675045BE066\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -45,5 +48,5 @@
   PcdLib\r
 \r
 [Pcd]\r
   PcdLib\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask       ## CONSUMES\r

 \r
 \r

diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
index 0926a5964ef8f4359afb9d0735bf97f286bb2260..13067ee36c38941d299e4a3f9b60a320c36c89fa 100644 (file)
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
@@ -1,7 +1,9 @@
 ## @file\r
 ## @file\r

+#  Provides hash service by registered hash handler\r
+#\r

 #  Ihis library is BaseCrypto router. It will redirect hash request to each individual\r
 #  Ihis library is BaseCrypto router. It will redirect hash request to each individual\r

-#  hash handler registerd, such as SHA1, SHA256.\r
-#  Platform can use PcdTpm2HashMask to mask some hash engines.\r
+#  hash handler registered, such as SHA1, SHA256. Platform can use PcdTpm2HashMask to \r
+#  mask some hash engines.\r

 #\r
 # Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 #\r
 # Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r


@@ -16,6 +18,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashLibBaseCryptoRouterPei\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashLibBaseCryptoRouterPei\r

+  MODULE_UNI_FILE                = HashLibBaseCryptoRouterPei.uni\r

   FILE_GUID                      = DDCBCFBA-8EEB-488a-96D6-097831A6E50B\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = DDCBCFBA-8EEB-488a-96D6-097831A6E50B\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r


@@ -46,5 +49,5 @@
   HobLib\r
 \r
 [Pcd]\r
   HobLib\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask        ## CONSUMES\r

 \r
 \r

diff --git a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf b/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf
index ffcc8b9e2c6dbbd55fdaebb184f92dd38cdd9763..f807cc7f3d3a8bbe72498a824f171774b4e74a69 100644 (file)
--- a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf
+++ b/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf
@@ -1,7 +1,10 @@
 ## @file\r
 ## @file\r

-#  Ihis library uses TPM2 device to calculation hash.\r
+#  Provides hash service using TPM2 device\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  This library uses TPM2 device to calculate hash. Platform can use PcdTpm2HashMask to \r
+#  mask some hash calculation.\r
+#\r
+# Copyright (c) 2014, 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
 # 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


@@ -14,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashLibTpm2\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = HashLibTpm2\r

+  MODULE_UNI_FILE                = HashLibTpm2.uni\r

   FILE_GUID                      = 1317F0D5-7842-475c-B1CA-6EDC20DCBE7D\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 1317F0D5-7842-475c-B1CA-6EDC20DCBE7D\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r


@@ -42,4 +46,4 @@
   PcdLib\r
 \r
 [Pcd]\r
   PcdLib\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask         ## CONSUMES\r

diff --git a/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf b/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
index 4380fdeb8f4413674a59db6d7b762cc2fd2582d5..7a5229d039232165909bfb61c03aba0951fc65ba 100644 (file)
--- a/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
+++ b/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
@@ -1,10 +1,12 @@
 ## @file\r
 ## @file\r

+#  NULL platform secure library instance that alway returns TRUE for a user physical present\r
+#\r

 #  NULL PlatformSecureLib instance does NOT really detect whether a physical present \r
 #  NULL PlatformSecureLib instance does NOT really detect whether a physical present \r

-#  user exists but return TRUE directly. This instance can be used to verify security\r
+#  user exists but returns TRUE directly. This instance can be used to verify security\r

 #  related features during platform enabling and development. It should be replaced\r
 #  by a platform-specific method(e.g. Button pressed) in a real platform for product.\r
 #\r
 #  related features during platform enabling and development. It should be replaced\r
 #  by a platform-specific method(e.g. Button pressed) in a real platform for product.\r
 #\r

-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2014, 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
 # 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


@@ -17,6 +19,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PlatformSecureLibNull\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PlatformSecureLibNull\r

+  MODULE_UNI_FILE                = PlatformSecureLibNull.uni\r

   FILE_GUID                      = 7FA68D82-10A4-4e71-9524-D3D9500D3CDF\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 7FA68D82-10A4-4e71-9524-D3D9500D3CDF\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf b/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
index 622eb2b41502eb4e7d5d4d97bcf296709c5afb1c..91ffbb62f54c6107c44b77ef6c528c7f3553e15d 100644 (file)
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
+++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
@@ -1,7 +1,9 @@
 ## @file\r
 ## @file\r

-#  This library is used by other modules to send TPM12 command.\r
+#  Provides some TPM 1.2 commands\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  This library is used by other modules to send TPM 1.2 command.\r
+#\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -14,6 +16,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm12CommandLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm12CommandLib\r

+  MODULE_UNI_FILE                = Tpm12CommandLib.uni\r

   FILE_GUID                      = C595047C-70B3-4731-99CC-A014E956D7A7\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = C595047C-70B3-4731-99CC-A014E956D7A7\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

diff --git a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf b/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
index 0eb91eee4ec84df8e2d379971ec93347eaa72393..30b399499ee0ed923701563c536a001906184e73 100644 (file)
--- a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
+++ b/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
@@ -1,8 +1,11 @@
 ## @file\r
 ## @file\r

-#  Ihis library is TPM2 DTPM device lib.\r
-#  Choosing this library means platform uses and only uses DTPM device as TPM2 engine.\r
+#  Provides TPM 1.2 TIS functions\r
+#  \r
+#  This library implements TIS (TPM Interface Specification) functions which is \r
+#  used for every TPM 1.2 command. Choosing this library means platform uses and \r
+#  only uses TPM 1.2 device.\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -15,6 +18,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm12DeviceLibDTpm\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm12DeviceLibDTpm\r

+  MODULE_UNI_FILE                = Tpm12DeviceLibDTpm.uni\r

   FILE_GUID                      = BC2B7672-A48B-4d58-B39E-AEE3707B5A23\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = BC2B7672-A48B-4d58-B39E-AEE3707B5A23\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r


@@ -41,4 +45,4 @@
   DebugLib\r
 \r
 [Pcd]\r
   DebugLib\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress
\ No newline at end of file
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress               ## CONSUMES
\ No newline at end of file

diff --git a/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf b/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
index 7ab5217bcfd7cedae67fa905035eea1e1b42775e..76ea4924a46b915d5546a5defc37ca00e1f119f3 100644 (file)
--- a/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
+++ b/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
@@ -1,7 +1,10 @@
 ## @file\r
 ## @file\r

-#  Ihis library is TPM12 TCG protocol lib.\r
+#  Provides function interfaces to communicate with TPM 1.2 device\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  This library helps to use TPM 1.2 device in library function API\r
+#  based on TCG protocol.\r
+#\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -14,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm12DeviceLibTcg\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm12DeviceLibTcg\r

+  MODULE_UNI_FILE                = Tpm12DeviceLibTcg.uni\r

   FILE_GUID                      = 4D8B77D9-E923-48f8-B070-4053D78B7E56\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 4D8B77D9-E923-48f8-B070-4053D78B7E56\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf b/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
index 804f063429e7973fa2bc8c75b78694c3d4768267..bc95ce7fa615454740b5b015fa9348462ba806fa 100644 (file)
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
@@ -1,7 +1,9 @@
 ## @file\r
 ## @file\r

-#  This library is used by other modules to send TPM2 command.\r
+#  Provides some TPM 2.0 commands\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  This library is used by other modules to send TPM 2.0 command.\r
+#\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -14,6 +16,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2CommandLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2CommandLib\r

+  MODULE_UNI_FILE                = Tpm2CommandLib.uni\r

   FILE_GUID                      = 2F572F32-8BE5-4868-BD1D-7438AD97DC27\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 2F572F32-8BE5-4868-BD1D-7438AD97DC27\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
index 78df432b60e75ba6e7326a042156df0f6d708b92..2d41e7ccd2ee251e0434407105aaf46dbb40da35 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
@@ -1,8 +1,11 @@
 ## @file\r
 ## @file\r

-#  Ihis library is TPM2 DTPM device lib.\r
-#  Choosing this library means platform uses and only uses DTPM device as TPM2 engine.\r
+#  Provides TPM 2.0 TIS functions for DTPM\r
+#  \r
+#  This library implements TIS (TPM Interface Specification) functions which is \r
+#  used for every TPM 2.0 command. Choosing this library means platform uses and \r
+#  only uses TPM 2.0 DTPM device.\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -15,6 +18,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2DeviceLibDTpm\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2DeviceLibDTpm\r

+  MODULE_UNI_FILE                = Tpm2DeviceLibDTpm.uni\r

   FILE_GUID                      = E54A3327-A345-4068-8842-70AC0D519855\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = E54A3327-A345-4068-8842-70AC0D519855\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r


@@ -42,4 +46,4 @@
   DebugLib\r
 \r
 [Pcd]\r
   DebugLib\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress            ## CONSUMES\r

diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
index a4d8068dff45fbcdfd3822478fbf507b5c354461..2a8f78beeb605de3ad77710c561af698a56736ff 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
@@ -1,9 +1,10 @@
 ## @file\r
 ## @file\r

-#  Ihis library is TPM2 DTPM instance.\r
-#  It can be registered to Tpm2 Device router, to be active TPM2 engine,\r
-#  based on platform setting.\r
+#  Provides a DTPM instance for TPM 2.0\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  This library can be registered to Tpm 2.0 device router, to be active TPM 2.0 \r
+#  engine, based on platform setting.\r
+#\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -16,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2InstanceLibDTpm\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2InstanceLibDTpm\r

+  MODULE_UNI_FILE                = Tpm2InstanceLibDTpm.uni\r

   FILE_GUID                      = 286BF25A-C2C3-408c-B3B4-25E6758B7317\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 286BF25A-C2C3-408c-B3B4-25E6758B7317\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r


@@ -44,4 +46,4 @@
   DebugLib\r
 \r
 [Pcd]\r
   DebugLib\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress        ## CONSUMES\r

diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
index 2e699887e3f5d2c683a2b0a6cf16afc2daa6d09a..b69e2a768d86d0789d243dd7f5945e7989a00cf7 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
@@ -1,9 +1,11 @@
 ## @file\r
 ## @file\r

-#  Ihis library is TPM2 device router. Platform can register multi TPM2 instance to it\r
-#  via PcdTpmInstanceGuid. Platform need make choice that which one will be final one.\r
-#  At most one TPM2 instance can be finally registered, and other will return unsupported.\r
+#  Provides TPM 2.0 TIS functions\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Ihis library is TPM 2.0 device router. Platform can register multi TPM 2.0 instance to\r
+#  it via PcdTpmInstanceGuid. Platform need make choice that which one will be final one.\r
+#  At most one TPM 2.0 instance can be finally registered, and other will return unsupported.\r
+#\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -16,6 +18,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2DeviceLibRouterDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2DeviceLibRouterDxe\r

+  MODULE_UNI_FILE                = Tpm2DeviceLibRouterDxe.uni\r

   FILE_GUID                      = C3D69D87-5200-4aab-A6DB-2569BA1A92FC\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = C3D69D87-5200-4aab-A6DB-2569BA1A92FC\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -41,4 +44,4 @@
   PcdLib\r
 \r
 [Pcd]\r
   PcdLib\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid           ## CONSUMES\r

diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
index dbdfc3dec8a7adba12d7e523d6e8494be327c8ef..b1a850f6caa2230844a147c4f128fe9145a3e64d 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
@@ -1,9 +1,11 @@
 ## @file\r
 ## @file\r

-#  Ihis library is TPM2 device router. Platform can register multi TPM2 instance to it\r
-#  via PcdTpmInstanceGuid. Platform need make choice that which one will be final one.\r
-#  At most one TPM2 instance can be finally registered, and other will return unsupported.\r
+#  Provides TPM 2.0 TIS functions\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Ihis library is TPM 2.0 device router. Platform can register multi TPM 2.0 instance to\r
+#  it via PcdTpmInstanceGuid. Platform need make choice that which one will be final one.\r
+#  At most one TPM 2.0 instance can be finally registered, and other will return unsupported.\r
+#\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -16,6 +18,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2DeviceLibRouterPei\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2DeviceLibRouterPei\r

+  MODULE_UNI_FILE                = Tpm2DeviceLibRouterPei.uni\r

   FILE_GUID                      = 97CDCF04-4C8E-42fe-8015-11CC8A6E9D81\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 97CDCF04-4C8E-42fe-8015-11CC8A6E9D81\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r


@@ -42,5 +45,5 @@
   PcdLib\r
 \r
 [Pcd]\r
   PcdLib\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid        ## CONSUMES\r

   
\ No newline at end of file
   
\ No newline at end of file

diff --git a/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf b/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf
index 684b1f136df996607961b87bef82a5173f76b578..81195e67047b0618ebc9c0b24c14ad009e55c7de 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf
+++ b/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf
@@ -1,7 +1,10 @@
 ## @file\r
 ## @file\r

-#  Ihis library is TPM2 TREE protocol lib.\r
+#  Provides function interfaces to communicate with TPM 2.0 device\r

 #\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  This library helps to use TPM 2.0 device in library function API\r
+#  based on TrEE protocol.\r
+#\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -14,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2DeviceLibTrEE\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Tpm2DeviceLibTrEE\r

+  MODULE_UNI_FILE                = Tpm2DeviceLibTrEE.uni\r

   FILE_GUID                      = BBCB6F85-303C-4eb9-8182-AF98D4B3020C\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = BBCB6F85-303C-4eb9-8182-AF98D4B3020C\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

diff --git a/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf b/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
index 7188a3b165b83b150422c41c5ab1ee2603d3fa66..7f05f597118ed7638dfb78f671bcec11d1b95a21 100644 (file)
--- a/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
+++ b/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
@@ -1,7 +1,10 @@
 ## @file\r
 ## @file\r

-#  TpmCommLib instance implements basis TPM Interface Specification (TIS) and TPM command functions.\r
+#  Provides some common functions for the TCG feature\r

 #\r
 #\r

-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#  This instance provides basic TPM Interface Specification (TIS) functions \r
+#  and TPM hashall function.\r
+#\r
+# Copyright (c) 2006 - 2014, 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
 # 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


@@ -14,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TpmCommLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TpmCommLib\r

+  MODULE_UNI_FILE                = TpmCommLib.uni\r

   FILE_GUID                      = 7d9fe32e-a6a9-4cdf-abff-10cc7f22e1c9\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 7d9fe32e-a6a9-4cdf-abff-10cc7f22e1c9\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r

diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf b/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
index 553dbf5cce71824955597969eb165e1997007fa3..d57c2d8c6f3480f89211b625c4f7d257cf64e791 100644 (file)
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
+++ b/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
@@ -1,5 +1,5 @@
 ## @file\r
 ## @file\r

-#  Module that produces the UEFI Random Number Generator protocol.\r
+#  Produces the UEFI Random Number Generator protocol\r

 #\r
 #  This module will leverage Intel Secure Key technology to produce the Random\r
 #  Number Generator protocol, which is used to provide high-quality random numbers\r
 #\r
 #  This module will leverage Intel Secure Key technology to produce the Random\r
 #  Number Generator protocol, which is used to provide high-quality random numbers\r


@@ -8,7 +8,7 @@
 #  -generator-drng-software-implementation-guide/ for more information about Intel\r
 #  Secure Key technology.\r
 #\r
 #  -generator-drng-software-implementation-guide/ for more information about Intel\r
 #  Secure Key technology.\r
 #\r

-#  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2013 - 2014, 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
 #  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


@@ -26,6 +26,7 @@
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = RngDriverEntry\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = RngDriverEntry\r

+  MODULE_UNI_FILE                = RngDxe.uni\r

 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r


@@ -63,18 +64,17 @@
   TimerLib\r
 \r
 [Guids]\r
   TimerLib\r
 \r
 [Guids]\r

-  gEfiRngAlgorithmSp80090Hash256Guid\r
-  gEfiRngAlgorithmSp80090Hmac256Guid\r
-  gEfiRngAlgorithmSp80090Ctr256Guid\r
-  gEfiRngAlgorithmX9313DesGuid\r
-  gEfiRngAlgorithmX931AesGuid\r
-  gEfiRngAlgorithmRaw\r
+  gEfiRngAlgorithmSp80090Ctr256Guid   ## SOMETIMES_PRODUCES    ## GUID        # Unique ID of the algorithm for RNG\r
+  gEfiRngAlgorithmRaw                 ## SOMETIMES_PRODUCES    ## GUID        # Unique ID of the algorithm for RNG\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiRngProtocolGuid             ## PRODUCES\r
+  gEfiRngProtocolGuid                ## PRODUCES\r

 \r
 [Depex]\r
   TRUE\r
 \r
 [BuildOptions]\r
   XCODE:*_*_*_CC_FLAGS = -mmmx -msse\r
 \r
 [Depex]\r
   TRUE\r
 \r
 [BuildOptions]\r
   XCODE:*_*_*_CC_FLAGS = -mmmx -msse\r

+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  RngDxeExtra.uni
\ No newline at end of file

diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
index 1aa296b47c27699252b9c1f2a8767dfc6023cb42..78e3f9b1cd465bd2c67b33844dd86397549d5a0c 100644 (file)
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
+++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
@@ -1,7 +1,9 @@
 ## @file\r
 ## @file\r

-#  Component description file for Memory Overwrite Control driver.\r
+#  Initilizes MemoryOverwriteRequestControl variable\r

 #\r
 #\r

-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  This module will clear MOR_CLEAR_MEMORY_BIT bit if it is set.\r
+#\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -14,6 +16,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgMor\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgMor\r

+  MODULE_UNI_FILE                = TcgMor.uni\r

   FILE_GUID                      = AD416CE3-A483-45b1-94C2-4B4E4D575562\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = AD416CE3-A483-45b1-94C2-4B4E4D575562\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -42,10 +45,13 @@
   UefiLib\r
 \r
 [Guids]\r
   UefiLib\r
 \r
 [Guids]\r

-  gEfiMemoryOverwriteControlDataGuid            # GUID ALWAYS_CONSUMED\r
+  ## SOMETIMES_CONSUMES      ## Variable:L"MemoryOverwriteRequestControl"\r
+  ## PRODUCES                ## Variable:L"MemoryOverwriteRequestControl"\r
+  gEfiMemoryOverwriteControlDataGuid\r

 \r
 [Depex]\r
   gEfiVariableArchProtocolGuid AND\r
 \r
 [Depex]\r
   gEfiVariableArchProtocolGuid AND\r

-  gEfiVariableWriteArchProtocolGuid AND\r
-  ( gEfiTcgProtocolGuid OR gEfiTrEEProtocolGuid )\r
+  gEfiVariableWriteArchProtocolGuid\r

 \r
 \r

+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TcgMorExtra.uni\r

diff --git a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf b/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
index da4e032299c9ca31df7d7902abb7959ffbd7af41..cac1abea348c96a7c28388a222f6d4a7f7a83f54 100644 (file)
--- a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
+++ b/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
@@ -1,7 +1,11 @@
 ## @file\r
 ## @file\r

-#  Component description file for physical presence PEI module.\r
+#  Produces a PPI to indicate whether to lock TPM in PEI phase\r

 #\r
 #\r

-# Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#  This module produces PEI_LOCK_PHYSICAL_PRESENCE_PPI to indicate whether\r
+#  TPM physical presence needs to be locked. It can be replaced by a \r
+#  platform specific module.\r
+#\r
+# Copyright (c) 2005 - 2014, 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
 # 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


@@ -15,6 +19,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PhysicalPresencePei\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PhysicalPresencePei\r

+  MODULE_UNI_FILE                = PhysicalPresencePei.uni\r

   FILE_GUID                      = 4FE772E8-FE3E-4086-B638-8C493C490488\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 4FE772E8-FE3E-4086-B638-8C493C490488\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r


@@ -40,16 +45,20 @@
   PeiServicesLib\r
 \r
 [Ppis]\r
   PeiServicesLib\r
 \r
 [Ppis]\r

-  gPeiLockPhysicalPresencePpiGuid\r
-  gEfiPeiReadOnlyVariable2PpiGuid\r
+  gPeiLockPhysicalPresencePpiGuid                       ## PRODUCES\r
+  gEfiPeiReadOnlyVariable2PpiGuid                       ## CONSUMES\r

 \r
 [Guids]\r
 \r
 [Guids]\r

-  gEfiPhysicalPresenceGuid\r
+  gEfiPhysicalPresenceGuid                              ## SOMETIMES_CONSUMES    ## Variable:L"PhysicalPresence"\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence  ## SOMETIMES_CONSUMES\r

 \r
 [Depex] \r
   gEfiPeiMemoryDiscoveredPpiGuid AND\r
   gEfiPeiReadOnlyVariable2PpiGuid AND\r
   gPeiTpmInitializedPpiGuid\r
 \r
 [Depex] \r
   gEfiPeiMemoryDiscoveredPpiGuid AND\r
   gEfiPeiReadOnlyVariable2PpiGuid AND\r
   gPeiTpmInitializedPpiGuid\r

+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  PhysicalPresencePeiExtra.uni\r
+  
\ No newline at end of file

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
index ba62017413d42b7bad71c7454e911eac6959c269..bd655c8870b7f0c6506626d50fdb1014e3ed6f87 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
@@ -1,5 +1,6 @@
 ## @file\r
 ## @file\r

-#  Component name for Tcg configuration module.\r
+#  Provides the capability to update TPM state setup browser\r
+#  By this module, user may enable/disable/activate/deactivate/clear TPM, etc.\r

 #\r
 # Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 #\r
 # Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r


@@ -14,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgConfigDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgConfigDxe\r

+  MODULE_UNI_FILE                = TcgConfigDxe.uni\r

   FILE_GUID                      = 1FA4DAFE-FA5D-4d75-BEA6-5863862C520A\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 1FA4DAFE-FA5D-4d75-BEA6-5863862C520A\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -53,21 +55,29 @@
   TpmCommLib\r
 \r
 [Guids]\r
   TpmCommLib\r
 \r
 [Guids]\r

+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"\r

   gEfiPhysicalPresenceGuid\r
   gEfiPhysicalPresenceGuid\r

-  gEfiIfrTianoGuid\r
+  \r
+  gEfiIfrTianoGuid                                    ## SOMETIMES_PRODUCES  ## GUID       # HII opcode\r
+  ## PRODUCES            ## HII\r
+  ## CONSUMES            ## HII\r

   gTcgConfigFormSetGuid\r
   gTcgConfigFormSetGuid\r

-  gEfiTpmDeviceInstanceTpm12Guid\r
+  gEfiTpmDeviceInstanceTpm12Guid                      ## CONSUMES     ## GUID       # TPM device identifier\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
-  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES\r
-  gEfiTcgProtocolGuid                           ## CONSUMES\r
+  gEfiHiiConfigAccessProtocolGuid                     ## PRODUCES\r
+  gEfiDevicePathProtocolGuid                          ## PRODUCES\r
+  gEfiTcgProtocolGuid                                 ## CONSUMES\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid    ## CONSUMES\r

 \r
 [Depex]\r
   gEfiHiiConfigRoutingProtocolGuid  AND\r
   gEfiHiiDatabaseProtocolGuid       AND\r
   gEfiVariableArchProtocolGuid      AND\r
 \r
 [Depex]\r
   gEfiHiiConfigRoutingProtocolGuid  AND\r
   gEfiHiiDatabaseProtocolGuid       AND\r
   gEfiVariableArchProtocolGuid      AND\r

-  gEfiVariableWriteArchProtocolGuid
\ No newline at end of file
+  gEfiVariableWriteArchProtocolGuid\r
+  \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TcgConfigDxeExtra.uni\r

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf b/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
index 40984291f868b954634b8f5600ee19984a4e2058..6cb49124a85062c1de3e5f5506d72a355b3b1677 100644 (file)
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
@@ -1,8 +1,8 @@
 ## @file\r
 ## @file\r

-#  Component file for module TcgDxe.\r
+#  Produces TCG protocol and measures boot environment\r

 #  This module will produce TCG protocol and measure boot environment.\r
 #\r
 #  This module will produce TCG protocol and measure boot environment.\r
 #\r

-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2014, 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
 # 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


@@ -15,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgDxe\r

+  MODULE_UNI_FILE                = TcgDxe.uni\r

   FILE_GUID                      = A5683620-7998-4bb2-A377-1C1E31E1E215\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = A5683620-7998-4bb2-A377-1C1E31E1E215\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -52,29 +53,33 @@
   PcdLib\r
 \r
 [Guids]\r
   PcdLib\r
 \r
 [Guids]\r

-  gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED\r
-  gEfiGlobalVariableGuid                        # ALWAYS_CONSUMED\r
-  gTcgEventEntryHobGuid\r
-  gEfiEventReadyToBootGuid\r
-  gEfiEventExitBootServicesGuid\r
-  gEventExitBootServicesFailedGuid              # ALWAYS_CONSUMED\r
-  gEfiTpmDeviceInstanceTpm12Guid\r
+  ## SOMETIMES_CONSUMES     ## SystemTable           # Smbios Table\r
+  ## SOMETIMES_CONSUMES     ## GUID                  # Handoff Table for measurement.\r
+  gEfiSmbiosTableGuid\r
+  \r
+  gEfiGlobalVariableGuid                             ## SOMETIMES_CONSUMES  ## Variable:L"BootXXXX"\r
+  gTcgEventEntryHobGuid                              ## SOMETIMES_CONSUMES  ## HOB\r
+  gEfiEventExitBootServicesGuid                      ## CONSUMES            ## Event\r
+  gEventExitBootServicesFailedGuid                   ## SOMETIMES_CONSUMES  ## Event\r
+  gEfiTpmDeviceInstanceTpm12Guid                     ## PRODUCES            ## GUID       # TPM device identifier\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiTcgProtocolGuid                           ## PRODUCES\r
-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiMpServiceProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-\r
+  gEfiTcgProtocolGuid                                ## PRODUCES\r
+  gEfiAcpiTableProtocolGuid                          ## NOTIFY\r
+  gEfiMpServiceProtocolGuid                          ## SOMETIMES_CONSUMES\r
+  \r

 [Pcd]\r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass              ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid               ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId             ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId        ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision       ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId         ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision   ## SOMETIMES_CONSUMES\r

 \r
 [Depex]\r
   TRUE\r
 \r
 \r
 [Depex]\r
   TRUE\r
 \r

+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TcgDxeExtra.uni\r
+  
\ No newline at end of file

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index d05a5b7b438905e566b9f0b5703de21df9103b0d..c68c9056cfe7964ab0e85c4807360a82dd1c441f 100644 (file)
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -1,5 +1,8 @@
 ## @file\r
 ## @file\r

-#  This module will initialize TPM device and measure FVs in PEI phase.\r
+#  Initializes TPM device and measures FVs in PEI phase\r
+#\r
+#  This module will initialize TPM device, measure reported FVs and BIOS version.\r
+#  This module may also lock TPM physical presence and physicalPresenceLifetimeLock.\r

 #\r
 # Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 #\r
 # Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r


@@ -14,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgPei\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgPei\r

+  MODULE_UNI_FILE                = TcgPei.uni\r

   FILE_GUID                      = 2BE1E4A6-6505-43b3-9FFC-A3C8330E0432\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 2BE1E4A6-6505-43b3-9FFC-A3C8330E0432\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r


@@ -24,6 +28,9 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

+# [BootMode]\r
+#   S3_RESUME                 ## SOMETIMES_CONSUMES\r
+#\r

 \r
 [Sources]\r
   TcgPei.c\r
 \r
 [Sources]\r
   TcgPei.c\r


@@ -51,29 +58,33 @@
   MemoryAllocationLib\r
 \r
 [Guids]\r
   MemoryAllocationLib\r
 \r
 [Guids]\r

-  gTcgEventEntryHobGuid\r
-  gMeasuredFvHobGuid\r
-  gEfiTpmDeviceInstanceTpm12Guid\r
+  gTcgEventEntryHobGuid                                               ## PRODUCES               ## HOB\r
+  gMeasuredFvHobGuid                                                  ## PRODUCES               ## HOB\r
+  gEfiTpmDeviceInstanceTpm12Guid                                      ## PRODUCES               ## GUID       # TPM device identifier\r

 \r
 [Ppis]\r
 \r
 [Ppis]\r

-  gPeiLockPhysicalPresencePpiGuid\r
-  gEfiPeiFirmwareVolumeInfoPpiGuid\r
-  gEfiPeiFirmwareVolumeInfo2PpiGuid\r
-  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid\r
-  gPeiTpmInitializedPpiGuid\r
-  gEfiEndOfPeiSignalPpiGuid\r
+  gPeiLockPhysicalPresencePpiGuid                                     ## SOMETIMES_CONSUMES     ## NOTIFY\r
+  gEfiPeiFirmwareVolumeInfoPpiGuid                                    ## SOMETIMES_CONSUMES     ## NOTIFY\r
+  gEfiPeiFirmwareVolumeInfo2PpiGuid                                   ## SOMETIMES_CONSUMES     ## NOTIFY\r
+  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid                 ## SOMETIMES_CONSUMES\r
+  gPeiTpmInitializedPpiGuid                                           ## PRODUCES\r
+  gEfiEndOfPeiSignalPpiGuid                                           ## SOMETIMES_CONSUMES     ## NOTIFY\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceLifetimeLock\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceCmdEnable\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceHwEnable\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString             ## CONSUMES\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceLifetimeLock       ## SOMETIMES_CONSUMES \r
+  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceCmdEnable          ## SOMETIMES_CONSUMES \r
+  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceHwEnable           ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString             ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                    ## CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy            ## CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy                     ## SOMETIMES_CONSUMES\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES\r
 \r
 [Depex]\r
   gEfiPeiMasterBootModePpiGuid AND\r
   gEfiPeiReadOnlyVariable2PpiGuid AND\r
   gEfiTpmDeviceSelectedGuid\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES\r
 \r
 [Depex]\r
   gEfiPeiMasterBootModePpiGuid AND\r
   gEfiPeiReadOnlyVariable2PpiGuid AND\r
   gEfiTpmDeviceSelectedGuid\r

+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TcgPeiExtra.uni\r
+  
\ No newline at end of file

diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf b/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
index 5a862b41b2ef743fa69d6736bf4b2077d4f40c53..f39e089bede0ac40fa6172e40cd2235c092211c1 100644 (file)
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
+++ b/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
@@ -1,13 +1,15 @@
 ## @file\r
 ## @file\r

-#  This driver implements TPM definition block in ACPI table and \r
-#  registers SMI callback functions for physical presence and \r
-#  MemoryClear to handle the requests from ACPI method.\r
+#  Implements ACPI metholds for the TCG feature\r
+#\r
+#  This driver implements TPM definition block in ACPI table and registers SMI \r
+#  callback functions for physical presence and MemoryClear to handle the requests \r
+#  from ACPI method.\r

 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable and ACPINvs data in SMM mode.\r
 #  This external input must be validated carefully to avoid security issue.\r
 #\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable and ACPINvs data in SMM mode.\r
 #  This external input must be validated carefully to avoid security issue.\r
 #\r

-# Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2014, 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
 # 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


@@ -20,6 +22,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgSmm\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TcgSmm\r

+  MODULE_UNI_FILE                = TcgSmm.uni\r

   FILE_GUID                      = 42293093-76B9-4482-8C02-3BEFDEA9B35D\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r
   FILE_GUID                      = 42293093-76B9-4482-8C02-3BEFDEA9B35D\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r


@@ -48,21 +51,32 @@
   PcdLib\r
 \r
 [Guids]\r
   PcdLib\r
 \r
 [Guids]\r

+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresenceFlags"\r

   gEfiPhysicalPresenceGuid\r
   gEfiPhysicalPresenceGuid\r

+\r
+  ## SOMETIMES_PRODUCES ## Variable:L"MemoryOverwriteRequestControl"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"MemoryOverwriteRequestControl"\r

   gEfiMemoryOverwriteControlDataGuid\r
   gEfiMemoryOverwriteControlDataGuid\r

-  gEfiTpmDeviceInstanceTpm12Guid\r
+  \r
+  gEfiTpmDeviceInstanceTpm12Guid                        ## PRODUCES           ## GUID       # TPM device identifier\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiSmmSwDispatch2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiSmmVariableProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiSmmSwDispatch2ProtocolGuid                        ## CONSUMES\r
+  gEfiSmmVariableProtocolGuid                           ## CONSUMES\r
+  gEfiAcpiTableProtocolGuid                             ## CONSUMES\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid      ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId    ## SOMETIMES_CONSUMES\r

 \r
 [Depex]\r
   gEfiAcpiTableProtocolGuid AND\r
   gEfiSmmSwDispatch2ProtocolGuid AND\r
   gEfiSmmVariableProtocolGuid AND\r
 \r
 [Depex]\r
   gEfiAcpiTableProtocolGuid AND\r
   gEfiSmmSwDispatch2ProtocolGuid AND\r
   gEfiSmmVariableProtocolGuid AND\r

-  gEfiTcgProtocolGuid
\ No newline at end of file
+  gEfiTcgProtocolGuid\r
+  \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TcgSmmExtra.uni\r
+  
\ No newline at end of file

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
index 042ad878d6a9c8356a964a71ec7db541b2e0897d..9935e40497c9fba5656af604926cbc0ed9e59171 100644 (file)
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
@@ -1,8 +1,10 @@
 ## @file\r
 ## @file\r

-#  Component name for TrEE configuration module.\r
+#  TPM device configuration for TPM 2.0\r
+#  \r
+#  By this module, user may select TPM device, clear TPM state, etc.\r

 #  NOTE: This module is only for reference only, each platform should have its own setup page.\r
 #\r
 #  NOTE: This module is only for reference only, each platform should have its own setup page.\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -15,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEEConfigDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEEConfigDxe\r

+  MODULE_UNI_FILE                = TrEEConfigDxe.uni\r

   FILE_GUID                      = 3141FD4D-EA02-4a70-9BCE-97EE837319AC\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 3141FD4D-EA02-4a70-9BCE-97EE837319AC\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -52,24 +55,34 @@
   PcdLib\r
   PrintLib\r
   Tpm2DeviceLib\r
   PcdLib\r
   PrintLib\r
   Tpm2DeviceLib\r

-  Tpm12DeviceLib\r

   Tpm2CommandLib\r
 \r
 [Guids]\r
   Tpm2CommandLib\r
 \r
 [Guids]\r

+  ## SOMETIMES_PRODUCES ## Variable:L"TrEEPhysicalPresence"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"TrEEPhysicalPresence"\r

   gEfiTrEEPhysicalPresenceGuid\r
   gEfiTrEEPhysicalPresenceGuid\r

+  \r
+  ## PRODUCES           ## HII\r
+  ## SOMETIMES_PRODUCES ## Variable:L"TREE_CONFIGURATION"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"TREE_CONFIGURATION"\r
+  ## PRODUCES           ## Variable:L"TREE_DEVICE_DETECTION"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"TREE_DEVICE_DETECTION"\r

   gTrEEConfigFormSetGuid\r
 \r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
   gTrEEConfigFormSetGuid\r
 \r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r

-  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES\r
+  gEfiDevicePathProtocolGuid                    ## PRODUCES\r

   gEdkiiVariableLockProtocolGuid                ## CONSUMES\r
 \r
 [Pcd]\r
   gEdkiiVariableLockProtocolGuid                ## CONSUMES\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid            ## CONSUMES\r

 \r
 [Depex]\r
   gEfiTrEEProtocolGuid              AND\r
   gEfiHiiConfigRoutingProtocolGuid  AND\r
   gEfiHiiDatabaseProtocolGuid       AND\r
   gEfiVariableArchProtocolGuid      AND\r
 \r
 [Depex]\r
   gEfiTrEEProtocolGuid              AND\r
   gEfiHiiConfigRoutingProtocolGuid  AND\r
   gEfiHiiDatabaseProtocolGuid       AND\r
   gEfiVariableArchProtocolGuid      AND\r

-  gEfiVariableWriteArchProtocolGuid
\ No newline at end of file
+  gEfiVariableWriteArchProtocolGuid\r
+  \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TrEEConfigDxeExtra.uni
\ No newline at end of file

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
index c3a8435391d1cff72b57dba0cada7b3ec26c35e8..31807cb06eff56238d636a052ab997f081909629 100644 (file)
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
@@ -1,5 +1,7 @@
 ## @file\r
 ## @file\r

-#  Component name for TrEE configuration module.\r
+#  Set TPM device type\r
+#\r
+#  This module initializes TPM device type based on variable and detection.\r

 #  NOTE: This module is only for reference only, each platform should have its own setup page.\r
 #\r
 # Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  NOTE: This module is only for reference only, each platform should have its own setup page.\r
 #\r
 # Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r


@@ -15,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEEConfigPei\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEEConfigPei\r

+  MODULE_UNI_FILE                = TrEEConfigPei.uni\r

   FILE_GUID                      = A5C1EF72-9379-4370-B4C7-0F5126CAC38E\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = A5C1EF72-9379-4370-B4C7-0F5126CAC38E\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r


@@ -23,6 +26,9 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

+# [BootMode]\r
+#   S3_RESUME                 ## SOMETIMES_CONSUMES\r
+#\r

 \r
 [Sources]\r
   TrEEConfigPeim.c\r
 \r
 [Sources]\r
   TrEEConfigPeim.c\r


@@ -48,19 +54,23 @@
   Tpm12DeviceLib\r
 \r
 [Guids]\r
   Tpm12DeviceLib\r
 \r
 [Guids]\r

-  gEfiTrEEPhysicalPresenceGuid\r
+  ## SOMETIMES_CONSUMES ## Variable:L"TREE_CONFIGURATION"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"TREE_DEVICE_DETECTION"\r

   gTrEEConfigFormSetGuid\r
   gTrEEConfigFormSetGuid\r

-  gEfiTpmDeviceSelectedGuid\r
+  gEfiTpmDeviceSelectedGuid           ## PRODUCES             ## GUID    # Used as a PPI GUID\r

 \r
 [Ppis]\r
 \r
 [Ppis]\r

-  gEfiPeiReadOnlyVariable2PpiGuid\r
+  gEfiPeiReadOnlyVariable2PpiGuid     ## CONSUMES\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                 ## PRODUCES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy         ## PRODUCES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection                ## CONSUMES \r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress                  ## SOMETIMES_CONSUMES\r

 \r
 [Depex]\r
   gEfiPeiMasterBootModePpiGuid AND\r
 \r
 [Depex]\r
   gEfiPeiMasterBootModePpiGuid AND\r

-  gEfiPeiReadOnlyVariable2PpiGuid
\ No newline at end of file
+  gEfiPeiReadOnlyVariable2PpiGuid\r
+  \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TrEEConfigPeiExtra.uni
\ No newline at end of file

diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
index a1f174192b38b87f3b311a7a7ba368904fd1bc60..ef8505cf393db1bfc66e839f9c6be79333eef8c7 100644 (file)
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
+++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
@@ -1,5 +1,5 @@
 ## @file\r
 ## @file\r

-#  Component file for module TrEEDxe.\r
+#  Produces TrEE protocol and measure boot environment\r

 #  This module will produce TrEE protocol and measure boot environment.\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This module will produce TrEE protocol and measure boot environment.\r
 #\r
 #  Caution: This module requires additional review when modified.\r


@@ -7,7 +7,7 @@
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -20,6 +20,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEEDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEEDxe\r

+  MODULE_UNI_FILE                = TrEEDxe.uni\r

   FILE_GUID                      = 2A7946E3-1AB2-49a9-ACCB-C6275139C1A5\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 2A7946E3-1AB2-49a9-ACCB-C6275139C1A5\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -58,34 +59,45 @@
   PerformanceLib\r
 \r
 [Guids]\r
   PerformanceLib\r
 \r
 [Guids]\r

-  gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED\r
-  gEfiGlobalVariableGuid                        # ALWAYS_CONSUMED\r
-  gTcgEventEntryHobGuid\r
-  gEfiEventReadyToBootGuid\r
-  gEfiEventExitBootServicesGuid\r
-  gEventExitBootServicesFailedGuid              # ALWAYS_CONSUMED\r
+  ## SOMETIMES_CONSUMES     ## SystemTable           # Smbios Table\r
+  ## SOMETIMES_CONSUMES     ## GUID                  # Handoff Table for measurement.\r
+  gEfiSmbiosTableGuid\r
+  \r
+  ## SOMETIMES_CONSUMES     ## Variable:L"SecureBoot"\r
+  ## SOMETIMES_CONSUMES     ## Variable:L"PK"\r
+  ## SOMETIMES_CONSUMES     ## Variable:L"KEK"\r
+  ## SOMETIMES_CONSUMES     ## Variable:L"BootXXXX"\r
+  gEfiGlobalVariableGuid\r
+\r
+  ## SOMETIMES_CONSUMES      ## Variable:L"db"\r
+  ## SOMETIMES_CONSUMES      ## Variable:L"dbx"\r

   gEfiImageSecurityDatabaseGuid\r
   gEfiImageSecurityDatabaseGuid\r

-  gEfiTpmDeviceInstanceNoneGuid\r
-  gEfiTpmDeviceInstanceTpm12Guid\r
+    \r
+  gTcgEventEntryHobGuid                              ## SOMETIMES_CONSUMES  ## HOB\r
+  gEfiEventExitBootServicesGuid                      ## CONSUMES            ## Event\r
+  gEventExitBootServicesFailedGuid                   ## SOMETIMES_CONSUMES  ## Event\r
+  gEfiTpmDeviceInstanceNoneGuid                      ## SOMETIMES_CONSUMES  ## GUID       # TPM device identifier\r
+  gEfiTpmDeviceInstanceTpm12Guid                     ## SOMETIMES_CONSUMES  ## GUID       # TPM device identifier\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiTrEEProtocolGuid                          ## PRODUCES\r
-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiMpServiceProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiTrEEProtocolGuid                               ## PRODUCES\r
+  gEfiAcpiTableProtocolGuid                          ## NOTIFY\r
+  gEfiMpServiceProtocolGuid                          ## SOMETIMES_CONSUMES\r
+  gEfiVariableWriteArchProtocolGuid                  ## NOTIFY\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdFirmwareDebuggerInitialized\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass                         ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdFirmwareDebuggerInitialized              ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                          ## CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress                           ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId                        ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId                   ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision                  ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId                    ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision              ## SOMETIMES_CONSUMES\r

 \r
 [Depex]\r
   TRUE\r
 \r
 \r
 [Depex]\r
   TRUE\r
 \r

+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TrEEDxeExtra.uni\r

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
index cf53ad124d0f2cacc0a2249075e36b2f04affb21..faa9fb33b0b6b2c82297e49e65486d811004d61e 100644 (file)
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
@@ -1,5 +1,7 @@
 ## @file\r
 ## @file\r

-#  This module will initialize TPM2 device and measure FVs in PEI phase.\r
+#  Initializes TPM 2.0 device and measure FVs in PEI phase\r
+#\r
+#  This module will initialize TPM device, measure reported FVs and BIOS version.\r

 #\r
 # Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 #\r
 # Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r


@@ -14,6 +16,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEEPei\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEEPei\r

+  MODULE_UNI_FILE                = TrEEPei.uni\r

   FILE_GUID                      = CA5A1928-6523-409d-A9FE-5DCC87387222\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = CA5A1928-6523-409d-A9FE-5DCC87387222\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r


@@ -24,6 +27,9 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

+# [BootMode]\r
+#   S3_RESUME                 ## SOMETIMES_CONSUMES\r
+#\r

 \r
 [Sources]\r
   TrEEPei.c\r
 \r
 [Sources]\r
   TrEEPei.c\r


@@ -47,27 +53,30 @@
   MemoryAllocationLib\r
 \r
 [Guids]\r
   MemoryAllocationLib\r
 \r
 [Guids]\r

-  gTcgEventEntryHobGuid\r
-  gMeasuredFvHobGuid\r
-  gEfiTpmDeviceInstanceNoneGuid\r
-  gEfiTpmDeviceInstanceTpm12Guid\r
+  gTcgEventEntryHobGuid                                                ## PRODUCES               ## HOB\r
+  gMeasuredFvHobGuid                                                   ## PRODUCES               ## HOB\r
+  gEfiTpmDeviceInstanceNoneGuid                                        ## SOMETIMES_PRODUCES     ## GUID       # TPM device identifier\r
+  gEfiTpmDeviceInstanceTpm12Guid                                       ## SOMETIMES_PRODUCES     ## GUID       # TPM device identifier\r

 \r
 [Ppis]\r
 \r
 [Ppis]\r

-  gEfiPeiFirmwareVolumeInfoPpiGuid\r
-  gEfiPeiFirmwareVolumeInfo2PpiGuid\r
-  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid\r
-  gPeiTpmInitializedPpiGuid\r
-  gEfiEndOfPeiSignalPpiGuid\r
+  gEfiPeiFirmwareVolumeInfoPpiGuid                                     ## SOMETIMES_CONSUMES     ## NOTIFY\r
+  gEfiPeiFirmwareVolumeInfo2PpiGuid                                    ## SOMETIMES_CONSUMES     ## NOTIFY\r
+  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid                  ## SOMETIMES_CONSUMES\r
+  gPeiTpmInitializedPpiGuid                                            ## PRODUCES\r
+  gEfiEndOfPeiSignalPpiGuid                                            ## SOMETIMES_CONSUMES     ## NOTIFY\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString             ## CONSUMES\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2InitializationPolicy\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2SelfTestPolicy\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString              ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                     ## CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2InitializationPolicy            ## CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2SelfTestPolicy                  ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy                     ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported              ## CONSUMES\r

 \r
 [Depex]\r
   gEfiPeiMasterBootModePpiGuid AND\r
   gEfiPeiReadOnlyVariable2PpiGuid AND\r
   gEfiTpmDeviceSelectedGuid\r
 \r
 [Depex]\r
   gEfiPeiMasterBootModePpiGuid AND\r
   gEfiPeiReadOnlyVariable2PpiGuid AND\r
   gEfiTpmDeviceSelectedGuid\r

+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TrEEPeiExtra.uni
\ No newline at end of file

diff --git a/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf b/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
index bb251d423a6053482144f06c8df91efa7bd570ce..0436ba5c51776bd2a86e9affa013335399e06b41 100644 (file)
--- a/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
+++ b/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
@@ -1,5 +1,7 @@
 ## @file\r
 ## @file\r

-#  This driver implements TPM2 definition block in ACPI table and \r
+#  Provides ACPI metholds for TPM 2.0 support\r
+#\r
+#  This driver implements TPM 2.0 definition block in ACPI table and \r

 #  registers SMI callback functions for TrEE physical presence and \r
 #  MemoryClear to handle the requests from ACPI method.\r
 #\r
 #  registers SMI callback functions for TrEE physical presence and \r
 #  MemoryClear to handle the requests from ACPI method.\r
 #\r


@@ -7,7 +9,7 @@
 #  This driver will have external input - variable and ACPINvs data in SMM mode.\r
 #  This external input must be validated carefully to avoid security issue.\r
 #\r
 #  This driver will have external input - variable and ACPINvs data in SMM mode.\r
 #  This external input must be validated carefully to avoid security issue.\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -20,6 +22,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEESmm\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEESmm\r

+  MODULE_UNI_FILE                = TrEESmm.uni\r

   FILE_GUID                      = 114B7105-6CC9-453c-BADC-16DF227BB4EF\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r
   FILE_GUID                      = 114B7105-6CC9-453c-BADC-16DF227BB4EF\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r


@@ -48,24 +51,34 @@
   Tpm2DeviceLib\r
 \r
 [Guids]\r
   Tpm2DeviceLib\r
 \r
 [Guids]\r

+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresenceFlags"\r

   gEfiTrEEPhysicalPresenceGuid\r
   gEfiTrEEPhysicalPresenceGuid\r

+\r
+  ## SOMETIMES_PRODUCES ## Variable:L"MemoryOverwriteRequestControl"\r
+  ## SOMETIMES_CONSUMES ## Variable:L"MemoryOverwriteRequestControl"  \r

   gEfiMemoryOverwriteControlDataGuid\r
   gEfiMemoryOverwriteControlDataGuid\r

-  gEfiTpmDeviceInstanceTpm20DtpmGuid\r
+  \r
+  gEfiTpmDeviceInstanceTpm20DtpmGuid                            ## PRODUCES           ## GUID       # TPM device identifier\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiSmmSwDispatch2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiSmmVariableProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiSmmSwDispatch2ProtocolGuid                                ## CONSUMES\r
+  gEfiSmmVariableProtocolGuid                                   ## CONSUMES\r
+  gEfiAcpiTableProtocolGuid                                     ## CONSUMES\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid              ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId            ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId       ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision      ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId        ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision  ## SOMETIMES_CONSUMES\r

 \r
 [Depex]\r
   gEfiAcpiTableProtocolGuid AND\r
   gEfiSmmSwDispatch2ProtocolGuid AND\r
   gEfiSmmVariableProtocolGuid\r
 \r
 [Depex]\r
   gEfiAcpiTableProtocolGuid AND\r
   gEfiSmmSwDispatch2ProtocolGuid AND\r
   gEfiSmmVariableProtocolGuid\r

+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TrEESmmExtra.uni
\ No newline at end of file

diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
index 541fff11feeccc33939e055aa3379ea3beeaa74a..07e6163e8bf391af4408df6489ff4db94ebb553d 100644 (file)
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
+++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
@@ -1,7 +1,8 @@
 ## @file\r
 ## @file\r

-#  Component description file for Password Credential Provider.\r
+#  Provides a password credential provider implementation\r
+#  This module provides a password credential provider implementation.\r

 #\r
 #\r

-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -14,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PwdCredentialProvider\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PwdCredentialProvider\r

+  MODULE_UNI_FILE                = PwdCredentialProvider.uni\r

   FILE_GUID                      = D6C589EA-DD29-49ef-97F6-1A9FE19A04E0\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = D6C589EA-DD29-49ef-97F6-1A9FE19A04E0\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -44,11 +46,20 @@
   BaseCryptLib\r
   \r
 [Guids]\r
   BaseCryptLib\r
   \r
 [Guids]\r

-  gEfiUserCredentialClassPasswordGuid           ## CONSUMES ## Guid\r
-  gPwdCredentialProviderGuid                    ## PRODUCES ## Guid\r
-\r
+  gEfiUserCredentialClassPasswordGuid           ## SOMETIMES_CONSUMES          ## GUID\r
+  \r
+  ## PRODUCES             ## Variable:L"PwdCredential"\r
+  ## CONSUMES             ## Variable:L"PwdCredential"\r
+  ## CONSUMES             ## HII\r
+  ## SOMETIMES_CONSUMES   ## GUID               #  The credential provider identifier\r
+  gPwdCredentialProviderGuid\r
+  \r

 [Protocols]\r
 [Protocols]\r

-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiConfigAccessProtocolGuid\r
-  gEfiUserCredential2ProtocolGuid\r
-  gEfiUserManagerProtocolGuid
\ No newline at end of file
+  gEfiDevicePathProtocolGuid                    ## PRODUCES\r
+  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
+  gEfiUserCredential2ProtocolGuid               ## PRODUCES\r
+  gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES\r
+  \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  PwdCredentialProviderExtra.uni\r
+  
\ No newline at end of file

diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
index 02f803036285627d2c9ce5b20382125e400f0f03..87a66fbea0a0c7cc8515eccdbc2ad4ffd153e92a 100644 (file)
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
+++ b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
@@ -1,7 +1,11 @@
 ## @file\r
 ## @file\r

-#  Component description file for USB Credential Provider.\r
+#  Provides a USB credential provider implementation\r

 #\r
 #\r

-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#  This module reads a token from a token file that is saved in the root \r
+#  folder of a USB stick. The token file name can be specified by the PCD\r
+#  PcdFixedUsbCredentialProviderTokenFileName.\r
+#\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -14,6 +18,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = UsbCredentialProvider\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = UsbCredentialProvider\r

+  MODULE_UNI_FILE                = UsbCredentialProvider.uni\r

   FILE_GUID                      = 672A0C68-2BF0-46f9-93C3-C4E7DC0FA555\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 672A0C68-2BF0-46f9-93C3-C4E7DC0FA555\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -42,17 +47,24 @@
   BaseCryptLib\r
   \r
 [Guids]\r
   BaseCryptLib\r
   \r
 [Guids]\r

-  gUsbCredentialProviderGuid                    ## PRODUCES ## Guid\r
-  gEfiFileInfoGuid                              ## CONSUMES ## Guid\r
-  gEfiUserCredentialClassSecureCardGuid         ## CONSUMES ## Guid\r
+  ## PRODUCES             ## Variable:L"UsbCredential"\r
+  ## CONSUMES             ## Variable:L"UsbCredential"\r
+  ## CONSUMES             ## HII\r
+  ## SOMETIMES_CONSUMES   ## GUID               # The credential provider identifier\r
+  gUsbCredentialProviderGuid\r
+  \r
+  gEfiFileInfoGuid                              ## SOMETIMES_CONSUMES         ## GUID\r
+  gEfiUserCredentialClassSecureCardGuid         ## SOMETIMES_CONSUMES         ## GUID\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdFixedUsbCredentialProviderTokenFileName\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdFixedUsbCredentialProviderTokenFileName    ## SOMETIMES_CONSUMES \r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiUserCredential2ProtocolGuid\r
-  gEfiUserManagerProtocolGuid\r
-  gEfiBlockIoProtocolGuid\r
-  gEfiSimpleFileSystemProtocolGuid\r
+  gEfiUserCredential2ProtocolGuid               ## PRODUCES\r
+  gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES\r
+  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES\r
+  \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  UsbCredentialProviderExtra.uni\r

   
\ No newline at end of file
   
\ No newline at end of file

diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
index 4963c09d6f0c1c1f420ecf2f2579dc5ee05d3638..ac23818660a6ebc380513d4f27467299373cbc1c 100644 (file)
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
+++ b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
@@ -1,7 +1,9 @@
 ## @file\r
 ## @file\r

-#  Component description file for user identify manager driver.\r
+#  Produces user manager protocol\r
+#\r
+#  This module manages user information and produces user manager protocol.\r

 # \r
 # \r

-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -14,6 +16,7 @@
 [defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = UserIdentifyManager\r
 [defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = UserIdentifyManager\r

+  MODULE_UNI_FILE                = UserIdentifyManager.uni\r

   FILE_GUID                      = C5D3191B-27D5-4873-8DF2-628136991A21\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = C5D3191B-27D5-4873-8DF2-628136991A21\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -43,22 +46,34 @@
   UefiLib\r
 \r
 [Guids]\r
   UefiLib\r
 \r
 [Guids]\r

-  gEfiIfrTianoGuid                              ## CONSUMES ## Guid\r
-  gEfiEventUserProfileChangedGuid               ## CONSUMES ## Guid \r
-  gUserIdentifyManagerGuid                      ## PRODUCES ## Guid\r
+  gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES  ## GUID\r
+  gEfiEventUserProfileChangedGuid               ## SOMETIMES_PRODUCES  ## Event\r
+  \r
+  ## SOMETIMES_PRODUCES                         ## Variable:L"Userxxxx"\r
+  ## SOMETIMES_CONSUMES                         ## Variable:L"Userxxxx"\r
+  ## CONSUMES                                   ## HII\r
+  gUserIdentifyManagerGuid\r

 \r
 [Protocols]\r
   gEfiFormBrowser2ProtocolGuid                  ## CONSUMES\r
   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES\r
 \r
 [Protocols]\r
   gEfiFormBrowser2ProtocolGuid                  ## CONSUMES\r
   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES\r

-  gEfiUserCredential2ProtocolGuid               ## CONSUMES\r
-  gEfiDeferredImageLoadProtocolGuid             ## CONSUMES\r
+  gEfiUserCredential2ProtocolGuid               ## SOMETIMES_CONSUMES\r
+  gEfiDeferredImageLoadProtocolGuid             ## SOMETIMES_CONSUMES\r
+  gEfiSimpleTextOutProtocolGuid                 ## SOMETIMES_CONSUMES\r
+  gEfiSimpleTextInProtocolGuid                  ## SOMETIMES_CONSUMES\r
+  gEfiSimpleTextInputExProtocolGuid             ## SOMETIMES_CONSUMES\r

   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r

-  gEfiUserManagerProtocolGuid                   ## PRODUCES\r
-  gEfiSimpleTextOutProtocolGuid\r
-  gEfiSimpleTextInProtocolGuid\r
-  gEfiSimpleTextInputExProtocolGuid\r
+  gEfiDevicePathProtocolGuid                    ## PRODUCES\r
+  \r
+  ## PRODUCES\r
+  ## SOMETIMES_PRODUCES                         ## SystemTable\r
+  gEfiUserManagerProtocolGuid                   \r

 \r
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid   AND \r
   gEfiHiiStringProtocolGuid     AND \r
   gEfiFormBrowser2ProtocolGuid \r
 \r
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid   AND \r
   gEfiHiiStringProtocolGuid     AND \r
   gEfiFormBrowser2ProtocolGuid \r

+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  UserIdentifyManagerExtra.uni\r
+  
\ No newline at end of file

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
index 847aaa21566c72ac876d714f87209089a98c6230..619b2dd9f05cadebb3a313d52882ceb2c4e710bc 100644 (file)
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
@@ -1,7 +1,10 @@
 ## @file\r
 ## @file\r

-#  Component description file for user profile manager driver.\r
+#  A UI tool to manage user profiles\r

 #\r
 #\r

-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  By this module, user can add/update/delete user profiles, and can also\r
+#  modify the user access policy and the user identification policy.\r
+#\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -14,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = UserProfileManager\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = UserProfileManager\r

+  MODULE_UNI_FILE                = UserProfileManager.uni\r

   FILE_GUID                      = E38CB52D-A74D-45db-A8D0-290C9B21BBF2\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = E38CB52D-A74D-45db-A8D0-290C9B21BBF2\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -47,18 +51,22 @@
   UefiLib\r
   DevicePathLib\r
   \r
   UefiLib\r
   DevicePathLib\r
   \r

-  [Guids]\r
-  gEfiIfrTianoGuid                              ## CONSUMES ## Guid\r
-  gEfiUserInfoAccessSetupAdminGuid              ## CONSUMES ## Guid\r
-  gEfiUserInfoAccessSetupNormalGuid             ## CONSUMES ## Guid\r
-  gEfiUserInfoAccessSetupRestrictedGuid         ## CONSUMES ## Guid\r
-  gUserProfileManagerGuid                       ## PRODUCES ## Guid\r
+[Guids]\r
+  gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES  ## GUID\r
+  gEfiUserInfoAccessSetupAdminGuid              ## SOMETIMES_CONSUMES  ## GUID\r
+  gEfiUserInfoAccessSetupNormalGuid             ## SOMETIMES_CONSUMES  ## GUID\r
+  gEfiUserInfoAccessSetupRestrictedGuid         ## SOMETIMES_CONSUMES  ## GUID\r
+  gUserProfileManagerGuid                       ## CONSUMES            ## HII\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiConfigAccessProtocolGuid\r
-  gEfiUserCredential2ProtocolGuid\r
-  gEfiUserManagerProtocolGuid\r
+  gEfiDevicePathProtocolGuid                    ## PRODUCES\r
+  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
+  gEfiUserCredential2ProtocolGuid               ## SOMETIMES_CONSUMES\r
+  gEfiUserManagerProtocolGuid                   ## CONSUMES\r

 \r
 [Depex]\r
 \r
 [Depex]\r

-  gEfiUserManagerProtocolGuid
\ No newline at end of file
+  gEfiUserManagerProtocolGuid\r
+  \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  UserProfileManagerExtra.uni\r
+  
\ No newline at end of file

diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.inf b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.inf
index f6eece98d7e5af4c013abf4fa4c2beb9828bae37..16caa30dadefb5e7beed580a0dc5a4ff505ac303 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.inf
+++ b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.inf
@@ -1,8 +1,10 @@
 ## @file\r
 ## @file\r

-#  Component description file for Extended SAL authentication variable \r
-#  service module.\r
+#  Provides authenticated variable service for IPF platform\r

 #\r
 #\r

-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#  This module installs variable arch protocol and variable write arch protocol to provide\r
+#  four EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName and QueryVariableInfo.\r
+#\r
+# Copyright (c) 2009 - 2014, 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
 # 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


@@ -15,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = EsalVariableDxeSal\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = EsalVariableDxeSal\r

+  MODULE_UNI_FILE                = EsalVariableDxeSal.uni\r

   FILE_GUID                      = 14610837-4E97-4427-96E0-21D9B2956996\r
   MODULE_TYPE                    = DXE_SAL_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 14610837-4E97-4427-96E0-21D9B2956996\r
   MODULE_TYPE                    = DXE_SAL_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -60,27 +63,43 @@
   HobLib\r
 \r
 [Protocols]\r
   HobLib\r
 \r
 [Protocols]\r

-  gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL SOMETIMES_CONSUMED\r
-  gEfiFaultTolerantWriteProtocolGuid            # PROTOCOL SOMETIMES_CONSUMED\r
+  gEfiFirmwareVolumeBlockProtocolGuid           ## SOMETIMES_CONSUMES\r
+  gEfiFaultTolerantWriteProtocolGuid            ## SOMETIMES_CONSUMES\r

 \r
 [Guids]\r
 \r
 [Guids]\r

+  ## SOMETIMES_CONSUMES   ## Variable:L"PK"\r
+  ## CONSUMES             ## Variable:L"SetupMode"\r
+  ## PRODUCES             ## Variable:L"SetupMode"\r
+  ## CONSUMES             ## Variable:L"SignatureSupport"\r
+  ## PRODUCES             ## Variable:L"SignatureSupport"\r

   gEfiGlobalVariableGuid\r
   gEfiGlobalVariableGuid\r

+  \r
+  ## PRODUCES             ## GUID # Variable store header\r
+  ## CONSUMES             ## GUID # Variable store header\r
+  ## SOMETIMES_CONSUMES   ## HOB\r
+  ## SOMETIMES_PRODUCES   ## SystemTable\r

   gEfiAuthenticatedVariableGuid\r
   gEfiAuthenticatedVariableGuid\r

-  gEfiEventVirtualAddressChangeGuid\r
-  gEfiCertRsa2048Sha256Guid\r
+  \r
+  gEfiEventVirtualAddressChangeGuid             ## CONSUMES               ## Event\r
+  gEfiCertRsa2048Sha256Guid                     ## CONSUMES               ## GUID        # Unique ID for the format of the CertType.\r
+\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DB"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DBX"\r

   gEfiImageSecurityDatabaseGuid\r
 \r
 [Pcd.common]\r
   gEfiImageSecurityDatabaseGuid\r
 \r
 [Pcd.common]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize\r
-\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize            ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase            ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize                       ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize          ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize                     ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize                      ## CONSUMES\r
+  \r

 [FeaturePcd.common]\r
 [FeaturePcd.common]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics             ## CONSUMES    # statistic the information of variable.\r

 \r
 [Depex]\r
 \r
 [Depex]\r

-  gEfiExtendedSalFvBlockServicesProtocolGuid AND gEfiFaultTolerantWriteProtocolGuid\r
-  \r
+  gEfiExtendedSalFvBlockServicesProtocolGuid AND gEfiFaultTolerantWriteProtocolGuid  \r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  EsalVariableDxeSalExtra.uni
\ No newline at end of file

diff --git a/SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf b/SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf
index 002bb04df4c73da12be9e07b3b353d1c947eb554..fa0b5e9876d9989881d7107af565e9cf5f1df650 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf
+++ b/SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf
@@ -1,5 +1,6 @@
 ## @file\r
 ## @file\r

-#  The component description for PEI variable driver. \r
+#  Implements ReadOnly Variable Services required by PEIM and installs PEI ReadOnly Varaiable2 PPI\r
+#  This module implements ReadOnly Variable Services required by PEIM and installs PEI ReadOnly Varaiable2 PPI.\r

 #\r
 # Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 #\r
 # Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r


@@ -14,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PeiVariableAuth\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PeiVariableAuth\r

+  MODULE_UNI_FILE                = PeiVariableAuth.uni\r

   FILE_GUID                      = B1F7AF2F-2807-478c-A893-2BF4DDD1F62B\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = B1F7AF2F-2807-478c-A893-2BF4DDD1F62B\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r


@@ -44,24 +46,28 @@
   PeiServicesLib\r
 \r
 [Guids]\r
   PeiServicesLib\r
 \r
 [Guids]\r

+  ## CONSUMES             ## GUID # Variable store header\r
+  ## SOMETIMES_CONSUMES   ## HOB\r

   gEfiAuthenticatedVariableGuid\r
   gEfiAuthenticatedVariableGuid\r

+  ## SOMETIMES_PRODUCES   ## HOB\r
+  ## SOMETIMES_CONSUMES   ## HOB\r

   gEfiVariableIndexTableGuid\r
   gEfiVariableIndexTableGuid\r

-  gEfiSystemNvDataFvGuid\r
-  gEdkiiFaultTolerantWriteGuid\r
+  gEfiSystemNvDataFvGuid            ## SOMETIMES_CONSUMES   ## GUID\r
+  gEdkiiFaultTolerantWriteGuid      ## SOMETIMES_CONSUMES   ## HOB\r

 \r
 [Ppis]\r
 \r
 [Ppis]\r

-  gEfiPeiReadOnlyVariable2PpiGuid                ## PRODUCES\r
+  gEfiPeiReadOnlyVariable2PpiGuid   ## PRODUCES\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase      ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase      ## SOMETIMES_CONSUMES\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64    ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize      ## CONSUMES\r
 \r
 [Depex]\r
   gEdkiiFaultTolerantWriteGuid\r
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64    ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize      ## CONSUMES\r
 \r
 [Depex]\r
   gEdkiiFaultTolerantWriteGuid\r
 \r

-#\r
-#  [BootMode]\r
-#    RECOVERY          ## CONSUMES\r
-#\r
+# [BootMode]\r
+# RECOVERY_FULL             ## SOMETIMES_CONSUMES\r

 \r
 \r

+[UserExtensions.TianoCore."ExtraFiles"]\r
+  PeiVariableExtra.uni
\ No newline at end of file

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf
index 41e85c01568b4b36fa9ce68c30e8dc1be165229c..593c906085788364591b28c6a6c68563a6612632 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf
@@ -1,10 +1,13 @@
 ## @file\r
 ## @file\r

-#  Component description file for Authenticated Variable module.\r
+#  Provides authenticated variable service\r
+#\r
+#  This module installs variable arch protocol and variable write arch protocol to provide \r
+#  variable services: SetVariable, GetVariable, GetNextVariableName and QueryVariableInfo.\r

 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable data.\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable data.\r

-#  This external input must be validated carefully to avoid security issue like\r
-#  buffer overflow, integer overflow.\r
+#  This external input must be validated carefully to avoid security issues such as \r
+#  buffer overflow or integer overflow.\r

 #\r
 # Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 #\r
 # Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r


@@ -19,6 +22,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VariableAuthRuntimeDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VariableAuthRuntimeDxe\r

+  MODULE_UNI_FILE                = VariableAuthRuntimeDxe.uni\r

   FILE_GUID                      = 2226F30F-3D5B-402d-9936-A97184EB4516\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 2226F30F-3D5B-402d-9936-A97184EB4516\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -65,51 +69,82 @@
   TpmMeasurementLib\r
 \r
 [Protocols]\r
   TpmMeasurementLib\r
 \r
 [Protocols]\r

-  gEfiFirmwareVolumeBlockProtocolGuid           ## SOMETIMES_CONSUMES\r
-  gEfiVariableWriteArchProtocolGuid             ## ALWAYS_PRODUCES\r
-  gEfiVariableArchProtocolGuid                  ## ALWAYS_PRODUCES\r
-  gEfiFaultTolerantWriteProtocolGuid            ## SOMETIMES_CONSUMES\r
-  gEdkiiVariableLockProtocolGuid                ## ALWAYS_PRODUCES\r
+  gEfiFirmwareVolumeBlockProtocolGuid           ## CONSUMES\r
+  ## CONSUMES\r
+  ## NOTIFY\r
+  gEfiFaultTolerantWriteProtocolGuid\r
+  gEfiVariableWriteArchProtocolGuid             ## PRODUCES\r
+  gEfiVariableArchProtocolGuid                  ## PRODUCES\r
+  gEdkiiVariableLockProtocolGuid                ## PRODUCES\r
+\r

 \r
 [Guids]\r
 \r
 [Guids]\r

-  gEfiAuthenticatedVariableGuid                 ## PRODUCES ## Configuration Table Guid\r
-  gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid\r
-  gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event\r
-  gEfiCertTypeRsa2048Sha256Guid\r
+  ## PRODUCES             ## GUID # Variable store header\r
+  ## CONSUMES             ## GUID # Variable store header\r
+  ## SOMETIMES_CONSUMES   ## HOB\r
+  ## SOMETIMES_PRODUCES   ## SystemTable\r
+  gEfiAuthenticatedVariableGuid\r
+  \r
+  ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLang"\r
+  ## SOMETIMES_PRODUCES   ## Variable:L"PlatformLang"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"Lang"\r
+  ## SOMETIMES_PRODUCES   ## Variable:L"Lang"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"HwErrRecSupport"\r
+  ## CONSUMES             ## Variable:L"SetupMode"\r
+  ## PRODUCES             ## Variable:L"SetupMode"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"PK"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"KEK"\r
+  ## CONSUMES             ## Variable:L"SecureBoot"\r
+  ## PRODUCES             ## Variable:L"SecureBoot"\r
+  ## CONSUMES             ## Variable:L"SignatureSupport"\r
+  ## PRODUCES             ## Variable:L"SignatureSupport"  \r
+  ## PRODUCES             ## Variable:L"VendorKeys"\r
+  gEfiGlobalVariableGuid\r
+  \r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DB"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DBX"\r

   gEfiImageSecurityDatabaseGuid\r
   gEfiImageSecurityDatabaseGuid\r

-  gEfiCertX509Guid\r
-  gEfiCertPkcs7Guid\r
-  gEfiCertRsa2048Guid\r
+  \r
+  ## CONSUMES             ## Variable:L"SecureBootEnable"\r
+  ## PRODUCES             ## Variable:L"SecureBootEnable"\r

   gEfiSecureBootEnableDisableGuid\r
   gEfiSecureBootEnableDisableGuid\r

+  \r
+  ## CONSUMES             ## Variable:L"CustomMode"\r
+  ## PRODUCES             ## Variable:L"CustomMode"\r

   gEfiCustomModeEnableGuid\r
   gEfiCustomModeEnableGuid\r

-  gEfiVendorKeysNvGuid\r
-  gEfiSystemNvDataFvGuid                        ## CONSUMES\r
+  \r
+  ## CONSUMES             ## Variable:L"certdb"\r
+  ## PRODUCES             ## Variable:L"certdb"\r

   gEfiCertDbGuid\r
   gEfiCertDbGuid\r

-  gEfiHardwareErrorVariableGuid                 ## SOMETIMES_CONSUMES\r
-  gEfiEndOfDxeEventGroupGuid                    ## CONSUMES ## Event\r
-  gEdkiiFaultTolerantWriteGuid                  ## CONSUMES\r
+  \r
+  ## CONSUMES             ## Variable:L"VendorKeysNv"\r
+  ## PRODUCES             ## Variable:L"VendorKeysNv"\r
+  gEfiVendorKeysNvGuid\r
+\r
+  gEfiEndOfDxeEventGroupGuid               ## CONSUMES               ## Event\r
+  gEfiEventVirtualAddressChangeGuid        ## CONSUMES               ## Event\r
+  gEfiCertTypeRsa2048Sha256Guid            ## SOMETIMES_CONSUMES     ## GUID     # Unique ID for the type of the certificate.\r
+  gEfiCertPkcs7Guid                        ## SOMETIMES_CONSUMES     ## GUID     # Unique ID for the type of the certificate.\r
+  gEfiCertX509Guid                         ## SOMETIMES_CONSUMES     ## GUID     # Unique ID for the type of the signature.\r
+  gEfiSystemNvDataFvGuid                   ## CONSUMES               ## GUID\r
+  gEfiHardwareErrorVariableGuid            ## SOMETIMES_CONSUMES     ## Variable:L"HwErrRec####"\r
+  gEdkiiFaultTolerantWriteGuid             ## SOMETIMES_CONSUMES     ## HOB\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize       ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase       ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64     ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize                  ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize     ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize                ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize                 ## CONSUMES\r

 \r
 [FeaturePcd]\r
 \r
 [FeaturePcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics  ## CONSUMES # statistic the information of variable.\r
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics        ## CONSUMES  # statistic the information of variable.\r
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate       ## CONSUMES  # Auto update PlatformLang/Lang\r

 \r
 [Depex]\r
   TRUE\r
 \r
 \r
 [Depex]\r
   TRUE\r
 \r

-# [Event]\r
-#   ##\r
-#   # Event will be signaled for VIRTUAL_ADDRESS_CHANGE event.\r
-#   #\r
-#   EVENT_TYPE_NOTIFY_SIGNAL                    ## PRODUCES\r
-#\r
-#\r
-\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  VariableRuntimeDxeExtra.uni\r

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.inf b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.inf
index 0e3fc514b4c098918dee746c8d9436b32c95f295..279a9248e292e9a93ead06b49cdf7afc8162c949 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.inf
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.inf
@@ -1,18 +1,18 @@
 ## @file\r
 ## @file\r

-#  Component description file for SMM Authenticated Variable module.\r
+#  Provides SMM authenticated variable service\r

 #\r
 #  This module installs SMM variable protocol into SMM protocol database,\r
 #  which can be used by SMM driver, and installs SMM variable protocol\r
 #  into BS protocol database, which can be used to notify the SMM Runtime\r
 #  Dxe driver that the SMM variable service is ready.\r
 #  This module should be used with SMM Runtime DXE module together. The\r
 #\r
 #  This module installs SMM variable protocol into SMM protocol database,\r
 #  which can be used by SMM driver, and installs SMM variable protocol\r
 #  into BS protocol database, which can be used to notify the SMM Runtime\r
 #  Dxe driver that the SMM variable service is ready.\r
 #  This module should be used with SMM Runtime DXE module together. The\r

-#  SMM Runtime DXE module would install variable arch protocol and variable\r
+#  SMM Runtime DXE module installs variable arch protocol and variable\r

 #  write arch protocol based on SMM variable module.\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable data and communicate buffer in SMM mode.\r
 #  write arch protocol based on SMM variable module.\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable data and communicate buffer in SMM mode.\r

-#  This external input must be validated carefully to avoid security issue like\r
-#  buffer overflow, integer overflow.\r
+#  This external input must be validated carefully to avoid security issues such as \r
+#  buffer overflow or integer overflow.\r

 #\r
 # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 #\r
 # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r


@@ -27,6 +27,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VariableAuthSmm\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VariableAuthSmm\r

+  MODULE_UNI_FILE                = VariableAuthSmm.uni\r

   FILE_GUID                      = D34BDC5E-968A-40f5-A48C-E594F45AE211\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = D34BDC5E-968A-40f5-A48C-E594F45AE211\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -69,43 +70,83 @@
   HobLib\r
 \r
 [Protocols]\r
   HobLib\r
 \r
 [Protocols]\r

-  gEfiSmmFirmwareVolumeBlockProtocolGuid        ## SOMETIMES_CONSUMES\r
-  gEfiSmmVariableProtocolGuid                   ## ALWAYS_PRODUCES\r
-  gEfiSmmFaultTolerantWriteProtocolGuid         ## SOMETIMES_CONSUMES\r
-  gEfiSmmAccess2ProtocolGuid                    ## ALWAYS_CONSUMES\r
-  gEfiSmmEndOfDxeProtocolGuid                   ## ALWAYS_CONSUMES\r
+  gEfiSmmFirmwareVolumeBlockProtocolGuid        ## CONSUMES\r
+  gEfiSmmAccess2ProtocolGuid                    ## CONSUMES\r
+  \r
+  ## PRODUCES\r
+  ## UNDEFINED     # SmiHandlerRegister\r
+  gEfiSmmVariableProtocolGuid\r
+  \r
+  ## CONSUMES\r
+  ## NOTIFY  \r
+  gEfiSmmFaultTolerantWriteProtocolGuid\r
+  gEfiSmmEndOfDxeProtocolGuid              ## NOTIFY\r

 \r
 [Guids]\r
 \r
 [Guids]\r

-  gEfiAuthenticatedVariableGuid                 ## PRODUCES ## Configuration Table Guid\r
-  gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid\r
-  gSmmVariableWriteGuid                         ## PRODUCES ## SMM Variable Write Guid\r
-  gEfiCertTypeRsa2048Sha256Guid\r
+  ## PRODUCES             ## GUID # Variable store header\r
+  ## CONSUMES             ## GUID # Variable store header\r
+  ## SOMETIMES_CONSUMES   ## HOB\r
+  gEfiAuthenticatedVariableGuid\r
+  \r
+  ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLang"\r
+  ## SOMETIMES_PRODUCES   ## Variable:L"PlatformLang"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"Lang"\r
+  ## SOMETIMES_PRODUCES   ## Variable:L"Lang"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"HwErrRecSupport"\r
+  ## CONSUMES             ## Variable:L"SetupMode"\r
+  ## PRODUCES             ## Variable:L"SetupMode"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"PK"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"KEK"\r
+  ## CONSUMES             ## Variable:L"SecureBoot"\r
+  ## PRODUCES             ## Variable:L"SecureBoot"\r
+  ## CONSUMES             ## Variable:L"SignatureSupport"\r
+  ## PRODUCES             ## Variable:L"SignatureSupport"\r
+  ## PRODUCES             ## Variable:L"VendorKeys"\r
+  gEfiGlobalVariableGuid\r
+  \r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DB"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DBX"\r

   gEfiImageSecurityDatabaseGuid\r
   gEfiImageSecurityDatabaseGuid\r

-  gEfiCertX509Guid\r
-  gEfiCertPkcs7Guid\r
-  gEfiCertRsa2048Guid\r
+ \r
+  ## CONSUMES             ## Variable:L"SecureBootEnable"\r
+  ## PRODUCES             ## Variable:L"SecureBootEnable"\r

   gEfiSecureBootEnableDisableGuid\r
   gEfiSecureBootEnableDisableGuid\r

+  \r
+  ## CONSUMES             ## Variable:L"CustomMode"\r
+  ## PRODUCES             ## Variable:L"CustomMode"\r

   gEfiCustomModeEnableGuid\r
   gEfiCustomModeEnableGuid\r

-  gEfiVendorKeysNvGuid\r
-  gEfiSystemNvDataFvGuid                        ## CONSUMES\r
+  \r
+  ## CONSUMES             ## Variable:L"certdb"\r
+  ## PRODUCES             ## Variable:L"certdb"\r

   gEfiCertDbGuid\r
   gEfiCertDbGuid\r

-  gEfiHardwareErrorVariableGuid                 ## SOMETIMES_CONSUMES\r
-  gEdkiiFaultTolerantWriteGuid                  ## CONSUMES\r

 \r
 \r

+  ## CONSUMES             ## Variable:L"VendorKeysNv"\r
+  ## PRODUCES             ## Variable:L"VendorKeysNv"\r
+  gEfiVendorKeysNvGuid\r
+    \r
+  gSmmVariableWriteGuid                    ## PRODUCES               ## GUID        # Install protocol\r
+  gEfiCertTypeRsa2048Sha256Guid            ## SOMETIMES_CONSUMES     ## GUID        # Unique ID for the format of the CertData.\r
+  gEfiCertPkcs7Guid                        ## SOMETIMES_CONSUMES     ## GUID        # Unique ID for the format of the CertData.\r
+  gEfiCertX509Guid                         ## SOMETIMES_CONSUMES     ## GUID        # Unique ID for the type of the signature.\r
+  gEfiSystemNvDataFvGuid                   ## CONSUMES               ## GUID\r
+  gEfiHardwareErrorVariableGuid            ## SOMETIMES_CONSUMES     ## Variable:L"HwErrRec####"\r
+  gEdkiiFaultTolerantWriteGuid             ## SOMETIMES_CONSUMES     ## HOB\r
+  \r

 [Pcd]\r
 [Pcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize\r
-\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize       ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase       ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64     ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize                  ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize     ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize                ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize                 ## CONSUMES\r
+  \r

 [FeaturePcd]\r
 [FeaturePcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics  ## CONSUMES # statistic the information of variable.\r
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics        ## CONSUMES  # statistic the information of variable.\r
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate       ## CONSUMES  # Auto update PlatformLang/Lang\r

 \r
 [Depex]\r
   TRUE\r
 \r
 [Depex]\r
   TRUE\r

-\r
-\r
+  \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  VariableSmmExtra.uni
\ No newline at end of file

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.inf b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.inf
index 5dd932d6d333444233b76de0dfecf2e06cd2f942..f0dfa89810bdef09881fb10c43c7e38b383f50aa 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.inf
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.inf
@@ -1,14 +1,13 @@
 ## @file\r
 ## @file\r

-#  Component description file for Authenticated Variable SmmRuntimeDxe module.\r
+#  Runtime DXE part corresponding to SMM authenticated variable module\r

 #\r
 #\r

-#  This module is the Runtime DXE part correspond to SMM variable module. It \r
-#  installs variable arch protocol and variable write arch protocol and works \r
-#  with SMM variable module together. \r
+#  This module installs variable arch protocol and variable write arch protocol to provide \r
+#  variable service. This module need work together with SMM authenticated variable module. \r

 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable data.\r
 #\r
 #  Caution: This module requires additional review when modified.\r
 #  This driver will have external input - variable data.\r

-#  This external input must be validated carefully to avoid security issue like\r
-#  buffer overflow, integer overflow.\r
+#  This external input must be validated carefully to avoid security issues such as \r
+#  buffer overflow or integer overflow.\r

 #\r
 # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 #\r
 # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r


@@ -23,6 +22,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VariableAuthSmmRuntimeDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VariableAuthSmmRuntimeDxe\r

+  MODULE_UNI_FILE                = VariableAuthSmmRuntimeDxe.uni\r

   FILE_GUID                      = 067E2381-7234-4798-B49C-D5FECBFF6D07\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 067E2381-7234-4798-B49C-D5FECBFF6D07\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -57,21 +57,41 @@
   TpmMeasurementLib\r
 \r
 [Protocols]\r
   TpmMeasurementLib\r
 \r
 [Protocols]\r

-  gEfiVariableWriteArchProtocolGuid             ## ALWAYS_PRODUCES\r
-  gEfiVariableArchProtocolGuid                  ## ALWAYS_PRODUCES  \r
-  gEfiSmmCommunicationProtocolGuid\r
+  gEfiVariableWriteArchProtocolGuid                                 ## PRODUCES\r
+  gEfiVariableArchProtocolGuid                                      ## PRODUCES\r
+  gEfiSmmCommunicationProtocolGuid                                  ## CONSUMES\r
+  gEdkiiVariableLockProtocolGuid                                    ## PRODUCES\r
+\r
+  ## CONSUMES\r
+  ## NOTIFY\r
+  ## UNDEFINED   # Used to do smm communication\r

   gEfiSmmVariableProtocolGuid\r
   gEfiSmmVariableProtocolGuid\r

-  gEdkiiVariableLockProtocolGuid                ## ALWAYS_PRODUCES\r

 \r
 [Guids]\r
 \r
 [Guids]\r

-  gEfiEventVirtualAddressChangeGuid             ## PRODUCES ## Event\r
+  gEfiEventVirtualAddressChangeGuid                                 ## CONSUMES       ## Event\r
+  gEfiEventExitBootServicesGuid                                     ## CONSUMES       ## Event\r
+    \r
+  ## CONSUMES ## UNDEFINED # Locate protocol\r
+  ## CONSUMES ## UNDEFINED # Protocol notify\r

   gSmmVariableWriteGuid\r
   gSmmVariableWriteGuid\r

+  \r
+\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"PK"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"KEK"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"SecureBoot"\r
+  gEfiGlobalVariableGuid\r
+  \r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DB"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DBX"\r

   gEfiImageSecurityDatabaseGuid\r
 \r
 [Pcd]\r
   gEfiImageSecurityDatabaseGuid\r
 \r
 [Pcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase\r
-  \r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize                 ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize    ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase      ## CONSUMES\r
+\r

 [Depex]\r
   gEfiSmmCommunicationProtocolGuid\r
 [Depex]\r
   gEfiSmmCommunicationProtocolGuid\r

+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  VariableSmmRuntimeDxeExtra.uni\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
index 071ca30338d54d24a85d1c6107a4c7328dccc46a..e6d21f5e69cfdb2540d1ba82c1792879a58604d5 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
@@ -1,7 +1,8 @@
 ## @file\r
 ## @file\r

-#  Component name for SecureBoot configuration module.\r
+#  Provides the capbility to configure secure boot in a setup browser\r
+#  By this module, user may change the content of DB, DBX, PK and KEK.\r

 #\r
 #\r

-# Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2014, 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
 # 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


@@ -14,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = SecureBootConfigDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = SecureBootConfigDxe\r

+  MODULE_UNI_FILE                = SecureBootConfigDxe.uni\r

   FILE_GUID                      = F0E6A44F-7195-41c3-AC64-54F202CD0A21\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = F0E6A44F-7195-41c3-AC64-54F202CD0A21\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -57,31 +59,64 @@
   DevicePathLib\r
 \r
 [Guids]\r
   DevicePathLib\r
 \r
 [Guids]\r

-  gEfiIfrTianoGuid\r
+  ## SOMETIMES_CONSUMES      ## Variable:L"CustomMode"\r
+  ## SOMETIMES_PRODUCES      ## Variable:L"CustomMode"\r

   gEfiCustomModeEnableGuid\r
   gEfiCustomModeEnableGuid\r

+    \r
+  ## SOMETIMES_CONSUMES      ## Variable:L"SecureBootEnable"\r
+  ## SOMETIMES_PRODUCES      ## Variable:L"SecureBootEnable"\r

   gEfiSecureBootEnableDisableGuid\r
   gEfiSecureBootEnableDisableGuid\r

+  \r
+  ## SOMETIMES_CONSUMES      ## GUID            # Unique ID for the type of the signature.\r
+  ## SOMETIMES_PRODUCES      ## GUID            # Unique ID for the type of the signature.\r
+  gEfiCertRsa2048Guid\r
+  \r
+  ## SOMETIMES_CONSUMES      ## GUID            # Unique ID for the type of the signature.\r
+  ## SOMETIMES_PRODUCES      ## GUID            # Unique ID for the type of the signature.                               \r
+  gEfiCertX509Guid\r
+  \r
+  ## SOMETIMES_CONSUMES      ## GUID            # Unique ID for the type of the signature.\r
+  ## SOMETIMES_PRODUCES      ## GUID            # Unique ID for the type of the signature.   \r
+  gEfiCertSha1Guid\r
+  \r
+  ## SOMETIMES_CONSUMES      ## GUID            # Unique ID for the type of the signature.\r
+  ## SOMETIMES_PRODUCES      ## GUID            # Unique ID for the type of the signature.   \r
+  gEfiCertSha256Guid\r
+  \r
+  ## SOMETIMES_CONSUMES      ## Variable:L"db"\r
+  ## SOMETIMES_PRODUCES      ## Variable:L"db"\r
+  ## SOMETIMES_CONSUMES      ## Variable:L"dbx"\r
+  ## SOMETIMES_PRODUCES      ## Variable:L"dbx"\r
+  gEfiImageSecurityDatabaseGuid\r
+    \r
+  ## SOMETIMES_CONSUMES      ## Variable:L"SetupMode"\r
+  ## SOMETIMES_PRODUCES      ## Variable:L"PK"\r
+  ## SOMETIMES_CONSUMES      ## Variable:L"KEK"\r
+  ## SOMETIMES_PRODUCES      ## Variable:L"KEK"\r
+  ## SOMETIMES_CONSUMES      ## Variable:L"SecureBoot"\r
+  gEfiGlobalVariableGuid\r
+  \r
+  gEfiIfrTianoGuid                              ## PRODUCES            ## GUID       # HII opcode\r
+  ## PRODUCES                ## HII\r
+  ## CONSUMES                ## HII\r

   gSecureBootConfigFormSetGuid\r
   gSecureBootConfigFormSetGuid\r

-  gEfiCertPkcs7Guid\r
-  gEfiCertRsa2048Guid                           ## CONSUMES\r
-  gEfiCertX509Guid                              ## CONSUMES\r
-  gEfiCertSha1Guid                              ## CONSUMES\r
-  gEfiCertSha256Guid                            ## CONSUMES\r
-  gEfiCertTypeRsa2048Sha256Guid                 ## CONSUMES\r
-  gEfiImageSecurityDatabaseGuid                 ## CONSUMES\r
-  gEfiFileSystemVolumeLabelInfoIdGuid           ## CONSUMES\r
-  gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid\r
-  gEfiFileInfoGuid                              ## CONSUMES ## GUID\r
+  gEfiCertPkcs7Guid                             ## SOMETIMES_PRODUCES  ## GUID  # Unique ID for the type of the certificate.\r
+  gEfiCertTypeRsa2048Sha256Guid                 ## SOMETIMES_CONSUMES  ## GUID  # Unique ID for the type of the certificate.\r
+  gEfiFileSystemVolumeLabelInfoIdGuid           ## SOMETIMES_CONSUMES  ## GUID  # Indicate the information type\r
+  gEfiFileInfoGuid                              ## SOMETIMES_CONSUMES  ## GUID  # Indicate the information type\r

 \r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
 \r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r

-  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES\r
-  gEfiSimpleFileSystemProtocolGuid              ## PROTOCOL CONSUMES\r
-  gEfiLoadFileProtocolGuid                      ## PROTOCOL CONSUMES\r
-  gEfiBlockIoProtocolGuid                       ## PROTOCOL CONSUMES\r
-  gEfiDevicePathProtocolGuid                    ## PROTOCOL CONSUMES\r
+  gEfiDevicePathProtocolGuid                    ## PRODUCES\r
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES\r
+  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES\r

 \r
 [Depex]\r
   gEfiHiiConfigRoutingProtocolGuid  AND\r
   gEfiHiiDatabaseProtocolGuid       AND\r
   gEfiVariableArchProtocolGuid      AND\r
   gEfiVariableWriteArchProtocolGuid\r
 \r
 [Depex]\r
   gEfiHiiConfigRoutingProtocolGuid  AND\r
   gEfiHiiDatabaseProtocolGuid       AND\r
   gEfiVariableArchProtocolGuid      AND\r
   gEfiVariableWriteArchProtocolGuid\r

+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  SecureBootConfigDxeExtra.uni\r
+  
\ No newline at end of file