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

4 files changed, 90 insertions, 44 deletions

diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
index 541fff11fe..07e6163e8b 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
+++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
@@ -1,7 +1,8 @@
 ## @file

-#  Component description file for Password Credential Provider.

+#  Provides a password credential provider implementation

+#  This module provides a password credential provider implementation.

 #

-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution. The full text of the license may be found at

@@ -14,6 +15,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = PwdCredentialProvider

+  MODULE_UNI_FILE                = PwdCredentialProvider.uni

   FILE_GUID                      = D6C589EA-DD29-49ef-97F6-1A9FE19A04E0

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

@@ -44,11 +46,20 @@
   BaseCryptLib

   

 [Guids]

-  gEfiUserCredentialClassPasswordGuid           ## CONSUMES ## Guid

-  gPwdCredentialProviderGuid                    ## PRODUCES ## Guid

-

+  gEfiUserCredentialClassPasswordGuid           ## SOMETIMES_CONSUMES          ## GUID

+  

+  ## PRODUCES             ## Variable:L"PwdCredential"

+  ## CONSUMES             ## Variable:L"PwdCredential"

+  ## CONSUMES             ## HII

+  ## SOMETIMES_CONSUMES   ## GUID               #  The credential provider identifier

+  gPwdCredentialProviderGuid

+  

 [Protocols]

-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

-  gEfiHiiConfigAccessProtocolGuid

-  gEfiUserCredential2ProtocolGuid

-  gEfiUserManagerProtocolGuid
\ No newline at end of file
+  gEfiDevicePathProtocolGuid                    ## PRODUCES

+  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES

+  gEfiUserCredential2ProtocolGuid               ## PRODUCES

+  gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES

+  

+[UserExtensions.TianoCore."ExtraFiles"]

+  PwdCredentialProviderExtra.uni

+  
\ No newline at end of file
diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
index 02f8030362..87a66fbea0 100644
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
+++ b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
@@ -1,7 +1,11 @@
 ## @file

-#  Component description file for USB Credential Provider.

+#  Provides a USB credential provider implementation

 #

-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>

+#  This module reads a token from a token file that is saved in the root 

+#  folder of a USB stick. The token file name can be specified by the PCD

+#  PcdFixedUsbCredentialProviderTokenFileName.

+#

+# 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

@@ -14,6 +18,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = UsbCredentialProvider

+  MODULE_UNI_FILE                = UsbCredentialProvider.uni

   FILE_GUID                      = 672A0C68-2BF0-46f9-93C3-C4E7DC0FA555

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

@@ -42,17 +47,24 @@
   BaseCryptLib

   

 [Guids]

-  gUsbCredentialProviderGuid                    ## PRODUCES ## Guid

-  gEfiFileInfoGuid                              ## CONSUMES ## Guid

-  gEfiUserCredentialClassSecureCardGuid         ## CONSUMES ## Guid

+  ## PRODUCES             ## Variable:L"UsbCredential"

+  ## CONSUMES             ## Variable:L"UsbCredential"

+  ## CONSUMES             ## HII

+  ## SOMETIMES_CONSUMES   ## GUID               # The credential provider identifier

+  gUsbCredentialProviderGuid

+  

+  gEfiFileInfoGuid                              ## SOMETIMES_CONSUMES         ## GUID

+  gEfiUserCredentialClassSecureCardGuid         ## SOMETIMES_CONSUMES         ## GUID

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdFixedUsbCredentialProviderTokenFileName

+  gEfiSecurityPkgTokenSpaceGuid.PcdFixedUsbCredentialProviderTokenFileName    ## SOMETIMES_CONSUMES 

 

 [Protocols]

-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

-  gEfiUserCredential2ProtocolGuid

-  gEfiUserManagerProtocolGuid

-  gEfiBlockIoProtocolGuid

-  gEfiSimpleFileSystemProtocolGuid

+  gEfiUserCredential2ProtocolGuid               ## PRODUCES

+  gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES

+  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES

+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES

+  

+[UserExtensions.TianoCore."ExtraFiles"]

+  UsbCredentialProviderExtra.uni

   
\ No newline at end of file
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
index 4963c09d6f..ac23818660 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
+++ b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
@@ -1,7 +1,9 @@
 ## @file

-#  Component description file for user identify manager driver.

+#  Produces user manager protocol

+#

+#  This module manages user information and produces user manager protocol.

 # 

-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution. The full text of the license may be found at

