Changeset 58466 in vbox for trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification

Timestamp:

Oct 29, 2015 4:30:44 AM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge ^{/vendor/edk2/UDK2014.SP1} /vendor/edk2/current .

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c (modified) (66 diffs)
• SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h (modified) (18 diffs)
• SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h (modified) (2 diffs)
• SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf (modified) (3 diffs)
• SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderStrings.uni (modified) (1 prop) ( previous)
• SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr (modified) (3 diffs, 1 prop)
• SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c (modified) (76 diffs)
• SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h (modified) (18 diffs)
• SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf (modified) (4 diffs)
• SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderStrings.uni (modified) (1 prop) ( previous)
• SecurityPkg/UserIdentification/UserIdentifyManagerDxe/LoadDeferredImage.c (modified) (6 diffs)
• SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c (modified) (141 diffs)
• SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h (modified) (3 diffs)
• SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerData.h (modified) (1 diff)
• SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf (modified) (3 diffs)
• SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerStrings.uni (modified) (1 prop) ( previous)
• SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr (modified) (3 diffs, 1 prop)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c (modified) (24 diffs)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyIdentityPolicy.c (modified) (22 diffs)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileAdd.c (modified) (18 diffs)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c (modified) (10 diffs)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c (modified) (30 diffs)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h (modified) (15 diffs)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h (modified) (4 diffs)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf (modified) (2 diffs)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerStrings.uni (modified) (1 prop) ( previous)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr (modified) (16 diffs, 1 prop)
• SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c (modified) (43 diffs)

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c

@@ -1 +1 @@
 /** @file
   Password Credential Provider driver implementation.
-    
+
 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -98 +98 @@
   //
   NewTable = (CREDENTIAL_TABLE *) AllocateZeroPool (
-                                    sizeof (CREDENTIAL_TABLE) + 
+                                    sizeof (CREDENTIAL_TABLE) +
                                     (Count - 1) * sizeof (PASSWORD_INFO)
                                     );
-  ASSERT (NewTable != NULL); 
+  ASSERT (NewTable != NULL);
 
   NewTable->MaxCount    = Count;
@@ -110 +110 @@
   //
   CopyMem (
-    &NewTable->UserInfo, 
-    &mPwdTable->UserInfo, 
+    &NewTable->UserInfo,
+    &mPwdTable->UserInfo,
     mPwdTable->Count * sizeof (PASSWORD_INFO)
     );
@@ -123 +123 @@
 
   @param[in]  Index     The index of the password in table. If index is found in
-                        table, update the info, else add the into to table. 
-  @param[in]  Info      The new password info to add into table.If Info is NULL, 
+                        table, update the info, else add the into to table.
+  @param[in]  Info      The new password info to add into table.If Info is NULL,
                         delete the info by Index.
 
@@ -151 +151 @@
       if (Index != mPwdTable->Count) {
         NewPasswordInfo = &mPwdTable->UserInfo[mPwdTable->Count];
-      } 
+      }
     } else {
       //
@@ -214 +214 @@
   Var     = NULL;
   Status  = gRT->GetVariable (
-                   L"PwdCredential", 
-                   &gPwdCredentialProviderGuid, 
-                   NULL, 
+                   L"PwdCredential",
+                   &gPwdCredentialProviderGuid,
+                   NULL,
                    &VarSize,
                    Var
@@ -226 +226 @@
     }
     Status = gRT->GetVariable (
-                    L"PwdCredential", 
-                    &gPwdCredentialProviderGuid, 
-                    NULL, 
+                    L"PwdCredential",
+                    &gPwdCredentialProviderGuid,
+                    NULL,
                     &VarSize,
                     Var
@@ -236 +236 @@
     return Status;
   }
-  
+
   //
   // Create the password credential table.
@@ -242 +242 @@
   mPwdTable = AllocateZeroPool (
                 sizeof (CREDENTIAL_TABLE) - sizeof (PASSWORD_INFO) +
-                PASSWORD_TABLE_INC * sizeof (PASSWORD_INFO) + 
+                PASSWORD_TABLE_INC * sizeof (PASSWORD_INFO) +
                 VarSize
                 );
@@ -270 +270 @@
   @retval      TRUE           Hash the password successfully.
   @retval      FALSE          Failed to hash the password.
-                 
+
 **/
 BOOLEAN
@@ -282 +282 @@
   UINTN             HashSize;
   VOID              *Hash;
-  
+
   HashSize = Sha1GetContextSize ();
   Hash     = AllocatePool (HashSize);
   ASSERT (Hash != NULL);
-  
+
   Status = Sha1Init (Hash);
   if (!Status) {
     goto Done;
   }
-  
+
   Status = Sha1Update (Hash, Password, PasswordSize);
   if (!Status) {
     goto Done;
   }
-  
+
   Status = Sha1Final (Hash, Credential);
-  
+
 Done:
   FreePool (Hash);
@@ -325 +325 @@
   CHAR16        *QuestionStr;
   CHAR16        *LineStr;
-  
+
   PasswordLen = 0;
   while (TRUE) {
@@ -346 +346 @@
     FreePool (QuestionStr);
     FreePool (LineStr);
-    
+
     //
     // Check key stroke
@@ -357 +357 @@
           PasswordLen--;
         }
-      } else if ((Key.UnicodeChar == CHAR_NULL) || 
-                 (Key.UnicodeChar == CHAR_TAB) || 
+      } else if ((Key.UnicodeChar == CHAR_NULL) ||
+                 (Key.UnicodeChar == CHAR_TAB) ||
                  (Key.UnicodeChar == CHAR_LINEFEED)) {
         continue;
@@ -371 +371 @@
     }
   }
-  
+
   PasswordLen = PasswordLen * sizeof (CHAR16);
   GenerateCredential (Password, PasswordLen, (UINT8 *)Credential);
@@ -392 +392 @@
   UINTN      Index;
   CHAR8      *Pwd;
-  
+
   //
   // Check password credential.
@@ -412 +412 @@
   Find a user infomation record by the information record type.
 
-  This function searches all user information records of User from beginning 
+  This function searches all user information records of User from beginning
   until either the information is found, or there are no more user infomation
   records. A match occurs when a Info.InfoType field matches the user information
   record type.
 
-  @param[in]     User      Points to the user profile record to search.                          
+  @param[in]     User      Points to the user profile record to search.
   @param[in]     InfoType  The infomation type to be searched.
   @param[out]    Info      Points to the user info found, the caller is responsible
                            to free.
-  
+
   @retval EFI_SUCCESS      Find the user information successfully.
   @retval Others           Fail to find the user information.
@@ -438 +438 @@
   EFI_USER_INFO_HANDLE       UserInfoHandle;
   EFI_USER_MANAGER_PROTOCOL  *UserManager;
-  
+
   //
   // Find user information by information type.
@@ -501 +501 @@
       *Info = UserInfo;
       return EFI_SUCCESS;
-    }    
+    }
   }
 
@@ -570 +570 @@
       }
       *ActionRequest  = EFI_BROWSER_ACTION_REQUEST_EXIT;
-    }    
+    }
     return EFI_SUCCESS;
   }
@@ -714 +714 @@
   Enroll a user on a credential provider.
 
-  This function enrolls a user on this credential provider. If the user exists on 
-  this credential provider, update the user information on this credential provider; 
+  This function enrolls a user on this credential provider. If the user exists on
+  this credential provider, update the user information on this credential provider;
   otherwise add the user information on credential provider.
-  
+
   @param[in] This                Points to this instance of EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[in] User                The user profile to enroll.
- 
+
   @retval EFI_SUCCESS            User profile was successfully enrolled.
   @retval EFI_ACCESS_DENIED      Current user profile does not permit enrollment on the
                                  user profile handle. Either the user profile cannot enroll
-                                 on any user profile or cannot enroll on a user profile 
+                                 on any user profile or cannot enroll on a user profile
                                  other than the current user profile.
   @retval EFI_UNSUPPORTED        This credential provider does not support enrollment in
@@ -731 +731 @@
                                  error.
   @retval EFI_INVALID_PARAMETER  User does not refer to a valid user profile handle.
-  
+
 **/
 EFI_STATUS
@@ -767 +767 @@
   }
 
-  CopyMem (PwdInfo.UserId, (UINT8 *) (UserInfo + 1), sizeof (EFI_USER_INFO_IDENTIFIER)); 
+  CopyMem (PwdInfo.UserId, (UINT8 *) (UserInfo + 1), sizeof (EFI_USER_INFO_IDENTIFIER));
   FreePool (UserInfo);
 
   //
   // Get password from user.
-  //  
+  //
   while (TRUE) {
     //
@@ -789 +789 @@
     if (CompareMem (PwdInfo.Password, Password, CREDENTIAL_LEN) == 0) {
       break;
-    } 
+    }
 
     QuestionStr = GetStringById (STRING_TOKEN (STR_PASSWORD_MISMATCH));
-    PromptStr   = GetStringById (STRING_TOKEN (STR_INPUT_PASSWORD_AGAIN));    
+    PromptStr   = GetStringById (STRING_TOKEN (STR_INPUT_PASSWORD_AGAIN));
     CreatePopUp (
       EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
@@ -807 +807 @@
   //
   // Check whether User is ever enrolled in the provider.
-  // 
+  //
   for (Index = 0; Index < mPwdTable->Count; Index++) {
     UserId = (UINT8 *) &mPwdTable->UserInfo[Index].UserId;
@@ -813 +813 @@
       //
       // User already exists, update the password.
-      //      
+      //
       break;
     }
   }
-   
+
   //
   // Enroll the User to the provider.
@@ -835 +835 @@
   This function returns information about the form used when interacting with the
   user during user identification. The form is the first enabled form in the form-set
-  class EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If 
+  class EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If
   the user credential provider does not require a form to identify the user, then this
   function should return EFI_NOT_FOUND.
@@ -843 +843 @@
   @param[out] FormSetId  On return, holds the identifier of the form set which contains
                          the form used during user identification.
-  @param[out] FormId     On return, holds the identifier of the form used during user 
+  @param[out] FormId     On return, holds the identifier of the form used during user
                          identification.
-                         
+
   @retval EFI_SUCCESS            Form returned successfully.
   @retval EFI_NOT_FOUND          Form not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or FormSetId is NULL or FormId is NULL.
-  
+
 **/
 EFI_STATUS
@@ -860 +860 @@
   )
 {
-  if ((This == NULL) || (Hii == NULL) || 
+  if ((This == NULL) || (Hii == NULL) ||
       (FormSetId == NULL) || (FormId == NULL)) {
     return EFI_INVALID_PARAMETER;
@@ -868 +868 @@
   *FormId    = FORMID_GET_PASSWORD_FORM;
   CopyGuid (FormSetId, &gPwdCredentialProviderGuid);
-  
+
   return EFI_SUCCESS;
 }
@@ -878 +878 @@
   This optional function returns a bitmap that is less than or equal to the number
   of pixels specified by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND
-  is returned. 
+  is returned.
 
   @param[in]      This    Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in, out] Width   On entry, points to the desired bitmap width. If NULL then no 
-                          bitmap information will be returned. On exit, points to the 
+  @param[in, out] Width   On entry, points to the desired bitmap width. If NULL then no
+                          bitmap information will be returned. On exit, points to the
                           width of the bitmap returned.
   @param[in, out] Height  On entry, points to the desired bitmap height. If NULL then no
-                          bitmap information will be returned. On exit, points to the 
+                          bitmap information will be returned. On exit, points to the
                           height of the bitmap returned
-  @param[out]     Hii     On return, holds the HII database handle. 
-  @param[out]     Image   On return, holds the HII image identifier. 
- 
+  @param[out]     Hii     On return, holds the HII database handle.
+  @param[out]     Image   On return, holds the HII image identifier.
+
   @retval EFI_SUCCESS            Image identifier returned successfully.
   @retval EFI_NOT_FOUND          Image identifier not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or Image is NULL.
-  
+
 **/
 EFI_STATUS
@@ -904 +904 @@
       OUT    EFI_IMAGE_ID                        *Image
   )
-{  
+{
   if ((This == NULL) || (Hii == NULL) || (Image == NULL)) {
     return EFI_INVALID_PARAMETER;
@@ -916 +916 @@
 
   This function returns a string which describes the credential provider. If no
-  such string exists, then EFI_NOT_FOUND is returned. 
+  such string exists, then EFI_NOT_FOUND is returned.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[out] Hii        On return, holds the HII database handle.
   @param[out] String     On return, holds the HII string identifier.
- 
+
   @retval EFI_SUCCESS            String identifier returned successfully.
   @retval EFI_NOT_FOUND          String identifier not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or String is NULL.
-  
+
 **/
 EFI_STATUS
@@ -938 +938 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Set Hii handle and String ID.
@@ -953 +953 @@
 
   This function returns the user identifier of the user authenticated by this credential
-  provider. This function is called after the credential-related information has been 
+  provider. This function is called after the credential-related information has been
   submitted on a form, OR after a call to Default() has returned that this credential is
   ready to log on.
 
   @param[in]  This           Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in]  User           The user profile handle of the user profile currently being 
+  @param[in]  User           The user profile handle of the user profile currently being
                              considered by the user identity manager. If NULL, then no user
                              profile is currently under consideration.
-  @param[out] Identifier     On return, points to the user identifier. 
- 
+  @param[out] Identifier     On return, points to the user identifier.
+
   @retval EFI_SUCCESS            User identifier returned successfully.
   @retval EFI_NOT_READY          No user identifier can be returned.
@@ -969 +969 @@
   @retval EFI_NOT_FOUND          User is not NULL, and the specified user handle can't be
                                  found in user profile database
-  
+
 **/
 EFI_STATUS
@@ -998 +998 @@
     return EFI_NOT_READY;
   }
-  
+
   if (User == NULL) {
     //
     // Return the user ID whose password matches the input password.
-    // 
+    //
     CopyMem (
-      Identifier, 
-      &mPwdTable->UserInfo[mPwdTable->ValidIndex - 1].UserId, 
+      Identifier,
+      &mPwdTable->UserInfo[mPwdTable->ValidIndex - 1].UserId,
       sizeof (EFI_USER_INFO_IDENTIFIER)
-      );    
+      );
     return EFI_SUCCESS;
   }
-  
+
   //
   // Get the User's ID.
@@ -1022 +1022 @@
     return EFI_NOT_FOUND;
   }
-  
+
   //
   // Check whether the input password matches one in PwdTable.
@@ -1036 +1036 @@
         FreePool (UserInfo);
         return EFI_SUCCESS;
-      } 
-    }
-  }
-
-  FreePool (UserInfo);  
+      }
+    }
+  }
+
+  FreePool (UserInfo);
   return EFI_NOT_READY;
 }
@@ -1048 +1048 @@
   Indicate that user interface interaction has begun for the specified credential.
 
-  This function is called when a credential provider is selected by the user. If 
+  This function is called when a credential provider is selected by the user. If
   AutoLogon returns FALSE, then the user interface will be constructed by the User
-  Identity Manager. 
+  Identity Manager.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[out] AutoLogon  On return, points to the credential provider's capabilities 
-                         after the credential provider has been selected by the user. 
- 
+  @param[out] AutoLogon  On return, points to the credential provider's capabilities
+                         after the credential provider has been selected by the user.
+
   @retval EFI_SUCCESS            Credential provider successfully selected.
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.
-  
+
 **/
 EFI_STATUS
@@ -1082 +1082 @@
 
   @param[in] This        Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
- 
+
   @retval EFI_SUCCESS    Credential provider successfully deselected.
-  
+
 **/
 EFI_STATUS
@@ -1102 +1102 @@
   Return the default logon behavior for this user credential.
 
-  This function reports the default login behavior regarding this credential provider.  
+  This function reports the default login behavior regarding this credential provider.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[out] AutoLogon  On return, holds whether the credential provider should be used
-                         by default to automatically log on the user.  
- 
+                         by default to automatically log on the user.
+
   @retval EFI_SUCCESS            Default information successfully returned.
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.
-  
+
 **/
 EFI_STATUS
@@ -1123 +1123 @@
   }
   *AutoLogon = 0;
-  
+
   return EFI_SUCCESS;
 }
@@ -1131 +1131 @@
   Return information attached to the credential provider.
 
-  This function returns user information. 
+  This function returns user information.
 
   @param[in]      This          Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in]      UserInfo      Handle of the user information data record. 
+  @param[in]      UserInfo      Handle of the user information data record.
   @param[out]     Info          On entry, points to a buffer of at least *InfoSize bytes. On
                                 exit, holds the user information. If the buffer is too small
@@ -1140 +1140 @@
                                 and InfoSize is updated to contain the number of bytes actually
                                 required.
-  @param[in, out] InfoSize      On entry, points to the size of Info. On return, points to the 
-                                size of the user information. 
- 
+  @param[in, out] InfoSize      On entry, points to the size of Info. On return, points to the
+                                size of the user information.
+
   @retval EFI_SUCCESS           Information returned successfully.
   @retval EFI_BUFFER_TOO_SMALL  The size specified by InfoSize is too small to hold all of the
                                 user information. The size required is returned in *InfoSize.
   @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.
-  @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle. 
-                                
+  @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle.
+
 **/
 EFI_STATUS
@@ -1161 +1161 @@
   EFI_USER_INFO            *CredentialInfo;
   UINTN                    Index;
-  
+
   if ((This == NULL) || (InfoSize == NULL) || (Info == NULL)) {
     return EFI_INVALID_PARAMETER;
@@ -1169 +1169 @@
     return EFI_NOT_FOUND;
   }
-  
+
   //
   // Find information handle in credential info table.
@@ -1183 +1183 @@
         return EFI_BUFFER_TOO_SMALL;
       }
-      CopyMem (Info, CredentialInfo, CredentialInfo->InfoSize);      
-      return EFI_SUCCESS; 
-    }
-  }
-  
+      CopyMem (Info, CredentialInfo, CredentialInfo->InfoSize);
+      return EFI_SUCCESS;
+    }
+  }
+
   return EFI_NOT_FOUND;
 }
@@ -1198 +1198 @@
   information record handle, point UserInfo at a NULL. Each subsequent call will retrieve
   another user information record handle until there are no more, at which point UserInfo
-  will point to NULL. 
+  will point to NULL.
 
   @param[in]      This     Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@@ -1204 +1204 @@
                            to start enumeration. On exit, points to the next user information
                            handle or NULL if there is no more user information.
- 
+
   @retval EFI_SUCCESS            User information returned.
   @retval EFI_NOT_FOUND          No more user information found.
   @retval EFI_INVALID_PARAMETER  UserInfo is NULL.
-  
+
 **/
 EFI_STATUS
@@ -1222 +1222 @@
   UINTN                    Index;
   UINTN                    ProvStrLen;
-    
+
   if ((This == NULL) || (UserInfo == NULL)) {
     return EFI_INVALID_PARAMETER;
@@ -1244 +1244 @@
     Info    = AllocateZeroPool (InfoLen);
     ASSERT (Info != NULL);
-    
+
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_RECORD;
     Info->InfoSize    = (UINT32) InfoLen;
@@ -1250 +1250 @@
     CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);
     CopyGuid ((EFI_GUID *)(Info + 1), &gPwdCredentialProviderGuid);
-    
+
     mPwdInfoHandle->Info[0] = Info;
     mPwdInfoHandle->Count++;
@@ -1262 +1262 @@
     Info        = AllocateZeroPool (InfoLen);
     ASSERT (Info != NULL);
-    
+
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;
     Info->InfoSize    = (UINT32) InfoLen;
@@ -1279 +1279 @@
     Info    = AllocateZeroPool (InfoLen);
     ASSERT (Info != NULL);
-      
+
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_TYPE_RECORD;
     Info->InfoSize    = (UINT32) InfoLen;
@@ -1285 +1285 @@
     CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);
     CopyGuid ((EFI_GUID *)(Info + 1), &gEfiUserCredentialClassPasswordGuid);
-    
+
     mPwdInfoHandle->Info[2] = Info;
     mPwdInfoHandle->Count++;
- 
+
     //
     // The fourth information, Credential Provider type name info.
@@ -1297 +1297 @@
     Info        = AllocateZeroPool (InfoLen);
     ASSERT (Info != NULL);
-    
+
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;
     Info->InfoSize    = (UINT32) InfoLen;
@@ -1304 +1304 @@
     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);
     FreePool (ProvNameStr);
-    
+
     mPwdInfoHandle->Info[3] = Info;
     mPwdInfoHandle->Count++;
   }
-  
+
   if (*UserInfo == NULL) {
     //
@@ -1316 +1316 @@
     return EFI_SUCCESS;
   }
-  
+
   //
   // Find information handle in credential info table.
@@ -1333 +1333 @@
         return EFI_NOT_FOUND;
       }
-    
+
       Index++;
       *UserInfo = (EFI_USER_INFO_HANDLE)mPwdInfoHandle->Info[Index];
