diff options
Diffstat (limited to 'SecurityPkg')
14 files changed, 425 insertions, 249 deletions
diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c index d32cc7aff3..18d87ebe74 100644 --- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c +++ b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c @@ -482,7 +482,7 @@ TcgPhysicalPresenceLibConstructor ( IN EFI_SYSTEM_TABLE *SystemTable
)
{
- mPpStringPackHandle = HiiAddPackages (&gEfiPhysicalPresenceGuid, &ImageHandle, DxeTcgPhysicalPresenceLibStrings, NULL);
+ mPpStringPackHandle = HiiAddPackages (&gEfiPhysicalPresenceGuid, ImageHandle, DxeTcgPhysicalPresenceLibStrings, NULL);
ASSERT (mPpStringPackHandle != NULL);
return EFI_SUCCESS;
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c index b8513e9515..0016db8663 100644 --- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c +++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c @@ -40,7 +40,7 @@ HII_VENDOR_DEVICE_PATH mHiiVendorDevicePath = { }
};
-EFI_USER_CREDENTIAL_PROTOCOL gPwdCredentialProviderDriver = {
+EFI_USER_CREDENTIAL2_PROTOCOL gPwdCredentialProviderDriver = {
PWD_CREDENTIAL_PROVIDER_GUID,
EFI_USER_CREDENTIAL_CLASS_PASSWORD,
CredentialEnroll,
@@ -52,7 +52,9 @@ EFI_USER_CREDENTIAL_PROTOCOL gPwdCredentialProviderDriver = { CredentialDeselect,
CredentialDefault,
CredentialGetInfo,
- CredentialGetNextInfo
+ CredentialGetNextInfo,
+ EFI_CREDENTIAL_CAPABILITIES_ENROLL,
+ CredentialDelete
};
@@ -117,12 +119,12 @@ ExpandTableSize ( /**
- Add or delete info in table, and sync with NV variable.
+ Add, update or delete info in table, and sync with NV variable.
- @param[in] Index The index of the password in table. The index begin from 1.
- If index is found in table, delete the info, else add the
- into to table.
- @param[in] Info The new password info to add into table.
+ @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,
+ delete the info by Index.
@retval EFI_INVALID_PARAMETER Info is NULL when save the info.
@retval EFI_SUCCESS Modify the table successfully.
@@ -135,23 +137,29 @@ ModifyTable ( IN PASSWORD_INFO * Info OPTIONAL
)
{
- EFI_STATUS Status;
-
+ EFI_STATUS Status;
+ PASSWORD_INFO *NewPasswordInfo;
+
+ NewPasswordInfo = NULL;
+
if (Index < mPwdTable->Count) {
- //
- // Delete the specified entry.
- //
- mPwdTable->Count--;
- if (Index != mPwdTable->Count) {
- CopyMem (
- &mPwdTable->UserInfo[Index],
- &mPwdTable->UserInfo[mPwdTable->Count],
- sizeof (PASSWORD_INFO)
- );
+ if (Info == NULL) {
+ //
+ // Delete the specified entry.
+ //
+ mPwdTable->Count--;
+ if (Index != mPwdTable->Count) {
+ NewPasswordInfo = &mPwdTable->UserInfo[mPwdTable->Count];
+ }
+ } else {
+ //
+ // Update the specified entry.
+ //
+ NewPasswordInfo = Info;
}
} else {
//
- // Add a new entry.
+ // Add a new password info.
//
if (Info == NULL) {
return EFI_INVALID_PARAMETER;
@@ -161,14 +169,14 @@ ModifyTable ( ExpandTableSize ();
}
- CopyMem (
- &mPwdTable->UserInfo[mPwdTable->Count],
- Info,
- sizeof (PASSWORD_INFO)
- );
+ NewPasswordInfo = Info;
mPwdTable->Count++;
}
+ if (NewPasswordInfo != NULL) {
+ CopyMem (&mPwdTable->UserInfo[Index], NewPasswordInfo, sizeof (PASSWORD_INFO));
+ }
+
//
// Save the credential table.
//
@@ -705,13 +713,11 @@ InitFormBrowser ( /**
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
- 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_CREDENTIAL_PROTOCOL.
+ @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.
@@ -729,7 +735,7 @@ InitFormBrowser ( EFI_STATUS
EFIAPI
CredentialEnroll (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User
)
{
@@ -741,7 +747,6 @@ CredentialEnroll ( EFI_INPUT_KEY Key;
EFI_USER_MANAGER_PROTOCOL *UserManager;
UINT8 *UserId;
- UINT8 *NewUserId;
CHAR16 *QuestionStr;
CHAR16 *PromptStr;
@@ -771,23 +776,11 @@ CredentialEnroll ( return EFI_INVALID_PARAMETER;
}
- //
- // If User exists in mPwdTable, delete User.
- //
- for (Index = 0; Index < mPwdTable->Count; Index++) {
- UserId = (UINT8 *) &mPwdTable->UserInfo[Index].UserId;
- NewUserId = (UINT8 *) (UserInfo + 1);
- if (CompareMem (UserId, NewUserId, sizeof (EFI_USER_INFO_IDENTIFIER)) == 0) {
- //
- // Delete the existing password.
- //
- FreePool (UserInfo);
- return ModifyTable (Index, NULL);
- }
- }
+ CopyMem (PwdInfo.UserId, (UINT8 *) (UserInfo + 1), sizeof (EFI_USER_INFO_IDENTIFIER));
+ FreePool (UserInfo);
//
- // The User doesn't exist in mPwdTable; Enroll the new User.
+ // Get password from user.
//
while (TRUE) {
//
@@ -821,17 +814,23 @@ CredentialEnroll ( FreePool (PromptStr);
}
- CopyMem (
- PwdInfo.UserId,
- (UINT8 *) (UserInfo + 1),
- sizeof (EFI_USER_INFO_IDENTIFIER)
- );
- FreePool (UserInfo);
-
//
- // Save the new added entry.
+ // Check whether User is ever enrolled in the provider.
+ //
+ for (Index = 0; Index < mPwdTable->Count; Index++) {
+ UserId = (UINT8 *) &mPwdTable->UserInfo[Index].UserId;
+ if (CompareMem (UserId, (UINT8 *) &PwdInfo.UserId, sizeof (EFI_USER_INFO_IDENTIFIER)) == 0) {
+ //
+ // User already exists, update the password.
+ //
+ break;
+ }
+ }
+
+ //
+ // Enroll the User to the provider.
//
- Status = ModifyTable (mPwdTable->Count, &PwdInfo);
+ Status = ModifyTable (Index, &PwdInfo);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -854,7 +853,7 @@ CredentialEnroll ( the user credential provider does not require a form to identify the user, then this
function should return EFI_NOT_FOUND.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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] FormSetId On return, holds the identifier of the form set which contains
the form used during user identification.
@@ -869,7 +868,7 @@ CredentialEnroll ( EFI_STATUS
EFIAPI
CredentialForm (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_GUID *FormSetId,
OUT EFI_FORM_ID *FormId
@@ -895,7 +894,7 @@ CredentialForm ( of pixels specified by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND
is returned.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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
width of the bitmap returned.
@@ -913,7 +912,7 @@ CredentialForm ( EFI_STATUS
EFIAPI
CredentialTile (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT UINTN *Width,
IN OUT UINTN *Height,
OUT EFI_HII_HANDLE *Hii,
@@ -933,7 +932,7 @@ CredentialTile ( This function returns a string which describes the credential provider. If no
such string exists, then EFI_NOT_FOUND is returned.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -945,7 +944,7 @@ CredentialTile ( EFI_STATUS
EFIAPI
CredentialTitle (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_STRING_ID *String
)
@@ -972,7 +971,7 @@ CredentialTitle ( 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_CREDENTIAL_PROTOCOL.
+ @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
considered by the user identity manager. If NULL, then no user
profile is currently under consideration.
@@ -989,7 +988,7 @@ CredentialTitle ( EFI_STATUS
EFIAPI
CredentialUser (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User,
OUT EFI_USER_INFO_IDENTIFIER *Identifier
)
@@ -1067,7 +1066,7 @@ CredentialUser ( AutoLogon returns FALSE, then the user interface will be constructed by the User
Identity Manager.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -1078,7 +1077,7 @@ CredentialUser ( EFI_STATUS
EFIAPI
CredentialSelect (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
)
{
@@ -1096,7 +1095,7 @@ CredentialSelect ( This function is called when a credential provider is deselected by the user.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@retval EFI_SUCCESS Credential provider successfully deselected.
@@ -1104,7 +1103,7 @@ CredentialSelect ( EFI_STATUS
EFIAPI
CredentialDeselect (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This
)
{
if (This == NULL) {
@@ -1119,7 +1118,7 @@ CredentialDeselect ( This function reports the default login behavior regarding this credential provider.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -1130,7 +1129,7 @@ CredentialDeselect ( EFI_STATUS
EFIAPI
CredentialDefault (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
)
{
@@ -1148,7 +1147,7 @@ CredentialDefault ( This function returns user information.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@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
@@ -1168,7 +1167,7 @@ CredentialDefault ( EFI_STATUS
EFIAPI
CredentialGetInfo (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_INFO_HANDLE UserInfo,
OUT EFI_USER_INFO *Info,
IN OUT UINTN *InfoSize
@@ -1215,7 +1214,7 @@ CredentialGetInfo ( 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_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@param[in, out] UserInfo On entry, points to the previous user information handle or NULL
to start enumeration. On exit, points to the next user information
handle or NULL if there is no more user information.
@@ -1228,7 +1227,7 @@ CredentialGetInfo ( EFI_STATUS
EFIAPI
CredentialGetNextInfo (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT EFI_USER_INFO_HANDLE *UserInfo
)
{
@@ -1359,6 +1358,71 @@ CredentialGetNextInfo ( return EFI_NOT_FOUND;
}
+/**
+ Delete 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.
+ @param[in] User The user profile handle to delete.
+
+ @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_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.
+ @retval EFI_INVALID_PARAMETER User does not refer to a valid user profile handle.
+**/
+EFI_STATUS
+EFIAPI
+CredentialDelete (
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
+ IN EFI_USER_PROFILE_HANDLE User
+ )
+{
+ EFI_STATUS Status;
+ EFI_USER_INFO *UserInfo;
+ UINT8 *UserId;
+ UINT8 *NewUserId;
+ UINTN Index;
+
+ if ((This == NULL) || (User == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Get User Identifier.
+ //
+ UserInfo = NULL;
+ Status = FindUserInfoByType (
+ User,
+ EFI_USER_INFO_IDENTIFIER_RECORD,
+ &UserInfo
+ );
+ if (EFI_ERROR (Status)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Find the user by user identifier in mPwdTable.
+ //
+ for (Index = 0; Index < mPwdTable->Count; Index++) {
+ UserId = (UINT8 *) &mPwdTable->UserInfo[Index].UserId;
+ NewUserId = (UINT8 *) (UserInfo + 1);
+ if (CompareMem (UserId, NewUserId, sizeof (EFI_USER_INFO_IDENTIFIER)) == 0) {
+ //
+ // Found the user, delete it.
+ //
+ ModifyTable (Index, NULL);
+ break;
+ }
+ }
+
+ FreePool (UserInfo);
+ return EFI_SUCCESS;
+}
+
/**
Main entry for this driver.
@@ -1399,7 +1463,7 @@ PasswordProviderInit ( //
Status = gBS->InstallProtocolInterface (
&mCallbackInfo->DriverHandle,
- &gEfiUserCredentialProtocolGuid,
+ &gEfiUserCredential2ProtocolGuid,
EFI_NATIVE_INTERFACE,
&gPwdCredentialProviderDriver
);
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h index c9ef33b8ac..7a51e7d078 100644 --- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h +++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h @@ -1,7 +1,7 @@ /** @file
Password Credential Provider driver header file.
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+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
@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Guid/GlobalVariable.h>
#include <Protocol/HiiConfigAccess.h>
-#include <Protocol/UserCredential.h>
+#include <Protocol/UserCredential2.h>
#include <Protocol/UserManager.h>
#include <Library/UefiRuntimeServicesTableLib.h>
@@ -92,13 +92,11 @@ typedef struct { /**
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
- provider.
-
- @param[in] This Points to this instance of EFI_USER_CREDENTIAL_PROTOCOL.
+ 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.
@@ -116,7 +114,7 @@ typedef struct { EFI_STATUS
EFIAPI
CredentialEnroll (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User
);
@@ -129,7 +127,7 @@ CredentialEnroll ( the user credential provider does not require a form to identify the user, then this
function should return EFI_NOT_FOUND.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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] FormSetId On return, holds the identifier of the form set which contains
the form used during user identification.
@@ -144,7 +142,7 @@ CredentialEnroll ( EFI_STATUS
EFIAPI
CredentialForm (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_GUID *FormSetId,
OUT EFI_FORM_ID *FormId
@@ -157,7 +155,7 @@ CredentialForm ( of pixels specified by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND
is returned.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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
width of the bitmap returned.
@@ -175,7 +173,7 @@ CredentialForm ( EFI_STATUS
EFIAPI
CredentialTile (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT UINTN *Width,
IN OUT UINTN *Height,
OUT EFI_HII_HANDLE *Hii,
@@ -188,7 +186,7 @@ CredentialTile ( This function returns a string which describes the credential provider. If no
such string exists, then EFI_NOT_FOUND is returned.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -200,7 +198,7 @@ CredentialTile ( EFI_STATUS
EFIAPI
CredentialTitle (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_STRING_ID *String
);
@@ -213,7 +211,7 @@ CredentialTitle ( 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_CREDENTIAL_PROTOCOL.
+ @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
considered by the user identity manager. If NULL, then no user
profile is currently under consideration.
@@ -230,7 +228,7 @@ CredentialTitle ( EFI_STATUS
EFIAPI
CredentialUser (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User,
OUT EFI_USER_INFO_IDENTIFIER *Identifier
);
@@ -242,7 +240,7 @@ CredentialUser ( AutoLogon returns FALSE, then the user interface will be constructed by the User
Identity Manager.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -253,7 +251,7 @@ CredentialUser ( EFI_STATUS
EFIAPI
CredentialSelect (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
);
@@ -262,7 +260,7 @@ CredentialSelect ( This function is called when a credential provider is deselected by the user.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@retval EFI_SUCCESS Credential provider successfully deselected.
@@ -270,7 +268,7 @@ CredentialSelect ( EFI_STATUS
EFIAPI
CredentialDeselect (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This
);
/**
@@ -278,7 +276,7 @@ CredentialDeselect ( This function reports the default login behavior regarding this credential provider.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -289,7 +287,7 @@ CredentialDeselect ( EFI_STATUS
EFIAPI
CredentialDefault (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
);
@@ -298,7 +296,7 @@ CredentialDefault ( This function returns user information.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@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
@@ -318,7 +316,7 @@ CredentialDefault ( EFI_STATUS
EFIAPI
CredentialGetInfo (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_INFO_HANDLE UserInfo,
OUT EFI_USER_INFO *Info,
IN OUT UINTN *InfoSize
@@ -333,7 +331,7 @@ CredentialGetInfo ( 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_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@param[in, out] UserInfo On entry, points to the previous user information handle or NULL
to start enumeration. On exit, points to the next user information
handle or NULL if there is no more user information.
@@ -346,8 +344,31 @@ CredentialGetInfo ( EFI_STATUS
EFIAPI
CredentialGetNextInfo (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT EFI_USER_INFO_HANDLE *UserInfo
);
+/**
+ Delete 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.
+ @param[in] User The user profile handle to delete.
+
+ @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_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.
+ @retval EFI_INVALID_PARAMETER User does not refer to a valid user profile handle.
+**/
+EFI_STATUS
+EFIAPI
+CredentialDelete (
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
+ IN EFI_USER_PROFILE_HANDLE User
+ );
+
#endif
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf index 3b32fbb962..541fff11fe 100644 --- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf +++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf @@ -50,5 +50,5 @@ [Protocols]
gEfiDevicePathProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiHiiConfigAccessProtocolGuid
- gEfiUserCredentialProtocolGuid
+ gEfiUserCredential2ProtocolGuid
gEfiUserManagerProtocolGuid
\ No newline at end of file diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c index 726e61c3b1..979cdfd2cb 100644 --- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c +++ b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c @@ -18,7 +18,7 @@ CREDENTIAL_TABLE *mUsbTable = NULL; USB_PROVIDER_CALLBACK_INFO *mCallbackInfo = NULL;
USB_CREDENTIAL_INFO *mUsbInfoHandle = NULL;
-EFI_USER_CREDENTIAL_PROTOCOL gUsbCredentialProviderDriver = {
+EFI_USER_CREDENTIAL2_PROTOCOL gUsbCredentialProviderDriver = {
USB_CREDENTIAL_PROVIDER_GUID,
EFI_USER_CREDENTIAL_CLASS_SECURE_CARD,
CredentialEnroll,
@@ -30,7 +30,9 @@ EFI_USER_CREDENTIAL_PROTOCOL gUsbCredentialProviderDriver = { CredentialDeselect,
CredentialDefault,
CredentialGetInfo,
- CredentialGetNextInfo
+ CredentialGetNextInfo,
+ EFI_CREDENTIAL_CAPABILITIES_ENROLL,
+ CredentialDelete
};
@@ -95,12 +97,12 @@ ExpandTableSize ( /**
- Add or delete info in table, and sync with NV variable.
+ Add, update or delete info in table, and sync with NV variable.
- @param[in] Index The index of the password in table. The index begin from 1.
- If index is found in table, delete the info, else add the
- into to table.
- @param[in] Info The new password info to add into table.
+ @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,
+ delete the info by Index.
@retval EFI_INVALID_PARAMETER Info is NULL when save the info.
@retval EFI_SUCCESS Modify the table successfully.
@@ -114,18 +116,23 @@ ModifyTable ( )
{
EFI_STATUS Status;
+ USB_INFO *NewUsbInfo;
+ NewUsbInfo = NULL;
if (Index < mUsbTable->Count) {
- //
- // Delete the specified entry
- //
- mUsbTable->Count--;
- if (Index != mUsbTable->Count) {
- CopyMem (
- &mUsbTable->UserInfo[Index],
- &mUsbTable->UserInfo[mUsbTable->Count],
- sizeof (USB_INFO)
- );
+ if (Info == NULL) {
+ //
+ // Delete the specified entry.
+ //
+ mUsbTable->Count--;
+ if (Index != mUsbTable->Count) {
+ NewUsbInfo = &mUsbTable->UserInfo[mUsbTable->Count];
+ }
+ } else {
+ //
+ // Update the specified entry.
+ //
+ NewUsbInfo = Info;
}
} else {
//
@@ -139,14 +146,14 @@ ModifyTable ( ExpandTableSize ();
}
- CopyMem (
- &mUsbTable->UserInfo[mUsbTable->Count],
- Info,
- sizeof (USB_INFO)
- );
+ NewUsbInfo = Info;
mUsbTable->Count++;
}
+ if (NewUsbInfo != NULL) {
+ CopyMem (&mUsbTable->UserInfo[Index], NewUsbInfo, sizeof (USB_INFO));
+ }
+
//
// Save the credential table.
//
@@ -636,13 +643,11 @@ InitFormBrowser ( /**
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
- 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_CREDENTIAL_PROTOCOL.
+ @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.
@@ -660,7 +665,7 @@ InitFormBrowser ( EFI_STATUS
EFIAPI
CredentialEnroll (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User
)
{
@@ -671,8 +676,6 @@ CredentialEnroll ( EFI_INPUT_KEY Key;
EFI_USER_MANAGER_PROTOCOL *UserManager;
UINT8 *UserId;
- UINT8 *NewUserId;
- EFI_TPL OldTpl;
CHAR16 *QuestionStr;
CHAR16 *PromptStr;
@@ -701,22 +704,10 @@ CredentialEnroll ( if (EFI_ERROR (Status)) {
return EFI_INVALID_PARAMETER;
}
-
- //
- // If User exists in mUsbTable, delete User.
- //
- for (Index = 0; Index < mUsbTable->Count; Index++) {
- UserId = (UINT8 *) &mUsbTable->UserInfo[Index].UserId;
- NewUserId = (UINT8 *) (UserInfo + 1);
- if (CompareMem (UserId, NewUserId, sizeof (EFI_USER_INFO_IDENTIFIER)) == 0) {
- //
- // Delete the exist Token.
- //
- FreePool (UserInfo);
- return ModifyTable (Index, NULL);
- }
- }
+ CopyMem (UsbInfo.UserId, (UINT8 *) (UserInfo + 1), sizeof (EFI_USER_INFO_IDENTIFIER));
+ FreePool (UserInfo);
+
//
// Get Token and User ID to UsbInfo.
//
@@ -724,8 +715,6 @@ CredentialEnroll ( if (EFI_ERROR (Status)) {
QuestionStr = GetStringById (STRING_TOKEN (STR_READ_USB_TOKEN_ERROR));
PromptStr = GetStringById (STRING_TOKEN (STR_INSERT_USB_TOKEN));
- OldTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
- gBS->RestoreTPL (TPL_APPLICATION);
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
&Key,
@@ -734,23 +723,28 @@ CredentialEnroll ( PromptStr,
NULL
);
- gBS->RaiseTPL (OldTpl);
FreePool (QuestionStr);
FreePool (PromptStr);
- FreePool (UserInfo);
return Status;
}
- CopyMem (
- UsbInfo.UserId,
- (UINT8 *) (UserInfo + 1),
- sizeof (EFI_USER_INFO_IDENTIFIER)
- );
- FreePool (UserInfo);
//
- // Save the new added entry.
+ // Check whether User is ever enrolled in the provider.
+ //
+ for (Index = 0; Index < mUsbTable->Count; Index++) {
+ UserId = (UINT8 *) &mUsbTable->UserInfo[Index].UserId;
+ if (CompareMem (UserId, (UINT8 *) &UsbInfo.UserId, sizeof (EFI_USER_INFO_IDENTIFIER)) == 0) {
+ //
+ // User already exists, update the password.
+ //
+ break;
+ }
+ }
+
+ //
+ // Enroll the User to the provider.
//
- Status = ModifyTable (mUsbTable->Count, &UsbInfo);
+ Status = ModifyTable (Index, &UsbInfo);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -773,7 +767,7 @@ CredentialEnroll ( the user credential provider does not require a form to identify the user, then this
function should return EFI_NOT_FOUND.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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] FormSetId On return, holds the identifier of the form set which contains
the form used during user identification.
@@ -788,7 +782,7 @@ CredentialEnroll ( EFI_STATUS
EFIAPI
CredentialForm (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_GUID *FormSetId,
OUT EFI_FORM_ID *FormId
@@ -809,7 +803,7 @@ CredentialForm ( of pixels specified by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND
is returned.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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
width of the bitmap returned.
@@ -827,7 +821,7 @@ CredentialForm ( EFI_STATUS
EFIAPI
CredentialTile (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT UINTN *Width,
IN OUT UINTN *Height,
OUT EFI_HII_HANDLE *Hii,
@@ -847,7 +841,7 @@ CredentialTile ( This function returns a string which describes the credential provider. If no
such string exists, then EFI_NOT_FOUND is returned.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -859,7 +853,7 @@ CredentialTile ( EFI_STATUS
EFIAPI
CredentialTitle (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_STRING_ID *String
)
@@ -885,7 +879,7 @@ CredentialTitle ( 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_CREDENTIAL_PROTOCOL.
+ @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
considered by the user identity manager. If NULL, then no user
profile is currently under consideration.
@@ -902,7 +896,7 @@ CredentialTitle ( EFI_STATUS
EFIAPI
CredentialUser (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User,
OUT EFI_USER_INFO_IDENTIFIER *Identifier
)
@@ -1023,7 +1017,7 @@ CredentialUser ( AutoLogon returns FALSE, then the user interface will be constructed by the User
Identity Manager.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -1034,7 +1028,7 @@ CredentialUser ( EFI_STATUS
EFIAPI
CredentialSelect (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
)
{
@@ -1053,7 +1047,7 @@ CredentialSelect ( This function is called when a credential provider is deselected by the user.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@retval EFI_SUCCESS Credential provider successfully deselected.
@@ -1061,7 +1055,7 @@ CredentialSelect ( EFI_STATUS
EFIAPI
CredentialDeselect (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This
)
{
if (This == NULL) {
@@ -1076,7 +1070,7 @@ CredentialDeselect ( This function reports the default login behavior regarding this credential provider.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -1087,7 +1081,7 @@ CredentialDeselect ( EFI_STATUS
EFIAPI
CredentialDefault (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
)
{
@@ -1105,7 +1099,7 @@ CredentialDefault ( This function returns user information.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@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
@@ -1125,7 +1119,7 @@ CredentialDefault ( EFI_STATUS
EFIAPI
CredentialGetInfo (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_INFO_HANDLE UserInfo,
OUT EFI_USER_INFO *Info,
IN OUT UINTN *InfoSize
@@ -1173,7 +1167,7 @@ CredentialGetInfo ( 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_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@param[in, out] UserInfo On entry, points to the previous user information handle or NULL
to start enumeration. On exit, points to the next user information
handle or NULL if there is no more user information.
@@ -1186,7 +1180,7 @@ CredentialGetInfo ( EFI_STATUS
EFIAPI
CredentialGetNextInfo (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT EFI_USER_INFO_HANDLE *UserInfo
)
{
@@ -1318,6 +1312,72 @@ CredentialGetNextInfo ( /**
+ Delete 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.
+ @param[in] User The user profile handle to delete.
+
+ @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_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.
+ @retval EFI_INVALID_PARAMETER User does not refer to a valid user profile handle.
+**/
+EFI_STATUS
+EFIAPI
+CredentialDelete (
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
+ IN EFI_USER_PROFILE_HANDLE User
+ )
+{
+ EFI_STATUS Status;
+ EFI_USER_INFO *UserInfo;
+ UINT8 *UserId;
+ UINT8 *NewUserId;
+ UINTN Index;
+
+ if ((This == NULL) || (User == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Get User Identifier.
+ //
+ UserInfo = NULL;
+ Status = FindUserInfoByType (
+ User,
+ EFI_USER_INFO_IDENTIFIER_RECORD,
+ &UserInfo
+ );
+ if (EFI_ERROR (Status)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Find the user by user identifier in mPwdTable.
+ //
+ for (Index = 0; Index < mUsbTable->Count; Index++) {
+ UserId = (UINT8 *) &mUsbTable->UserInfo[Index].UserId;
+ NewUserId = (UINT8 *) (UserInfo + 1);
+ if (CompareMem (UserId, NewUserId, sizeof (EFI_USER_INFO_IDENTIFIER)) == 0) {
+ //
+ // Found the user, delete it.
+ //
+ ModifyTable (Index, NULL);
+ break;
+ }
+ }
+
+ FreePool (UserInfo);
+ return EFI_SUCCESS;
+}
+
+
+/**
Main entry for this driver.
@param ImageHandle Image handle this driver.
@@ -1356,7 +1416,7 @@ UsbProviderInit ( //
Status = gBS->InstallProtocolInterface (
&mCallbackInfo->DriverHandle,
- &gEfiUserCredentialProtocolGuid,
+ &gEfiUserCredential2ProtocolGuid,
EFI_NATIVE_INTERFACE,
&gUsbCredentialProviderDriver
);
diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h index d0295b8de4..83f7f9e2ca 100644 --- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h +++ b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h @@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/SimpleFileSystem.h>
#include <Protocol/BlockIo.h>
-#include <Protocol/UserCredential.h>
+#include <Protocol/UserCredential2.h>
#include <Protocol/UserManager.h>
#include <Library/UefiRuntimeServicesTableLib.h>
@@ -86,7 +86,7 @@ typedef struct { 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_CREDENTIAL_PROTOCOL.
+ @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.
@@ -104,20 +104,18 @@ typedef struct { EFI_STATUS
EFIAPI
CredentialEnroll (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User
);
/**
Returns the user interface information used during user identification.
- 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
- the user credential provider does not require a form to identify the user, then this
- function should return EFI_NOT_FOUND.
+ 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 the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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] FormSetId On return, holds the identifier of the form set which contains
the form used during user identification.
@@ -132,7 +130,7 @@ CredentialEnroll ( EFI_STATUS
EFIAPI
CredentialForm (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_GUID *FormSetId,
OUT EFI_FORM_ID *FormId
@@ -145,7 +143,7 @@ CredentialForm ( of pixels specified by Width and Height. If no such bitmap exists, then EFI_NOT_FOUND
is returned.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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
width of the bitmap returned.
@@ -163,7 +161,7 @@ CredentialForm ( EFI_STATUS
EFIAPI
CredentialTile (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT UINTN *Width,
IN OUT UINTN *Height,
OUT EFI_HII_HANDLE *Hii,
@@ -176,7 +174,7 @@ CredentialTile ( This function returns a string which describes the credential provider. If no
such string exists, then EFI_NOT_FOUND is returned.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -188,7 +186,7 @@ CredentialTile ( EFI_STATUS
EFIAPI
CredentialTitle (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_STRING_ID *String
);
@@ -201,7 +199,7 @@ CredentialTitle ( 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_CREDENTIAL_PROTOCOL.
+ @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
considered by the user identity manager. If NULL, then no user
profile is currently under consideration.
@@ -218,7 +216,7 @@ CredentialTitle ( EFI_STATUS
EFIAPI
CredentialUser (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User,
OUT EFI_USER_INFO_IDENTIFIER *Identifier
);
@@ -230,7 +228,7 @@ CredentialUser ( AutoLogon returns FALSE, then the user interface will be constructed by the User
Identity Manager.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -241,7 +239,7 @@ CredentialUser ( EFI_STATUS
EFIAPI
CredentialSelect (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
);
@@ -250,7 +248,7 @@ CredentialSelect ( This function is called when a credential provider is deselected by the user.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@retval EFI_SUCCESS Credential provider successfully deselected.
@@ -258,7 +256,7 @@ CredentialSelect ( EFI_STATUS
EFIAPI
CredentialDeselect (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This
);
/**
@@ -266,7 +264,7 @@ CredentialDeselect ( This function reports the default login behavior regarding this credential provider.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @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.
@@ -277,7 +275,7 @@ CredentialDeselect ( EFI_STATUS
EFIAPI
CredentialDefault (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
);
@@ -286,7 +284,7 @@ CredentialDefault ( This function returns user information.
- @param[in] This Points to this instance of the EFI_USER_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@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
@@ -306,7 +304,7 @@ CredentialDefault ( EFI_STATUS
EFIAPI
CredentialGetInfo (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_INFO_HANDLE UserInfo,
OUT EFI_USER_INFO *Info,
IN OUT UINTN *InfoSize
@@ -320,7 +318,7 @@ CredentialGetInfo ( 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_CREDENTIAL_PROTOCOL.
+ @param[in] This Points to this instance of the EFI_USER_CREDENTIAL2_PROTOCOL.
@param[in, out] UserInfo On entry, points to the previous user information handle or NULL
to start enumeration. On exit, points to the next user information
handle or NULL if there is no more user information.
@@ -333,8 +331,31 @@ CredentialGetInfo ( EFI_STATUS
EFIAPI
CredentialGetNextInfo (
- IN CONST EFI_USER_CREDENTIAL_PROTOCOL *This,
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT EFI_USER_INFO_HANDLE *UserInfo
);
+/**
+ Delete 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.
+ @param[in] User The user profile handle to delete.
+
+ @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_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.
+ @retval EFI_INVALID_PARAMETER User does not refer to a valid user profile handle.
+**/
+EFI_STATUS
+EFIAPI
+CredentialDelete (
+ IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
+ IN EFI_USER_PROFILE_HANDLE User
+ );
+
#endif
diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf index 06f212e88a..02f8030362 100644 --- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf +++ b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf @@ -51,7 +51,7 @@ [Protocols]
gEfiDevicePathProtocolGuid # PROTOCOL ALWAYS_CONSUMED
- gEfiUserCredentialProtocolGuid
+ gEfiUserCredential2ProtocolGuid
gEfiUserManagerProtocolGuid
gEfiBlockIoProtocolGuid
gEfiSimpleFileSystemProtocolGuid
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c index e846b71f03..00826f7589 100644 --- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c +++ b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c @@ -1016,6 +1016,8 @@ ExpandUserProfile ( @param[in] ByType If TRUE, Provider is credential class guid.
If FALSE, Provider is provider guid.
@param[in] User Points to user profile.
+ @param[in] Delete If TRUE, delete User from the provider; If FALSE, add
+ User info from the provider.
@retval EFI_SUCCESS Add or delete record successfully.
@retval Others Fail to add or delete record.
@@ -1025,17 +1027,17 @@ EFI_STATUS ModifyProviderCredential (
IN EFI_GUID *Provider,
IN BOOLEAN ByType,
- IN USER_PROFILE_ENTRY *User
+ IN USER_PROFILE_ENTRY *User,
+ IN BOOLEAN Delete
)
{
UINTN Index;
- EFI_USER_CREDENTIAL_PROTOCOL *UserCredential;
+ EFI_USER_CREDENTIAL2_PROTOCOL *UserCredential;
if (Provider == NULL) {
return EFI_INVALID_PARAMETER;
}
-
//
// Find the specified credential provider.
//
@@ -1045,7 +1047,11 @@ ModifyProviderCredential ( //
UserCredential = mProviderDb->Provider[Index];
if (CompareGuid (&UserCredential->Identifier, Provider)) {
- return UserCredential->Enroll (UserCredential, User);
+ if (Delete) {
+ return UserCredential->Delete (UserCredential, User);
+ } else {
+ return UserCredential->Enroll (UserCredential, User);
+ }
}
}
@@ -1059,9 +1065,11 @@ ModifyProviderCredential ( Found the providers information in PolicyInfo, and then add or delete the user's credential
record in the providers.
- @param User Points to user profile.
- @param PolicyInfo Point to identification policy to be modified.
- @param InfoLen The length of PolicyInfo.
+ @param[in] User Points to user profile.
+ @param[in] PolicyInfo Point to identification policy to be modified.
+ @param[in] InfoLen The length of PolicyInfo.
+ @param[in] Delete If TRUE, delete User from the provider; If FALSE, add
+ User info from the provider.
@retval EFI_SUCCESS Modify PolicyInfo successfully.
@retval Others Fail to modify PolicyInfo.
@@ -1071,7 +1079,8 @@ EFI_STATUS ModifyCredentialInfo (
IN USER_PROFILE_ENTRY *User,
IN UINT8 *PolicyInfo,
- IN UINTN InfoLen
+ IN UINTN InfoLen,
+ IN BOOLEAN Delete
)
{
EFI_STATUS Status;
@@ -1089,14 +1098,14 @@ ModifyCredentialInfo ( Identity = (EFI_USER_INFO_IDENTITY_POLICY *) (PolicyInfo + TotalLen);
switch (Identity->Type) {
case EFI_USER_INFO_IDENTITY_CREDENTIAL_TYPE:
- Status = ModifyProviderCredential ((EFI_GUID *) (Identity + 1), TRUE, User);
+ Status = ModifyProviderCredential ((EFI_GUID *) (Identity + 1), TRUE, User, Delete);
if (EFI_ERROR (Status)) {
return Status;
}
break;
case EFI_USER_INFO_IDENTITY_CREDENTIAL_PROVIDER:
- Status = ModifyProviderCredential ((EFI_GUID *) (Identity + 1), FALSE, User);
+ Status = ModifyProviderCredential ((EFI_GUID *) (Identity + 1), FALSE, User, Delete);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -1372,7 +1381,7 @@ ModifyUserIpInfo ( //
// The credential is NOT found in the old identity policy; add it.
//
- Status = ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length);
+ Status = ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length, FALSE);
if (EFI_ERROR (Status)) {
break;
}
@@ -1399,7 +1408,7 @@ ModifyUserIpInfo ( break;
}
- ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length);
+ ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length, TRUE);
CredentialCount--;
}
}
@@ -1426,7 +1435,7 @@ ModifyUserIpInfo ( //
// The credential is found in the old identity policy, so delete the old credential first.
//
- Status = ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length);
+ Status = ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length, TRUE);
if (EFI_ERROR (Status)) {
//
// Failed to delete old credential.
@@ -1438,7 +1447,7 @@ ModifyUserIpInfo ( //
// Add the new credential.
//
- Status = ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length);
+ Status = ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length, FALSE);
if (EFI_ERROR (Status)) {
//
// Failed to enroll the user by new identification policy.
@@ -1462,7 +1471,7 @@ ModifyUserIpInfo ( //
// The credential is NOT found in the new identity policy. Delete the old credential.
//
- ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length);
+ ModifyCredentialInfo (User, (UINT8 *) Identity, Identity->Length, TRUE);
}
}
TotalLen += Identity->Length;
@@ -1526,7 +1535,8 @@ AddUserInfo ( Status = ModifyCredentialInfo (
User,
(UINT8 *) ((EFI_USER_INFO *) Info + 1),
- InfoSize - sizeof (EFI_USER_INFO)
+ InfoSize - sizeof (EFI_USER_INFO),
+ FALSE
);
if (EFI_ERROR (Status)) {
return Status;
@@ -1672,7 +1682,7 @@ DelUserInfo ( if (Info->InfoType == EFI_USER_INFO_IDENTIFIER_RECORD) {
return EFI_ACCESS_DENIED;
} else if (Info->InfoType == EFI_USER_INFO_IDENTITY_POLICY_RECORD) {
- Status = ModifyCredentialInfo (User, (UINT8 *) (Info + 1), Info->InfoSize - sizeof (EFI_USER_INFO));
+ Status = ModifyCredentialInfo (User, (UINT8 *) (Info + 1), Info->InfoSize - sizeof (EFI_USER_INFO), TRUE);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -2331,7 +2341,7 @@ IdentifyByProviderId ( EFI_HII_HANDLE HiiHandle;
EFI_GUID FormSetId;
EFI_FORM_ID FormId;
- EFI_USER_CREDENTIAL_PROTOCOL *UserCredential;
+ EFI_USER_CREDENTIAL2_PROTOCOL *UserCredential;
if (Provider == NULL) {
return EFI_INVALID_PARAMETER;
@@ -2523,7 +2533,7 @@ AddProviderSelection ( EFI_STRING_ID ProvID;
CHAR16 *ProvStr;
UINTN Index;
- EFI_USER_CREDENTIAL_PROTOCOL *UserCredential;
+ EFI_USER_CREDENTIAL2_PROTOCOL *UserCredential;
for (Index = 0; Index < mProviderDb->Count; Index++) {
UserCredential = mProviderDb->Provider[Index];
@@ -3152,7 +3162,7 @@ InitProviderInfo ( HandleBuf = NULL;
Status = gBS->LocateHandleBuffer (
ByProtocol,
- &gEfiUserCredentialProtocolGuid,
+ &gEfiUserCredential2ProtocolGuid,
NULL,
&HandleCount,
&HandleBuf
@@ -3166,8 +3176,8 @@ InitProviderInfo ( //
mProviderDb = AllocateZeroPool (
sizeof (CREDENTIAL_PROVIDER_INFO) -
- sizeof (EFI_USER_CREDENTIAL_PROTOCOL *) +
- HandleCount * sizeof (EFI_USER_CREDENTIAL_PROTOCOL *)
+ sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *) +
+ HandleCount * sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *)
);
if (mProviderDb == NULL) {
FreePool (HandleBuf);
@@ -3178,7 +3188,7 @@ InitProviderInfo ( for (Index = 0; Index < HandleCount; Index++) {
Status = gBS->HandleProtocol (
HandleBuf[Index],
- &gEfiUserCredentialProtocolGuid,
+ &gEfiUserCredential2ProtocolGuid,
(VOID **) &mProviderDb->Provider[Index]
);
if (EFI_ERROR (Status)) {
@@ -3513,7 +3523,7 @@ IdentifyUser ( EFI_CREDENTIAL_LOGON_FLAGS AutoLogon;
EFI_USER_INFO *IdentifyInfo;
EFI_USER_INFO_IDENTITY_POLICY *Identity;
- EFI_USER_CREDENTIAL_PROTOCOL *UserCredential;
+ EFI_USER_CREDENTIAL2_PROTOCOL *UserCredential;
USER_PROFILE_ENTRY *UserEntry;
//
@@ -4114,7 +4124,7 @@ UserProfileSetInfo ( credential and add it.
@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_CREDENTIAL_PROTOCOL
+ @param[in] Changed Handle on which is installed an instance of the EFI_USER_CREDENTIAL2_PROTOCOL
where the user has changed.
@retval EFI_SUCCESS The User Identity Manager has handled the notification.
@@ -4130,7 +4140,7 @@ UserProfileNotify ( )
{
EFI_STATUS Status;
- EFI_USER_CREDENTIAL_PROTOCOL *Provider;
+ EFI_USER_CREDENTIAL2_PROTOCOL *Provider;
EFI_USER_INFO_IDENTIFIER UserId;
EFI_USER_INFO_HANDLE UserInfo;
EFI_USER_INFO_HANDLE UserInfo2;
@@ -4144,7 +4154,7 @@ UserProfileNotify ( Status = gBS->HandleProtocol (
Changed,
- &gEfiUserCredentialProtocolGuid,
+ &gEfiUserCredential2ProtocolGuid,
(VOID **) &Provider
);
if (EFI_ERROR (Status)) {
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h index b1e078a03e..fab0605728 100644 --- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h +++ b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h @@ -1,7 +1,7 @@ /** @file
The header file for User identify Manager driver.
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+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
@@ -25,7 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/HiiConfigAccess.h>
#include <Protocol/HiiString.h>
#include <Protocol/HiiConfigRouting.h>
-#include <Protocol/UserCredential.h>
+#include <Protocol/UserCredential2.h>
#include <Protocol/UserManager.h>
#include <Protocol/DeferredImageLoad.h>
#include <Protocol/SimpleTextOut.h>
@@ -67,7 +67,7 @@ extern UINT8 UserIdentifyManagerStrings[]; //
typedef struct {
UINTN Count;
- EFI_USER_CREDENTIAL_PROTOCOL *Provider[1];
+ EFI_USER_CREDENTIAL2_PROTOCOL *Provider[1];
} CREDENTIAL_PROVIDER_INFO;
//
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf index a8d7818597..4963c09d6f 100644 --- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf +++ b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf @@ -50,7 +50,7 @@ [Protocols]
gEfiFormBrowser2ProtocolGuid ## CONSUMES
gEfiHiiDatabaseProtocolGuid ## CONSUMES
- gEfiUserCredentialProtocolGuid ## CONSUMES
+ gEfiUserCredential2ProtocolGuid ## CONSUMES
gEfiDeferredImageLoadProtocolGuid ## CONSUMES
gEfiHiiConfigAccessProtocolGuid ## PRODUCES
gEfiUserManagerProtocolGuid ## PRODUCES
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c index 83b391c546..6e5bd06502 100644 --- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c +++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c @@ -94,7 +94,7 @@ InitProviderInfo ( HandleBuf = NULL;
Status = gBS->LocateHandleBuffer (
ByProtocol,
- &gEfiUserCredentialProtocolGuid,
+ &gEfiUserCredential2ProtocolGuid,
NULL,
&HandleCount,
&HandleBuf
@@ -111,8 +111,8 @@ InitProviderInfo ( }
mProviderInfo = AllocateZeroPool (
sizeof (CREDENTIAL_PROVIDER_INFO) -
- sizeof (EFI_USER_CREDENTIAL_PROTOCOL *) +
- HandleCount * sizeof (EFI_USER_CREDENTIAL_PROTOCOL *)
+ sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *) +
+ HandleCount * sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *)
);
if (mProviderInfo == NULL) {
FreePool (HandleBuf);
@@ -123,7 +123,7 @@ InitProviderInfo ( for (Index = 0; Index < HandleCount; Index++) {
Status = gBS->HandleProtocol (
HandleBuf[Index],
- &gEfiUserCredentialProtocolGuid,
+ &gEfiUserCredential2ProtocolGuid,
(VOID **) &mProviderInfo->Provider[Index]
);
if (EFI_ERROR (Status)) {
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h index bff9539602..9013d2f88f 100644 --- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h +++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h @@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/HiiConfigAccess.h>
#include <Protocol/DevicePathToText.h>
-#include <Protocol/UserCredential.h>
+#include <Protocol/UserCredential2.h>
#include <Protocol/UserManager.h>
#include <Library/UefiRuntimeServicesTableLib.h>
@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. //
typedef struct {
UINTN Count;
- EFI_USER_CREDENTIAL_PROTOCOL *Provider[1];
+ EFI_USER_CREDENTIAL2_PROTOCOL *Provider[1];
} CREDENTIAL_PROVIDER_INFO;
//
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf index b31c37e7b2..9fb4bf9261 100644 --- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf +++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf @@ -54,7 +54,7 @@ [Protocols]
gEfiDevicePathProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiHiiConfigAccessProtocolGuid
- gEfiUserCredentialProtocolGuid
+ gEfiUserCredential2ProtocolGuid
gEfiUserManagerProtocolGuid
gEfiDevicePathToTextProtocolGuid
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c index 9b0bfbd57a..1d67b479a8 100644 --- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c +++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c @@ -379,7 +379,7 @@ ResolveIdentityPolicy ( CHAR16 *ProvStr;
EFI_STRING_ID ProvId;
EFI_HII_HANDLE HiiHandle;
- EFI_USER_CREDENTIAL_PROTOCOL *UserCredential;
+ EFI_USER_CREDENTIAL2_PROTOCOL *UserCredential;
TmpStr = NULL;
|