@@ -14,6 +16,7 @@
 [defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = UserIdentifyManager

+  MODULE_UNI_FILE                = UserIdentifyManager.uni

   FILE_GUID                      = C5D3191B-27D5-4873-8DF2-628136991A21

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

@@ -43,22 +46,34 @@
   UefiLib

 

 [Guids]

-  gEfiIfrTianoGuid                              ## CONSUMES ## Guid

-  gEfiEventUserProfileChangedGuid               ## CONSUMES ## Guid 

-  gUserIdentifyManagerGuid                      ## PRODUCES ## Guid

+  gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES  ## GUID

+  gEfiEventUserProfileChangedGuid               ## SOMETIMES_PRODUCES  ## Event

+  

+  ## SOMETIMES_PRODUCES                         ## Variable:L"Userxxxx"

+  ## SOMETIMES_CONSUMES                         ## Variable:L"Userxxxx"

+  ## CONSUMES                                   ## HII

+  gUserIdentifyManagerGuid

 

 [Protocols]

   gEfiFormBrowser2ProtocolGuid                  ## CONSUMES

   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES

-  gEfiUserCredential2ProtocolGuid               ## CONSUMES

-  gEfiDeferredImageLoadProtocolGuid             ## CONSUMES

+  gEfiUserCredential2ProtocolGuid               ## SOMETIMES_CONSUMES

+  gEfiDeferredImageLoadProtocolGuid             ## SOMETIMES_CONSUMES

+  gEfiSimpleTextOutProtocolGuid                 ## SOMETIMES_CONSUMES

+  gEfiSimpleTextInProtocolGuid                  ## SOMETIMES_CONSUMES

+  gEfiSimpleTextInputExProtocolGuid             ## SOMETIMES_CONSUMES

   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES

-  gEfiUserManagerProtocolGuid                   ## PRODUCES

-  gEfiSimpleTextOutProtocolGuid

-  gEfiSimpleTextInProtocolGuid

-  gEfiSimpleTextInputExProtocolGuid

+  gEfiDevicePathProtocolGuid                    ## PRODUCES

+  

+  ## PRODUCES

+  ## SOMETIMES_PRODUCES                         ## SystemTable

+  gEfiUserManagerProtocolGuid                   

 

 [Depex]

   gEfiHiiDatabaseProtocolGuid   AND 

   gEfiHiiStringProtocolGuid     AND 

   gEfiFormBrowser2ProtocolGuid 

+

+[UserExtensions.TianoCore."ExtraFiles"]

+  UserIdentifyManagerExtra.uni

+  
\ No newline at end of file
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
index 847aaa2156..619b2dd9f0 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
@@ -1,7 +1,10 @@
 ## @file

-#  Component description file for user profile manager driver.

+#  A UI tool to manage user profiles

 #

-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>

+#  By this module, user can add/update/delete user profiles, and can also

+#  modify the user access policy and the user identification policy.

+#

+# 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

@@ -14,6 +17,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = UserProfileManager

+  MODULE_UNI_FILE                = UserProfileManager.uni

   FILE_GUID                      = E38CB52D-A74D-45db-A8D0-290C9B21BBF2

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

@@ -47,18 +51,22 @@
   UefiLib

   DevicePathLib

   

-  [Guids]

-  gEfiIfrTianoGuid                              ## CONSUMES ## Guid

-  gEfiUserInfoAccessSetupAdminGuid              ## CONSUMES ## Guid

-  gEfiUserInfoAccessSetupNormalGuid             ## CONSUMES ## Guid

-  gEfiUserInfoAccessSetupRestrictedGuid         ## CONSUMES ## Guid

-  gUserProfileManagerGuid                       ## PRODUCES ## Guid

+[Guids]

+  gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES  ## GUID

+  gEfiUserInfoAccessSetupAdminGuid              ## SOMETIMES_CONSUMES  ## GUID

+  gEfiUserInfoAccessSetupNormalGuid             ## SOMETIMES_CONSUMES  ## GUID

+  gEfiUserInfoAccessSetupRestrictedGuid         ## SOMETIMES_CONSUMES  ## GUID

+  gUserProfileManagerGuid                       ## CONSUMES            ## HII

 

 [Protocols]

-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

-  gEfiHiiConfigAccessProtocolGuid

-  gEfiUserCredential2ProtocolGuid

-  gEfiUserManagerProtocolGuid

+  gEfiDevicePathProtocolGuid                    ## PRODUCES

+  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES

+  gEfiUserCredential2ProtocolGuid               ## SOMETIMES_CONSUMES

+  gEfiUserManagerProtocolGuid                   ## CONSUMES

 

 [Depex]

-  gEfiUserManagerProtocolGuid
\ No newline at end of file
+  gEfiUserManagerProtocolGuid

+  

+[UserExtensions.TianoCore."ExtraFiles"]

+  UserProfileManagerExtra.uni

+  
\ No newline at end of file