-      return EFI_SUCCESS;            
+      return EFI_SUCCESS;
     }
   }
@@ -1347 +1347 @@
   Delete a user on this credential provider.
 
-  This function deletes a user on this credential provider. 
+  This function deletes a user on this credential provider.
 
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@@ -1353 +1353 @@
 
   @retval EFI_SUCCESS            User profile was successfully deleted.
-  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle. 
-                                 Either the user profile cannot delete on any user profile or cannot delete 
-                                 on a user profile other than the current user profile. 
+  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle.
+                                 Either the user profile cannot delete on any user profile or cannot delete
+                                 on a user profile other than the current user profile.
   @retval EFI_UNSUPPORTED        This credential provider does not support deletion in the pre-OS.
   @retval EFI_DEVICE_ERROR       The new credential could not be deleted because of a device error.
@@ -1372 +1372 @@
   UINT8                     *NewUserId;
   UINTN                     Index;
-  
+
   if ((This == NULL) || (User == NULL)) {
     return EFI_INVALID_PARAMETER;
@@ -1392 +1392 @@
   //
   // Find the user by user identifier in mPwdTable.
-  // 
+  //
   for (Index = 0; Index < mPwdTable->Count; Index++) {
     UserId    = (UINT8 *) &mPwdTable->UserInfo[Index].UserId;
@@ -1440 +1440 @@
     return Status;
   }
-  
+
   //
   // Init Form Browser.
@@ -1448 +1448 @@
     return Status;
   }
-  
+
   //
   // Install protocol interfaces for the password credential provider.

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h

@@ -1 +1 @@
 /** @file
   Password Credential Provider driver header file.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -93 +93 @@
   Enroll a user on a credential provider.
 
-  This function enrolls a user on this credential provider. If the user exists on 
-  this credential provider, update the user information on this credential provider; 
+  This function enrolls a user on this credential provider. If the user exists on
+  this credential provider, update the user information on this credential provider;
   otherwise delete the user information on credential provider.
-  
+
   @param[in] This                Points to this instance of EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[in] User                The user profile to enroll.
- 
+
   @retval EFI_SUCCESS            User profile was successfully enrolled.
   @retval EFI_ACCESS_DENIED      Current user profile does not permit enrollment on the
                                  user profile handle. Either the user profile cannot enroll
-                                 on any user profile or cannot enroll on a user profile 
+                                 on any user profile or cannot enroll on a user profile
                                  other than the current user profile.
   @retval EFI_UNSUPPORTED        This credential provider does not support enrollment in
@@ -110 +110 @@
                                  error.
   @retval EFI_INVALID_PARAMETER  User does not refer to a valid user profile handle.
-  
+
 **/
 EFI_STATUS
@@ -124 +124 @@
   This function returns information about the form used when interacting with the
   user during user identification. The form is the first enabled form in the form-set
-  class EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If 
+  class EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If
   the user credential provider does not require a form to identify the user, then this
   function should return EFI_NOT_FOUND.
@@ -132 +132 @@
   @param[out] FormSetId  On return, holds the identifier of the form set which contains
                          the form used during user identification.
-  @param[out] FormId     On return, holds the identifier of the form used during user 
+  @param[out] FormId     On return, holds the identifier of the form used during user
                          identification.
-                         
+
   @retval EFI_SUCCESS            Form returned successfully.
   @retval EFI_NOT_FOUND          Form not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or FormSetId is NULL or FormId is NULL.
-  
+
 **/
 EFI_STATUS
@@ -154 +154 @@
   This optional function returns a bitmap which is less than or equal to the number
   of pixels specified by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND
-  is returned. 
+  is returned.
 
   @param[in]      This    Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in, out] Width   On entry, points to the desired bitmap width. If NULL then no 
-                          bitmap information will be returned. On exit, points to the 
+  @param[in, out] Width   On entry, points to the desired bitmap width. If NULL then no
+                          bitmap information will be returned. On exit, points to the
                           width of the bitmap returned.
   @param[in, out] Height  On entry, points to the desired bitmap height. If NULL then no
-                          bitmap information will be returned. On exit, points to the 
+                          bitmap information will be returned. On exit, points to the
                           height of the bitmap returned
-  @param[out]     Hii     On return, holds the HII database handle. 
-  @param[out]     Image   On return, holds the HII image identifier. 
- 
+  @param[out]     Hii     On return, holds the HII database handle.
+  @param[out]     Image   On return, holds the HII image identifier.
+
   @retval EFI_SUCCESS            Image identifier returned successfully.
   @retval EFI_NOT_FOUND          Image identifier not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or Image is NULL.
-  
+
 **/
 EFI_STATUS
@@ -185 +185 @@
 
   This function returns a string which describes the credential provider. If no
-  such string exists, then EFI_NOT_FOUND is returned. 
+  such string exists, then EFI_NOT_FOUND is returned.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[out] Hii        On return, holds the HII database handle.
   @param[out] String     On return, holds the HII string identifier.
- 
+
   @retval EFI_SUCCESS            String identifier returned successfully.
   @retval EFI_NOT_FOUND          String identifier not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or String is NULL.
-  
+
 **/
 EFI_STATUS
@@ -208 +208 @@
 
   This function returns the user identifier of the user authenticated by this credential
-  provider. This function is called after the credential-related information has been 
+  provider. This function is called after the credential-related information has been
   submitted on a form OR after a call to Default() has returned that this credential is
   ready to log on.
 
   @param[in]  This           Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in]  User           The user profile handle of the user profile currently being 
+  @param[in]  User           The user profile handle of the user profile currently being
                              considered by the user identity manager. If NULL, then no user
                              profile is currently under consideration.
-  @param[out] Identifier     On return, points to the user identifier. 
- 
+  @param[out] Identifier     On return, points to the user identifier.
+
   @retval EFI_SUCCESS            User identifier returned successfully.
   @retval EFI_NOT_READY          No user identifier can be returned.
@@ -224 +224 @@
   @retval EFI_NOT_FOUND          User is not NULL, and the specified user handle can't be
                                  found in user profile database
-  
+
 **/
 EFI_STATUS
@@ -237 +237 @@
   Indicate that user interface interaction has begun for the specified credential.
 
-  This function is called when a credential provider is selected by the user. If 
+  This function is called when a credential provider is selected by the user. If
   AutoLogon returns FALSE, then the user interface will be constructed by the User
-  Identity Manager. 
+  Identity Manager.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[out] AutoLogon  On return, points to the credential provider's capabilities 
-                         after the credential provider has been selected by the user. 
- 
+  @param[out] AutoLogon  On return, points to the credential provider's capabilities
+                         after the credential provider has been selected by the user.
+
   @retval EFI_SUCCESS            Credential provider successfully selected.
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.
-  
+
 **/
 EFI_STATUS
@@ -262 +262 @@
 
   @param[in] This        Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
- 
+
   @retval EFI_SUCCESS    Credential provider successfully deselected.
-  
+
 **/
 EFI_STATUS
@@ -275 +275 @@
   Return the default logon behavior for this user credential.
 
-  This function reports the default login behavior regarding this credential provider.  
+  This function reports the default login behavior regarding this credential provider.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[out] AutoLogon  On return, holds whether the credential provider should be used
-                         by default to automatically log on the user.  
- 
+                         by default to automatically log on the user.
+
   @retval EFI_SUCCESS            Default information successfully returned.
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.
@@ -295 +295 @@
   Return information attached to the credential provider.
 
-  This function returns user information. 
+  This function returns user information.
 
   @param[in]      This          Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in]      UserInfo      Handle of the user information data record. 
+  @param[in]      UserInfo      Handle of the user information data record.
   @param[out]     Info          On entry, points to a buffer of at least *InfoSize bytes. On
                                 exit, holds the user information. If the buffer is too small
@@ -304 +304 @@
                                 and InfoSize is updated to contain the number of bytes actually
                                 required.
-  @param[in, out] InfoSize      On entry, points to the size of Info. On return, points to the 
-                                size of the user information. 
- 
+  @param[in, out] InfoSize      On entry, points to the size of Info. On return, points to the
+                                size of the user information.
+
   @retval EFI_SUCCESS           Information returned successfully.
   @retval EFI_BUFFER_TOO_SMALL  The size specified by InfoSize is too small to hold all of the
                                 user information. The size required is returned in *InfoSize.
   @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.
-  @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle. 
-                                
+  @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle.
+
 **/
 EFI_STATUS
@@ -330 +330 @@
   information record handle, point UserInfo at a NULL. Each subsequent call will retrieve
   another user information record handle until there are no more, at which point UserInfo
-  will point to NULL. 
+  will point to NULL.
 
   @param[in]      This     Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@@ -336 +336 @@
                            to start enumeration. On exit, points to the next user information
                            handle or NULL if there is no more user information.
- 
+
   @retval EFI_SUCCESS            User information returned.
   @retval EFI_NOT_FOUND          No more user information found.
   @retval EFI_INVALID_PARAMETER  UserInfo is NULL.
-  
+
 **/
 EFI_STATUS
@@ -352 +352 @@
   Delete a user on this credential provider.
 
-  This function deletes a user on this credential provider. 
+  This function deletes a user on this credential provider.
 
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@@ -358 +358 @@
 
   @retval EFI_SUCCESS            User profile was successfully deleted.
-  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle. 
-                                 Either the user profile cannot delete on any user profile or cannot delete 
-                                 on a user profile other than the current user profile. 
+  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle.
+                                 Either the user profile cannot delete on any user profile or cannot delete
+                                 on a user profile other than the current user profile.
   @retval EFI_UNSUPPORTED        This credential provider does not support deletion in the pre-OS.
   @retval EFI_DEVICE_ERROR       The new credential could not be deleted because of a device error.

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h

@@ -1 +1 @@
 /** @file
   Data structure used by the Password Credential Provider driver.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -25 +25 @@
 //
 // Key defination
-// 
+//
 #define KEY_GET_PASSWORD              0x1000
 

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf

@@ -45 +45 @@
   UefiLib
   BaseCryptLib
-  
+
 [Guids]
   gEfiUserCredentialClassPasswordGuid           ## SOMETIMES_CONSUMES          ## GUID
-  
+
   ## PRODUCES             ## Variable:L"PwdCredential"
   ## CONSUMES             ## Variable:L"PwdCredential"
@@ -54 +54 @@
   ## SOMETIMES_CONSUMES   ## GUID               #  The credential provider identifier
   gPwdCredentialProviderGuid
-  
+
 [Protocols]
   gEfiDevicePathProtocolGuid                    ## PRODUCES
@@ -60 +60 @@
   gEfiUserCredential2ProtocolGuid               ## PRODUCES
   gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES
-  
+
 [UserExtensions.TianoCore."ExtraFiles"]
   PwdCredentialProviderExtra.uni

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr

@@ -3 +3 @@
 
 Copyright (c) 2009 - 2010, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -15 +15 @@
 #include "PwdCredentialProviderData.h"
 
-formset 
+formset
   guid      = PWD_CREDENTIAL_PROVIDER_GUID,
-  title     = STRING_TOKEN(STR_CREDENTIAL_TITLE),  
-  help      = STRING_TOKEN(STR_NULL_STRING), 
+  title     = STRING_TOKEN(STR_CREDENTIAL_TITLE),
+  help      = STRING_TOKEN(STR_NULL_STRING),
   classguid = PWD_CREDENTIAL_PROVIDER_GUID,
-  
-  form formid = FORMID_GET_PASSWORD_FORM,            
+
+  form formid = FORMID_GET_PASSWORD_FORM,
     title = STRING_TOKEN(STR_FORM_TITLE);
-    
-    text 
-      help   = STRING_TOKEN(STR_NULL_STRING),  
+
+    text
+      help   = STRING_TOKEN(STR_NULL_STRING),
       text   = STRING_TOKEN(STR_INPUT_PASSWORD),
       flags  = INTERACTIVE,
@@ -31 +31 @@
 
   endform;
-  
+
 endformset;

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c

@@ -1 +1 @@
 /** @file
   Usb Credential Provider driver implemenetation.
-    
+
 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -79 +79 @@
                Count * sizeof (USB_INFO)
                );
-  ASSERT (NewTable != NULL); 
+  ASSERT (NewTable != NULL);
 
   NewTable->MaxCount = Count;
@@ -88 +88 @@
   //
   CopyMem (
-    &NewTable->UserInfo, 
-    &mUsbTable->UserInfo, 
+    &NewTable->UserInfo,
+    &mUsbTable->UserInfo,
     mUsbTable->Count * sizeof (USB_INFO)
     );
@@ -101 +101 @@
 
   @param[in]  Index     The index of the password in table. If index is found in
-                        table, update the info, else add the into to table. 
-  @param[in]  Info      The new credential info to add into table. If Info is NULL, 
+                        table, update the info, else add the into to table.
+  @param[in]  Info      The new credential info to add into table. If Info is NULL,
                         delete the info by Index.
 
@@ -118 +118 @@
   EFI_STATUS  Status;
   USB_INFO    *NewUsbInfo;
-  
+
   NewUsbInfo = NULL;
   if (Index < mUsbTable->Count) {
@@ -128 +128 @@
       if (Index != mUsbTable->Count) {
         NewUsbInfo = &mUsbTable->UserInfo[mUsbTable->Count];
-      } 
+      }
     } else {
       //
@@ -191 +191 @@
   Var     = NULL;
   Status  = gRT->GetVariable (
-                   L"UsbCredential", 
-                   &gUsbCredentialProviderGuid, 
-                   NULL, 
+                   L"UsbCredential",
+                   &gUsbCredentialProviderGuid,
+                   NULL,
                    &VarSize,
                    Var
@@ -203 +203 @@
     }
     Status = gRT->GetVariable (
-                    L"UsbCredential", 
-                    &gUsbCredentialProviderGuid, 
-                    NULL, 
+                    L"UsbCredential",
+                    &gUsbCredentialProviderGuid,
+                    NULL,
                     &VarSize,
                     Var
@@ -213 +213 @@
     return Status;
   }
-  
+
   //
   // Init Usb credential table.
@@ -219 +219 @@
   mUsbTable = AllocateZeroPool (
                 sizeof (CREDENTIAL_TABLE) - sizeof (USB_INFO) +
-                USB_TABLE_INC * sizeof (USB_INFO) + 
+                USB_TABLE_INC * sizeof (USB_INFO) +
                 VarSize
                 );
@@ -307 +307 @@
         continue;
       }
-    
+
       Status = SimpleFileSystem->OpenVolume (
                                    SimpleFileSystem,
@@ -315 +315 @@
         continue;
       }
-                                   
+
       Status = RootFs->Open (
                          RootFs,
@@ -325 +325 @@
       if (!EFI_ERROR (Status)) {
         break;
-      }      
+      }
     }
   }
@@ -336 +336 @@
     goto Done;
   }
-  
+
   //
   // Figure out how big the file is.
@@ -353 +353 @@
   }
 
-  FileInfo = AllocateZeroPool (ScratchBufferSize);                                    
+  FileInfo = AllocateZeroPool (ScratchBufferSize);
   if (FileInfo == NULL) {
     DEBUG ((DEBUG_ERROR, "Can not allocate enough memory for the token file!\n"));
@@ -371 +371 @@
     goto Done;
   }
-  
+
   //
   // Allocate a buffer for the file.
   //
   *BufferSize = (UINT32) FileInfo->FileSize;
-  *Buffer     = AllocateZeroPool (*BufferSize); 
+  *Buffer     = AllocateZeroPool (*BufferSize);
   if (*Buffer == NULL) {
     DEBUG ((DEBUG_ERROR, "Can not allocate a buffer for the file!\n"));
@@ -382 +382 @@
     goto Done;
   }
-  
+
   //
   // Load file into the allocated memory.
@@ -393 +393 @@
     goto Done;
   }
-  
+
   //
   // Close file.
@@ -417 +417 @@
   Hash the data to get credential.
 
-  @param[in]   Buffer         Points to the data buffer 
+  @param[in]   Buffer         Points to the data buffer
   @param[in]   BufferSize     The size of data in buffer, in bytes.
   @param[out]  Credential     Points to the hashed result
@@ -423 +423 @@
   @retval      TRUE           Hash the data successfully.
   @retval      FALSE          Failed to hash the data.
-                 
+
 **/
 BOOLEAN
@@ -435 +435 @@
   UINTN             HashSize;
   VOID              *Hash;
-  
+
   HashSize = Sha1GetContextSize ();
   Hash     = AllocatePool (HashSize);
   ASSERT (Hash != NULL);
-  
+
   Status = Sha1Init (Hash);
   if (!Status) {
     goto Done;
   }
-  
+
   Status = Sha1Update (Hash, Buffer, BufferSize);
   if (!Status) {
     goto Done;
   }
-  
+
   Status = Sha1Final (Hash, Credential);
-  
+
 Done:
   FreePool (Hash);
@@ -465 +465 @@
   @retval EFI_SUCCESS           Read a Token successfully.
   @retval Others                Fails to read a Token.
-  
+
 **/
 EFI_STATUS
@@ -485 +485 @@
     return Status;
   }
-  
+
   if (!GenerateCredential (Buffer, BufSize, Token)) {
     DEBUG ((DEBUG_ERROR, "Generate credential from read data failed!\n"));
@@ -491 +491 @@
     return EFI_SECURITY_VIOLATION;
   }
-  
-  FreePool (Buffer);  
+
+  FreePool (Buffer);
   return EFI_SUCCESS;
 }
@@ -500 +500 @@
   Find a user infomation record by the information record type.
 
-  This function searches all user information records of User from beginning 
+  This function searches all user information records of User from beginning
   until either the information is found or there are no more user infomation
   record. A match occurs when a Info.InfoType field matches the user information
   record type.
 
-  @param[in]     User      Points to the user profile record to search.                          
+  @param[in]     User      Points to the user profile record to search.
   @param[in]     InfoType  The infomation type to be searched.
   @param[out]    Info      Points to the user info found, the caller is responsible
                            to free.
-  
+
   @retval EFI_SUCCESS      Find the user information successfully.
   @retval Others           Fail to find the user information.
@@ -526 +526 @@
   EFI_USER_INFO_HANDLE       UserInfoHandle;
   EFI_USER_MANAGER_PROTOCOL  *UserManager;
-  
+
   //
   // Find user information by information type.
@@ -589 +589 @@
       *Info = UserInfo;
       return EFI_SUCCESS;
-    }    
+    }
   }
 
@@ -612 +612 @@
 {
   USB_PROVIDER_CALLBACK_INFO  *CallbackInfo;
-    
+
   //
   // Initialize driver private data.
@@ -620 +620 @@
     return EFI_OUT_OF_RESOURCES;
   }
- 
+
   CallbackInfo->DriverHandle  = NULL;
 
@@ -644 +644 @@
   Enroll a user on a credential provider.
 
-  This function enrolls a user on this credential provider. If the user exists on 
-  this credential provider, update the user information on this credential provider; 
+  This function enrolls a user on this credential provider. If the user exists on
+  this credential provider, update the user information on this credential provider;
   otherwise add the user information on credential provider.
-  
+
   @param[in] This                Points to this instance of EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[in] User                The user profile to enroll.
- 
+
   @retval EFI_SUCCESS            User profile was successfully enrolled.
   @retval EFI_ACCESS_DENIED      Current user profile does not permit enrollment on the
                                  user profile handle. Either the user profile cannot enroll
-                                 on any user profile or cannot enroll on a user profile 
+                                 on any user profile or cannot enroll on a user profile
                                  other than the current user profile.
   @retval EFI_UNSUPPORTED        This credential provider does not support enrollment in
@@ -661 +661 @@
                                  error.
   @retval EFI_INVALID_PARAMETER  User does not refer to a valid user profile handle.
-  
+
 **/
 EFI_STATUS
@@ -682 +682 @@
     return EFI_INVALID_PARAMETER;
   }
- 
+
   //
   // Get User Identifier
@@ -696 +696 @@
   }
 
-  CopyMem (UsbInfo.UserId, (UINT8 *) (UserInfo + 1), sizeof (EFI_USER_INFO_IDENTIFIER)); 
+  CopyMem (UsbInfo.UserId, (UINT8 *) (UserInfo + 1), sizeof (EFI_USER_INFO_IDENTIFIER));
   FreePool (UserInfo);
-  
+
   //
   // Get Token and User ID to UsbInfo.
@@ -705 +705 @@
   if (EFI_ERROR (Status)) {
     QuestionStr = GetStringById (STRING_TOKEN (STR_READ_USB_TOKEN_ERROR));
-    PromptStr   = GetStringById (STRING_TOKEN (STR_INSERT_USB_TOKEN)); 
+    PromptStr   = GetStringById (STRING_TOKEN (STR_INSERT_USB_TOKEN));
     CreatePopUp (
       EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
@@ -717 +717 @@
     FreePool (PromptStr);
     return Status;
-  } 
+  }
 
   //
   // Check whether User is ever enrolled in the provider.
