UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / MdeModulePkg / Universal / iScsi / IScsiCHAP.c

diff --git a/MdeModulePkg/Universal/iScsi/IScsiCHAP.c b/MdeModulePkg/Universal/iScsi/IScsiCHAP.c
index 6f4b170a60b304206157b06d4c04270d5f1e94be..e6ea8b5400331d2273eba26ba895ff377aa70b2c 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiCHAP.c
+++ b/MdeModulePkg/Universal/iScsi/IScsiCHAP.c
@@ -119,6 +119,7 @@ Returns:
 {\r
   EFI_STATUS                Status;\r
   ISCSI_SESSION             *Session;\r
+  ISCSI_SESSION_CONFIG_DATA *ConfigData;\r
   ISCSI_CHAP_AUTH_DATA      *AuthData;\r
   CHAR8                     *Value;\r
   UINT8                     *Data;\r
@@ -136,6 +137,7 @@ Returns:
   ASSERT (Conn->RspQue.BufNum != 0);\r
 \r
   Session     = Conn->Session;\r
+  ConfigData  = &Session->ConfigData;\r
   AuthData    = &Session->AuthData;\r
 \r
   Len         = Conn->RspQue.BufSize;\r
@@ -151,7 +153,7 @@ Returns:
   //\r
   // Build the key-value list from the data segment of the Login Response.\r
   //\r
-  KeyValueList = IScsiBuildKeyValueList ((CHAR8*)Data, Len);\r
+  KeyValueList = IScsiBuildKeyValueList (Data, Len);\r
   if (KeyValueList == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -317,6 +319,7 @@ Returns:
   EFI_STATUS                Status;\r
   ISCSI_SESSION             *Session;\r
   ISCSI_LOGIN_REQUEST       *LoginReq;\r
+  ISCSI_SESSION_CONFIG_DATA *ConfigData;\r
   ISCSI_CHAP_AUTH_DATA      *AuthData;\r
   CHAR8                     *Value;\r
   CHAR8                     ValueStr[256];\r
@@ -328,6 +331,7 @@ Returns:
   ASSERT (Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION);\r
 \r
   Session     = Conn->Session;\r
+  ConfigData  = &Session->ConfigData;\r
   AuthData    = &Session->AuthData;\r
   LoginReq    = (ISCSI_LOGIN_REQUEST *) NetbufGetByte (Pdu, 0, 0);\r
   Status      = EFI_SUCCESS;\r
@@ -383,7 +387,7 @@ Returns:
     //\r
     // CHAP_N=<N>\r
     //\r
-    IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_NAME, (CHAR8 *) &AuthData->AuthConfig.CHAPName);\r
+    IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_NAME, (UINT8 *) &AuthData->AuthConfig.CHAPName);\r
     //\r
     // CHAP_R=<R>\r
     //\r