Move the definitions defined for User Manager protocol from UserCredential.h to UserManager.h to align with UEFI spec.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9861 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 290 insertions, 292 deletions

diff --git a/MdePkg/Include/Protocol/UserCredential.h b/MdePkg/Include/Protocol/UserCredential.h
index 66862e99c0..d889c9097b 100644
--- a/MdePkg/Include/Protocol/UserCredential.h
+++ b/MdePkg/Include/Protocol/UserCredential.h
@@ -3,7 +3,7 @@
 

   Attached to a device handle, this protocol identifies a single means of identifying the user.

 

-  Copyright (c) 2009, Intel Corporation                                                         

+  Copyright (c) 2009 - 2010, Intel Corporation                                                         

   All rights reserved. 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        

@@ -17,279 +17,13 @@
 #ifndef __USER_CREDENTIAL_H__

 #define __USER_CREDENTIAL_H__

 

+#include <Protocol/UserManager.h>

+

 #define EFI_USER_CREDENTIAL_PROTOCOL_GUID \

   { \

     0x71ee5e94, 0x65b9, 0x45d5, { 0x82, 0x1a, 0x3a, 0x4d, 0x86, 0xcf, 0xe6, 0xbe } \

   }

 

-typedef VOID *EFI_USER_PROFILE_HANDLE;

-typedef VOID *EFI_USER_INFO_HANDLE;

-

-///

-/// The attributes of the user profile information.

-///

-typedef UINT16 EFI_USER_INFO_ATTRIBS;

-#define EFI_USER_INFO_STORAGE                   0x000F

-#define EFI_USER_INFO_STORAGE_VOLATILE          0x0000

-#define EFI_USER_INFO_STORAGE_CREDENTIAL_NV     0x0001

-#define EFI_USER_INFO_STORAGE_PLATFORM_NV       0x0002

-

-#define EFI_USER_INFO_ACCESS                    0x0070

-#define EFI_USER_INFO_PUBLIC                    0x0010

-#define EFI_USER_INFO_PRIVATE                   0x0020

-#define EFI_USER_INFO_PROTECTED                 0x0030

-#define EFI_USER_INFO_EXCLUSIVE                 0x0080

-

-///

-/// User information structure

-///

-typedef struct {

-  ///

-  /// The user credential identifier associated with this user information or else Nil if the 

-  /// information is not associated with any specific credential.

-  ///

-  EFI_GUID               Credential;

-  ///

-  /// The type of user information.

-  ///

-  UINT8                  InfoType;

-  ///

-  /// Must be set to 0.

-  ///

-  UINT8                  Reserved1;

-  ///

-  /// The attributes of the user profile information.

-  ///

-  EFI_USER_INFO_ATTRIBS  InfoAttribs;

-  ///

-  /// The size of the user information, in bytes, including this header.

-  ///

-  UINT32                 InfoSize;

-} EFI_USER_INFO;

-

-///

-/// User credential class GUIDs

-///

-#define EFI_USER_CREDENTIAL_CLASS_UNKNOWN \

-  { 0x5cf32e68, 0x7660, 0x449b, { 0x80, 0xe6, 0x7e, 0xa3, 0x6e, 0x3, 0xf6, 0xa8 } }

-#define EFI_USER_CREDENTIAL_CLASS_PASSWORD \

-  { 0xf8e5058c, 0xccb6, 0x4714, { 0xb2, 0x20, 0x3f, 0x7e, 0x3a, 0x64, 0xb, 0xd1 } }

-#define EFI_USER_CREDENTIAL_CLASS_SMART_CARD \

-  { 0x5f03ba33, 0x8c6b, 0x4c24, { 0xaa, 0x2e, 0x14, 0xa2, 0x65, 0x7b, 0xd4, 0x54 } }

-#define EFI_USER_CREDENTIAL_CLASS_FINGERPRINT \

-  { 0x32cba21f, 0xf308, 0x4cbc, { 0x9a, 0xb5, 0xf5, 0xa3, 0x69, 0x9f, 0x4, 0x4a } }

-#define EFI_USER_CREDENTIAL_CLASS_HANDPRINT \

