sync tracker 210250&210253 of R8 into R9, which fix the issue of iSCSI CHAP Secret...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8694 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
index 2bae18fc330b9e75592c7608eb170b76175f6202..cce7e5a3248a793dc42a36f887ecf2951869150d 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
@@ -50,9 +50,9 @@ typedef enum {
 typedef struct _ISCSI_CHAP_AUTH_CONFIG_NVDATA {\r
   UINT8 CHAPType;\r
   CHAR8 CHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
-  CHAR8 CHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];\r
+  CHAR8 CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
   CHAR8 ReverseCHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
-  CHAR8 ReverseCHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];\r
+  CHAR8 ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
 } ISCSI_CHAP_AUTH_CONFIG_NVDATA;\r
 \r
 #pragma pack()\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni
index 0c91ce61f14c4c83735d13301c917cf680e36082..c9ece9153279a72d02002151f954c3f52fc3f2e9 100644 (file)
Binary files a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni and b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni differ

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
index 7b77a19e78ad98d699c3c49f0d32eda84c8d43c8..8f1aaeacb135b2231a472dd993de0833b8ed4a30 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -66,8 +66,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define KEY_DEVICE_ENTRY_BASE     0x1000\r
 \r
 #define ISCSI_LUN_STR_MAX_LEN     21\r
-#define ISCSI_CHAP_SECRET_MIN_LEN 13\r
-#define ISCSI_CHAP_SECRET_MAX_LEN 17\r
+#define ISCSI_CHAP_SECRET_MIN_LEN 12\r
+#define ISCSI_CHAP_SECRET_MAX_LEN 16\r
+//\r
+//  ISCSI_CHAP_SECRET_STORAGE = ISCSI_CHAP_SECRET_MAX_LEN + sizeof (NULL-Terminator)\r
+//\r
+#define ISCSI_CHAP_SECRET_STORAGE 17\r
+\r
 #define ISCSI_CHAP_NAME_MAX_LEN   126\r
 \r
 #pragma pack(1)\r
@@ -89,9 +94,9 @@ typedef struct {
 \r
   UINT8   CHAPType;\r
   CHAR16  CHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
-  CHAR16  CHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];\r
+  CHAR16  CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
   CHAR16  ReverseCHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
-  CHAR16  ReverseCHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];\r
+  CHAR16  ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
 } ISCSI_CONFIG_IFR_NVDATA;\r
 #pragma pack()\r
 \r