tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update header file to match UEFI231B mantis 771, 850, 853 and 857. 

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Hot Tian <hot.tian@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13504 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2012-07-05 04:52:43 +00:00
parent ed71a22c18
commit b37aa2c645
4 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MdePkg/Include/Protocol/AbsolutePointer.h
View File

@ -2,7 +2,7 @@
The file provides services that allow information about an The file provides services that allow information about an
absolute pointer device to be retrieved. absolute pointer device to be retrieved.
Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -116,7 +116,7 @@ typedef struct {
UINT64 CurrentX; UINT64 CurrentX;
/// ///
/// The unsigned position of the activation on the x axis. If the AboluteMinY /// The unsigned position of the activation on the y axis. If the AboluteMinY
/// and the AboluteMaxY fields of the EFI_ABSOLUTE_POINTER_MODE structure are /// and the AboluteMaxY fields of the EFI_ABSOLUTE_POINTER_MODE structure are
/// both 0, then this pointer device does not support an y-axis, and this field /// both 0, then this pointer device does not support an y-axis, and this field
/// must be ignored. /// must be ignored.
@ -124,7 +124,7 @@ typedef struct {
UINT64 CurrentY; UINT64 CurrentY;
/// ///
/// The unsigned position of the activation on the x axis, or the pressure /// The unsigned position of the activation on the z axis, or the pressure
/// measurement. If the AboluteMinZ and the AboluteMaxZ fields of the /// measurement. If the AboluteMinZ and the AboluteMaxZ fields of the
/// EFI_ABSOLUTE_POINTER_MODE structure are both 0, then this pointer device /// EFI_ABSOLUTE_POINTER_MODE structure are both 0, then this pointer device
/// does not support an z-axis, and this field must be ignored. /// does not support an z-axis, and this field must be ignored.

18
MdePkg/Include/Protocol/Eap.h
View File

@ -2,10 +2,10 @@
EFI EAP(Extended Authenticaton Protocol) Protocol Definition EFI EAP(Extended Authenticaton Protocol) Protocol Definition
The EFI EAP Protocol is used to abstract the ability to configure and extend the The EFI EAP Protocol is used to abstract the ability to configure and extend the
EAP framework. EAP framework.
The definitions in this file are defined in UEFI Specification 2.3, which have The definitions in this file are defined in UEFI Specification 2.3.1B, which have
not been verified by one implementation yet. not been verified by one implementation yet.
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -37,13 +37,17 @@ typedef struct _EFI_EAP_PROTOCOL EFI_EAP_PROTOCOL;
typedef VOID * EFI_PORT_HANDLE; typedef VOID * EFI_PORT_HANDLE;
/// ///
/// EAP Authentication Method Type (RFC 2284 Section 3) /// EAP Authentication Method Type (RFC 3748)
///@{ ///@{
#define EFI_EAP_TYPE_MD5 0x4 ///< REQUIRED #define EFI_EAP_TYPE_TLS 13 ///< REQUIRED - RFC 5216
#define EFI_EAP_TYPE_OTP 0x5 ///< OPTIONAL
#define EFI_EAP_TYPE_TOKEN_CARD 0x6 ///< OPTIONAL
///@} ///@}
//
// EAP_TYPE MD5, OTP and TOEKN_CARD has been removed from UEFI2.3.1B.
//
#define EFI_EAP_TYPE_MD5 0x4
#define EFI_EAP_TYPE_OTP 0x5
#define EFI_EAP_TYPE_TOKEN_CARD 0x6
/** /**
One user provided EAP authentication method. One user provided EAP authentication method.
@ -85,6 +89,8 @@ EFI_STATUS
returned. returned.
If the EAP authentication method of EapAuthType is unsupported by the Ports, then it will If the EAP authentication method of EapAuthType is unsupported by the Ports, then it will
return EFI_UNSUPPORTED. return EFI_UNSUPPORTED.
The cryptographic strength of EFI_EAP_TYPE_TLS shall be at least of hash strength
SHA-256 and RSA key length of at least 2048 bits.
@param[in] This A pointer to the EFI_EAP_PROTOCOL instance that indicates @param[in] This A pointer to the EFI_EAP_PROTOCOL instance that indicates
the calling context. the calling context.

24
MdePkg/Include/Protocol/Hash.h
View File

@ -5,7 +5,7 @@
provided by a driver and to create and destroy instances of the EFI Hash Protocol provided by a driver and to create and destroy instances of the EFI Hash Protocol
so that a multiple drivers can use the underlying hashing services. so that a multiple drivers can use the underlying hashing services.
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution. the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at The full text of the license may be found at
@ -59,6 +59,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
0xaf7c79c, 0x65b5, 0x4319, {0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 } \ 0xaf7c79c, 0x65b5, 0x4319, {0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 } \
} }
#define EFI_HASH_ALGORITHM_SHA1_NOPAD_GUID \
{ \
0x24c5dc2f, 0x53e2, 0x40ca, {0x9e, 0xd6, 0xa5, 0xd9, 0xa4, 0x9f, 0x46, 0x3b } \
}
#define EFI_HASH_ALGORITHM_SHA256_NOPAD_GUID \
{ \
0x8628752a, 0x6cb7, 0x4814, {0x96, 0xfc, 0x24, 0xa8, 0x15, 0xac, 0x22, 0x26 } \
}
typedef struct _EFI_HASH_PROTOCOL EFI_HASH_PROTOCOL; typedef struct _EFI_HASH_PROTOCOL EFI_HASH_PROTOCOL;
typedef UINT8 EFI_MD5_HASH[16]; typedef UINT8 EFI_MD5_HASH[16];
@ -99,7 +109,7 @@ EFI_STATUS
); );
/** /**
Returns the size of the hash which results from a specific algorithm. Creates a hash for the specified message text.
@param[in] This Points to this instance of EFI_HASH_PROTOCOL. @param[in] This Points to this instance of EFI_HASH_PROTOCOL.
@param[in] HashAlgorithm Points to the EFI_GUID which identifies the algorithm to use. @param[in] HashAlgorithm Points to the EFI_GUID which identifies the algorithm to use.
@ -107,8 +117,12 @@ EFI_STATUS
existing hash (TRUE). existing hash (TRUE).
@param[in] Message Points to the start of the message. @param[in] Message Points to the start of the message.
@param[in] MessageSize The size of Message, in bytes. @param[in] MessageSize The size of Message, in bytes.
@param[in,out] Hash On input, if Extend is TRUE, then this holds the hash to extend. On @param[in,out] Hash On input, if Extend is TRUE, then this parameter holds a pointer
output, holds the resulting hash computed from the message. to a pointer to an array containing the hash to extend. If Extend
is FALSE, then this parameter holds a pointer to a pointer to a
caller-allocated array that will receive the result of the hash
computation. On output (regardless of the value of Extend), the
array will contain the result of the hash computation.
@retval EFI_SUCCESS Hash returned successfully. @retval EFI_SUCCESS Hash returned successfully.
@retval EFI_INVALID_PARAMETER Message or Hash is NULL @retval EFI_INVALID_PARAMETER Message or Hash is NULL
@ -144,5 +158,7 @@ extern EFI_GUID gEfiHashAlgorithmSha256Guid;
extern EFI_GUID gEfiHashAlgorithmSha384Guid; extern EFI_GUID gEfiHashAlgorithmSha384Guid;
extern EFI_GUID gEfiHashAlgorithmSha512Guid; extern EFI_GUID gEfiHashAlgorithmSha512Guid;
extern EFI_GUID gEfiHashAlgorithmMD5Guid; extern EFI_GUID gEfiHashAlgorithmMD5Guid;
extern EFI_GUID gEfiHashAlgorithmSha1NoPadGuid;
extern EFI_GUID gEfiHashAlgorithmSha256NoPadGuid;
#endif #endif

4
MdePkg/MdePkg.dec
View File

@ -507,6 +507,10 @@
gEfiCertSha512Guid = { 0x93e0fae, 0xa6c4, 0x4f50, {0x9f, 0x1b, 0xd4, 0x1e, 0x2b, 0x89, 0xc1, 0x9a }} gEfiCertSha512Guid = { 0x93e0fae, 0xa6c4, 0x4f50, {0x9f, 0x1b, 0xd4, 0x1e, 0x2b, 0x89, 0xc1, 0x9a }}
gEfiCertPkcs7Guid = { 0x4aafd29d, 0x68df, 0x49ee, {0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7 }} gEfiCertPkcs7Guid = { 0x4aafd29d, 0x68df, 0x49ee, {0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7 }}
## Include/Protocol/Hash.h
gEfiHashAlgorithmSha1NoPadGuid = { 0x24c5dc2f, 0x53e2, 0x40ca, { 0x9e, 0xd6, 0xa5, 0xd9, 0xa4, 0x9f, 0x46, 0x3b }}
gEfiHashAlgorithmSha256NoPadGuid = { 0x8628752a, 0x6cb7, 0x4814, { 0x96, 0xfc, 0x24, 0xa8, 0x15, 0xac, 0x22, 0x26 }}
# #
# GUID defined in PI1.0 # GUID defined in PI1.0
# #