-  // 
+  //
   for (Index = 0; Index < mUsbTable->Count; Index++) {
     UserId = (UINT8 *) &mUsbTable->UserInfo[Index].UserId;
@@ -727 +727 @@
       //
       // User already exists, update the password.
-      //      
+      //
       break;
     }
   }
-  
+
   //
   // Enroll the User to the provider.
@@ -749 +749 @@
   This function returns information about the form used when interacting with the
   user during user identification. The form is the first enabled form in the form-set
-  class EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If 
+  class EFI_HII_USER_CREDENTIAL_FORMSET_GUID installed on the HII handle HiiHandle. If
   the user credential provider does not require a form to identify the user, then this
   function should return EFI_NOT_FOUND.
@@ -757 +757 @@
   @param[out] FormSetId  On return, holds the identifier of the form set which contains
                          the form used during user identification.
-  @param[out] FormId     On return, holds the identifier of the form used during user 
+  @param[out] FormId     On return, holds the identifier of the form used during user
                          identification.
-                         
+
   @retval EFI_SUCCESS            Form returned successfully.
   @retval EFI_NOT_FOUND          Form not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or FormSetId is NULL or FormId is NULL.
-  
+
 **/
 EFI_STATUS
@@ -774 +774 @@
   )
 {
-  if ((This == NULL) || (Hii == NULL) || 
+  if ((This == NULL) || (Hii == NULL) ||
       (FormSetId == NULL) || (FormId == NULL)) {
     return EFI_INVALID_PARAMETER;
@@ -787 +787 @@
   This optional function returns a bitmap which is less than or equal to the number
   of pixels specified by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND
-  is returned. 
+  is returned.
 
   @param[in]     This    Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in, out] Width  On entry, points to the desired bitmap width. If NULL then no 
-                         bitmap information will be returned. On exit, points to the 
+  @param[in, out] Width  On entry, points to the desired bitmap width. If NULL then no
+                         bitmap information will be returned. On exit, points to the
                          width of the bitmap returned.
   @param[in, out] Height On entry, points to the desired bitmap height. If NULL then no
-                         bitmap information will be returned. On exit, points to the 
+                         bitmap information will be returned. On exit, points to the
                          height of the bitmap returned.
-  @param[out]    Hii     On return, holds the HII database handle. 
-  @param[out]    Image   On return, holds the HII image identifier. 
- 
+  @param[out]    Hii     On return, holds the HII database handle.
+  @param[out]    Image   On return, holds the HII image identifier.
+
   @retval EFI_SUCCESS            Image identifier returned successfully.
   @retval EFI_NOT_FOUND          Image identifier not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or Image is NULL.
-  
+
 **/
 EFI_STATUS
@@ -825 +825 @@
 
   This function returns a string which describes the credential provider. If no
-  such string exists, then EFI_NOT_FOUND is returned. 
+  such string exists, then EFI_NOT_FOUND is returned.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[out] Hii        On return, holds the HII database handle.
   @param[out] String     On return, holds the HII string identifier.
- 
+
   @retval EFI_SUCCESS            String identifier returned successfully.
   @retval EFI_NOT_FOUND          String identifier not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or String is NULL.
-  
+
 **/
 EFI_STATUS
@@ -861 +861 @@
 
   This function returns the user identifier of the user authenticated by this credential
-  provider. This function is called after the credential-related information has been 
+  provider. This function is called after the credential-related information has been
   submitted on a form OR after a call to Default() has returned that this credential is
   ready to log on.
 
   @param[in]  This           Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in]  User           The user profile handle of the user profile currently being 
+  @param[in]  User           The user profile handle of the user profile currently being
                              considered by the user identity manager. If NULL, then no user
                              profile is currently under consideration.
-  @param[out] Identifier     On return, points to the user identifier. 
- 
+  @param[out] Identifier     On return, points to the user identifier.
+
   @retval EFI_SUCCESS            User identifier returned successfully.
   @retval EFI_NOT_READY          No user identifier can be returned.
@@ -877 +877 @@
   @retval EFI_NOT_FOUND          User is not NULL, and the specified user handle can't be
                                  found in user profile database.
-  
+
 **/
 EFI_STATUS
@@ -892 +892 @@
   UINT8         *UserId;
   UINT8         *NewUserId;
-  UINT8         *UserToken; 
+  UINT8         *UserToken;
   UINT8         ReadToken[HASHED_CREDENTIAL_LEN];
   EFI_INPUT_KEY Key;
   CHAR16        *QuestionStr;
   CHAR16        *PromptStr;
-  
+
   if ((This == NULL) || (Identifier == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
- 
+
   if (User == NULL) {
     //
@@ -909 +909 @@
       return EFI_NOT_READY;
     }
-    
+
     //
     // No user selected, get token first and verify the user existed in user database.
@@ -917 +917 @@
       return EFI_NOT_READY;
     }
-    
+
     for (Index = 0; Index < mUsbTable->Count; Index++) {
       //
@@ -930 +930 @@
     }
 
-    return EFI_NOT_READY;  
-  }
-   
-  //  
-  // User is not NULL here. Read a token, and check whether the token matches with 
-  // the selected user's Token. If not, try to find a token in token DB to matches 
+    return EFI_NOT_READY;
+  }
+
+  //
+  // User is not NULL here. Read a token, and check whether the token matches with
+  // the selected user's Token. If not, try to find a token in token DB to matches
   // with read token.
-  // 
-  
+  //
+
   Status = GetToken (ReadToken);
   if (EFI_ERROR (Status)) {
@@ -962 +962 @@
   if (EFI_ERROR (Status)) {
     return EFI_NOT_FOUND;
-  } 
-  
+  }
+
   //
   // Check the selected user's Token with the read token.
@@ -982 +982 @@
         FreePool (UserInfo);
         return EFI_SUCCESS;
-      } 
-    }
-  }
-
-  FreePool (UserInfo); 
-    
+      }
+    }
+  }
+
+  FreePool (UserInfo);
+
   return EFI_NOT_READY;
 }
@@ -995 +995 @@
   Indicate that user interface interaction has begun for the specified credential.
 
-  This function is called when a credential provider is selected by the user. If 
+  This function is called when a credential provider is selected by the user. If
   AutoLogon returns FALSE, then the user interface will be constructed by the User
-  Identity Manager. 
+  Identity Manager.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[out] AutoLogon  On return, points to the credential provider's capabilities 
-                         after the credential provider has been selected by the user. 
- 
+  @param[out] AutoLogon  On return, points to the credential provider's capabilities
+                         after the credential provider has been selected by the user.
+
   @retval EFI_SUCCESS            Credential provider successfully selected.
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.
-  
+
 **/
 EFI_STATUS
@@ -1030 +1030 @@
 
   @param[in] This        Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
- 
+
   @retval EFI_SUCCESS    Credential provider successfully deselected.
-  
+
 **/
 EFI_STATUS
@@ -1050 +1050 @@
   Return the default logon behavior for this user credential.
 
-  This function reports the default login behavior regarding this credential provider.  
+  This function reports the default login behavior regarding this credential provider.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[out] AutoLogon  On return, holds whether the credential provider should be used
-                         by default to automatically log on the user.  
- 
+                         by default to automatically log on the user.
+
   @retval EFI_SUCCESS            Default information successfully returned.
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.
-  
+
 **/
 EFI_STATUS
@@ -1079 +1079 @@
   Return information attached to the credential provider.
 
-  This function returns user information. 
+  This function returns user information.
 
   @param[in]      This          Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in]      UserInfo      Handle of the user information data record. 
+  @param[in]      UserInfo      Handle of the user information data record.
   @param[out]     Info          On entry, points to a buffer of at least *InfoSize bytes. On
                                 exit, holds the user information. If the buffer is too small
@@ -1088 +1088 @@
                                 and InfoSize is updated to contain the number of bytes actually
                                 required.
-  @param[in, out] InfoSize      On entry, points to the size of Info. On return, points to the 
-                                size of the user information. 
- 
+  @param[in, out] InfoSize      On entry, points to the size of Info. On return, points to the
+                                size of the user information.
+
   @retval EFI_SUCCESS           Information returned successfully.
   @retval EFI_BUFFER_TOO_SMALL  The size specified by InfoSize is too small to hold all of the
                                 user information. The size required is returned in *InfoSize.
   @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.
-  @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle. 
-                                
+  @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle.
+
 **/
 EFI_STATUS
@@ -1109 +1109 @@
   EFI_USER_INFO            *CredentialInfo;
   UINTN                    Index;
-  
+
   if ((This == NULL) || (InfoSize == NULL) || (Info == NULL)) {
     return EFI_INVALID_PARAMETER;
@@ -1117 +1117 @@
     return EFI_NOT_FOUND;
   }
-  
+
   //
   // Find information handle in credential info table.
@@ -1131 +1131 @@
         return EFI_BUFFER_TOO_SMALL;
       }
-      
-      CopyMem (Info, CredentialInfo, CredentialInfo->InfoSize);      
-      return EFI_SUCCESS;            
-    }
-  }
-  
+
+      CopyMem (Info, CredentialInfo, CredentialInfo->InfoSize);
+      return EFI_SUCCESS;
+    }
+  }
+
   return EFI_NOT_FOUND;
 }
@@ -1147 +1147 @@
   information record handle, point UserInfo at a NULL. Each subsequent call will retrieve
   another user information record handle until there are no more, at which point UserInfo
-  will point to NULL. 
+  will point to NULL.
 
   @param[in]      This     Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@@ -1153 +1153 @@
                            to start enumeration. On exit, points to the next user information
                            handle or NULL if there is no more user information.
- 
+
   @retval EFI_SUCCESS            User information returned.
   @retval EFI_NOT_FOUND          No more user information found.
   @retval EFI_INVALID_PARAMETER  UserInfo is NULL.
-  
+
 **/
 EFI_STATUS
@@ -1171 +1171 @@
   UINTN                    Index;
   UINTN                    ProvStrLen;
-    
+
   if ((This == NULL) || (UserInfo == NULL)) {
     return EFI_INVALID_PARAMETER;
@@ -1193 +1193 @@
     Info    = AllocateZeroPool (InfoLen);
     ASSERT (Info != NULL);
-    
+
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_RECORD;
     Info->InfoSize    = (UINT32) InfoLen;
@@ -1199 +1199 @@
     CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);
     CopyGuid ((EFI_GUID *)(Info + 1), &gUsbCredentialProviderGuid);
-    
+
     mUsbInfoHandle->Info[0] = Info;
     mUsbInfoHandle->Count++;
@@ -1211 +1211 @@
     Info        = AllocateZeroPool (InfoLen);
     ASSERT (Info != NULL);
-    
+
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;
     Info->InfoSize    = (UINT32) InfoLen;
@@ -1218 +1218 @@
     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);
     FreePool (ProvNameStr);
-    
+
     mUsbInfoHandle->Info[1] = Info;
     mUsbInfoHandle->Count++;
@@ -1228 +1228 @@
     Info    = AllocateZeroPool (InfoLen);
     ASSERT (Info != NULL);
-      
+
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_TYPE_RECORD;
     Info->InfoSize    = (UINT32) InfoLen;
@@ -1234 +1234 @@
     CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);
     CopyGuid ((EFI_GUID *)(Info + 1), &gEfiUserCredentialClassSecureCardGuid);
-    
+
     mUsbInfoHandle->Info[2] = Info;
     mUsbInfoHandle->Count++;
- 
+
     //
     // The fourth information, Credential Provider type name info.
@@ -1246 +1246 @@
     Info        = AllocateZeroPool (InfoLen);
     ASSERT (Info != NULL);
-    
+
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;
     Info->InfoSize    = (UINT32) InfoLen;
@@ -1253 +1253 @@
     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);
     FreePool (ProvNameStr);
-    
+
     mUsbInfoHandle->Info[3] = Info;
     mUsbInfoHandle->Count++;
   }
-  
+
   if (*UserInfo == NULL) {
     //
@@ -1265 +1265 @@
     return EFI_SUCCESS;
   }
-  
+
   //
   // Find information handle in credential info table.
@@ -1284 +1284 @@
       Index++;
       *UserInfo = (EFI_USER_INFO_HANDLE)mUsbInfoHandle->Info[Index];
-      return EFI_SUCCESS; 
+      return EFI_SUCCESS;
     }
   }
@@ -1296 +1296 @@
   Delete a user on this credential provider.
 
-  This function deletes a user on this credential provider. 
+  This function deletes a user on this credential provider.
 
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@@ -1302 +1302 @@
 
   @retval EFI_SUCCESS            User profile was successfully deleted.
-  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle. 
-                                 Either the user profile cannot delete on any user profile or cannot delete 
-                                 on a user profile other than the current user profile. 
+  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle.
+                                 Either the user profile cannot delete on any user profile or cannot delete
+                                 on a user profile other than the current user profile.
   @retval EFI_UNSUPPORTED        This credential provider does not support deletion in the pre-OS.
   @retval EFI_DEVICE_ERROR       The new credential could not be deleted because of a device error.
@@ -1321 +1321 @@
   UINT8                     *NewUserId;
   UINTN                     Index;
-  
+
   if ((This == NULL) || (User == NULL)) {
     return EFI_INVALID_PARAMETER;
@@ -1341 +1341 @@
   //
   // Find the user by user identifier in mPwdTable.
-  // 
+  //
   for (Index = 0; Index < mUsbTable->Count; Index++) {
     UserId    = (UINT8 *) &mUsbTable->UserInfo[Index].UserId;
@@ -1389 +1389 @@
     return Status;
   }
-  
+
   //
   // Init Form Browser
@@ -1397 +1397 @@
     return Status;
   }
-  
+
   //
   // Install protocol interfaces for the Usb Credential Provider.

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h

@@ -1 +1 @@
 /** @file
   Usb Credential Provider driver header file.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -81 +81 @@
   Enroll a user on a credential provider.
 
-  This function enrolls and deletes a user profile using this credential provider. 
-  If a user profile is successfully enrolled, it calls the User Manager Protocol 
-  function Notify() to notify the user manager driver that credential information 
-  has changed. If an enrolled user does exist, delete the user on the credential 
+  This function enrolls and deletes a user profile using this credential provider.
+  If a user profile is successfully enrolled, it calls the User Manager Protocol
+  function Notify() to notify the user manager driver that credential information
+  has changed. If an enrolled user does exist, delete the user on the credential
   provider.
 
   @param[in] This                Points to this instance of EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[in] User                The user profile to enroll.
- 
+
   @retval EFI_SUCCESS            User profile was successfully enrolled.
   @retval EFI_ACCESS_DENIED      Current user profile does not permit enrollment on the
                                  user profile handle. Either the user profile cannot enroll
-                                 on any user profile or cannot enroll on a user profile 
+                                 on any user profile or cannot enroll on a user profile
                                  other than the current user profile.
   @retval EFI_UNSUPPORTED        This credential provider does not support enrollment in
@@ -100 +100 @@
                                  error.
   @retval EFI_INVALID_PARAMETER  User does not refer to a valid user profile handle.
-  
+
 **/
 EFI_STATUS
@@ -112 +112 @@
   Returns the user interface information used during user identification.
 
-  This function enrolls a user on this credential provider. If the user exists on 
-  this credential provider, update the user information on this credential provider; 
+  This function enrolls a user on this credential provider. If the user exists on
+  this credential provider, update the user information on this credential provider;
   otherwise delete the user information on credential provider.
 
@@ -120 +120 @@
   @param[out] FormSetId  On return, holds the identifier of the form set which contains
                          the form used during user identification.
-  @param[out] FormId     On return, holds the identifier of the form used during user 
+  @param[out] FormId     On return, holds the identifier of the form used during user
                          identification.
-                         
+
   @retval EFI_SUCCESS            Form returned successfully.
   @retval EFI_NOT_FOUND          Form not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or FormSetId is NULL or FormId is NULL.
-  
+
 **/
 EFI_STATUS
@@ -142 +142 @@
   This optional function returns a bitmap which is less than or equal to the number
   of pixels specified by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND
-  is returned. 
+  is returned.
 
   @param[in]     This    Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in, out] Width  On entry, points to the desired bitmap width. If NULL then no 
-                         bitmap information will be returned. On exit, points to the 
+  @param[in, out] Width  On entry, points to the desired bitmap width. If NULL then no
+                         bitmap information will be returned. On exit, points to the
                          width of the bitmap returned.
   @param[in, out] Height On entry, points to the desired bitmap height. If NULL then no
-                         bitmap information will be returned. On exit, points to the 
+                         bitmap information will be returned. On exit, points to the
                          height of the bitmap returned.
-  @param[out]    Hii     On return, holds the HII database handle. 
-  @param[out]    Image   On return, holds the HII image identifier. 
- 
+  @param[out]    Hii     On return, holds the HII database handle.
+  @param[out]    Image   On return, holds the HII image identifier.
+
   @retval EFI_SUCCESS            Image identifier returned successfully.
   @retval EFI_NOT_FOUND          Image identifier not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or Image is NULL.
-  
+
 **/
 EFI_STATUS
@@ -173 +173 @@
 
   This function returns a string which describes the credential provider. If no
-  such string exists, then EFI_NOT_FOUND is returned. 
+  such string exists, then EFI_NOT_FOUND is returned.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[out] Hii        On return, holds the HII database handle.
   @param[out] String     On return, holds the HII string identifier.
- 
+
   @retval EFI_SUCCESS            String identifier returned successfully.
   @retval EFI_NOT_FOUND          String identifier not returned.
   @retval EFI_INVALID_PARAMETER  Hii is NULL or String is NULL.
-  
+
 **/
 EFI_STATUS
@@ -196 +196 @@
 
   This function returns the user identifier of the user authenticated by this credential
-  provider. This function is called after the credential-related information has been 
+  provider. This function is called after the credential-related information has been
   submitted on a form OR after a call to Default() has returned that this credential is
   ready to log on.
 
   @param[in]  This           Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in]  User           The user profile handle of the user profile currently being 
+  @param[in]  User           The user profile handle of the user profile currently being
                              considered by the user identity manager. If NULL, then no user
                              profile is currently under consideration.
-  @param[out] Identifier     On return, points to the user identifier. 
- 
+  @param[out] Identifier     On return, points to the user identifier.
+
   @retval EFI_SUCCESS        User identifier returned successfully.
   @retval EFI_NOT_READY      No user identifier can be returned.
@@ -212 +212 @@
   @retval EFI_NOT_FOUND          User is not NULL, and the specified user handle can't be
                                  found in user profile database.
-  
+
 **/
 EFI_STATUS
@@ -225 +225 @@
   Indicate that user interface interaction has begun for the specified credential.
 
-  This function is called when a credential provider is selected by the user. If 
+  This function is called when a credential provider is selected by the user. If
   AutoLogon returns FALSE, then the user interface will be constructed by the User
-  Identity Manager. 
+  Identity Manager.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[out] AutoLogon  On return, points to the credential provider's capabilities 
-                         after the credential provider has been selected by the user. 
- 
+  @param[out] AutoLogon  On return, points to the credential provider's capabilities
+                         after the credential provider has been selected by the user.
+
   @retval EFI_SUCCESS            Credential provider successfully selected.
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.
-  
+
 **/
 EFI_STATUS
@@ -250 +250 @@
 
   @param[in] This        Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
- 
+
   @retval EFI_SUCCESS    Credential provider successfully deselected.
-  
+
 **/
 EFI_STATUS
@@ -263 +263 @@
   Return the default logon behavior for this user credential.
 
-  This function reports the default login behavior regarding this credential provider.  
+  This function reports the default login behavior regarding this credential provider.
 
   @param[in]  This       Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
   @param[out] AutoLogon  On return, holds whether the credential provider should be used
-                         by default to automatically log on the user.  
- 
+                         by default to automatically log on the user.
+
   @retval EFI_SUCCESS            Default information successfully returned.
   @retval EFI_INVALID_PARAMETER  AutoLogon is NULL.
@@ -283 +283 @@
   Return information attached to the credential provider.
 
-  This function returns user information. 
+  This function returns user information.
 
   @param[in]      This          Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
-  @param[in]      UserInfo      Handle of the user information data record. 
+  @param[in]      UserInfo      Handle of the user information data record.
   @param[out]     Info          On entry, points to a buffer of at least *InfoSize bytes. On
                                 exit, holds the user information. If the buffer is too small
@@ -292 +292 @@
                                 and InfoSize is updated to contain the number of bytes actually
                                 required.
-  @param[in, out] InfoSize      On entry, points to the size of Info. On return, points to the 
-                                size of the user information. 
- 
+  @param[in, out] InfoSize      On entry, points to the size of Info. On return, points to the
+                                size of the user information.
+
   @retval EFI_SUCCESS           Information returned successfully.
   @retval EFI_BUFFER_TOO_SMALL  The size specified by InfoSize is too small to hold all of the
                                 user information. The size required is returned in *InfoSize.
   @retval EFI_INVALID_PARAMETER Info is NULL or InfoSize is NULL.
