Update UID drivers to align with latest UEFI spec 2.3.1.

[mirror_edk2.git] / SecurityPkg / UserIdentification / UserIdentifyManagerDxe / UserIdentifyManager.c

diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
index e105579115a89cf1864dfc5fb7962f4677049a79..e846b71f035903562258638bc6dcbd8279c451b5 100644 (file)
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
+++ b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
@@ -14,11 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "UserIdentifyManager.h"\r
 \r
-//\r
-// Guid used in user profile saving and in form browser.\r
-//\r
-EFI_GUID                    mUserManagerGuid  = USER_IDENTIFY_MANAGER_GUID;\r
-\r
 //\r
 // Default user name.\r
 //\r
@@ -54,10 +49,7 @@ HII_VENDOR_DEVICE_PATH      mHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {ACA7C06F-743C-454f-9C6D-692138482498}\r
-    //\r
-    { 0xaca7c06f, 0x743c, 0x454f, { 0x9c, 0x6d, 0x69, 0x21, 0x38, 0x48, 0x24, 0x98 } }\r
+    USER_IDENTIFY_MANAGER_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -1152,7 +1144,7 @@ SaveNvUserProfile (
   //\r
   Status = gRT->SetVariable (\r
                   User->UserVarName,\r
-                  &mUserManagerGuid,\r
+                  &gUserIdentifyManagerGuid,\r
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                   Delete ? 0 : User->UserProfileSize,\r
                   User->ProfileInfo\r
@@ -2319,7 +2311,7 @@ GetIdentifyType (
   Identify the User by the specfied provider.\r
 \r
   @param[in]  User                Handle of a user profile.\r
-  @param[in]  Provider            Points to the identifir of credential provider.\r
+  @param[in]  Provider            Points to the identifier of credential provider.\r
 \r
   @retval EFI_INVALID_PARAMETER   Provider is NULL.\r
   @retval EFI_NOT_FOUND           Fail to identify the specified user.\r
@@ -2340,7 +2332,6 @@ IdentifyByProviderId (
   EFI_GUID                      FormSetId;\r
   EFI_FORM_ID                   FormId;\r
   EFI_USER_CREDENTIAL_PROTOCOL  *UserCredential;\r
-  EFI_USER_INFO                 *IdInfo;\r
 \r
   if (Provider == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -2398,24 +2389,7 @@ IdentifyByProviderId (
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
-\r
-      if (User == NULL) {\r
-        return EFI_SUCCESS;\r
-      }\r
       \r
-      //\r
-      // Get user ID information.\r
-      //\r
-      IdInfo  = NULL;\r
-      Status  = FindUserInfoByType (User, &IdInfo, EFI_USER_INFO_IDENTIFIER_RECORD);\r
-      ASSERT (IdInfo != NULL);\r
-\r
-      if (CompareMem ((UINT8 *) (IdInfo + 1), UserId, sizeof (EFI_USER_INFO_IDENTIFIER)) != 0) {\r
-        //\r
-        // One user name is selected, but the other's credential is given. Here no user passed.\r
-        //\r
-        break;\r
-      }\r
       return EFI_SUCCESS;\r
     }\r
   }\r
@@ -2830,7 +2804,7 @@ IdentifyOrTypeUser (
 \r
   HiiUpdateForm (\r
     mCallbackInfo->HiiHandle, // HII handle\r
-    &mUserManagerGuid,        // Formset GUID\r
+    &gUserIdentifyManagerGuid,// Formset GUID\r
     FORMID_PROVIDER_FORM,     // Form ID\r
     StartOpCodeHandle,        // Label for where to insert opcodes\r
     EndOpCodeHandle           // Replace data\r
@@ -2934,7 +2908,7 @@ UserIdentifyManagerCallback (
   \r
       HiiUpdateForm (\r
         mCallbackInfo->HiiHandle, // HII handle\r
-        &mUserManagerGuid,        // Formset GUID\r
+        &gUserIdentifyManagerGuid,// Formset GUID\r
         FORMID_USER_FORM,         // Form ID\r
         StartOpCodeHandle,        // Label for where to insert opcodes\r
         EndOpCodeHandle           // Replace data\r
@@ -3076,7 +3050,7 @@ InitUserProfileDb (
     // Get variable value.\r
     //\r
     VarSize = CurVarSize;\r
-    Status  = gRT->GetVariable (VarName, &mUserManagerGuid, &VarAttr, &VarSize, VarData);\r
+    Status  = gRT->GetVariable (VarName, &gUserIdentifyManagerGuid, &VarAttr, &VarSize, VarData);\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
       FreePool (VarData);\r
       VarData = AllocatePool (VarSize);\r
@@ -3086,7 +3060,7 @@ InitUserProfileDb (
       }\r
 \r
       CurVarSize  = VarSize;\r
-      Status      = gRT->GetVariable (VarName, &mUserManagerGuid, &VarAttr, &VarSize, VarData);\r
+      Status      = gRT->GetVariable (VarName, &gUserIdentifyManagerGuid, &VarAttr, &VarSize, VarData);\r
     }\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -3100,7 +3074,7 @@ InitUserProfileDb (
     // Check variable attributes.\r
     //\r
     if (VarAttr != (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS)) {\r
-      Status = gRT->SetVariable (VarName, &mUserManagerGuid, VarAttr, 0, NULL);\r
+      Status = gRT->SetVariable (VarName, &gUserIdentifyManagerGuid, VarAttr, 0, NULL);\r
       continue;\r
     }\r
     \r
@@ -3113,7 +3087,7 @@ InitUserProfileDb (
         //\r
         // Delete invalid user profile\r
         //\r
-        gRT->SetVariable (VarName, &mUserManagerGuid, VarAttr, 0, NULL);\r
+        gRT->SetVariable (VarName, &gUserIdentifyManagerGuid, VarAttr, 0, NULL);\r
       } else if (Status == EFI_OUT_OF_RESOURCES) {\r
         break;\r
       }\r
@@ -3122,7 +3096,7 @@ InitUserProfileDb (
       // Delete and save the profile again if some invalid profiles are deleted.\r
       //\r
       if (mUserProfileDb->UserProfileNum < Index) {\r
-        gRT->SetVariable (VarName, &mUserManagerGuid, VarAttr, 0, NULL);\r
+        gRT->SetVariable (VarName, &gUserIdentifyManagerGuid, VarAttr, 0, NULL);\r
         SaveNvUserProfile (mUserProfileDb->UserProfile[mUserProfileDb->UserProfileNum - 1], FALSE);\r
       }\r
     }\r
@@ -3367,7 +3341,7 @@ InitFormBrowser (
   // Publish HII data.\r
   //\r
   CallbackInfo->HiiHandle = HiiAddPackages (\r
-                              &mUserManagerGuid,\r
+                              &gUserIdentifyManagerGuid,\r
                               CallbackInfo->DriverHandle,\r
                               UserIdentifyManagerStrings,\r
                               UserIdentifyManagerVfrBin,\r
@@ -3608,7 +3582,7 @@ IdentifyUser (
                                  mCallbackInfo->FormBrowser2,\r
                                  &mCallbackInfo->HiiHandle,\r
                                  1,\r
-                                 &mUserManagerGuid,\r
+                                 &gUserIdentifyManagerGuid,\r
                                  0,\r
                                  NULL,\r
                                  NULL\r