X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FInclude%2FProtocol%2FEap.h;h=eac2d5e5642a601039336fee8f9714dadb3d760d;hb=713e4b007cb791829397522ad8f366dd1e08bee6;hp=99c2b865ecd1a8ac5d8099c7c8e5bfaaf15473cc;hpb=badd7e61a86feb50421a3a1aec9ea8b651c3ede8;p=mirror_edk2.git

diff --git a/MdePkg/Include/Protocol/Eap.h b/MdePkg/Include/Protocol/Eap.h
index 99c2b865ec..eac2d5e564 100644
--- a/MdePkg/Include/Protocol/Eap.h
+++ b/MdePkg/Include/Protocol/Eap.h
@@ -2,11 +2,11 @@
   EFI EAP(Extended Authenticaton Protocol) Protocol Definition
   The EFI EAP Protocol is used to abstract the ability to configure and extend the
   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.
 
-  Copyright (c) 2009, Intel Corporation
-  All rights reserved. This program and the accompanying materials
+  Copyright (c) 2009 - 2015, 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
   http://opensource.org/licenses/bsd-license.php
@@ -14,6 +14,9 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
+  @par Revision Reference:          
+  This Protocol is introduced in UEFI Specification 2.2
+
 **/
 
 #ifndef __EFI_EAP_PROTOCOL_H__
@@ -34,13 +37,18 @@ typedef struct _EFI_EAP_PROTOCOL EFI_EAP_PROTOCOL;
 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_OTP                0x5   ///< OPTIONAL
-#define EFI_EAP_TYPE_TOKEN_CARD         0x6   ///< OPTIONAL
+#define EFI_EAP_TYPE_TLS 13 ///< REQUIRED - RFC 5216
 ///@}
 
+//
+// EAP_TYPE MD5, OTP and TOEKN_CARD has been removed from UEFI2.3.1B.
+// Definitions are kept for backward compatibility.
+//
+#define EFI_EAP_TYPE_MD5                4
+#define EFI_EAP_TYPE_OTP                5
+#define EFI_EAP_TYPE_TOKEN_CARD         6
 
 /**
   One user provided EAP authentication method.
@@ -80,9 +88,11 @@ EFI_STATUS
   
   If EapAuthType is an invalid EAP authentication type, then EFI_INVALID_PARAMETER is 
   returned.
-  If the EAP authentication method of EapAuthType is unsupported by the Ports, then this
-  function will return EFI_UNSUPPORTED.
-
+  If the EAP authentication method of EapAuthType is unsupported by the Ports, then it will
+  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 
                                  the calling context.
   @param[in] EapAuthType         The type of the EAP authentication method to register. It should 
@@ -92,13 +102,14 @@ EFI_STATUS
   @retval EFI_SUCCESS            The EAP authentication method of EapAuthType is 
                                  registered successfully.
   @retval EFI_INVALID_PARAMETER  EapAuthType is an invalid EAP authentication type.
-  @retval EFI_OUT_OF_RESOURCES   There is not enough system memory to perform the registration.
+  @retval EFI_UNSUPPORTED        The EAP authentication method of EapAuthType is
+                                 unsupported by the Port.
 
 **/
 typedef
 EFI_STATUS
 (EFIAPI *EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD)(
-  IN struct _EFI_EAP_PROTOCOL    *This, 
+  IN EFI_EAP_PROTOCOL            *This, 
   IN UINT8                       EapAuthType
   );
 
@@ -128,7 +139,7 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *EFI_EAP_REGISTER_AUTHENTICATION_METHOD)(
-  IN struct _EFI_EAP_PROTOCOL             *This, 
+  IN EFI_EAP_PROTOCOL                     *This, 
   IN UINT8                                EapAuthType, 
   IN EFI_EAP_BUILD_RESPONSE_PACKET        Handler
   );