-  @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle. 
-                                
+  @retval EFI_NOT_FOUND         The specified UserInfo does not refer to a valid user info handle.
+
 **/
 EFI_STATUS
@@ -317 +317 @@
   information record handle, point UserInfo at a NULL. Each subsequent call will retrieve
   another user information record handle until there are no more, at which point UserInfo
-  will point to NULL. 
+  will point to NULL.
 
   @param[in]      This     Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@@ -323 +323 @@
                            to start enumeration. On exit, points to the next user information
                            handle or NULL if there is no more user information.
- 
+
   @retval EFI_SUCCESS            User information returned.
   @retval EFI_NOT_FOUND          No more user information found.
   @retval EFI_INVALID_PARAMETER  UserInfo is NULL.
-  
+
 **/
 EFI_STATUS
@@ -339 +339 @@
   Delete a user on this credential provider.
 
-  This function deletes a user on this credential provider. 
+  This function deletes a user on this credential provider.
 
   @param[in]     This            Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@@ -345 +345 @@
 
   @retval EFI_SUCCESS            User profile was successfully deleted.
-  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle. 
-                                 Either the user profile cannot delete on any user profile or cannot delete 
-                                 on a user profile other than the current user profile. 
+  @retval EFI_ACCESS_DENIED      Current user profile does not permit deletion on the user profile handle.
+                                 Either the user profile cannot delete on any user profile or cannot delete
+                                 on a user profile other than the current user profile.
   @retval EFI_UNSUPPORTED        This credential provider does not support deletion in the pre-OS.
   @retval EFI_DEVICE_ERROR       The new credential could not be deleted because of a device error.

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf

@@ -2 +2 @@
 #  Provides a USB credential provider implementation
 #
-#  This module reads a token from a token file that is saved in the root 
+#  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.
@@ -46 +46 @@
   UefiLib
   BaseCryptLib
-  
+
 [Guids]
   ## PRODUCES             ## Variable:L"UsbCredential"
@@ -53 +53 @@
   ## SOMETIMES_CONSUMES   ## GUID               # The credential provider identifier
   gUsbCredentialProviderGuid
-  
+
   gEfiFileInfoGuid                              ## SOMETIMES_CONSUMES         ## GUID
   gEfiUserCredentialClassSecureCardGuid         ## SOMETIMES_CONSUMES         ## GUID
 
 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdFixedUsbCredentialProviderTokenFileName    ## SOMETIMES_CONSUMES 
+  gEfiSecurityPkgTokenSpaceGuid.PcdFixedUsbCredentialProviderTokenFileName    ## SOMETIMES_CONSUMES
 
 [Protocols]
@@ -65 +65 @@
   gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES
   gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES
-  
+
 [UserExtensions.TianoCore."ExtraFiles"]
   UsbCredentialProviderExtra.uni

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/LoadDeferredImage.c

@@ -1 +1 @@
 /** @file
   Load the deferred images after user is identified.
-    
+
 Copyright (c) 2009 - 2010, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -40 +40 @@
   EFI_DEVICE_PATH_PROTOCOL           *ImageDevicePath;
   VOID                               *DriverImage;
-  UINTN                              ImageSize; 
+  UINTN                              ImageSize;
   BOOLEAN                            BootOption;
   EFI_HANDLE                         ImageHandle;
@@ -78 +78 @@
       //
       Status = DeferredImage->GetImageInfo(
-                                DeferredImage, 
-                                DriverIndex, 
-                                &ImageDevicePath, 
+                                DeferredImage,
+                                DriverIndex,
+                                &ImageDevicePath,
                                 (VOID **) &DriverImage,
-                                &ImageSize, 
+                                &ImageSize,
                                 &BootOption
                                 );
       if (EFI_ERROR (Status)) {
         break;
-      } 
+      }
 
       //
@@ -107 +107 @@
         gBS->SetWatchdogTimer (5 * 60, 0x0000, 0x00, NULL);
         Status = gBS->StartImage (ImageHandle, &ExitDataSize, &ExitData);
-    
+
         //
         // Clear the Watchdog Timer after the image returns.
@@ -116 +116 @@
     } while (TRUE);
   }
-  FreePool (HandleBuf); 
+  FreePool (HandleBuf);
 }
 
@@ -135 +135 @@
 
   mDeferredImageHandle = ImageHandle;
-  
+
   Status = gBS->CreateEventEx (
                   EVT_NOTIFY_SIGNAL,

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c

@@ -1 +1 @@
 /** @file
   This driver manages user information and produces user manager protocol.
-  
+
 Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials 
-are licensed and made available under the terms and conditions of the BSD License 
-which accompanies this distribution.  The full text of the license may be found at 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -81 +81 @@
   Find the specified user in the user database.
 
-  This function searches the specified user from the beginning of the user database. 
-  And if NextUser is TRUE, return the next User in the user database.  
-  
-  @param[in, out] User         On entry, points to the user profile entry to search. 
+  This function searches the specified user from the beginning of the user database.
+  And if NextUser is TRUE, return the next User in the user database.
+
+  @param[in, out] User         On entry, points to the user profile entry to search.
                                On return, points to the user profile entry or NULL if not found.
   @param[in]      NextUser     If FALSE, find the user in user profile database specifyed by User
-                               If TRUE, find the next user in user profile database specifyed 
-                               by User. 
-  @param[out]     ProfileIndex A pointer to the index of user profile database that matches the 
+                               If TRUE, find the next user in user profile database specifyed
+                               by User.
+  @param[out]     ProfileIndex A pointer to the index of user profile database that matches the
                                user specifyed by User.
 
   @retval EFI_NOT_FOUND        User was NULL, or User was not found, or the next user was not found.
   @retval EFI_SUCCESS          User or the next user are found in user profile database
-  
+
 **/
 EFI_STATUS
@@ -111 +111 @@
     return EFI_NOT_FOUND;
   }
-  
+
   //
   // Check whether the user profile is in the user profile database.
@@ -152 +152 @@
   Find the specified user information record in the specified User profile.
 
-  This function searches the specified user information record from the beginning of the user 
-  profile. And if NextInfo is TRUE, return the next info in the user profile.  
-  
-  @param[in]      User     Points to the user profile entry.                             
+  This function searches the specified user information record from the beginning of the user
+  profile. And if NextInfo is TRUE, return the next info in the user profile.
+
+  @param[in]      User     Points to the user profile entry.
   @param[in, out] Info     On entry, points to the user information record or NULL to start
                            searching with the first user information record.
-                           On return, points to the user information record or NULL if not found.                           
+                           On return, points to the user information record or NULL if not found.
   @param[in]      NextInfo If FALSE, find the user information record in profile specifyed by User.
-                           If TRUE, find the next user information record in profile specifyed 
-                           by User. 
+                           If TRUE, find the next user information record in profile specifyed
+                           by User.
   @param[out]     Offset   A pointer to the offset of the information record in the user profile.
 
@@ -167 +167 @@
   @retval EFI_NOT_FOUND         Info was not found, or the next Info was not found.
   @retval EFI_SUCCESS           Info or the next info are found in user profile.
-  
+
 **/
 EFI_STATUS
@@ -184 +184 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Check user profile entry
@@ -207 +207 @@
     InfoLen += ALIGN_VARIABLE (UserInfo->InfoSize);
   }
-  
+
   //
   // Check whether to find the next user information.
@@ -245 +245 @@
   Find a user infomation record by the information record type.
 
-  This function searches all user information records of User. The search starts with the 
-  user information record following Info and continues until either the information is found 
+  This function searches all user information records of User. The search starts with the
+  user information record following Info and continues until either the information is found
   or there are no more user infomation record.
   A match occurs when a Info.InfoType field matches the user information record type.
 
-  @param[in]      User     Points to the user profile record to search.                          
+  @param[in]      User     Points to the user profile record to search.
   @param[in, out] Info     On entry, points to the user information record or NULL to start
                            searching with the first user information record.
@@ -257 +257 @@
 
   @retval EFI_SUCCESS           User information was found. Info points to the user information record.
-  @retval EFI_NOT_FOUND         User information was not found.                           
+  @retval EFI_NOT_FOUND         User information was not found.
   @retval EFI_INVALID_PARAMETER User is NULL or Info is NULL.
-  
+
 **/
 EFI_STATUS
@@ -275 +275 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Check whether the user has the specified user information.
@@ -289 +289 @@
     return EFI_NOT_FOUND;
   }
-  
+
   while (InfoLen < User->UserProfileSize) {
     UserInfo = (EFI_USER_INFO *) (User->ProfileInfo + InfoLen);
@@ -309 +309 @@
   Find a user using a user information record.
 
-  This function searches all user profiles for the specified user information record. The 
-  search starts with the user information record handle following UserInfo and continues 
+  This function searches all user profiles for the specified user information record. The
+  search starts with the user information record handle following UserInfo and continues
   until either the information is found or there are no more user profiles.
-  A match occurs when the Info.InfoType field matches the user information record type and the 
+  A match occurs when the Info.InfoType field matches the user information record type and the
   user information record data matches the portion of Info passed the EFI_USER_INFO header.
 
-  @param[in, out] User     On entry, points to the previously returned user profile record, 
-                           or NULL to start searching with the first user profile. 
+  @param[in, out] User     On entry, points to the previously returned user profile record,
+                           or NULL to start searching with the first user profile.
                            On return, points to the user profile entry, or NULL if not found.
-  @param[in, out] UserInfo On entry, points to the previously returned user information record, 
-                           or NULL to start searching with the first. 
+  @param[in, out] UserInfo On entry, points to the previously returned user information record,
+                           or NULL to start searching with the first.
                            On return, points to the user information record, or NULL if not found.
-  @param[in]      Info     Points to the buffer containing the user information to be compared 
+  @param[in]      Info     Points to the buffer containing the user information to be compared
                            to the user information record.
   @param[in]      InfoSize The size of Info, in bytes. Same as Info->InfoSize.
 
-  @retval EFI_SUCCESS           User information was found. User points to the user profile record, 
+  @retval EFI_SUCCESS           User information was found. User points to the user profile record,
                                 and UserInfo points to the user information record.
-  @retval EFI_NOT_FOUND         User information was not found.                           
+  @retval EFI_NOT_FOUND         User information was not found.
   @retval EFI_INVALID_PARAMETER User is NULL; Info is NULL; or, InfoSize is too small.
-  
+
 **/
 EFI_STATUS
@@ -362 +362 @@
     *User = mUserProfileDb->UserProfile[0];
   }
-  
+
   //
   // Check user profile handle.
@@ -377 +377 @@
         break;
       }
-      
+
       if (InfoSize == Info->InfoSize) {
         if (CompareMem ((UINT8 *) (InfoEntry + 1), (UINT8 *) (Info + 1), InfoSize - sizeof (EFI_USER_INFO)) == 0) {
@@ -388 +388 @@
           return EFI_SUCCESS;
         }
-      }      
-    }
-    
+      }
+    }
+
     //
     // Get next user profile.
@@ -410 +410 @@
   @retval TRUE     The policy is a valid access policy.
   @retval FALSE    The access policy is not a valid access policy.
-  
+
 **/
 BOOLEAN
@@ -430 +430 @@
     // Check access policy according to type.
     //
-    CopyMem (&Access, PolicyInfo + TotalLen, sizeof (Access));    
+    CopyMem (&Access, PolicyInfo + TotalLen, sizeof (Access));
     ValueLen = Access.Size - sizeof (EFI_USER_INFO_ACCESS_CONTROL);
     switch (Access.Type) {
@@ -492 +492 @@
   @retval TRUE     The policy is a valid identity policy.
   @retval FALSE    The access policy is not a valid identity policy.
-  
+
 **/
 BOOLEAN
@@ -602 +602 @@
   @retval TRUE     The info is a valid user information record.
   @retval FALSE    The info is not a valid user information record.
-  
+
 **/
 BOOLEAN
@@ -697 +697 @@
   @retval TRUE     It is a valid user profile.
   @retval FALSE    It is not a valid user profile.
-  
+
 **/
 BOOLEAN
@@ -711 +711 @@
     return FALSE;
   }
-  
+
   //
   // Check user profile information length.
@@ -742 +742 @@
                              EFI_USER_INFO_ACCESS_ENROLL_OTHERS or
                              EFI_USER_INFO_ACCESS_ENROLL_SELF.
-  
+
   @retval TRUE     Find the specified RightType in current user profile.
   @retval FALSE    Can't find the right in the profile.
-  
+
 **/
 BOOLEAN
@@ -882 +882 @@
   @retval TRUE     Success to expand user profile database.
   @retval FALSE    Fail to expand user profile database.
-  
+
 **/
 BOOLEAN
@@ -935 +935 @@
 
   @param[in]  User                    Points to user profile.
-  @param[in]  ExpandSize              The size of user profile. 
+  @param[in]  ExpandSize              The size of user profile.
 
   @retval TRUE     Success to expand user profile size.
   @retval FALSE    Fail to expand user profile size.
-  
+
 **/
 BOOLEAN
@@ -959 +959 @@
     return FALSE;
   }
-  
+
   //
   // Copy exist information.
@@ -981 +981 @@
   @retval EFI_SUCCESS      Save or delete user profile successfully.
   @retval Others           Fail to change the profile.
-  
+
 **/
 EFI_STATUS
@@ -998 +998 @@
     return Status;
   }
-  
+
   //
   // Save the user profile to non-volatile memory.
@@ -1040 +1040 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Check user profile handle.
@@ -1048 +1048 @@
     return Status;
   }
-  
+
   //
   // Check user information memory size.
@@ -1057 +1057 @@
     }
   }
-  
+
   //
   // Add new user information.
@@ -1083 +1083 @@
   @param[in]      User            Point to the user profile.
   @param[in]      UserInfo        Point to the user information record to get.
-  @param[out]     Info            On entry, points to a buffer of at least *InfoSize bytes. 
+  @param[out]     Info            On entry, points to a buffer of at least *InfoSize bytes.
                                   On exit, holds the user information.
-  @param[in, out] InfoSize        On entry, points to the size of Info. 
+  @param[in, out] InfoSize        On entry, points to the size of Info.
                                   On return, points to the size of the user information.
   @param[in]      ChkRight        If TRUE, check the user info attribute.
@@ -1093 +1093 @@
   @retval EFI_ACCESS_DENIED       The information cannot be accessed by the current user.
   @retval EFI_INVALID_PARAMETER   InfoSize is NULL or UserInfo is NULL.
-  @retval EFI_BUFFER_TOO_SMALL    The number of bytes specified by *InfoSize is too small to hold the 
+  @retval EFI_BUFFER_TOO_SMALL    The number of bytes specified by *InfoSize is too small to hold the
                                   returned data. The actual size required is returned in *InfoSize.
   @retval EFI_SUCCESS             Information returned successfully.
@@ -1116 +1116 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Find the user information to get.
@@ -1124 +1124 @@
     return Status;
   }
-  
+
   //
   // Check information attributes.
@@ -1145 +1145 @@
     }
   }
-  
+
   //
   // Get user information.
@@ -1197 +1197 @@
     return EFI_ACCESS_DENIED;
   }
-  
+
   //
   // Delete the specified user information.
@@ -1220 +1220 @@
   @param[in]      User           Point to the user profile.
   @param[in, out] UserInfo       On entry, points to the user information to modify,
-                                 or NULL to add a new UserInfo. 
+                                 or NULL to add a new UserInfo.
                                  On return, points to the modified user information.
   @param[in]      Info           Points to the new user information.
@@ -1249 +1249 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Check user information.
@@ -1256 +1256 @@
     return EFI_ACCESS_DENIED;
   }
-  
+
   if (!CheckUserInfo (Info)) {
     return EFI_INVALID_PARAMETER;
@@ -1274 +1274 @@
       ASSERT (OldInfo != NULL);
 
-      if (((OldInfo->InfoAttribs & EFI_USER_INFO_EXCLUSIVE) != 0) || 
+      if (((OldInfo->InfoAttribs & EFI_USER_INFO_EXCLUSIVE) != 0) ||
            ((Info->InfoAttribs & EFI_USER_INFO_EXCLUSIVE) != 0)) {
         //
@@ -1292 +1292 @@
         continue;
       }
-  
+
       PayloadLen = Info->InfoSize - sizeof (EFI_USER_INFO);
       if (PayloadLen == 0) {
@@ -1311 +1311 @@
     return Status;
   }
-  
+
   //
   // Modify existing user information.
@@ -1319 +1319 @@
     return EFI_INVALID_PARAMETER;
   }
-  
-  if (((Info->InfoAttribs & EFI_USER_INFO_EXCLUSIVE) != 0) && 
+
+  if (((Info->InfoAttribs & EFI_USER_INFO_EXCLUSIVE) != 0) &&
        (OldInfo->InfoAttribs & EFI_USER_INFO_EXCLUSIVE) == 0) {
     //
-    // Try to add exclusive attrib in new info. 
+    // Try to add exclusive attrib in new info.
     // Check whether there is another information with the same type in profile.
     //
@@ -1339 +1339 @@
         return EFI_ACCESS_DENIED;
       }
-    } while (TRUE);    
+    } while (TRUE);
   }
 
@@ -1358 +1358 @@
   @retval EFI_SUCCESS      Delete user from the user profile successfully.
   @retval Others           Fail to delete user from user profile
-  
+
 **/
 EFI_STATUS
@@ -1375 +1375 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Check whether it is the current user.
@@ -1382 +1382 @@
     return EFI_ACCESS_DENIED;
   }
-  
+
   //
   // Delete user profile from the non-volatile memory.
@@ -1449 +1449 @@
     return EFI_SECURITY_VIOLATION;
   }
-  
+
   //
   // Create user profile entry.
@@ -1468 +1468 @@
 
   UnicodeSPrint (
-    User->UserVarName, 
+    User->UserVarName,
     sizeof (User->UserVarName),
-    L"User%04x", 
+    L"User%04x",
     mUserProfileDb->UserProfileNum
     );
@@ -1532 +1532 @@
   UserInfo->InfoAttribs = EFI_USER_INFO_STORAGE_PLATFORM_NV | EFI_USER_INFO_PUBLIC | EFI_USER_INFO_EXCLUSIVE;
   GenerateUserId ((UINT8 *) (UserInfo + 1));
-  
+
   //
   // Add user profile to the user profile database.
@@ -1547 +1547 @@
   @retval EFI_SUCCESS             A default user profile is added successfully.
   @retval Others                  Fail to add a default user profile
-  
+
 **/
 EFI_STATUS
@@ -1562 +1562 @@
   EFI_USER_INFO_ACCESS_CONTROL  *Access;
   EFI_USER_INFO_IDENTITY_POLICY *Policy;
-  
+
   //
   // Create a user profile.
@@ -1570 +1570 @@
     return Status;
   }
- 
+
   //
   // Allocate a buffer to add all default user information.
@@ -1591 +1591 @@
     goto Done;
   }
-  
+
   //
   // Add user profile create date record.
@@ -1609 +1609 @@
     goto Done;
   }
-  
+
   //
   // Add user profile usage count record.
@@ -1623 +1623 @@
     goto Done;
   }
- 
+
   //
   // Add user access right.
@@ -1638 +1638 @@
     goto Done;
   }
-  
+
   //
   // Add user identity policy.
@@ -1646 +1646 @@
   Policy            = (EFI_USER_INFO_IDENTITY_POLICY *) (Info + 1);
   Policy->Type      = EFI_USER_INFO_IDENTITY_TRUE;
-  Policy->Length    = sizeof (EFI_USER_INFO_IDENTITY_POLICY);  
+  Policy->Length    = sizeof (EFI_USER_INFO_IDENTITY_POLICY);
   Info->InfoSize    = sizeof (EFI_USER_INFO) + Policy->Length;
   NewInfo = NULL;
@@ -1660 +1660 @@
   Publish current user information into EFI System Configuration Table.
 
-  By UEFI spec, the User Identity Manager will publish the current user profile 
+  By UEFI spec, the User Identity Manager will publish the current user profile
   into the EFI System Configuration Table. Currently, only the user identifier and user
   name are published.
@@ -1685 +1685 @@
   if (!EFI_ERROR (Status)) {
     //
-    // The table existed! 
+    // The table existed!
     //
     return EFI_SUCCESS;
@@ -1707 +1707 @@
     return Status;
   }
-  
+
   //
   // Allocate a buffer for user information table.
   //
   UserInfoTable = (EFI_USER_INFO_TABLE *) AllocateRuntimePool (
-                                            sizeof (EFI_USER_INFO_TABLE) + 
-                                            IdInfo->InfoSize + 
+                                            sizeof (EFI_USER_INFO_TABLE) +
+                                            IdInfo->InfoSize +
                                             NameInfo->InfoSize
                                             );
