Update UID drivers to align with latest UEFI spec 2.3.1 errata A.

Signed-off-by: gdong1
Reviewed-by: xdu2
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12345 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
index ad1521040c32f0c162221f7d6f734ebc33bad310..9d2e622f1338effee846aafc66faefe7c914fa22 100644 (file)
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
+++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
@@ -1061,17 +1061,8 @@ CredentialUser (
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  //\r
-  // The User's password doesn't match the input password.\r
-  // Return the user ID whose password matches the input password.\r
-  //\r
-  CopyMem (\r
-    Identifier,\r
-    &mPwdTable->UserInfo[mPwdTable->ValidIndex - 1].UserId,\r
-    sizeof (EFI_USER_INFO_IDENTIFIER)\r
-    );\r

   FreePool (UserInfo);  \r
   FreePool (UserInfo);  \r

-  return EFI_SUCCESS;\r
+  return EFI_NOT_READY;\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
index 6c22bfb2bb2922be2c4ac33b14a7cc15c6644c46..2b79354fbd9805f9b3e5925100b04ec7d6e245b1 100644 (file)
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
+++ b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
@@ -1,7 +1,7 @@
 /** @file\r
   Usb Credential Provider driver implemenetation.\r
     \r
 /** @file\r
   Usb Credential Provider driver implemenetation.\r
     \r

-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r


@@ -1037,25 +1037,10 @@ CredentialUser (
       } \r
     }\r
   }\r
       } \r
     }\r
   }\r

-  FreePool (UserInfo);\r
-  \r
-  //\r
-  // The read token mismatch with the User's Token.\r
-  // Only check token.\r
-  //\r
-  for (Index = 0; Index < mUsbTable->Count; Index++) {\r
-    UserToken = mUsbTable->UserInfo[Index].Token;\r
-    if (CompareMem (UserToken, ReadToken, HASHED_CREDENTIAL_LEN) == 0) {\r
-      //\r
-      // The read token matches with the one in UsbTable.\r
-      //\r
-      UserId = (UINT8 *) &mUsbTable->UserInfo[Index].UserId;\r
-      CopyMem (Identifier, UserId, sizeof (EFI_USER_INFO_IDENTIFIER));\r
-      return EFI_SUCCESS;\r
-    } \r
-  }\r
-  \r
-  return EFI_NOT_FOUND;\r
+\r
+  FreePool (UserInfo); \r
+    \r
+  return EFI_NOT_READY;\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
index e105579115a89cf1864dfc5fb7962f4677049a79..64388130e1e4938d3a271c91e3cfaa1e9199caa0 100644 (file)
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
+++ b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
@@ -2319,7 +2319,7 @@ GetIdentifyType (
   Identify the User by the specfied provider.\r
 \r
   @param[in]  User                Handle of a user profile.\r
   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
 \r
   @retval EFI_INVALID_PARAMETER   Provider is NULL.\r
   @retval EFI_NOT_FOUND           Fail to identify the specified user.\r


@@ -2340,7 +2340,6 @@ IdentifyByProviderId (
   EFI_GUID                      FormSetId;\r
   EFI_FORM_ID                   FormId;\r
   EFI_USER_CREDENTIAL_PROTOCOL  *UserCredential;\r
   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
 \r
   if (Provider == NULL) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -2398,24 +2397,7 @@ IdentifyByProviderId (
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r

-\r
-      if (User == NULL) {\r
-        return EFI_SUCCESS;\r
-      }\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
       return EFI_SUCCESS;\r
     }\r
   }\r