From 6f0b864812b3313b79e7beade487f0ca8ca5f28d Mon Sep 17 00:00:00 2001 From: gdong1 Date: Wed, 12 Oct 2011 03:38:19 +0000 Subject: Update UID drivers to align with latest UEFI spec 2.3.1. Directly use ImageHandle instead of &ImageHandle for wrong usage in TCG physical presence library. Signed-off-by: gdong1 Reviewed-by: xdu2 Reviewed-by: lgao4 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12530 6f19259b-4bc3-4df7-8a09-765794883524 --- .../UserIdentification/UserProfileManagerDxe/UserProfileManager.c | 8 ++++---- .../UserIdentification/UserProfileManagerDxe/UserProfileManager.h | 4 ++-- .../UserProfileManagerDxe/UserProfileManagerDxe.inf | 2 +- .../UserIdentification/UserProfileManagerDxe/UserProfileModify.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'SecurityPkg/UserIdentification/UserProfileManagerDxe') 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 #include -#include +#include #include #include @@ -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; -- cgit v1.2.3