@@ -1721 +1721 @@
   }
 
-  UserInfoTable->Size = sizeof (EFI_USER_INFO_TABLE);  
-  
+  UserInfoTable->Size = sizeof (EFI_USER_INFO_TABLE);
+
   //
   // Append the user information to the user info table
@@ -1740 +1740 @@
   Get the user's identity type.
 
-  The identify manager only supports the identity policy in which the credential 
+  The identify manager only supports the identity policy in which the credential
   provider handles are connected by the operator 'AND' or 'OR'.
 
@@ -1771 +1771 @@
   }
   ASSERT (IdentifyInfo != NULL);
-  
+
   //
   // Search the user identify policy according to type.
@@ -1823 +1823 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Check the user ID identified by the specified credential provider.
@@ -1843 +1843 @@
         //
         Status = UserCredential->Form (
-                                   UserCredential, 
-                                   &HiiHandle, 
-                                   &FormSetId, 
+                                   UserCredential,
+                                   &HiiHandle,
+                                   &FormSetId,
                                    &FormId
                                    );
-        if (!EFI_ERROR (Status)) {        
+        if (!EFI_ERROR (Status)) {
           //
           // Send form to get user input.
@@ -1863 +1863 @@
           if (EFI_ERROR (Status)) {
             return Status;
-          }                                            
-        }        
+          }
+        }
       }
 
@@ -1876 +1876 @@
         return Status;
       }
-      
+
       return EFI_SUCCESS;
     }
@@ -1914 +1914 @@
     return EFI_OUT_OF_RESOURCES;
   }
-  
+
   //
   // Check create date record.
@@ -1938 +1938 @@
     }
   }
-  
+
   //
   // Update usage date record.
@@ -1961 +1961 @@
     }
   }
-  
+
   //
   // Update usage count record.
@@ -2043 +2043 @@
 
   @param[in]  Index            The index of the user in the user name list.
-  @param[in]  User             Points to the user profile whose username is added. 
+  @param[in]  User             Points to the user profile whose username is added.
   @param[in]  OpCodeHandle     Points to container for dynamic created opcodes.
 
@@ -2066 +2066 @@
     return Status;
   }
-  
+
   //
   // Add user name selection.
@@ -2090 +2090 @@
 /**
   Identify the user whose identity policy does not contain the operator 'OR'.
-  
+
   @param[in]  User             Points to the user profile.
 
   @retval EFI_SUCCESS          The specified user is identified successfully.
   @retval Others               Fail to identify the user.
-  
+
 **/
 EFI_STATUS
@@ -2118 +2118 @@
   }
   ASSERT (IdentifyInfo != NULL);
-  
+
   //
   // Check each part of identification policy expression.
@@ -2213 +2213 @@
 /**
   Identify the user whose identity policy does not contain the operator 'AND'.
-  
+
   @param[in]  User             Points to the user profile.
 
   @retval EFI_SUCCESS          The specified user is identified successfully.
   @retval Others               Fail to identify the user.
-  
+
 **/
 EFI_STATUS
@@ -2244 +2244 @@
   }
   ASSERT (IdentifyInfo != NULL);
-  
+
   //
   // Initialize the container for dynamic opcodes.
@@ -2354 +2354 @@
         return EFI_SUCCESS;
       }
-  
+
       //
       // Initialize the container for dynamic opcodes.
@@ -2360 +2360 @@
       StartOpCodeHandle = HiiAllocateOpCodeHandle ();
       ASSERT (StartOpCodeHandle != NULL);
-  
+
       EndOpCodeHandle = HiiAllocateOpCodeHandle ();
       ASSERT (EndOpCodeHandle != NULL);
-  
+
       //
       // Create Hii Extend Label OpCode.
@@ -2375 +2375 @@
       StartLabel->ExtendOpCode  = EFI_IFR_EXTEND_OP_LABEL;
       StartLabel->Number        = LABEL_USER_NAME;
-  
+
       EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (
                                           EndOpCodeHandle,
@@ -2384 +2384 @@
       EndLabel->ExtendOpCode  = EFI_IFR_EXTEND_OP_LABEL;
       EndLabel->Number        = LABEL_END;
-  
+
       //
       // Add all the user profile in the user profile database.
@@ -2392 +2392 @@
         AddUserSelection ((UINT16)(LABEL_USER_NAME + Index), User, StartOpCodeHandle);
       }
-  
+
       HiiUpdateForm (
         mCallbackInfo->HiiHandle, // HII handle
@@ -2400 +2400 @@
         EndOpCodeHandle           // Replace data
         );
-  
+
       HiiFreeOpCodeHandle (StartOpCodeHandle);
       HiiFreeOpCodeHandle (EndOpCodeHandle);
-  
+
       return EFI_SUCCESS;
     }
@@ -2415 +2415 @@
     if (QuestionId >= LABEL_PROVIDER_NAME) {
       //
-      // QuestionId comes from the second Form (Select a Credential Provider if identity  
+      // QuestionId comes from the second Form (Select a Credential Provider if identity
       // policy is OR type). Identify the user by the selected provider.
       //
@@ -2426 +2426 @@
     }
     break;
-    
+
   case EFI_BROWSER_ACTION_CHANGING:
     //
@@ -2483 +2483 @@
 /**
   This function construct user profile database from user data saved in the Flash.
-  If no user is found in Flash, add one default user "administrator" in the user 
+  If no user is found in Flash, add one default user "administrator" in the user
   profile database.
 
   @retval EFI_SUCCESS            Init user profile database successfully.
   @retval Others                 Fail to init user profile database.
-  
+
 **/
 EFI_STATUS
@@ -2522 +2522 @@
     return EFI_OUT_OF_RESOURCES;
   }
-  
+
   //
   // Get all user proifle entries.
@@ -2532 +2532 @@
     //
     UnicodeSPrint (
-      VarName, 
+      VarName,
       sizeof (VarName),
-      L"User%04x", 
+      L"User%04x",
       Index
       );
@@ -2562 +2562 @@
       break;
     }
-    
+
     //
     // Check variable attributes.
@@ -2570 +2570 @@
       continue;
     }
-    
+
     //
     // Add user profile to the user profile database.
@@ -2602 +2602 @@
     return Status;
   }
-  
+
   //
   // Check whether the user profile database is empty.
@@ -2629 +2629 @@
   UINTN       HandleCount;
   EFI_HANDLE  *HandleBuf;
-  UINTN       Index; 
+  UINTN       Index;
 
   if (mProviderDb != NULL) {
@@ -2658 +2658 @@
   //
   mProviderDb = AllocateZeroPool (
-                  sizeof (CREDENTIAL_PROVIDER_INFO) - 
-                  sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *) + 
+                  sizeof (CREDENTIAL_PROVIDER_INFO) -
+                  sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *) +
                   HandleCount * sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *)
                   );
@@ -2816 +2816 @@
   CallbackInfo->FormBrowser2  = FormBrowser2;
   CallbackInfo->DriverHandle  = NULL;
-  
+
   //
   // Install Device Path Protocol and Config Access protocol to driver handle.
@@ -2890 +2890 @@
     return Status;
   }
-  
+
   //
   // Find user with the specified user ID.
@@ -2909 +2909 @@
     return EFI_NOT_READY;
   }
-  
+
   return Status;
 }
@@ -2918 +2918 @@
 
   @param[in]   ProtocolGuid   Points to the protocol guid of sonsole .
-  
+
   @retval TRUE     The given console is ready.
   @retval FALSE    The given console is not ready.
-  
+
 **/
 BOOLEAN
 CheckConsole (
-  EFI_GUID                     *ProtocolGuid  
+  EFI_GUID                     *ProtocolGuid
   )
 {
@@ -2931 +2931 @@
   UINTN                        HandleCount;
   EFI_HANDLE                   *HandleBuf;
-  UINTN                        Index; 
+  UINTN                        Index;
   EFI_DEVICE_PATH_PROTOCOL     *DevicePath;
-  
+
   //
   // Try to find all the handle driver.
@@ -2957 +2957 @@
     }
   }
-  FreePool (HandleBuf);  
+  FreePool (HandleBuf);
   return FALSE;
 }
@@ -2967 +2967 @@
   @retval TRUE     The console is ready.
   @retval FALSE    The console is not ready.
-  
+
 **/
 BOOLEAN
@@ -2983 +2983 @@
     }
   }
-  
+
   return TRUE;
 }
@@ -3039 +3039 @@
     }
   }
-  
+
   //
   // Find and login the default & AutoLogon user.
@@ -3060 +3060 @@
     }
   }
-  
+
   if (!IsConsoleReady ()) {
     //
@@ -3080 +3080 @@
                                  NULL
                                  );
-  
+
   if (mIdentified) {
     *User = (USER_PROFILE_ENTRY *) mCurrentUser;
@@ -3086 +3086 @@
     return EFI_SUCCESS;
   }
-  
+
   return EFI_ACCESS_DENIED;
 }
@@ -3093 +3093 @@
 /**
   An empty function to pass error checking of CreateEventEx ().
- 
+
   @param  Event         Event whose notification function is being invoked.
   @param  Context       Pointer to the notification function's context,
@@ -3138 +3138 @@
   Create a new user profile.
 
-  This function creates a new user profile with only a new user identifier attached and returns 
+  This function creates a new user profile with only a new user identifier attached and returns
   its handle. The user profile is non-volatile, but the handle User can change across reboots.
 
   @param[in]  This               Points to this instance of the EFI_USER_MANAGER_PROTOCOL.
-  @param[out] User               On return, points to the new user profile handle. 
+  @param[out] User               On return, points to the new user profile handle.
                                  The user profile handle is unique only during this boot.
- 
+
   @retval EFI_SUCCESS            User profile was successfully created.
-  @retval EFI_ACCESS_DENIED      Current user does not have sufficient permissions to create a 
+  @retval EFI_ACCESS_DENIED      Current user does not have sufficient permissions to create a
                                  user profile.
   @retval EFI_UNSUPPORTED        Creation of new user profiles is not supported.
   @retval EFI_INVALID_PARAMETER  The User parameter is NULL.
-  
+
 **/
 EFI_STATUS
@@ -3173 +3173 @@
     }
   }
-  
+
   //
   // Create new user profile
@@ -3189 +3189 @@
 
   @param[in] This                Points to this instance of the EFI_USER_MANAGER_PROTOCOL.
-  @param[in] User                User profile handle. 
+  @param[in] User                User profile handle.
 
   @retval EFI_SUCCESS            User profile was successfully deleted.
@@ -3196 +3196 @@
   @retval EFI_UNSUPPORTED        Deletion of new user profiles is not supported.
   @retval EFI_INVALID_PARAMETER  User does not refer to a valid user profile.
-  
+
 **/
 EFI_STATUS
@@ -3210 +3210 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Check the right of the current user.
@@ -3217 +3217 @@
     return EFI_ACCESS_DENIED;
   }
-  
+
   //
   // Delete user profile.
@@ -3236 +3236 @@
   Enumerate all of the enrolled users on the platform.
 
-  This function returns the next enrolled user profile. To retrieve the first user profile handle,  
-  point User at a NULL. Each subsequent call will retrieve another user profile handle until there 
-  are no more, at which point User will point to NULL. 
+  This function returns the next enrolled user profile. To retrieve the first user profile handle,
+  point User at a NULL. Each subsequent call will retrieve another user profile handle until there
+  are no more, at which point User will point to NULL.
 
   @param[in]      This           Points to this instance of the EFI_USER_MANAGER_PROTOCOL.
-  @param[in, out] User           On entry, points to the previous user profile handle or NULL to 
+  @param[in, out] User           On entry, points to the previous user profile handle or NULL to
                                  start enumeration. On exit, points to the next user profile handle
                                  or NULL if there are no more user profiles.
 
-  @retval EFI_SUCCESS            Next enrolled user profile successfully returned. 
+  @retval EFI_SUCCESS            Next enrolled user profile successfully returned.
   @retval EFI_ACCESS_DENIED      Next enrolled user profile was not successfully returned.
   @retval EFI_INVALID_PARAMETER  The User parameter is NULL.
@@ -3261 +3261 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   Status = FindUserProfile ((USER_PROFILE_ENTRY **) User, TRUE, NULL);
   if (EFI_ERROR (Status)) {
@@ -3276 +3276 @@
   @param[out] CurrentUser        On return, points to the current user profile handle.
 
-  @retval EFI_SUCCESS            Current user profile handle returned successfully. 
+  @retval EFI_SUCCESS            Current user profile handle returned successfully.
   @retval EFI_INVALID_PARAMETER  The CurrentUser parameter is NULL.
-  
+
 **/
 EFI_STATUS
@@ -3286 +3286 @@
   OUT       EFI_USER_PROFILE_HANDLE             *CurrentUser
   )
-{  
+{
   //
   // Get current user profile.
@@ -3304 +3304 @@
   Identify the user and, if authenticated, returns the user handle and changes the current
   user profile. All user information marked as private in a previously selected profile
-  is no longer available for inspection. 
-  Whenever the current user profile is changed then the an event with the GUID 
+  is no longer available for inspection.
+  Whenever the current user profile is changed then the an event with the GUID
   EFI_EVENT_GROUP_USER_PROFILE_CHANGED is signaled.
 
@@ -3315 +3315 @@
   @retval EFI_ACCESS_DENIED      User was not successfully identified.
   @retval EFI_INVALID_PARAMETER  The User parameter is NULL.
-  
+
 **/
 EFI_STATUS
@@ -3334 +3334 @@
     return EFI_SUCCESS;
   }
-  
+
   //
   // Identify user
@@ -3342 +3342 @@
     return EFI_ACCESS_DENIED;
   }
-  
+
   //
   // Publish the user info into the EFI system configuration table.
@@ -3359 +3359 @@
 
   This function searches all user profiles for the specified user information record.
-  The search starts with the user information record handle following UserInfo and 
+  The search starts with the user information record handle following UserInfo and
   continues until either the information is found or there are no more user profiles.
   A match occurs when the Info.InfoType field matches the user information record
@@ -3365 +3365 @@
 
   @param[in]      This           Points to this instance of the EFI_USER_MANAGER_PROTOCOL.
-  @param[in, out] User           On entry, points to the previously returned user profile 
+  @param[in, out] User           On entry, points to the previously returned user profile
                                  handle, or NULL to start searching with the first user profile.
                                  On return, points to the user profile handle, or NULL if not
                                  found.
   @param[in, out] UserInfo       On entry, points to the previously returned user information
-                                 handle, or NULL to start searching with the first. On return, 
+                                 handle, or NULL to start searching with the first. On return,
                                  points to the user information handle of the user information
-                                 record, or NULL if not found. Can be NULL, in which case only 
-                                 one user information record per user can be returned. 
-  @param[in]      Info           Points to the buffer containing the user information to be 
-                                 compared to the user information record. If the user information 
-                                 record data is empty, then only the user information record type 
-                                 is compared. If InfoSize is 0, then the user information record 
+                                 record, or NULL if not found. Can be NULL, in which case only
+                                 one user information record per user can be returned.
+  @param[in]      Info           Points to the buffer containing the user information to be
+                                 compared to the user information record. If the user information
+                                 record data is empty, then only the user information record type
+                                 is compared. If InfoSize is 0, then the user information record
                                  must be empty.
 
-  @param[in]      InfoSize       The size of Info, in bytes. 
+  @param[in]      InfoSize       The size of Info, in bytes.
 
   @retval EFI_SUCCESS            User information was found. User points to the user profile
                                  handle, and UserInfo points to the user information handle.
-  @retval EFI_NOT_FOUND          User information was not found. User points to NULL, and  
+  @retval EFI_NOT_FOUND          User information was not found. User points to NULL, and
                                  UserInfo points to NULL.
-  @retval EFI_INVALID_PARAMETER  User is NULL. Or Info is NULL.                           
-  
+  @retval EFI_INVALID_PARAMETER  User is NULL. Or Info is NULL.
+
 **/
 EFI_STATUS
@@ -3418 +3418 @@
     }
   }
-  Size = Info->InfoSize;  
-  
+  Size = Info->InfoSize;
+
   //
   // Find user profile accdoring to user information.
@@ -3436 +3436 @@
     return EFI_NOT_FOUND;
   }
-  
+
   return EFI_SUCCESS;
 }
@@ -3444 +3444 @@
   Return information attached to the user.
 
-  This function returns user information. The format of the information is described in User 
-  Information. The function may return EFI_ACCESS_DENIED if the information is marked private 
-  and the handle specified by User is not the current user profile. The function may return 
-  EFI_ACCESS_DENIED if the information is marked protected and the information is associated 
+  This function returns user information. The format of the information is described in User
+  Information. The function may return EFI_ACCESS_DENIED if the information is marked private
+  and the handle specified by User is not the current user profile. The function may return
+  EFI_ACCESS_DENIED if the information is marked protected and the information is associated
   with a credential provider for which the user has not been authenticated.
 
   @param[in]      This           Points to this instance of the EFI_USER_MANAGER_PROTOCOL.
-  @param[in]      User           Handle of the user whose profile will be retrieved. 
-  @param[in]      UserInfo       Handle of the user information data record.   
-  @param[out]     Info           On entry, points to a buffer of at least *InfoSize bytes. On exit,  
-                                 holds the user information. If the buffer is too small to hold the  
-                                 information, then EFI_BUFFER_TOO_SMALL is returned and InfoSize is 
-                                 updated to contain the number of bytes actually required. 
-  @param[in, out] InfoSize       On entry, points to the size of Info. On return, points to the size  
-                                 of the user information. 
+  @param[in]      User           Handle of the user whose profile will be retrieved.
+  @param[in]      UserInfo       Handle of the user information data record.
+  @param[out]     Info           On entry, points to a buffer of at least *InfoSize bytes. On exit,
+                                 holds the user information. If the buffer is too small to hold the
+                                 information, then EFI_BUFFER_TOO_SMALL is returned and InfoSize is
+                                 updated to contain the number of bytes actually required.
+  @param[in, out] InfoSize       On entry, points to the size of Info. On return, points to the size
+                                 of the user information.
 
   @retval EFI_SUCCESS            Information returned successfully.
-  @retval EFI_ACCESS_DENIED      The information about the specified user cannot be accessed by the 
+  @retval EFI_ACCESS_DENIED      The information about the specified user cannot be accessed by the
                                  current user.
-  @retval EFI_BUFFER_TOO_SMALL   The number of bytes specified by *InfoSize is too small to hold the 
+  @retval EFI_BUFFER_TOO_SMALL   The number of bytes specified by *InfoSize is too small to hold the
                                  returned data. The actual size required is returned in *InfoSize.
-  @retval EFI_NOT_FOUND          User does not refer to a valid user profile or UserInfo does not refer 
+  @retval EFI_NOT_FOUND          User does not refer to a valid user profile or UserInfo does not refer
                                  to a valid user info handle.
   @retval EFI_INVALID_PARAMETER  Info is NULL or InfoSize is NULL.
-  
+
 **/
 EFI_STATUS
@@ -3489 +3489 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   if ((User == NULL) || (UserInfo == NULL)) {
     return EFI_NOT_FOUND;
   }
-  
+
   Status = GetUserInfo (User, UserInfo, Info, InfoSize, TRUE);
   if (EFI_ERROR (Status)) {
@@ -3508 +3508 @@
   Add or update user information.
 
-  This function changes user information.  If NULL is pointed to by UserInfo, then a new user 
-  information record is created and its handle is returned in UserInfo. Otherwise, the existing  
+  This function changes user information.  If NULL is pointed to by UserInfo, then a new user
+  information record is created and its handle is returned in UserInfo. Otherwise, the existing
   one is replaced.
-  If EFI_USER_INFO_IDENITTY_POLICY_RECORD is changed, it is the caller's responsibility to keep 
+  If EFI_USER_INFO_IDENITTY_POLICY_RECORD is changed, it is the caller's responsibility to keep
   it to be synced with the information on credential providers.
-  If EFI_USER_INFO_EXCLUSIVE is specified in Info and a user information record of the same 
+  If EFI_USER_INFO_EXCLUSIVE is specified in Info and a user information record of the same
   type already exists in the user profile, then EFI_ACCESS_DENIED will be returned and UserInfo
   will point to the handle of the existing record.
 
   @param[in]      This            Points to this instance of the EFI_USER_MANAGER_PROTOCOL.
-  @param[in]      User            Handle of the user whose profile will be retrieved. 
-  @param[in, out] UserInfo        Handle of the user information data record.   
-  @param[in]      Info            On entry, points to a buffer of at least *InfoSize bytes. On exit, 
-                                  holds the user information. If the buffer is too small to hold the 
-                                  information, then EFI_BUFFER_TOO_SMALL is returned and InfoSize is 
-                                  updated to contain the number of bytes actually required. 
-  @param[in]      InfoSize        On entry, points to the size of Info. On return, points to the size 
-                                  of the user information. 
+  @param[in]      User            Handle of the user whose profile will be retrieved.
+  @param[in, out] UserInfo        Handle of the user information data record.
+  @param[in]      Info            On entry, points to a buffer of at least *InfoSize bytes. On exit,
+                                  holds the user information. If the buffer is too small to hold the
+                                  information, then EFI_BUFFER_TOO_SMALL is returned and InfoSize is
+                                  updated to contain the number of bytes actually required.
+  @param[in]      InfoSize        On entry, points to the size of Info. On return, points to the size
+                                  of the user information.
 
   @retval EFI_SUCCESS             Information returned successfully.
   @retval EFI_ACCESS_DENIED       The record is exclusive.
-  @retval EFI_SECURITY_VIOLATION  The current user does not have permission to change the specified 
+  @retval EFI_SECURITY_VIOLATION  The current user does not have permission to change the specified
                                   user profile or user information record.
-  @retval EFI_NOT_FOUND           User does not refer to a valid user profile or UserInfo does not  
+  @retval EFI_NOT_FOUND           User does not refer to a valid user profile or UserInfo does not
                                   refer to a valid user info handle.
-  @retval EFI_INVALID_PARAMETER   UserInfo is NULL or Info is NULL. 
+  @retval EFI_INVALID_PARAMETER   UserInfo is NULL or Info is NULL.
 **/
 EFI_STATUS
@@ -3550 +3550 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Check the right of the current user.
@@ -3562 +3562 @@
         return EFI_SECURITY_VIOLATION;
       }