-  { 0x5917ef16, 0xf723, 0x4bb9, { 0xa6, 0x4b, 0xd8, 0xc5, 0x32, 0xf4, 0xd8, 0xb5 } }

-#define EFI_USER_CREDENTIAL_CLASS_SECURE_CARD \

-  { 0x8a6b4a83, 0x42fe, 0x45d2, { 0xa2, 0xef, 0x46, 0xf0, 0x6c, 0x7d, 0x98, 0x52 } }

-

-typedef UINT64   EFI_CREDENTIAL_CAPABILITIES;

-#define EFI_CREDENTIAL_CAPABILITIES_ENROLL  0x0000000000000001

-

-///

-/// Credential logon flags 

-///

-typedef UINT32 EFI_CREDENTIAL_LOGON_FLAGS;

-#define EFI_CREDENTIAL_LOGON_FLAG_AUTO                0x00000001

-#define EFI_CREDENTIAL_LOGON_FLAG_DEFAULT             0x00000002

-

-///

-/// User information record types

-///

-

-///

-/// No information.

-///

-#define EFI_USER_INFO_EMPTY_RECORD                    0x00

-///

-/// Provide the user's name for the enrolled user.

-///

-#define EFI_USER_INFO_NAME_RECORD                     0x01

-typedef CHAR16 *EFI_USER_INFO_NAME;

-///

-/// Provides the date and time when the user profile was created.

-///

-#define EFI_USER_INFO_CREATE_DATE_RECORD              0x02

-typedef EFI_TIME EFI_USER_INFO_CREATE_DATE;

-///

-/// Provides the date and time when the user profile was selected.

-///

-#define EFI_USER_INFO_USAGE_DATE_RECORD               0x03

-typedef EFI_TIME EFI_USER_INFO_USAGE_DATE;

-///

-/// Provides the number of times that the user profile has been selected.

-///

-#define EFI_USER_INFO_USAGE_COUNT_RECORD              0x04

-typedef UINT64 EFI_USER_INFO_USAGE_COUNT;

-///

-/// Provides a unique non-volatile user identifier for each enrolled user.

-///

-#define EFI_USER_INFO_IDENTIFIER_RECORD               0x05

-typedef UINT8 EFI_USER_INFO_IDENTIFIER[16];

-///

-/// Specifies the type of a particular credential associated with the user profile.

-///

-#define EFI_USER_INFO_CREDENTIAL_TYPE_RECORD          0x06

-typedef EFI_GUID EFI_USER_INFO_CREDENTIAL_TYPE;

-///

-/// Specifies the user-readable name of a particular credential type.

-///

-#define EFI_USER_INFO_CREDENTIAL_TYPE_NAME_RECORD     0x07

-typedef CHAR16 *EFI_USER_INFO_CREDENTIAL_TYPE_NAME;

-///

-/// Specifies the credential provider.

-///

-#define EFI_USER_INFO_CREDENTIAL_PROVIDER_RECORD      0x08

-typedef EFI_GUID EFI_USER_INFO_CREDENTIAL_PROVIDER;

-///

-/// Specifies the user-readable name of a particular credential's provider.

-///

-#define EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD 0x09

-typedef CHAR16 *EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME;

-///

-/// Provides PKCS#11 credential information from a smart card.

-///

-#define EFI_USER_INFO_PKCS11_RECORD                   0x0A

-///

-/// Provides standard biometric information in the format specified by the ISO 19785 (Common 

-/// Biometric Exchange Formats Framework) specification.

-///

-#define EFI_USER_INFO_CBEFF_RECORD                    0x0B

-typedef VOID *EFI_USER_INFO_CBEFF;

-///

-/// Indicates how close of a match the fingerprint must be in order to be considered a match.

-///

-#define EFI_USER_INFO_FAR_RECORD                      0x0C

-typedef UINT8 EFI_USER_INFO_FAR;

-///

-/// Indicates how many attempts the user has to with a particular credential before the system prevents 

-/// further attempts.

-///

-#define EFI_USER_INFO_RETRY_RECORD                    0x0D

