diff options
Diffstat (limited to 'MdePkg/Include/Protocol')
| -rw-r--r-- | MdePkg/Include/Protocol/AuthenticationInfo.h | 68 | ||||
| -rw-r--r-- | MdePkg/Include/Protocol/Hash.h | 23 |
2 files changed, 43 insertions, 48 deletions
diff --git a/MdePkg/Include/Protocol/AuthenticationInfo.h b/MdePkg/Include/Protocol/AuthenticationInfo.h index b520327834..a3c9b97377 100644 --- a/MdePkg/Include/Protocol/AuthenticationInfo.h +++ b/MdePkg/Include/Protocol/AuthenticationInfo.h @@ -34,6 +34,7 @@ typedef struct _EFI_AUTHENTICATION_INFO_PROTOCOL EFI_AUTHENTICATION_INFO_PROTOCOL;
+#pragma pack(1)
typedef struct {
///
/// Authentication Type GUID.
@@ -52,7 +53,7 @@ typedef struct { ///
/// RADIUS Server IPv4 or IPv6 Address
///
- EFI_IPv6_ADDRESS RadiusIpAddr; ///< IPv4 or IPv6 address
+ UINT8 RadiusIpAddr[16]; ///< IPv4 or IPv6 address
///
/// Reserved for future use
@@ -62,7 +63,7 @@ typedef struct { ///
/// Network Access Server IPv4 or IPv6 Address (OPTIONAL)
///
- EFI_IPv6_ADDRESS NasIpAddr; ///< IPv4 or IPv6 address
+ UINT8 NasIpAddr[16]; ///< IPv4 or IPv6 address
///
/// Network Access Server Secret Length in bytes (OPTIONAL)
@@ -70,29 +71,27 @@ typedef struct { UINT16 NasSecretLength;
///
- /// Network Access Server secret (OPTIONAL)
+ /// Network Access Server Secret (OPTIONAL)
///
- UINT8 *NasSecret;
+ UINT8 NasSecret[1];
+ ///
+ /// CHAP Initiator Secret length in bytes on offset NasSecret + NasSecretLength.
///
- /// CHAP Initiator Secret length in bytes
- ///
- UINT16 ChapSecretLength;
-
+ /// UINT16 ChapSecretLength;
///
/// CHAP Initiator Secret
///
- UINT8 *ChapSecret;
-
+ /// UINT8 ChapSecret[];
///
- /// CHAP Initiator Name Length in bytes
+ /// CHAP Initiator Name Length in bytes on offset ChapSecret + ChapSecretLength
///
- UINT16 ChapNameLength;
-
+ /// UINT16 ChapNameLength;
///
/// CHAP Initiator Name
///
- UINT8 *ChapName;
+ /// UINT8 ChapName[];
+ ///
} CHAP_RADIUS_AUTH_NODE;
typedef struct {
@@ -111,45 +110,42 @@ typedef struct { ///
/// User Secret
///
- UINT8 *UserSecret;
+ UINT8 UserSecret[1];
///
- /// User Name Length in bytes
+ /// User Name Length in bytes on offset UserSecret + UserSecretLength
///
- UINT16 UserNameLength;
-
+ /// UINT16 UserNameLength;
///
/// User Name
///
- UINT8 *UserName;
-
+ /// UINT8 *UserName;
///
- /// CHAP Initiator Secret length in bytes
+ /// CHAP Initiator Secret length in bytes on offset UserName + UserNameLength
///
- UINT16 ChapSecretLength;
-
+ /// UINT16 ChapSecretLength;
///
/// CHAP Initiator Secret
///
- UINT8 *ChapSecret;
-
+ /// UINT8 *ChapSecret;
///
- /// CHAP Initiator Name Length in bytes
+ /// CHAP Initiator Name Length in bytes on offset ChapSecret + ChapSecretLength
///
- UINT16 ChapNameLength;
-
+ /// UINT16 ChapNameLength;
///
/// CHAP Initiator Name
///
- UINT8 *ChapName;
+ /// UINT8 *ChapName;
+ ///
} CHAP_LOCAL_AUTH_NODE;
+#pragma pack()
/**
Retrieves the authentication information associated with a particular controller handle.
- @param This Pointer to the EFI_AUTHENTICATION_INFO_PROTOCOL
- @param ControllerHandle Handle to the Controller
- @param Buffer Pointer to the authentication information.
+ @param[in] This Pointer to the EFI_AUTHENTICATION_INFO_PROTOCOL
+ @param[in] ControllerHandle Handle to the Controller
+ @param[out] Buffer Pointer to the authentication information.
@retval EFI_SUCCESS Successfully retrieved authentication information for the given ControllerHandle
@retval EFI_INVALID_PARAMETER No matching authentication information found for the given ControllerHandle
@@ -163,14 +159,14 @@ EFI_STATUS IN EFI_AUTHENTICATION_INFO_PROTOCOL *This,
IN EFI_HANDLE *ControllerHandle,
OUT VOID *Buffer
- );
+ );
/**
Set the authentication information for a given controller handle.
- @param This Pointer to the EFI_AUTHENTICATION_INFO_PROTOCOL
- @param ControllerHandle Handle to the Controller
- @param Buffer Pointer to the authentication information.
+ @param[in] This Pointer to the EFI_AUTHENTICATION_INFO_PROTOCOL
+ @param[in] ControllerHandle Handle to the Controller
+ @param[in] Buffer Pointer to the authentication information.
@retval EFI_SUCCESS Successfully set authentication information for the given ControllerHandle
@retval EFI_UNSUPPORTED If the platform policies do not allow setting of the authentication
diff --git a/MdePkg/Include/Protocol/Hash.h b/MdePkg/Include/Protocol/Hash.h index fda852fd90..b9ed6daa6d 100644 --- a/MdePkg/Include/Protocol/Hash.h +++ b/MdePkg/Include/Protocol/Hash.h @@ -4,7 +4,6 @@ The EFI Hash Service Binding Protocol is used to locate hashing services support
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.
- The EFI Service Binding Protocol defines the generic Service Binding Protocol functions.
Copyright (c) 2006 - 2009, Intel Corporation
All rights reserved. This program and the accompanying materials
@@ -81,9 +80,9 @@ typedef union { /**
Returns the size of the hash which results from a specific algorithm.
- @param This Points to this instance of EFI_HASH_PROTOCOL.
- @param HashAlgorithm Points to the EFI_GUID which identifies the algorithm to use.
- @param HashSize Holds the returned size of the algorithm's hash.
+ @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[out] HashSize Holds the returned size of the algorithm's hash.
@retval EFI_SUCCESS Hash size returned successfully.
@retval EFI_INVALID_PARAMETER HashSize is NULL
@@ -102,14 +101,14 @@ EFI_STATUS /**
Returns the size of the hash which results from a specific algorithm.
- @param This Points to this instance of EFI_HASH_PROTOCOL.
- @param HashAlgorithm Points to the EFI_GUID which identifies the algorithm to use.
- @param Extend Specifies whether to create a new hash (FALSE) or extend the specified
- existing hash (TRUE).
- @param Message Points to the start of the message.
- @param MessageSize The size of Message, in bytes.
- @param Hash On input, if Extend is TRUE, then this holds the hash to extend. On
- output, holds the resulting hash computed from the message.
+ @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] Extend Specifies whether to create a new hash (FALSE) or extend the specified
+ existing hash (TRUE).
+ @param[in] Message Points to the start of the message.
+ @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
+ output, holds the resulting hash computed from the message.
@retval EFI_SUCCESS Hash returned successfully.
@retval EFI_INVALID_PARAMETER Message or Hash is NULL
|