-      
+
       if (!CheckCurrentUserAccessRight (EFI_USER_INFO_ACCESS_ENROLL_OTHERS)) {
         //
@@ -3582 +3582 @@
     }
   }
-  
+
   //
   // Modify user information.
@@ -3589 +3589 @@
   if (EFI_ERROR (Status)) {
     if (Status == EFI_ACCESS_DENIED) {
-      return EFI_ACCESS_DENIED;      
+      return EFI_ACCESS_DENIED;
     }
     return EFI_SECURITY_VIOLATION;
@@ -3600 +3600 @@
   Called by credential provider to notify of information change.
 
-  This function allows the credential provider to notify the User Identity Manager when user status  
+  This function allows the credential provider to notify the User Identity Manager when user status
   has changed.
-  If the User Identity Manager doesn't support asynchronous changes in credentials, then this function 
-  should return EFI_UNSUPPORTED. 
-  If current user does not exist, and the credential provider can identify a user, then make the user 
+  If the User Identity Manager doesn't support asynchronous changes in credentials, then this function
+  should return EFI_UNSUPPORTED.
+  If current user does not exist, and the credential provider can identify a user, then make the user
   to be current user and signal the EFI_EVENT_GROUP_USER_PROFILE_CHANGED event.
-  If current user already exists, and the credential provider can identify another user, then switch 
+  If current user already exists, and the credential provider can identify another user, then switch
   current user to the newly identified user, and signal the EFI_EVENT_GROUP_USER_PROFILE_CHANGED event.
-  If current user was identified by this credential provider and now the credential provider cannot identify 
+  If current user was identified by this credential provider and now the credential provider cannot identify
   current user, then logout current user and signal the EFI_EVENT_GROUP_USER_PROFILE_CHANGED event.
 
   @param[in] This          Points to this instance of the EFI_USER_MANAGER_PROTOCOL.
-  @param[in] Changed       Handle on which is installed an instance of the EFI_USER_CREDENTIAL2_PROTOCOL 
+  @param[in] Changed       Handle on which is installed an instance of the EFI_USER_CREDENTIAL2_PROTOCOL
                            where the user has changed.
 
@@ -3618 +3618 @@
   @retval EFI_NOT_READY    The function was called while the specified credential provider was not selected.
   @retval EFI_UNSUPPORTED  The User Identity Manager doesn't support asynchronous notifications.
-  
+
 **/
 EFI_STATUS
@@ -3626 +3626 @@
   IN        EFI_HANDLE                          Changed
   )
-{    
+{
   return EFI_UNSUPPORTED;
 }
@@ -3642 +3642 @@
   @retval EFI_SUCCESS        User information deleted successfully.
   @retval EFI_NOT_FOUND      User information record UserInfo does not exist in the user profile.
-  @retval EFI_ACCESS_DENIED  The current user does not have permission to delete this user information. 
-  
+  @retval EFI_ACCESS_DENIED  The current user does not have permission to delete this user information.
+
 **/
 EFI_STATUS
@@ -3658 +3658 @@
     return EFI_INVALID_PARAMETER;
   }
-  
+
   //
   // Check the right of the current user.
@@ -3667 +3667 @@
     }
   }
-  
+
   //
   // Delete user information.
@@ -3677 +3677 @@
     }
     return EFI_ACCESS_DENIED;
-  } 
+  }
   return EFI_SUCCESS;
 }
@@ -3685 +3685 @@
   Enumerate user information of all the enrolled users on the platform.
 
-  This function returns the next user information record. To retrieve the first user   
-  information record handle, point UserInfo at a NULL. Each subsequent call will retrieve 
-  another user information record handle until there are no more, at which point UserInfo 
-  will point to NULL. 
+  This function returns the next user information record. To retrieve the first user
+  information record handle, point UserInfo at a NULL. Each subsequent call will retrieve
+  another user information record handle until there are no more, at which point UserInfo
+  will point to NULL.
 
   @param[in]      This           Points to this instance of the EFI_USER_MANAGER_PROTOCOL.
@@ -3697 +3697 @@
   @retval EFI_NOT_FOUND          No more user information found.
   @retval EFI_INVALID_PARAMETER  UserInfo is NULL.
-  
+
 **/
 EFI_STATUS
@@ -3755 +3755 @@
                   &gUserIdentifyManager
                   );
-  ASSERT_EFI_ERROR (Status);  
+  ASSERT_EFI_ERROR (Status);
 
   LoadDeferredImageInit (ImageHandle);

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h

@@ -1 +1 @@
 /** @file
   The header file for User identify Manager driver.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -240 +240 @@
 
   This function searches all user profiles for the specified user information record.
-  The search starts with the user information record handle following UserInfo and 
+  The search starts with the user information record handle following UserInfo and
   continues until either the information is found or there are no more user profiles.
   A match occurs when the Info.InfoType field matches the user information record
-  type and the user information record data matches the portion of Info passed the 
+  type and the user information record data matches the portion of Info passed the
   EFI_USER_INFO header.
 
   @param[in]      This     Points to this instance of the EFI_USER_MANAGER_PROTOCOL.
-  @param[in, out] User     On entry, points to the previously returned user profile 
+  @param[in, out] User     On entry, points to the previously returned user profile
                            handle, or NULL to start searching with the first user profile.
                            On return, points to the user profile handle, or NULL if not
                            found.
   @param[in, out] UserInfo On entry, points to the previously returned user information
-                           handle, or NULL to start searching with the first. On return, 
+                           handle, or NULL to start searching with the first. On return,
                            points to the user information handle of the user information
-                           record, or NULL if not found. Can be NULL, in which case only 
-                           one user information record per user can be returned. 
-  @param[in]      Info     Points to the buffer containing the user information to be 
-                           compared to the user information record. If NULL, then only 
-                           the user information record type is compared. If InfoSize is 0, 
+                           record, or NULL if not found. Can be NULL, in which case only
+                           one user information record per user can be returned.
+  @param[in]      Info     Points to the buffer containing the user information to be
+                           compared to the user information record. If NULL, then only
+                           the user information record type is compared. If InfoSize is 0,
                            then the user information record must be empty.
 
-  @param[in]      InfoSize The size of Info, in bytes. 
+  @param[in]      InfoSize The size of Info, in bytes.
 
   @retval EFI_SUCCESS      User information was found. User points to the user profile handle,
                            and UserInfo points to the user information handle.
-  @retval EFI_NOT_FOUND    User information was not found. User points to NULL and UserInfo 
+  @retval EFI_NOT_FOUND    User information was not found. User points to NULL and UserInfo
                            points to NULL.
-  
+
 **/
 EFI_STATUS
@@ -410 +410 @@
   IN OUT    EFI_USER_INFO_HANDLE                *UserInfo
   );
-  
+
 #endif

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerData.h

@@ -1 +1 @@
 /** @file
   Data structure used by the user identify manager driver.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf

@@ -3 +3 @@
 #
 #  This module manages user information and produces user manager protocol.
-# 
+#
 # Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
@@ -49 +49 @@
   gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES  ## GUID
   gEfiEventUserProfileChangedGuid               ## SOMETIMES_PRODUCES  ## Event
-  
+
   ## SOMETIMES_PRODUCES                         ## Variable:L"Userxxxx"
   ## SOMETIMES_CONSUMES                         ## Variable:L"Userxxxx"
@@ -65 +65 @@
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES
   gEfiDevicePathProtocolGuid                    ## PRODUCES
-  
+
   ## PRODUCES
   ## SOMETIMES_PRODUCES                         ## SystemTable
-  gEfiUserManagerProtocolGuid                   
+  gEfiUserManagerProtocolGuid
 
 [Depex]
-  gEfiHiiDatabaseProtocolGuid   AND 
-  gEfiHiiStringProtocolGuid     AND 
-  gEfiFormBrowser2ProtocolGuid 
+  gEfiHiiDatabaseProtocolGuid   AND
+  gEfiHiiStringProtocolGuid     AND
+  gEfiFormBrowser2ProtocolGuid
 
 [UserExtensions.TianoCore."ExtraFiles"]

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr

@@ -3 +3 @@
 
 Copyright (c) 2009 - 2010, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -15 +15 @@
 #include "UserIdentifyManagerData.h"
 
-formset 
+formset
   guid      = USER_IDENTIFY_MANAGER_GUID,
-  title     = STRING_TOKEN(STR_TITLE),  
-  help      = STRING_TOKEN(STR_NULL_STRING), 
+  title     = STRING_TOKEN(STR_TITLE),
+  help      = STRING_TOKEN(STR_NULL_STRING),
   classguid = USER_IDENTIFY_MANAGER_GUID,
-  
+
   form formid = FORMID_USER_FORM,
-    title = STRING_TOKEN(STR_USER_SELECT);      
+    title = STRING_TOKEN(STR_USER_SELECT);
 
     suppressif TRUE;
@@ -33 +33 @@
 
     label LABEL_USER_NAME;
-    label LABEL_END;  
+    label LABEL_END;
   endform;
-  
+
   form formid = FORMID_PROVIDER_FORM,
     title = STRING_TOKEN(STR_PROVIDER_SELECT);
     label LABEL_PROVIDER_NAME;
     label LABEL_END;
-  endform;  
+  endform;
 endformset;

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c

@@ -1 +1 @@
 /** @file
   The functions for access policy modification.
-    
+
 Copyright (c) 2009 - 2013, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -16 +16 @@
 
 /**
-  Collect all the access policy data to mUserInfo.AccessPolicy, 
+  Collect all the access policy data to mUserInfo.AccessPolicy,
   and save it to user profile.
 
@@ -39 +39 @@
   mUserInfo.AccessPolicyModified  = TRUE;
   OffSet                          = 0;
-  
+
   //
   // Save access right.
@@ -52 +52 @@
   CopyMem (mUserInfo.AccessPolicy + OffSet, &Control, sizeof (Control));
   OffSet += sizeof (Control);
-  
+
   //
   // Save access setup.
@@ -62 +62 @@
 
   Control.Type = EFI_USER_INFO_ACCESS_SETUP;
-  Control.Size = (UINT32) Size;  
+  Control.Size = (UINT32) Size;
   CopyMem (mUserInfo.AccessPolicy + OffSet, &Control, sizeof (Control));
   OffSet += sizeof (Control);
-  
+
   if (mAccessInfo.AccessSetup == ACCESS_SETUP_NORMAL) {
     CopyGuid ((EFI_GUID *) (mUserInfo.AccessPolicy + OffSet), &gEfiUserInfoAccessSetupNormalGuid);
@@ -74 +74 @@
   }
   OffSet += sizeof (EFI_GUID);
-  
+
   //
   // Save access of boot order.
@@ -84 +84 @@
 
   Control.Type = EFI_USER_INFO_ACCESS_BOOT_ORDER;
-  Control.Size = (UINT32) Size;  
+  Control.Size = (UINT32) Size;
   CopyMem (mUserInfo.AccessPolicy + OffSet, &Control, sizeof (Control));
   OffSet += sizeof (Control);
@@ -90 +90 @@
   CopyMem ((UINT8 *) (mUserInfo.AccessPolicy + OffSet), &mAccessInfo.AccessBootOrder, sizeof (UINT32));
   OffSet += sizeof (UINT32);
-  
+
   //
   // Save permit load.
@@ -101 +101 @@
 
     Control.Type = EFI_USER_INFO_ACCESS_PERMIT_LOAD;
-    Control.Size = (UINT32) Size;  
+    Control.Size = (UINT32) Size;
     CopyMem (mUserInfo.AccessPolicy + OffSet, &Control, sizeof (Control));
     OffSet += sizeof (Control);
-  
+
     CopyMem (mUserInfo.AccessPolicy + OffSet, mAccessInfo.LoadPermit, mAccessInfo.LoadPermitLen);
     OffSet += mAccessInfo.LoadPermitLen;
   }
-  
+
   //
   // Save forbid load.
@@ -119 +119 @@
 
     Control.Type = EFI_USER_INFO_ACCESS_FORBID_LOAD;
-    Control.Size = (UINT32) Size;  
+    Control.Size = (UINT32) Size;
     CopyMem (mUserInfo.AccessPolicy + OffSet, &Control, sizeof (Control));
     OffSet += sizeof (Control);
-    
+
     CopyMem (mUserInfo.AccessPolicy + OffSet, mAccessInfo.LoadForbid, mAccessInfo.LoadForbidLen);
     OffSet += mAccessInfo.LoadForbidLen;
   }
-  
+
   //
   // Save permit connect.
@@ -137 +137 @@
 
     Control.Type = EFI_USER_INFO_ACCESS_PERMIT_CONNECT;
-    Control.Size = (UINT32) Size;  
+    Control.Size = (UINT32) Size;
     CopyMem (mUserInfo.AccessPolicy + OffSet, &Control, sizeof (Control));
     OffSet += sizeof (Control);
-    
+
     CopyMem (mUserInfo.AccessPolicy + OffSet, mAccessInfo.ConnectPermit, mAccessInfo.ConnectPermitLen);
     OffSet += mAccessInfo.ConnectPermitLen;
   }
-  
+
   //
   // Save forbid connect.
@@ -155 +155 @@
 
     Control.Type = EFI_USER_INFO_ACCESS_FORBID_CONNECT;
-    Control.Size = (UINT32) Size;  
+    Control.Size = (UINT32) Size;
     CopyMem (mUserInfo.AccessPolicy + OffSet, &Control, sizeof (Control));
     OffSet += sizeof (Control);
-    
+
     CopyMem (mUserInfo.AccessPolicy + OffSet, mAccessInfo.ConnectForbid, mAccessInfo.ConnectForbidLen);
     OffSet += mAccessInfo.ConnectForbidLen;
@@ -265 +265 @@
 
 /**
-  Check whether the DevicePath is in the device path forbid list 
+  Check whether the DevicePath is in the device path forbid list
   (mAccessInfo.LoadForbid).
 
   @param[in]  DevicePath           Points to device path.
-  
+
   @retval TRUE     The DevicePath is in the device path forbid list.
   @retval FALSE    The DevicePath is not in the device path forbid list.
@@ -331 +331 @@
   OrderSize = 0;
   Status    = gRT->GetVariable (
-                     L"DriverOrder", 
-                     &gEfiGlobalVariableGuid, 
-                     NULL, 
-                     &OrderSize, 
+                     L"DriverOrder",
+                     &gEfiGlobalVariableGuid,
+                     NULL,
+                     &OrderSize,
                      NULL
                      );
@@ -347 +347 @@
 
   Status = gRT->GetVariable (
-                  L"DriverOrder", 
-                  &gEfiGlobalVariableGuid, 
-                  NULL, 
-                  &OrderSize, 
+                  L"DriverOrder",
+                  &gEfiGlobalVariableGuid,
+                  NULL,
+                  &OrderSize,
                   Order
                   );
@@ -356 +356 @@
     return ;
   }
-  
+
   //
   // Initialize the container for dynamic opcodes.
@@ -401 +401 @@
       continue;
     }
-    
+
     //
     // Check whether the driver is already forbidden.
     //
-    
+
     VarPtr = Var;
     //
@@ -546 +546 @@
 {
   //
-  // Note: 
+  // Note:
   // As no architect protocol/interface to be called in ConnectController()
   // to verify the device path, just add a place holder for permitted connect
@@ -564 +564 @@
 {
   //
-  // Note: 
+  // Note:
   // As no architect protocol/interface to be called in ConnectController()
   // to verify the device path, just add a place holder for forbidden connect
@@ -573 +573 @@
 
 /**
-  Delete the specified device path by DriverIndex from the forbid device path 
+  Delete the specified device path by DriverIndex from the forbid device path
   list (mAccessInfo.LoadForbid).
 
   @param[in]  DriverIndex   The index of driver in forbidden device path list.
-  
+
 **/
 VOID
@@ -599 +599 @@
     DriverIndex--;
   }
-  
+
   //
   // Specified device path found.
@@ -609 +609 @@
     if (OffLen > 0) {
       CopyMem (
-        mAccessInfo.LoadForbid + OffSet, 
-        mAccessInfo.LoadForbid + OffSet + DPSize, 
+        mAccessInfo.LoadForbid + OffSet,
+        mAccessInfo.LoadForbid + OffSet + DPSize,
         OffLen
         );
@@ -620 +620 @@
 
 /**
-  Add the specified device path by DriverIndex to the forbid device path 
+  Add the specified device path by DriverIndex to the forbid device path
   list (mAccessInfo.LoadForbid).
 
   @param[in]  DriverIndex   The index of driver saved in driver options.
-  
+
 **/
 VOID
@@ -646 +646 @@
     return;
   }
-  
+
   //
   // Save forbid load driver.
   //
-  
+
   VarPtr = Var;
   //

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyIdentityPolicy.c

@@ -1 +1 @@
 /** @file
   The functions for identification policy modification.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -21 +21 @@
 
   @param[in] NewGuid       Points to the credential provider guid.
-  
+
   @retval TRUE     The NewGuid was found in the identity policy.
   @retval FALSE    The NewGuid was not found.
@@ -53 +53 @@
     Offset += Identity->Length;
   }
-  
+
   return FALSE;
 }
@@ -71 +71 @@
 EnrollUserOnProvider (
   IN  EFI_USER_INFO_IDENTITY_POLICY              *Identity,
-  IN  EFI_USER_PROFILE_HANDLE                    User 
+  IN  EFI_USER_PROFILE_HANDLE                    User
   )
 {
   UINTN                          Index;
   EFI_USER_CREDENTIAL2_PROTOCOL  *UserCredential;
-  
+
   //
   // Find the specified credential provider.
@@ -87 +87 @@
   }
 
-  return EFI_NOT_FOUND;  
+  return EFI_NOT_FOUND;
 }
 
@@ -104 +104 @@
 DeleteUserOnProvider (
   IN  EFI_USER_INFO_IDENTITY_POLICY              *Identity,
-  IN  EFI_USER_PROFILE_HANDLE                    User 
+  IN  EFI_USER_PROFILE_HANDLE                    User
   )
 {
   UINTN                          Index;
   EFI_USER_CREDENTIAL2_PROTOCOL  *UserCredential;
-  
+
   //
   // Find the specified credential provider.
@@ -120 +120 @@
   }
 
-  return EFI_NOT_FOUND;  
+  return EFI_NOT_FOUND;
 }
 
@@ -126 +126 @@
 /**
   Delete User's credental from all the providers that exist in User's identity policy.
-  
+
   @param[in]  IdentityPolicy     Point to User's identity policy.
   @param[in]  IdentityPolicyLen  The length of the identity policy.
@@ -136 +136 @@
   IN     UINT8                                *IdentityPolicy,
   IN     UINTN                                 IdentityPolicyLen,
-  IN     EFI_USER_PROFILE_HANDLE               User 
+  IN     EFI_USER_PROFILE_HANDLE               User
   )
 {
@@ -159 +159 @@
 /**
   Remove the provider specified by Offset from the new user identification record.
-  
+
   @param[in]  IdentityPolicy    Point to user identity item in new identification policy.
   @param[in]  Offset            The item offset in the new identification policy.
@@ -188 +188 @@
     //
     // This provider is not the last item in the identification policy, delete it and the connector.
-    //    
+    //
     RemainingLen = mUserInfo.NewIdentityPolicyLen - Offset - DeleteLen;
     CopyMem ((UINT8 *) IdentityPolicy, (UINT8 *) IdentityPolicy + DeleteLen, RemainingLen);
   }
-  mUserInfo.NewIdentityPolicyLen -= DeleteLen;  
+  mUserInfo.NewIdentityPolicyLen -= DeleteLen;
 }
 
@@ -202 +202 @@
 
   @param[in] NewGuid       Points to the credential provider guid.
-  
+
 **/
 VOID
