[Change summary]:

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiCHAP.c

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
index 4df7123b545e4c2e3a2230d6e9a9969de49c28cc..a3d20a75f97bdbe7d6f8a3dc101a4911a53c6c0a 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
@@ -1,7 +1,7 @@
 /** @file\r
   This file is for Challenge-Handshake Authentication Protocol (CHAP) Configuration.\r
  \r
-Copyright (c) 2004 - 2008, Intel Corporation.<BR>\r
+Copyright (c) 2004 - 2009, Intel Corporation.<BR>\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -20,11 +20,11 @@ EFI_GUID  mIScsiCHAPAuthInfoGuid = ISCSI_CHAP_AUTH_INFO_GUID;
 /**\r
   Initator caculates its own expected hash value. \r
   \r
-  @param[in]   ChapIdentifier     ISCSI CHAP identifier sent by authenticator.  \r
-  @param[in]   ChapSecret         ISCSI CHAP secret of the authenticator.   \r
-  @param[in]   SecretLength       The length of ISCSI CHAP secret.\r
+  @param[in]   ChapIdentifier     iSCSI CHAP identifier sent by authenticator.  \r
+  @param[in]   ChapSecret         iSCSI CHAP secret of the authenticator.   \r
+  @param[in]   SecretLength       The length of iSCSI CHAP secret.\r
   @param[in]   ChapChallenge      The challenge message sent by authenticator.  \r
-  @param[in]   ChallengeLength    The length of ISCSI CHAP challenge message.\r
+  @param[in]   ChallengeLength    The length of iSCSI CHAP challenge message.\r
   @param[out]  ChapResponse       The calculation of the expected hash value.\r
   \r
   @retval EFI_SUCCESS             The expected hash value was caculatedly successfully.\r
@@ -77,7 +77,7 @@ IScsiCHAPCalculateResponse (
   The initator checks the CHAP response replied by target against its own\r
   calculation of the expected hash value. \r
   \r
-  @param[in]   AuthData             ISCSI CHAP authentication data. \r
+  @param[in]   AuthData             iSCSI CHAP authentication data. \r
   @param[in]   TargetResponse       The response from target.    \r
 \r
   @retval EFI_SUCCESS               The response from target passed authentication.\r
@@ -118,7 +118,6 @@ IScsiCHAPAuthTarget (
   negotiation stage.\r
   \r
   @param[in] Conn             The iSCSI connection.\r
-  @param[in] Transit          The transit flag of the latest iSCSI Login Response.\r
 \r
   @retval EFI_SUCCESS          The Login Response passed the CHAP validation.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
@@ -127,8 +126,7 @@ IScsiCHAPAuthTarget (
 **/\r
 EFI_STATUS\r
 IScsiCHAPOnRspReceived (\r
-  IN ISCSI_CONNECTION  *Conn,\r
-  IN BOOLEAN           Transit\r
+  IN ISCSI_CONNECTION  *Conn\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -167,8 +165,8 @@ IScsiCHAPOnRspReceived (
   //\r
   KeyValueList = IScsiBuildKeyValueList ((CHAR8 *) Data, Len);\r
   if (KeyValueList == NULL) {\r
-    Status = EFI_OUT_OF_RESOURCES;\r
-    goto ON_EXIT;\r
+    gBS->FreePool (Data);\r
+    return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   Status = EFI_PROTOCOL_ERROR;\r
@@ -306,8 +304,8 @@ ON_EXIT:
   This function fills the CHAP authentication information into the login PDU\r
   during the security negotiation stage in the iSCSI connection login.\r
 \r
-  @param[in]  Conn             The iSCSI connection.\r
-  @param[in]  Pdu              The PDU to send out.\r
+  @param[in]       Conn        The iSCSI connection.\r
+  @param[in, out]  Pdu         The PDU to send out.\r
 \r
   @retval EFI_SUCCESS          All check passed and the phase-related CHAP\r
                                authentication info is filled into the iSCSI PDU.\r
@@ -316,8 +314,8 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 IScsiCHAPToSendReq (\r
-  IN ISCSI_CONNECTION  *Conn,\r
-  IN NET_BUF           *Pdu\r
+  IN      ISCSI_CONNECTION  *Conn,\r
+  IN OUT  NET_BUF           *Pdu\r
   )\r
 {\r
   EFI_STATUS                Status;\r