-typedef UINT8 EFI_USER_INFO_RETRY;

-///

-/// Provides the user's pre-OS access rights.

-///

-#define EFI_USER_INFO_ACCESS_POLICY_RECORD            0x0E

-

-typedef struct {

-  UINT32  Type;  ///< Specifies the type of user access control.

-  UINT32  Size;  ///< Specifies the size of the user access control record, in bytes, including this header.

-} EFI_USER_INFO_ACCESS_CONTROL;

-

-typedef EFI_USER_INFO_ACCESS_CONTROL EFI_USER_INFO_ACCESS_POLICY;

-

-///

-/// User Information access types

-///

-

-///

-/// Forbids the user from booting or loading executables from the specified device path or any child 

-/// device paths.

-///

-#define EFI_USER_INFO_ACCESS_FORBID_LOAD              0x00000001

-///

-/// Permits the user from booting or loading executables from the specified device path or any child 

-/// device paths.

-/// Note: in-consistency between code and the UEFI 2.3 specification here.

-/// The definition EFI_USER_INFO_ACCESS_PERMIT_BOOT in the specification should be typo and wait for

-/// spec update.

-///

-#define EFI_USER_INFO_ACCESS_PERMIT_LOAD              0x00000002

-///

-/// Presence of this record indicates that a user can update enrollment information.

-///

-#define EFI_USER_INFO_ACCESS_ENROLL_SELF              0x00000003

-///

-/// Presence of this record indicates that a user can enroll new users.

-///

-#define EFI_USER_INFO_ACCESS_ENROLL_OTHERS            0x00000004

-///

-/// Presence of this record indicates that a user can update the user information of any user.

-///

-#define EFI_USER_INFO_ACCESS_MANAGE                   0x00000005

-///

-/// Describes permissions usable when configuring the platform.

-///

-#define EFI_USER_INFO_ACCESS_SETUP                    0x00000006

-///

-/// Standard GUIDs for access to configure the platform.

-///

-#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \

-  { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } }

-#define EFI_USER_INFO_ACCESS_SETUP_NORMAL_GUID \

-  { 0x1db29ae0, 0x9dcb, 0x43bc, { 0x8d, 0x87, 0x5d, 0xa1, 0x49, 0x64, 0xdd, 0xe2 } }

-#define EFI_USER_INFO_ACCESS_SETUP_RESTRICTED_GUID \

-  { 0xbdb38125, 0x4d63, 0x49f4, { 0x82, 0x12, 0x61, 0xcf, 0x5a, 0x19, 0xa, 0xf8 } }

-

-///

-/// Forbids UEFI drivers from being started from the specified device path(s) or any child device paths.

-///

-#define EFI_USER_INFO_ACCESS_FORBID_CONNECT           0x00000007

-///

-/// Permits UEFI drivers to be started on the specified device path(s) or any child device paths.

-///

-#define EFI_USER_INFO_ACCESS_PERMIT_CONNECT           0x00000008

-///

-/// Modifies the boot order.

-///

-#define EFI_USER_INFO_ACCESS_BOOT_ORDER               0x00000009

-typedef UINT32 EFI_USER_INFO_ACCESS_BOOT_ORDER_HDR;

-

-#define EFI_USER_INFO_ACCESS_BOOT_ORDER_MASK          0x0000000F

-///

-/// Insert new boot options at the beginning of the boot order.

-///

-#define EFI_USER_INFO_ACCESS_BOOT_ORDER_INSERT        0x00000000

-///

-/// Append new boot options to the end of the boot order.

-///

-#define EFI_USER_INFO_ACCESS_BOOT_ORDER_APPEND        0x00000001

-///

-/// Replace the entire boot order.

-///

-#define EFI_USER_INFO_ACCESS_BOOT_ORDER_REPLACE       0x00000002

-///

-/// The Boot Manager will not attempt find a default boot device 

-/// when the default boot order is does not lead to a bootable device.

-///

-#define EFI_USER_INFO_ACCESS_BOOT_ORDER_NODEFAULT     0x00000010

-

-///

-/// Provides the expression which determines which credentials are required to assert user identity.

-///