@@ -249 +249 @@
     FreePool (mUserInfo.NewIdentityPolicy);
   }
-  
+
   //
   // Save credential provider.
@@ -326 +326 @@
   @retval TRUE     The policy is a valid identity policy.
   @retval FALSE    The policy is not a valid identity policy.
-  
+
 **/
 BOOLEAN
@@ -338 +338 @@
   UINTN                         Offset;
   UINT32                        OpCode;
-  
+
   //
   // Check policy expression.
@@ -350 +350 @@
     Identity = (EFI_USER_INFO_IDENTITY_POLICY *) (PolicyInfo + Offset);
     switch (Identity->Type) {
-      
+
     case EFI_USER_INFO_IDENTITY_TRUE:
       break;
@@ -409 +409 @@
 /**
   Save the identity policy and update UI with it.
-  
-  This funciton will verify the new identity policy, in current implementation, 
+
+  This funciton will verify the new identity policy, in current implementation,
   the identity policy can be:  T, P & P & P & ..., P | P | P | ...
   Here, "T" means "True", "P" means "Credential Provider", "&" means "and", "|" means "or".
-  Other identity policies are not supported.  
+  Other identity policies are not supported.
 
 **/
@@ -440 +440 @@
     return ;
   }
-  
+
   //
   // Update the informantion on credential provider.
@@ -448 +448 @@
     return ;
   }
-  
+
   //
   // Save new identification policy.
@@ -462 +462 @@
   Status = mUserManager->SetInfo (mUserManager, mModifyUser, &UserInfo, Info, Info->InfoSize);
   FreePool (Info);
-   
+
   //
   // Update the mUserInfo.IdentityPolicy by mUserInfo.NewIdentityPolicy
@@ -474 +474 @@
   mUserInfo.NewIdentityPolicy         = NULL;
   mUserInfo.NewIdentityPolicyLen      = 0;
-  mUserInfo.NewIdentityPolicyModified = FALSE;   
+  mUserInfo.NewIdentityPolicyModified = FALSE;
 
   //
@@ -495 +495 @@
     return ;
   }
-  
+
   //
   // Check the identity policy.

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileAdd.c

@@ -1 +1 @@
 /** @file
   The functions to add a user profile.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -18 +18 @@
 /**
   Get user name from the popup windows.
-  
+
   @param[in, out]  UserNameLen  On entry, point to UserName buffer lengh, in bytes.
                                 On exit, point to input user name length, in bytes.
   @param[out]      UserName     The buffer to hold the input user name.
- 
+
   @retval EFI_ABORTED           It is given up by pressing 'ESC' key.
   @retval EFI_NOT_READY         Not a valid input at all.
@@ -101 +101 @@
   *UserNameLen = NameLen * sizeof (CHAR16);
   CopyMem (UserName, Name, *UserNameLen);
-  
+
   return EFI_SUCCESS;
 }
@@ -113 +113 @@
 
   @retval EFI_NOT_READY      The usernme in mAddUserName had been used.
-  @retval EFI_SUCCESS        Change the user's username successfully with 
+  @retval EFI_SUCCESS        Change the user's username successfully with
                              username in mAddUserName.
 
@@ -128 +128 @@
   EFI_USER_PROFILE_HANDLE TempUser;
   EFI_USER_INFO           *NewUserInfo;
-   
+
   NewUserInfo = AllocateZeroPool (sizeof (EFI_USER_INFO) + UserNameLen);
   ASSERT (NewUserInfo != NULL);
 
   NewUserInfo->InfoType    = EFI_USER_INFO_NAME_RECORD;
-  NewUserInfo->InfoAttribs = EFI_USER_INFO_STORAGE_PLATFORM_NV | 
-                             EFI_USER_INFO_PUBLIC | 
+  NewUserInfo->InfoAttribs = EFI_USER_INFO_STORAGE_PLATFORM_NV |
+                             EFI_USER_INFO_PUBLIC |
                              EFI_USER_INFO_EXCLUSIVE;
   NewUserInfo->InfoSize    = (UINT32) (sizeof (EFI_USER_INFO) + UserNameLen);
@@ -182 +182 @@
   EFI_USER_INFO_CREATE_DATE Date;
   EFI_USER_INFO             *NewUserInfo;
-  
+
   NewUserInfo = AllocateZeroPool (
                   sizeof (EFI_USER_INFO) +
@@ -190 +190 @@
 
   NewUserInfo->InfoType    = EFI_USER_INFO_CREATE_DATE_RECORD;
-  NewUserInfo->InfoAttribs = EFI_USER_INFO_STORAGE_PLATFORM_NV | 
-                             EFI_USER_INFO_PUBLIC | 
+  NewUserInfo->InfoAttribs = EFI_USER_INFO_STORAGE_PLATFORM_NV |
+                             EFI_USER_INFO_PUBLIC |
                              EFI_USER_INFO_EXCLUSIVE;
   NewUserInfo->InfoSize    = sizeof (EFI_USER_INFO) + sizeof (EFI_USER_INFO_CREATE_DATE);
@@ -216 +216 @@
   Set the default identity policy of the specified user.
 
-  @param[in]  User               Handle of a user profile. 
+  @param[in]  User               Handle of a user profile.
 
 **/
@@ -227 +227 @@
   EFI_USER_INFO_HANDLE          UserInfo;
   EFI_USER_INFO                 *NewUserInfo;
-  
+
   NewUserInfo = AllocateZeroPool (
-                  sizeof (EFI_USER_INFO) + 
+                  sizeof (EFI_USER_INFO) +
                   sizeof (EFI_USER_INFO_IDENTITY_POLICY)
                   );
   ASSERT (NewUserInfo != NULL);
-  
+
   Policy                   = (EFI_USER_INFO_IDENTITY_POLICY *) (NewUserInfo + 1);
   Policy->Type             = EFI_USER_INFO_IDENTITY_TRUE;
@@ -239 +239 @@
 
   NewUserInfo->InfoType    = EFI_USER_INFO_IDENTITY_POLICY_RECORD;
-  NewUserInfo->InfoAttribs = EFI_USER_INFO_STORAGE_PLATFORM_NV | 
-                             EFI_USER_INFO_PUBLIC | 
+  NewUserInfo->InfoAttribs = EFI_USER_INFO_STORAGE_PLATFORM_NV |
+                             EFI_USER_INFO_PUBLIC |
                              EFI_USER_INFO_EXCLUSIVE;
   NewUserInfo->InfoSize    = sizeof (EFI_USER_INFO) + Policy->Length;
@@ -258 +258 @@
   Set the default access policy of the specified user.
 
-  @param[in]  User               Handle of a user profile. 
+  @param[in]  User               Handle of a user profile.
 
 **/
@@ -269 +269 @@
   EFI_USER_INFO_HANDLE          UserInfo;
   EFI_USER_INFO                 *NewUserInfo;
-  
+
   NewUserInfo = AllocateZeroPool (
-                  sizeof (EFI_USER_INFO) + 
+                  sizeof (EFI_USER_INFO) +
                   sizeof (EFI_USER_INFO_ACCESS_CONTROL)
                   );
   ASSERT (NewUserInfo != NULL);
-  
+
   Control                  = (EFI_USER_INFO_ACCESS_CONTROL *) (NewUserInfo + 1);
   Control->Type            = EFI_USER_INFO_ACCESS_ENROLL_SELF;
@@ -281 +281 @@
 
   NewUserInfo->InfoType    = EFI_USER_INFO_ACCESS_POLICY_RECORD;
-  NewUserInfo->InfoAttribs = EFI_USER_INFO_STORAGE_PLATFORM_NV | 
-                             EFI_USER_INFO_PUBLIC | 
+  NewUserInfo->InfoAttribs = EFI_USER_INFO_STORAGE_PLATFORM_NV |
+                             EFI_USER_INFO_PUBLIC |
                              EFI_USER_INFO_EXCLUSIVE;
   NewUserInfo->InfoSize    = sizeof (EFI_USER_INFO) + Control->Size;
@@ -316 +316 @@
   QuestionStr = NULL;
   PromptStr   = NULL;
-  
+
   //
   // Get user name to add.
@@ -325 +325 @@
     if (Status != EFI_ABORTED) {
       QuestionStr = GetStringById (STRING_TOKEN (STR_GET_USERNAME_FAILED));
-      PromptStr   = GetStringById (STRING_TOKEN (STR_STROKE_KEY_CONTINUE)); 
+      PromptStr   = GetStringById (STRING_TOKEN (STR_STROKE_KEY_CONTINUE));
       goto Done;
     }
@@ -338 +338 @@
   if (EFI_ERROR (Status)) {
     QuestionStr = GetStringById (STRING_TOKEN (STR_CREATE_PROFILE_FAILED));
-    PromptStr   = GetStringById (STRING_TOKEN (STR_STROKE_KEY_CONTINUE)); 
+    PromptStr   = GetStringById (STRING_TOKEN (STR_STROKE_KEY_CONTINUE));
   } else {
     //
@@ -346 +346 @@
     if (EFI_ERROR (Status)) {
       QuestionStr = GetStringById (STRING_TOKEN (STR_USER_ALREADY_EXISTED));
-      PromptStr   = GetStringById (STRING_TOKEN (STR_STROKE_KEY_CONTINUE)); 
+      PromptStr   = GetStringById (STRING_TOKEN (STR_STROKE_KEY_CONTINUE));
       goto Done;
     }
@@ -355 +355 @@
 
     QuestionStr = GetStringById (STRING_TOKEN (STR_CREATE_PROFILE_SUCCESS));
-    PromptStr   = GetStringById (STRING_TOKEN (STR_STROKE_KEY_CONTINUE)); 
+    PromptStr   = GetStringById (STRING_TOKEN (STR_STROKE_KEY_CONTINUE));
   }
 

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c

@@ -1 +1 @@
 /** @file
   The functions to delete a user profile.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -18 +18 @@
   Get the username from the specified user.
 
-  @param[in]   User              Handle of a user profile. 
+  @param[in]   User              Handle of a user profile.
 
   @retval EFI_STRING_ID          The String Id of the user's username.
 
 **/
-EFI_STRING_ID 
+EFI_STRING_ID
 GetUserName (
   IN  EFI_USER_PROFILE_HANDLE                   User
@@ -36 +36 @@
   CHAR16                UserName[USER_NAME_LENGTH];
   EFI_STRING_ID         UserId;
-  
+
   //
   // Allocate user information memory.
@@ -43 +43 @@
   Info    = AllocateZeroPool (MemSize);
   ASSERT (Info != NULL);
-  
+
   //
   // Get user name information.
@@ -117 +117 @@
   Add a username item in form.
 
-  @param[in]  User          Points to the user profile whose username is added. 
+  @param[in]  User          Points to the user profile whose username is added.
   @param[in]  Index         The index of the user in the user name list
   @param[in]  OpCodeHandle  Points to container for dynamic created opcodes.
@@ -138 +138 @@
     return ;
   }
-  
+
   //
   // Create user name option.
@@ -174 +174 @@
   Delete the user specified by UserIndex in user profile database.
 
-  @param[in]  UserIndex       The index of user in the user name list 
+  @param[in]  UserIndex       The index of user in the user name list
                               to be deleted.
 
@@ -198 +198 @@
     goto Done;
   }
-  
+
   while (UserIndex > 1) {
     Status = mUserManager->GetNext (mUserManager, &User);
@@ -233 +233 @@
     DeleteCredentialFromProviders ((UINT8 *)(Info + 1), Info->InfoSize - sizeof (EFI_USER_INFO), User);
     FreePool (Info);
-    
+
     Status = mUserManager->Delete (mUserManager, User);
     if (EFI_ERROR (Status)) {
@@ -246 +246 @@
       NULL
       );
-    return ;  
+    return ;
   }
 

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c

@@ -1 +1 @@
 /** @file
-  This driver is a configuration tool for adding, deleting or modifying user 
-  profiles, including gathering the necessary information to ascertain their 
-  identity in the future, updating user access policy and identification 
+  This driver is a configuration tool for adding, deleting or modifying user
+  profiles, including gathering the necessary information to ascertain their
+  identity in the future, updating user access policy and identification
   policy, etc.
 
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -71 +71 @@
 
 /**
-  This function gets all the credential providers in the system and saved them 
+  This function gets all the credential providers in the system and saved them
   to mProviderInfo.
 
   @retval EFI_SUCESS     Init credential provider database successfully.
   @retval Others         Fail to init credential provider database.
-  
+
 **/
 EFI_STATUS
@@ -86 +86 @@
   UINTN       HandleCount;
   EFI_HANDLE  *HandleBuf;
-  UINTN       Index;  
-  
+  UINTN       Index;
+
   //
   // Try to find all the user credential provider driver.
@@ -103 +103 @@
     return Status;
   }
-  
+
   //
   // Get provider infomation.
@@ -111 +111 @@
   }
   mProviderInfo = AllocateZeroPool (
-                    sizeof (CREDENTIAL_PROVIDER_INFO) - 
+                    sizeof (CREDENTIAL_PROVIDER_INFO) -
                     sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *) +
                     HandleCount * sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *)
@@ -192 +192 @@
         return EFI_SUCCESS;
       }
-  
+
       //
       // Get current user
@@ -202 +202 @@
         return EFI_NOT_READY;
       }
-      
+
       //
       // Get current user's right information.
@@ -210 +210 @@
         CurrentAccessRight = EFI_USER_INFO_ACCESS_ENROLL_SELF;
       }
-  
+
       //
       // Init credential provider information.
@@ -218 +218 @@
         return Status;
       }
-      
+
       //
       // Initialize the container for dynamic opcodes.
@@ -224 +224 @@
       StartOpCodeHandle = HiiAllocateOpCodeHandle ();
       ASSERT (StartOpCodeHandle != NULL);
-  
+
       EndOpCodeHandle = HiiAllocateOpCodeHandle ();
       ASSERT (EndOpCodeHandle != NULL);
-  
+
       //
       // Create Hii Extend Label OpCode.
@@ -239 +239 @@
       StartLabel->ExtendOpCode  = EFI_IFR_EXTEND_OP_LABEL;
       StartLabel->Number        = LABEL_USER_MANAGE_FUNC;
-  
+
       EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (
                                           EndOpCodeHandle,
@@ -248 +248 @@
       EndLabel->ExtendOpCode  = EFI_IFR_EXTEND_OP_LABEL;
       EndLabel->Number        = LABEL_END;
-  
+
       //
       // Add user profile option.
@@ -264 +264 @@
           );
       }
-      
+
       //
       // Add modify user profile option.
@@ -276 +276 @@
         KEY_MODIFY_USER                       // Question ID
         );
-  
+
       //
       // Add delete user profile option
@@ -290 +290 @@
           );
       }
-  
+
       HiiUpdateForm (
         mCallbackInfo->HiiHandle,               // HII handle
@@ -298 +298 @@
         EndOpCodeHandle                         // Replace data
         );
-  
+
       HiiFreeOpCodeHandle (StartOpCodeHandle);
       HiiFreeOpCodeHandle (EndOpCodeHandle);
-  
+
       return EFI_SUCCESS;
     }
@@ -311 +311 @@
 
   case EFI_BROWSER_ACTION_CHANGED:
-  {  
+  {
     //
     // Handle the request from form.
@@ -318 +318 @@
       return EFI_INVALID_PARAMETER;
     }
-    
+
     //
     // Judge first 2 bits.
@@ -392 +392 @@
           // Change credential provider option.
           //
-          case KEY_MODIFY_PROV:         
+          case KEY_MODIFY_PROV:
             mProviderChoice = Value->u8;
             break;
@@ -556 +556 @@
 
   case EFI_BROWSER_ACTION_CHANGING:
-  {  
+  {
     //
     // Handle the request from form.
@@ -563 +563 @@
       return EFI_INVALID_PARAMETER;
     }
-    
+
     //
     // Judge first 2 bits.
@@ -666 +666 @@
               DisplayLoadPermit ();
               break;
-          
+
             //
             // Forbid load device path.
@@ -673 +673 @@
               DisplayLoadForbid ();
               break;
-          
+
             default:
               break;
             }
             break;
-            
+
           //
           // Connect device path form.
@@ -693 +693 @@
               DisplayConnectPermit ();
               break;
-          
+
             //
             // Forbid connect device path.
@@ -700 +700 @@
               DisplayConnectForbid ();
               break;
-          
+
             default:
               break;
@@ -837 +837 @@
     return EFI_SUCCESS;
   }
-  
+
   //
   // Initialize driver private data.
@@ -845 +845 @@
 
   CallbackInfo = AllocateZeroPool (sizeof (USER_PROFILE_MANAGER_CALLBACK_INFO));
-  ASSERT (CallbackInfo != NULL);  
+  ASSERT (CallbackInfo != NULL);
 
   CallbackInfo->Signature                   = USER_PROFILE_MANAGER_SIGNATURE;
@@ -852 +852 @@
   CallbackInfo->ConfigAccess.Callback       = UserProfileManagerCallback;
   CallbackInfo->DriverHandle                = NULL;
-  
+
   //
   // Install Device Path Protocol and Config Access protocol to driver handle.
@@ -876 +876 @@
                               NULL
                               );
-  ASSERT (CallbackInfo->HiiHandle != NULL);                              
+  ASSERT (CallbackInfo->HiiHandle != NULL);
   mCallbackInfo = CallbackInfo;
 
@@ -882 +882 @@
 }
 
-  
+

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h

@@ -1 +1 @@
 /** @file
   The header file for user profile manager driver.
-    
+
 Copyright (c) 2009 - 2013, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -56 +56 @@
   UINTN     AccessPolicyLen;
   UINTN     IdentityPolicyLen;
-  UINTN     NewIdentityPolicyLen;    
+  UINTN     NewIdentityPolicyLen;
   UINT8     *AccessPolicy;
   UINT8     *IdentityPolicy;
@@ -198 +198 @@
   Add a username item in form.
 
-  @param[in]  User             Points to the user profile whose username is added. 
+  @param[in]  User             Points to the user profile whose username is added.
   @param[in]  Index            The index of the user in the user name list.
   @param[in]  OpCodeHandle     Points to container for dynamic created opcodes.
@@ -217 +217 @@
 
   @param[in] UserIndex       The index of the user in display list to modify.
-  
+
 **/
 VOID
@@ -225 +225 @@
 
 /**
-  Get the username from user input and update username string in Hii 
+  Get the username from user input and update username string in Hii
   database with it.
 
@@ -254 +254 @@
 /**
   Save the identity policy and update UI with it.
-  
-  This funciton will verify the new identity policy, in current implementation, 
+
+  This funciton will verify the new identity policy, in current implementation,
   the identity policy can be:  T, P & P & P & ..., P | P | P | ...
   Here, "T" means "True", "P" means "Credential Provider", "&" means "and", "|" means "or".
-  Other identity policies are not supported.  
+  Other identity policies are not supported.
 
 **/
@@ -271 +271 @@
   In this form, access right, access setu,p and access boot order are dynamically
   added. Load devicepath and connect devicepath are displayed too.
-  
+
 **/
 VOID
@@ -279 +279 @@
 
 /**
-  Collect all the access policy data to mUserInfo.AccessPolicy, 
+  Collect all the access policy data to mUserInfo.AccessPolicy,
   and save it to user profile.
 
@@ -339 +339 @@
 
 /**
-  Delete the specified device path by DriverIndex from the forbid device path 
+  Delete the specified device path by DriverIndex from the forbid device path
   list (mAccessInfo.LoadForbid).
 
   @param[in]  DriverIndex   The index of driver in a forbidden device path list.
-  
+
 **/
 VOID
@@ -349 +349 @@
   IN  UINT16                                    DriverIndex
   );
-  
-/**
-  Add the specified device path by DriverIndex to the forbid device path 
+
+/**
+  Add the specified device path by DriverIndex to the forbid device path
   list (mAccessInfo.LoadForbid).
 
   @param[in]  DriverIndex   The index of driver saved in driver options.
-  
+
 **/
 VOID
