From 60c944c7d63978eee337f52af360ca5d807c11b6 Mon Sep 17 00:00:00 2001
From: "Dong, Guo" <guo.dong@intel.com>
Date: Thu, 28 Aug 2014 05:31:09 +0000
Subject: 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
---
 SecurityPkg/Application/RngTest/RngTest.inf        | 23 +++++++++++------
 .../Application/VariableInfo/VariableInfo.inf      | 29 ++++++++++++++--------
 2 files changed, 34 insertions(+), 18 deletions(-)

(limited to 'SecurityPkg/Application')

diff --git a/SecurityPkg/Application/RngTest/RngTest.inf b/SecurityPkg/Application/RngTest/RngTest.inf
index bec78a4c99..334cff45b0 100644
--- a/SecurityPkg/Application/RngTest/RngTest.inf
+++ b/SecurityPkg/Application/RngTest/RngTest.inf
@@ -1,7 +1,10 @@
 ## @file
 #  UEFI RNG (Random Number Generator) Protocol test application.
+#  
+#  This application can print out the supported RNG algorithm in UEFI RNG Protocol. 
+#  And then it will do a generation test on the supported RNG algorithm.  
 #
-#  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution. The full text of the license may be found at
@@ -19,6 +22,7 @@
   MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   ENTRY_POINT                    = UefiMain
+  MODULE_UNI_FILE                = RngTest.uni
 
 #
 # The following information is for reference only and not required by the build tools.
@@ -39,12 +43,15 @@
   UefiLib
 
 [Protocols]
-  gEfiRngProtocolGuid
+  gEfiRngProtocolGuid            ## CONSUMES
 
 [Guids]
-  gEfiRngAlgorithmSp80090Hash256Guid
-  gEfiRngAlgorithmSp80090Hmac256Guid
-  gEfiRngAlgorithmSp80090Ctr256Guid
-  gEfiRngAlgorithmX9313DesGuid
-  gEfiRngAlgorithmX931AesGuid
-  gEfiRngAlgorithmRaw
\ No newline at end of file
+  gEfiRngAlgorithmSp80090Hash256Guid    ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG
+  gEfiRngAlgorithmSp80090Hmac256Guid    ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG
+  gEfiRngAlgorithmSp80090Ctr256Guid     ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG
+  gEfiRngAlgorithmX9313DesGuid          ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG
+  gEfiRngAlgorithmX931AesGuid           ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG
+  gEfiRngAlgorithmRaw                   ## SOMETIMES_CONSUMES    ## GUID        # Unique ID of the algorithm for RNG
+  
+  [UserExtensions.TianoCore."ExtraFiles"]
+  RngTestExtra.uni
\ No newline at end of file
diff --git a/SecurityPkg/Application/VariableInfo/VariableInfo.inf b/SecurityPkg/Application/VariableInfo/VariableInfo.inf
index 902ed7f1c5..d4a771a908 100644
--- a/SecurityPkg/Application/VariableInfo/VariableInfo.inf
+++ b/SecurityPkg/Application/VariableInfo/VariableInfo.inf
@@ -1,11 +1,12 @@
 ## @file
-#  This is a shell application that will display statistical information 
-#  about variable usage.
-#  Note that if Variable Dxe driver doesn't enable the feature by setting 
-#  PcdVariableCollectStatistics as TRUE, The application will not display 
-#  variable statistical information.
+#  A shell application that displays statistical information about variable usage
 #
-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+#  This application can display statistical information about variable usage for SMM variable
+#  driver and non-SMM variable driver.
+#  Note that if Variable Dxe driver doesn't enable the feature by setting PcdVariableCollectStatistics
+#  as TRUE, the application will not display variable statistical information.
+#
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution. The full text of the license may be found at
@@ -18,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = VariableInfo
+  MODULE_UNI_FILE                = VariableInfo.uni
   FILE_GUID                      = B9EF901F-A2A2-4fc8-8D2B-3A2E07B301CC
   MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
@@ -46,9 +48,16 @@
   MemoryAllocationLib
 
 [Protocols]
-  gEfiSmmCommunicationProtocolGuid
-  gEfiSmmVariableProtocolGuid
+  gEfiSmmCommunicationProtocolGuid     ## SOMETIMES_CONSUMES
+  
+    ## UNDEFINED           # Used to do smm communication
+    ## SOMETIMES_CONSUMES 
+  gEfiSmmVariableProtocolGuid 
   
 [Guids]
-  gEfiAuthenticatedVariableGuid        ## CONSUMES ## Configuration Table Guid
-  gEfiVariableGuid                     ## CONSUMES ## Configuration Table Guid
+  gEfiAuthenticatedVariableGuid        ## SOMETIMES_CONSUMES    ## SystemTable
+  gEfiVariableGuid                     ## CONSUMES              ## SystemTable
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  VariableInfoExtra.uni
+  
\ No newline at end of file
-- 
cgit v1.2.3