-#define EFI_USER_INFO_IDENTITY_POLICY_RECORD          0x0F

-

-typedef struct {

-  UINT32  Type;    ///< Specifies either an operator or a data item. 

-  UINT32  Length;  ///< The length of this block, in bytes, including this header.

-} EFI_USER_INFO_IDENTITY_POLICY;

-

-///

-/// User identity policy expression operators.

-///

-#define EFI_USER_INFO_IDENTITY_FALSE                  0x00

-#define EFI_USER_INFO_IDENTITY_TRUE                   0x01

-#define EFI_USER_INFO_IDENTITY_CREDENTIAL_TYPE        0x02

-#define EFI_USER_INFO_IDENTITY_CREDENTIAL_PROVIDER    0x03

-#define EFI_USER_INFO_IDENTITY_NOT                    0x10

-#define EFI_USER_INFO_IDENTITY_AND                    0x11

-#define EFI_USER_INFO_IDENTITY_OR                     0x12

-

-///

-/// Provides placeholder for additional user profile information identified by a GUID.

-///

-#define EFI_USER_INFO_GUID_RECORD                     0xFF

-typedef EFI_GUID EFI_USER_INFO_GUID;

-

-///

-/// User information table

-/// A collection of EFI_USER_INFO records, prefixed with this header.

-///

-typedef struct {

-  UINT64   Size;  ///< Total size of the user information table, in bytes.

-} EFI_USER_INFO_TABLE;