@@ -364 +364 @@
 /**
   Get user name from the popup windows.
-  
+
   @param[in, out]  UserNameLen   On entry, point to the buffer lengh of UserName.
                                  On exit, point to the input user name length.
   @param[out]      UserName      The buffer to hold the input user name.
- 
+
   @retval EFI_ABORTED            It is given up by pressing 'ESC' key.
   @retval EFI_NOT_READY          Not a valid input at all.
@@ -386 +386 @@
   @param[in]  InfoType     The user information type to find.
   @param[out] UserInfo     Points to user information handle found.
-  
+
   @retval EFI_SUCCESS      Find the user information successfully.
   @retval Others           Fail to find the user information.
@@ -419 +419 @@
   @param[in] ValidLen       The valid access policy length.
   @param[in] ExpandLen      The length that is needed to expand.
-    
+
 **/
 VOID
@@ -429 +429 @@
 /**
   Delete User's credental from all the providers that exist in User's identity policy.
-  
+
   @param[in]  IdentityPolicy     Point to User's identity policy.
   @param[in]  IdentityPolicyLen  The length of the identity policy.
@@ -439 +439 @@
   IN     UINT8                                *IdentityPolicy,
   IN     UINTN                                 IdentityPolicyLen,
-  IN     EFI_USER_PROFILE_HANDLE               User 
-  );
-  
+  IN     EFI_USER_PROFILE_HANDLE               User
+  );
+
 #endif

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h

@@ -1 +1 @@
 /** @file
   The form data for user profile manager driver.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -48 +48 @@
 
 //
-// First form key (Add/modify/del user profile). 
+// First form key (Add/modify/del user profile).
 // First 2 bits (bit 16~15).
 //
@@ -78 +78 @@
 // Specified key, used in VFR (KEY_MODIFY_USER | KEY_SELECT_USER | KEY_MODIFY_NAME).
 //
-#define  KEY_MODIFY_USER_NAME       0x5200 
+#define  KEY_MODIFY_USER_NAME       0x5200
 
 //
@@ -135 +135 @@
 // Device path modify key.
 // 2 bits (bit 12~11).
-// 
+//
 #define KEY_LOAD_PERMIT_MODIFY      0x0000
 #define KEY_LOAD_FORBID_MODIFY      0x0400

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf

@@ -51 +51 @@
   UefiLib
   DevicePathLib
-  
+
 [Guids]
   gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES  ## GUID
@@ -67 +67 @@
 [Depex]
   gEfiUserManagerProtocolGuid
-  
+
 [UserExtensions.TianoCore."ExtraFiles"]
   UserProfileManagerExtra.uni

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr

@@ -3 +3 @@
 
 Copyright (c) 2009 - 2010, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -18 +18 @@
 #define USER_MANAGER_SUBCLASS    0x04
 
-formset 
+formset
   guid     = USER_PROFILE_MANAGER_GUID,
-  title    = STRING_TOKEN(STR_FORMSET_TITLE),  
+  title    = STRING_TOKEN(STR_FORMSET_TITLE),
   help     = STRING_TOKEN(STR_TITLE_HELP),
   class    = USER_MANAGER_CLASS,
   subclass = USER_MANAGER_SUBCLASS,
-    
+
   // User manager form
   form formid = FORMID_USER_MANAGE,
@@ -39 +39 @@
         key    = QUESTIONID_USER_MANAGE;
     endif;
-     
-  endform;
-  
+
+  endform;
+
   // Modify user profile form
   form formid = FORMID_MODIFY_USER,
@@ -50 +50 @@
 
   endform;
-  
+
   // Delete user profile form
   form formid = FORMID_DEL_USER,
     title     = STRING_TOKEN(STR_DELETE_USER_TITLE);
-  
+
     label LABEL_USER_DEL_FUNC;
     label LABEL_END;
-    
-    subtitle 
-      text   = STRING_TOKEN(STR_NULL_STRING);
-  endform;
-  
+
+    subtitle
+      text   = STRING_TOKEN(STR_NULL_STRING);
+  endform;
+
   //
   // User profile information form
@@ -68 +68 @@
     title     = STRING_TOKEN(STR_USER_INFO);
 
-    text 
-      help   = STRING_TOKEN(STR_USER_NAME_VAL),  
+    text
+      help   = STRING_TOKEN(STR_USER_NAME_VAL),
       text   = STRING_TOKEN(STR_USER_NAME),
       flags  = INTERACTIVE,
       key    = KEY_MODIFY_USER_NAME;
-      
-    text 
-      help   = STRING_TOKEN(STR_CREATE_DATE_VAL),  
+
+    text
+      help   = STRING_TOKEN(STR_CREATE_DATE_VAL),
       text   = STRING_TOKEN(STR_CREATE_DATE);
-      
-    text 
-      help   = STRING_TOKEN(STR_USAGE_DATE_VAL),  
+
+    text
+      help   = STRING_TOKEN(STR_USAGE_DATE_VAL),
       text   = STRING_TOKEN(STR_USAGE_DATE);
-      
-    text 
-      help   = STRING_TOKEN(STR_USAGE_COUNT_VAL),  
+
+    text
+      help   = STRING_TOKEN(STR_USAGE_COUNT_VAL),
       text   = STRING_TOKEN(STR_USAGE_COUNT);
-      
-    label LABEL_USER_INFO_FUNC; 
-    label LABEL_END;
-
-  endform;
-  
+
+    label LABEL_USER_INFO_FUNC;
+    label LABEL_END;
+
+  endform;
+
   //
   // Identify policy modify form
@@ -97 +97 @@
     title     = STRING_TOKEN(STR_IDENTIFY_POLICY);
 
-    text 
+    text
       help   = STRING_TOKEN(STR_IDENTIFY_POLICY_HELP),
       text   = STRING_TOKEN(STR_IDENTIFY_POLICY),
         text   = STRING_TOKEN(STR_IDENTIFY_POLICY_VALUE);
-      
+
     label LABEL_IP_MOD_FUNC;
     label LABEL_END;
-    
-    text 
-      help   = STRING_TOKEN(STR_ADD_OPTION_HELP),  
+
+    text
+      help   = STRING_TOKEN(STR_ADD_OPTION_HELP),
       text   = STRING_TOKEN(STR_ADD_OPTION),
       flags  = INTERACTIVE,
       key    = KEY_ADD_LOGICAL_OP;
-      
-    subtitle 
+
+    subtitle
       text   = STRING_TOKEN(STR_NULL_STRING);
 
@@ -121 +121 @@
 
   endform;
-  
+
   //
   // Access policy modify form
@@ -143 +143 @@
       key     = KEY_CONN_DP;
 
-    subtitle 
-      text   = STRING_TOKEN(STR_NULL_STRING);
-   
+    subtitle
+      text   = STRING_TOKEN(STR_NULL_STRING);
+
     text
       help   = STRING_TOKEN(STR_ACCESS_SAVE_HELP),
@@ -165 +165 @@
       flags   = INTERACTIVE,
       key     = KEY_LOAD_PERMIT;
-    
+
     goto FORMID_FORBID_LOAD_DP,
       prompt  = STRING_TOKEN(STR_LOAD_FORBID),
@@ -171 +171 @@
       flags   = INTERACTIVE,
       key     = KEY_LOAD_FORBID;
- 
-  endform;
-  
+
+  endform;
+
   //
   // Permit load device path form
@@ -179 +179 @@
   form formid = FORMID_PERMIT_LOAD_DP,
     title     = STRING_TOKEN(STR_LOAD_PERMIT);
-  
+
     label LABEL_PERMIT_LOAD_FUNC;
     label LABEL_END;
-  
-    subtitle 
-      text   = STRING_TOKEN(STR_NULL_STRING);
-
-  endform;
-  
+
+    subtitle
+      text   = STRING_TOKEN(STR_NULL_STRING);
+
+  endform;
+
   //
   // Forbid load device path form
@@ -193 +193 @@
   form formid = FORMID_FORBID_LOAD_DP,
     title     = STRING_TOKEN(STR_LOAD_FORBID);
-  
+
     label LABLE_FORBID_LOAD_FUNC;
     label LABEL_END;
-   
-    subtitle 
-      text   = STRING_TOKEN(STR_NULL_STRING);
-
-  endform;
-  
+
+    subtitle
+      text   = STRING_TOKEN(STR_NULL_STRING);
+
+  endform;
+
   //
   // Connect device path form
@@ -213 +213 @@
       flags   = INTERACTIVE,
       key     = KEY_CONNECT_PERMIT;
-      
+
     goto FORMID_FORBID_CONNECT_DP,
       prompt  = STRING_TOKEN(STR_CONNECT_FORBID),
@@ -219 +219 @@
       flags   = INTERACTIVE,
       key     = KEY_CONNECT_FORBID;
-      
-  endform;
-  
+
+  endform;
+
   //
   // Permit connect device path form
@@ -227 +227 @@
   form formid = FORMID_PERMIT_CONNECT_DP,
     title     = STRING_TOKEN(STR_CONNECT_PERMIT);
-     
-    subtitle 
-      text   = STRING_TOKEN(STR_NULL_STRING);
-
-  endform;
-  
+
+    subtitle
+      text   = STRING_TOKEN(STR_NULL_STRING);
+
+  endform;
+
   //
   // Forbid connect device path form
@@ -238 +238 @@
   form formid = FORMID_FORBID_CONNECT_DP,
     title     = STRING_TOKEN(STR_CONNECT_FORBID);
-     
-   subtitle 
+
+   subtitle
      text   = STRING_TOKEN(STR_NULL_STRING);
 
   endform;
-  
+
 endformset;

trunk/src/VBox/Devices/EFI/Firmware/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c

@@ -1 +1 @@
 /** @file
   The functions to modify a user profile.
-    
+
 Copyright (c) 2009 - 2011, 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 
+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
 http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -128 +128 @@
   mUserInfo.UsageDateExist          = FALSE;
   mUserInfo.UsageCount              = 0;
-  
+
   mUserInfo.AccessPolicyLen         = 0;
   mUserInfo.AccessPolicyModified    = FALSE;
@@ -141 +141 @@
     mUserInfo.IdentityPolicy = NULL;
   }
-  
+
   //
   // Allocate user information memory.
@@ -150 +150 @@
     return ;
   }
-  
+
   //
   // Get each user information.
@@ -165 +165 @@
     InfoSize  = MemSize;
     Status    = mUserManager->GetInfo (
-                                mUserManager, 
-                                mModifyUser, 
-                                UserInfo, 
-                                Info, 
+                                mUserManager,
+                                mModifyUser,
+                                UserInfo,
+                                Info,
                                 &InfoSize
                                 );
@@ -282 +282 @@
     Str + StrLen (Str),
     DateBufLen,
-    L"%2d:%2d:%2d", 
+    L"%2d:%2d:%2d",
     Date->Hour,
     Date->Minute,
     Date->Second
     );
-  
+
   HiiSetString (mCallbackInfo->HiiHandle, DateId, Str, NULL);
   FreePool (Str);
@@ -309 +309 @@
   CHAR16  Count[10];
 
-  UnicodeSPrint (Count, 20, L"%d", CountVal);  
+  UnicodeSPrint (Count, 20, L"%d", CountVal);
   HiiSetString (mCallbackInfo->HiiHandle, CountId, Count, NULL);
 }
@@ -319 +319 @@
 
   @param[in, out]  Source1      On entry, point to a Null-terminated Unicode string.
-                                On exit, point to a new concatenated Unicode string                                
+                                On exit, point to a new concatenated Unicode string
   @param[in]       Source2      Pointer to a Null-terminated Unicode string.
 
@@ -381 +381 @@
   EFI_HII_HANDLE                HiiHandle;
   EFI_USER_CREDENTIAL2_PROTOCOL *UserCredential;
- 
+
   TmpStr = NULL;
-  
+
   //
   // Resolve each policy.
@@ -414 +414 @@
       for (Index = 0; Index < mProviderInfo->Count; Index++) {
         UserCredential = mProviderInfo->Provider[Index];
-        if (CompareGuid ((EFI_GUID *) (Identity + 1), &UserCredential->Type)) {     
-          UserCredential->Title (
-                            UserCredential, 
-                            &HiiHandle, 
-                            &ProvId
-                            );
-          ProvStr = HiiGetString (HiiHandle, ProvId, NULL);
-          if (ProvStr != NULL) {
-            AddStr (&TmpStr, ProvStr);
-            FreePool (ProvStr);
-          }
-          break;
-        }
-      }
-      break;
-
-    case EFI_USER_INFO_IDENTITY_CREDENTIAL_PROVIDER:
-      for (Index = 0; Index < mProviderInfo->Count; Index++) {
-        UserCredential = mProviderInfo->Provider[Index];
-        if (CompareGuid ((EFI_GUID *) (Identity + 1), &UserCredential->Identifier)) {          
+        if (CompareGuid ((EFI_GUID *) (Identity + 1), &UserCredential->Type)) {
           UserCredential->Title (
                             UserCredential,
@@ -448 +429 @@
       }
       break;
+
+    case EFI_USER_INFO_IDENTITY_CREDENTIAL_PROVIDER:
+      for (Index = 0; Index < mProviderInfo->Count; Index++) {
+        UserCredential = mProviderInfo->Provider[Index];
+        if (CompareGuid ((EFI_GUID *) (Identity + 1), &UserCredential->Identifier)) {
+          UserCredential->Title (
+                            UserCredential,
+                            &HiiHandle,
+                            &ProvId
+                            );
+          ProvStr = HiiGetString (HiiHandle, ProvId, NULL);
+          if (ProvStr != NULL) {
+            AddStr (&TmpStr, ProvStr);
+            FreePool (ProvStr);
+          }
+          break;
+        }
+      }
+      break;
     }
 
@@ -467 +467 @@
 
   @param[in] UserIndex       The index of the user in display list to modify.
-  
+
 **/
 VOID
@@ -528 +528 @@
     UserIndex--;
   }
-  
+
   //
   // Get user profile information.
@@ -542 +542 @@
     NULL
     );
-  
+
   //
   // Update create date.
@@ -556 +556 @@
       );
   }
-  
+
   //
   // Add usage date.
@@ -570 +570 @@
       );
   }
-  
+
   //
   // Add usage count.
   //
   ResolveCount ((UINT32) mUserInfo.UsageCount, STRING_TOKEN (STR_USAGE_COUNT_VAL));
-  
+
   //
   // Add identity policy.
@@ -595 +595 @@
       );
   }
-  
+
   //
   // Add access policy.
@@ -644 +644 @@
 
   //
-  // Set default value 
+  // Set default value
   //
   mAccessInfo.AccessRight       = EFI_USER_INFO_ACCESS_ENROLL_SELF;
@@ -654 +654 @@
   mAccessInfo.ConnectPermitLen  = 0;
   mAccessInfo.ConnectForbidLen  = 0;
-  
+
   //
   // Get each user access policy.
@@ -660 +660 @@
   OffSet = 0;
   while (OffSet < mUserInfo.AccessPolicyLen) {
-    CopyMem (&Control, mUserInfo.AccessPolicy + OffSet, sizeof (Control));    
+    CopyMem (&Control, mUserInfo.AccessPolicy + OffSet, sizeof (Control));
     ValLen = Control.Size - sizeof (Control);
     switch (Control.Type) {
@@ -755 +755 @@
   @param[in]  InfoType     The user information type to find.
   @param[out] UserInfo     Points to user information handle found.
-  
+
   @retval EFI_SUCCESS      Find the user information successfully.
   @retval Others           Fail to find the user information.
@@ -785 +785 @@
     return EFI_OUT_OF_RESOURCES;
   }
-  
+
   //
   // Get each user information.
@@ -837 +837 @@
   In this form, access right, access setup and access boot order are dynamically
   added. Load devicepath and connect devicepath are displayed too.
-  
+
 **/
 VOID
@@ -850 +850 @@
   EFI_IFR_GUID_LABEL  *EndLabel;
   VOID                *DefaultOpCodeHandle;
-  
+
   //
   // Initialize the container for dynamic opcodes.
@@ -894 +894 @@
   DefaultOpCodeHandle = HiiAllocateOpCodeHandle ();
   ASSERT (DefaultOpCodeHandle != NULL);
-  
+
   HiiCreateOneOfOptionOpCode (
     OptionsOpCodeHandle,
@@ -920 +920 @@
 
   HiiCreateDefaultOpCode (
-    DefaultOpCodeHandle, 
-    EFI_HII_DEFAULT_CLASS_STANDARD, 
-    EFI_IFR_NUMERIC_SIZE_1, 
+    DefaultOpCodeHandle,
+    EFI_HII_DEFAULT_CLASS_STANDARD,
+    EFI_IFR_NUMERIC_SIZE_1,
     mAccessInfo.AccessRight
     );
- 
+
   HiiCreateOneOfOpCode (
     StartOpCodeHandle,                    // Container for dynamic created opcodes
@@ -949 +949 @@
   DefaultOpCodeHandle = HiiAllocateOpCodeHandle ();
   ASSERT (DefaultOpCodeHandle != NULL);
-  
+
   HiiCreateOneOfOptionOpCode (
     OptionsOpCodeHandle,
@@ -957 +957 @@
     ACCESS_SETUP_RESTRICTED
     );
-    
+
   HiiCreateOneOfOptionOpCode (
     OptionsOpCodeHandle,
@@ -975 +975 @@
 
   HiiCreateDefaultOpCode (
-    DefaultOpCodeHandle, 
-    EFI_HII_DEFAULT_CLASS_STANDARD, 
-    EFI_IFR_NUMERIC_SIZE_1, 
+    DefaultOpCodeHandle,
+    EFI_HII_DEFAULT_CLASS_STANDARD,
+    EFI_IFR_NUMERIC_SIZE_1,
     mAccessInfo.AccessSetup
-    );    
+    );
 
   HiiCreateOneOfOpCode (
@@ -995 +995 @@
   HiiFreeOpCodeHandle (DefaultOpCodeHandle);
   HiiFreeOpCodeHandle (OptionsOpCodeHandle);
-  
+
   //
   // Add boot order one-of-code.
@@ -1003 +1003 @@
   DefaultOpCodeHandle = HiiAllocateOpCodeHandle ();
   ASSERT (DefaultOpCodeHandle != NULL);
-  
+
   HiiCreateOneOfOptionOpCode (
     OptionsOpCodeHandle,
@@ -1027 +1027 @@
     EFI_USER_INFO_ACCESS_BOOT_ORDER_REPLACE
     );
-    
+
   HiiCreateOneOfOptionOpCode (
     OptionsOpCodeHandle,
@@ -1037 +1037 @@
 
   HiiCreateDefaultOpCode (
-    DefaultOpCodeHandle, 
-    EFI_HII_DEFAULT_CLASS_STANDARD, 
-    EFI_IFR_NUMERIC_SIZE_4, 
+    DefaultOpCodeHandle,
+    EFI_HII_DEFAULT_CLASS_STANDARD,
+    EFI_IFR_NUMERIC_SIZE_4,
     mAccessInfo.AccessBootOrder
     );
-    
+
   HiiCreateOneOfOpCode (
     StartOpCodeHandle,                  // Container for dynamic created opcodes
@@ -1055 +1055 @@
     DefaultOpCodeHandle                 // Default Opcode
     );
-  HiiFreeOpCodeHandle (DefaultOpCodeHandle);    
+  HiiFreeOpCodeHandle (DefaultOpCodeHandle);
   HiiFreeOpCodeHandle (OptionsOpCodeHandle);
 
@@ -1079 +1079 @@
   @param[in] ValidLen       The valid access policy length.
   @param[in] ExpandLen      The length that is needed to expand.
-    
+
 **/
 VOID
@@ -1108 +1108 @@
 
 /**
-  Get the username from user input, and update username string in the Hii 
+  Get the username from user input, and update username string in the Hii
   database with it.
 
@@ -1143 +1143 @@
     return ;
   }
-  
+
   //
   // Check whether the username had been used or not.
@@ -1179 +1179 @@
     return ;
   }
-  
+
   //
   // Update username display in the form.
@@ -1185 +1185 @@
   CopyMem (mUserInfo.UserName, UserName, Len);
   HiiSetString (
-    mCallbackInfo->HiiHandle, 
-    STRING_TOKEN (STR_USER_NAME_VAL), 
-    mUserInfo.UserName, 
+    mCallbackInfo->HiiHandle,
+    STRING_TOKEN (STR_USER_NAME_VAL),
+    mUserInfo.UserName,
     NULL
     );
@@ -1304 +1304 @@
     HiiFreeOpCodeHandle (OptionsOpCodeHandle);
   }
-  
+
   //
   // Add logical connector Option OpCode.
@@ -1346 +1346 @@
   //
   ResolveIdentityPolicy (
-    mUserInfo.IdentityPolicy, 
-    mUserInfo.IdentityPolicyLen, 
+    mUserInfo.IdentityPolicy,
+    mUserInfo.IdentityPolicyLen,
     STRING_TOKEN (STR_IDENTIFY_POLICY_VALUE)
     );
@@ -1405 +1405 @@
     return EFI_OUT_OF_RESOURCES;
   }
- 
+
   //
   // Get user access information.
@@ -1446 +1446 @@
       break;
     }
-    
+
     //
     // Check user information.