-

 typedef struct _EFI_USER_CREDENTIAL_PROTOCOL  EFI_USER_CREDENTIAL_PROTOCOL;

 

 /**

@@ -540,15 +274,4 @@ struct _EFI_USER_CREDENTIAL_PROTOCOL {
 

 extern EFI_GUID gEfiUserCredentialProtocolGuid;

 

-extern EFI_GUID gEfiUserCredentialClassUnknownGuid;

-extern EFI_GUID gEfiUserCredentialClassPasswordGuid;

-extern EFI_GUID gEfiUserCredentialClassSmartCardGuid;

-extern EFI_GUID gEfiUserCredentialClassFingerprintGuid;

-extern EFI_GUID gEfiUserCredentialClassHandprintGuid;

-extern EFI_GUID gEfiUserCredentialClassSecureCardGuid;

-

-extern EFI_GUID gEfiUserInfoAccessSetupAdminGuid;

-extern EFI_GUID gEfiUserInfoAccessSetupNormalGuid;

-extern EFI_GUID gEfiUserInfoAccessSetupRestrictedGuid;

-

 #endif

diff --git a/MdePkg/Include/Protocol/UserManager.h b/MdePkg/Include/Protocol/UserManager.h
index 0a1964963c..edd07221ad 100644
--- a/MdePkg/Include/Protocol/UserManager.h
+++ b/MdePkg/Include/Protocol/UserManager.h
@@ -3,7 +3,7 @@
 

   This protocol manages user profiles.

 

-  Copyright (c) 2009, Intel Corporation                                                         

+  Copyright (c) 2009 - 2010, Intel Corporation                                                         

   All rights reserved. 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        

@@ -17,8 +17,6 @@
 #ifndef __USER_MANAGER_H__

 #define __USER_MANAGER_H__

 

-#include <Protocol/UserCredential.h>

-

 ///

 /// Global ID for the User Manager Protocol

 ///

@@ -32,6 +30,274 @@
     0xbaf1e6de, 0x209e, 0x4adb, { 0x8d, 0x96, 0xfd, 0x8b, 0x71, 0xf3, 0xf6, 0x83 } \

   }

 

+typedef VOID *EFI_USER_PROFILE_HANDLE;

+typedef VOID *EFI_USER_INFO_HANDLE;

+

+///

+/// The attributes of the user profile information.

+///

+typedef UINT16 EFI_USER_INFO_ATTRIBS;

+#define EFI_USER_INFO_STORAGE                   0x000F

+#define EFI_USER_INFO_STORAGE_VOLATILE          0x0000

+#define EFI_USER_INFO_STORAGE_CREDENTIAL_NV     0x0001

+#define EFI_USER_INFO_STORAGE_PLATFORM_NV       0x0002

+

+#define EFI_USER_INFO_ACCESS                    0x0070

+#define EFI_USER_INFO_PUBLIC                    0x0010

+#define EFI_USER_INFO_PRIVATE                   0x0020

+#define EFI_USER_INFO_PROTECTED                 0x0030

+#define EFI_USER_INFO_EXCLUSIVE                 0x0080

+

+///

+/// User information structure

+///

+typedef struct {

+  ///

+  /// The user credential identifier associated with this user information or else Nil if the 

+  /// information is not associated with any specific credential.

+  ///

+  EFI_GUID               Credential;

+  ///

+  /// The type of user information.

+  ///

+  UINT8                  InfoType;

+  ///

+  /// Must be set to 0.

+  ///

+  UINT8                  Reserved1;

+  ///

+  /// The attributes of the user profile information.

+  ///

+  EFI_USER_INFO_ATTRIBS  InfoAttribs;

+  ///

+  /// The size of the user information, in bytes, including this header.

+  ///

+  UINT32                 InfoSize;

+} EFI_USER_INFO;

+

+///

+/// User credential class GUIDs

+///

+#define EFI_USER_CREDENTIAL_CLASS_UNKNOWN \

+  { 0x5cf32e68, 0x7660, 0x449b, { 0x80, 0xe6, 0x7e, 0xa3, 0x6e, 0x3, 0xf6, 0xa8 } }

+#define EFI_USER_CREDENTIAL_CLASS_PASSWORD \

+  { 0xf8e5058c, 0xccb6, 0x4714, { 0xb2, 0x20, 0x3f, 0x7e, 0x3a, 0x64, 0xb, 0xd1 } }

+#define EFI_USER_CREDENTIAL_CLASS_SMART_CARD \

+  { 0x5f03ba33, 0x8c6b, 0x4c24, { 0xaa, 0x2e, 0x14, 0xa2, 0x65, 0x7b, 0xd4, 0x54 } }

+#define EFI_USER_CREDENTIAL_CLASS_FINGERPRINT \

+  { 0x32cba21f, 0xf308, 0x4cbc, { 0x9a, 0xb5, 0xf5, 0xa3, 0x69, 0x9f, 0x4, 0x4a } }

+#define EFI_USER_CREDENTIAL_CLASS_HANDPRINT \

+  { 0x5917ef16, 0xf723, 0x4bb9, { 0xa6, 0x4b, 0xd8, 0xc5, 0x32, 0xf4, 0xd8, 0xb5 } }

+#define EFI_USER_CREDENTIAL_CLASS_SECURE_CARD \

+  { 0x8a6b4a83, 0x42fe, 0x45d2, { 0xa2, 0xef, 0x46, 0xf0, 0x6c, 0x7d, 0x98, 0x52 } }

+

+typedef UINT64   EFI_CREDENTIAL_CAPABILITIES;

+#define EFI_CREDENTIAL_CAPABILITIES_ENROLL  0x0000000000000001

+

+///

+/// Credential logon flags 

+///

+typedef UINT32 EFI_CREDENTIAL_LOGON_FLAGS;

+#define EFI_CREDENTIAL_LOGON_FLAG_AUTO                0x00000001

+#define EFI_CREDENTIAL_LOGON_FLAG_DEFAULT             0x00000002

+

+///

+/// User information record types

+///

+

+///

+/// No information.

+///

+#define EFI_USER_INFO_EMPTY_RECORD                    0x00

+///

+/// Provide the user's name for the enrolled user.

+///

+#define EFI_USER_INFO_NAME_RECORD                     0x01

+typedef CHAR16 *EFI_USER_INFO_NAME;

+///

+/// Provides the date and time when the user profile was created.

+///

+#define EFI_USER_INFO_CREATE_DATE_RECORD              0x02

+typedef EFI_TIME EFI_USER_INFO_CREATE_DATE;

+///

+/// Provides the date and time when the user profile was selected.

+///

+#define EFI_USER_INFO_USAGE_DATE_RECORD               0x03

+typedef EFI_TIME EFI_USER_INFO_USAGE_DATE;

+///

+/// Provides the number of times that the user profile has been selected.

+///

+#define EFI_USER_INFO_USAGE_COUNT_RECORD              0x04

+typedef UINT64 EFI_USER_INFO_USAGE_COUNT;

+///

+/// Provides a unique non-volatile user identifier for each enrolled user.

+///

+#define EFI_USER_INFO_IDENTIFIER_RECORD               0x05

+typedef UINT8 EFI_USER_INFO_IDENTIFIER[16];

+///

+/// Specifies the type of a particular credential associated with the user profile.

+///

+#define EFI_USER_INFO_CREDENTIAL_TYPE_RECORD          0x06

+typedef EFI_GUID EFI_USER_INFO_CREDENTIAL_TYPE;

+///

+/// Specifies the user-readable name of a particular credential type.

+///

+#define EFI_USER_INFO_CREDENTIAL_TYPE_NAME_RECORD     0x07

+typedef CHAR16 *EFI_USER_INFO_CREDENTIAL_TYPE_NAME;

+///

+/// Specifies the credential provider.

+///

+#define EFI_USER_INFO_CREDENTIAL_PROVIDER_RECORD      0x08

+typedef EFI_GUID EFI_USER_INFO_CREDENTIAL_PROVIDER;

+///

+/// Specifies the user-readable name of a particular credential's provider.

+///

+#define EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD 0x09

+typedef CHAR16 *EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME;

+///

+/// Provides PKCS#11 credential information from a smart card.

+///

+#define EFI_USER_INFO_PKCS11_RECORD                   0x0A

+///

+/// Provides standard biometric information in the format specified by the ISO 19785 (Common 

+/// Biometric Exchange Formats Framework) specification.

+///

+#define EFI_USER_INFO_CBEFF_RECORD                    0x0B

+typedef VOID *EFI_USER_INFO_CBEFF;

+///

+/// Indicates how close of a match the fingerprint must be in order to be considered a match.

+///

+#define EFI_USER_INFO_FAR_RECORD                      0x0C

+typedef UINT8 EFI_USER_INFO_FAR;

+///

+/// Indicates how many attempts the user has to with a particular credential before the system prevents 

+/// further attempts.

+///

+#define EFI_USER_INFO_RETRY_RECORD                    0x0D

+typedef UINT8 EFI_USER_INFO_RETRY;

+///

+/// Provides the user's pre-OS access rights.

+///

+#define EFI_USER_INFO_ACCESS_POLICY_RECORD            0x0E

+

+typedef struct {

+  UINT32  Type;  ///< Specifies the type of user access control.

+  UINT32  Size;  ///< Specifies the size of the user access control record, in bytes, including this header.

+} EFI_USER_INFO_ACCESS_CONTROL;

+

+typedef EFI_USER_INFO_ACCESS_CONTROL EFI_USER_INFO_ACCESS_POLICY;

+

+///

+/// User Information access types

+///

+

+///

+/// Forbids the user from booting or loading executables from the specified device path or any child 

+/// device paths.

+///

+#define EFI_USER_INFO_ACCESS_FORBID_LOAD              0x00000001

+///

+/// Permits the user from booting or loading executables from the specified device path or any child 

+/// device paths.

+/// Note: in-consistency between code and the UEFI 2.3 specification here.

+/// The definition EFI_USER_INFO_ACCESS_PERMIT_BOOT in the specification should be typo and wait for

+/// spec update.

+///

+#define EFI_USER_INFO_ACCESS_PERMIT_LOAD              0x00000002

+///

+/// Presence of this record indicates that a user can update enrollment information.

+///

+#define EFI_USER_INFO_ACCESS_ENROLL_SELF              0x00000003

+///

+/// Presence of this record indicates that a user can enroll new users.

+///

+#define EFI_USER_INFO_ACCESS_ENROLL_OTHERS            0x00000004

+///

+/// Presence of this record indicates that a user can update the user information of any user.

+///

+#define EFI_USER_INFO_ACCESS_MANAGE                   0x00000005

+///

+/// Describes permissions usable when configuring the platform.

+///

+#define EFI_USER_INFO_ACCESS_SETUP                    0x00000006

+///

+/// Standard GUIDs for access to configure the platform.

+///

+#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \

+  { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } }

+#define EFI_USER_INFO_ACCESS_SETUP_NORMAL_GUID \

+  { 0x1db29ae0, 0x9dcb, 0x43bc, { 0x8d, 0x87, 0x5d, 0xa1, 0x49, 0x64, 0xdd, 0xe2 } }

+#define EFI_USER_INFO_ACCESS_SETUP_RESTRICTED_GUID \

+  { 0xbdb38125, 0x4d63, 0x49f4, { 0x82, 0x12, 0x61, 0xcf, 0x5a, 0x19, 0xa, 0xf8 } }

+

+///

+/// Forbids UEFI drivers from being started from the specified device path(s) or any child device paths.

+///

+#define EFI_USER_INFO_ACCESS_FORBID_CONNECT           0x00000007

+///

+/// Permits UEFI drivers to be started on the specified device path(s) or any child device paths.

+///

+#define EFI_USER_INFO_ACCESS_PERMIT_CONNECT           0x00000008

+///

+/// Modifies the boot order.

+///

+#define EFI_USER_INFO_ACCESS_BOOT_ORDER               0x00000009

+typedef UINT32 EFI_USER_INFO_ACCESS_BOOT_ORDER_HDR;

+

+#define EFI_USER_INFO_ACCESS_BOOT_ORDER_MASK          0x0000000F

+///

+/// Insert new boot options at the beginning of the boot order.

+///

+#define EFI_USER_INFO_ACCESS_BOOT_ORDER_INSERT        0x00000000

+///

+/// Append new boot options to the end of the boot order.

+///

+#define EFI_USER_INFO_ACCESS_BOOT_ORDER_APPEND        0x00000001

+///

+/// Replace the entire boot order.

+///

+#define EFI_USER_INFO_ACCESS_BOOT_ORDER_REPLACE       0x00000002

+///

+/// The Boot Manager will not attempt find a default boot device 

+/// when the default boot order is does not lead to a bootable device.

+///

+#define EFI_USER_INFO_ACCESS_BOOT_ORDER_NODEFAULT     0x00000010

+

+///

+/// Provides the expression which determines which credentials are required to assert user identity.

+///

+#define EFI_USER_INFO_IDENTITY_POLICY_RECORD          0x0F

+

+typedef struct {

+  UINT32  Type;    ///< Specifies either an operator or a data item. 

+  UINT32  Length;  ///< The length of this block, in bytes, including this header.

+} EFI_USER_INFO_IDENTITY_POLICY;

+

+///

+/// User identity policy expression operators.

+///

+#define EFI_USER_INFO_IDENTITY_FALSE                  0x00

+#define EFI_USER_INFO_IDENTITY_TRUE                   0x01

+#define EFI_USER_INFO_IDENTITY_CREDENTIAL_TYPE        0x02

+#define EFI_USER_INFO_IDENTITY_CREDENTIAL_PROVIDER    0x03

+#define EFI_USER_INFO_IDENTITY_NOT                    0x10

+#define EFI_USER_INFO_IDENTITY_AND                    0x11

+#define EFI_USER_INFO_IDENTITY_OR                     0x12

+

+///

+/// Provides placeholder for additional user profile information identified by a GUID.

+///

+#define EFI_USER_INFO_GUID_RECORD                     0xFF

+typedef EFI_GUID EFI_USER_INFO_GUID;

+

+///

+/// User information table

+/// A collection of EFI_USER_INFO records, prefixed with this header.

+///

+typedef struct {

+  UINT64   Size;  ///< Total size of the user information table, in bytes.

+} EFI_USER_INFO_TABLE;

+

 typedef struct _EFI_USER_MANAGER_PROTOCOL  EFI_USER_MANAGER_PROTOCOL;

 

 /**

@@ -334,5 +600,14 @@ struct _EFI_USER_MANAGER_PROTOCOL {
 

 extern EFI_GUID gEfiUserManagerProtocolGuid;

 extern EFI_GUID gEfiEventUserProfileChangedGuid;

+extern EFI_GUID gEfiUserCredentialClassUnknownGuid;

+extern EFI_GUID gEfiUserCredentialClassPasswordGuid;

+extern EFI_GUID gEfiUserCredentialClassSmartCardGuid;

+extern EFI_GUID gEfiUserCredentialClassFingerprintGuid;

+extern EFI_GUID gEfiUserCredentialClassHandprintGuid;

+extern EFI_GUID gEfiUserCredentialClassSecureCardGuid;

+extern EFI_GUID gEfiUserInfoAccessSetupAdminGuid;

+extern EFI_GUID gEfiUserInfoAccessSetupNormalGuid;

+extern EFI_GUID gEfiUserInfoAccessSetupRestrictedGuid;

 

 #endif

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 683eefedfe..480fea9d2f 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -364,31 +364,31 @@
   ## Include/Protocol/UserManager.h

   gEfiEventUserProfileChangedGuid = { 0xbaf1e6de, 0x209e, 0x4adb, {0x8d, 0x96, 0xfd, 0x8b, 0x71, 0xf3, 0xf6, 0x83 }}

 

-  ## Include/Protocol/UserCredential.h

+  ## Include/Protocol/UserManager.h

   gEfiUserCredentialClassUnknownGuid = { 0x5cf32e68, 0x7660, 0x449b, { 0x80, 0xe6, 0x7e, 0xa3, 0x6e, 0x3, 0xf6, 0xa8 }}

 

-  ## Include/Protocol/UserCredential.h

+  ## Include/Protocol/UserManager.h

   gEfiUserCredentialClassPasswordGuid = { 0xf8e5058c, 0xccb6, 0x4714, { 0xb2, 0x20, 0x3f, 0x7e, 0x3a, 0x64, 0xb, 0xd1 }}

 

-  ## Include/Protocol/UserCredential.h

+  ## Include/Protocol/UserManager.h

   gEfiUserCredentialClassSmartCardGuid = { 0x5f03ba33, 0x8c6b, 0x4c24, { 0xaa, 0x2e, 0x14, 0xa2, 0x65, 0x7b, 0xd4, 0x54 }}

 

-  ## Include/Protocol/UserCredential.h

+  ## Include/Protocol/UserManager.h

   gEfiUserCredentialClassFingerprintGuid = { 0x32cba21f, 0xf308, 0x4cbc, { 0x9a, 0xb5, 0xf5, 0xa3, 0x69, 0x9f, 0x4, 0x4a }}

 

-  ## Include/Protocol/UserCredential.h

+  ## Include/Protocol/UserManager.h

   gEfiUserCredentialClassHandprintGuid = { 0x5917ef16, 0xf723, 0x4bb9, { 0xa6, 0x4b, 0xd8, 0xc5, 0x32, 0xf4, 0xd8, 0xb5 }}

 

-  ## Include/Protocol/UserCredential.h

+  ## Include/Protocol/UserManager.h

   gEfiUserCredentialClassSecureCardGuid = { 0x8a6b4a83, 0x42fe, 0x45d2, { 0xa2, 0xef, 0x46, 0xf0, 0x6c, 0x7d, 0x98, 0x52 }}

 

-  ## Include/Protocol/UserCredential.h

+  ## Include/Protocol/UserManager.h

   gEfiUserInfoAccessSetupAdminGuid = { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee }}

 

-  ## Include/Protocol/UserCredential.h

+  ## Include/Protocol/UserManager.h

   gEfiUserInfoAccessSetupNormalGuid = { 0x1db29ae0, 0x9dcb, 0x43bc, { 0x8d, 0x87, 0x5d, 0xa1, 0x49, 0x64, 0xdd, 0xe2 }}

 

-  ## Include/Protocol/UserCredential.h

+  ## Include/Protocol/UserManager.h

   gEfiUserInfoAccessSetupRestrictedGuid = { 0xbdb38125, 0x4d63, 0x49f4, { 0x82, 0x12, 0x61, 0xcf, 0x5a, 0x19, 0xa, 0xf8 }}

 

   #