sync tracker 210250&210253 of R8 into R9, which fix the issue of iSCSI CHAP Secret UI allows the minimum number of 13 characters while the spec only requires 12

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8694 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
eric_tian 2009-07-01 00:47:09 +00:00
parent 064d5de378
commit c2c1e4504b
3 changed files with 11 additions and 6 deletions

View File

@ -50,9 +50,9 @@ typedef enum {
typedef struct _ISCSI_CHAP_AUTH_CONFIG_NVDATA {
UINT8 CHAPType;
CHAR8 CHAPName[ISCSI_CHAP_NAME_MAX_LEN];
CHAR8 CHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];
CHAR8 CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
CHAR8 ReverseCHAPName[ISCSI_CHAP_NAME_MAX_LEN];
CHAR8 ReverseCHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];
CHAR8 ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
} ISCSI_CHAP_AUTH_CONFIG_NVDATA;
#pragma pack()

View File

@ -66,8 +66,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define KEY_DEVICE_ENTRY_BASE 0x1000
#define ISCSI_LUN_STR_MAX_LEN 21
#define ISCSI_CHAP_SECRET_MIN_LEN 13
#define ISCSI_CHAP_SECRET_MAX_LEN 17
#define ISCSI_CHAP_SECRET_MIN_LEN 12
#define ISCSI_CHAP_SECRET_MAX_LEN 16
//
// ISCSI_CHAP_SECRET_STORAGE = ISCSI_CHAP_SECRET_MAX_LEN + sizeof (NULL-Terminator)
//
#define ISCSI_CHAP_SECRET_STORAGE 17
#define ISCSI_CHAP_NAME_MAX_LEN 126
#pragma pack(1)
@ -89,9 +94,9 @@ typedef struct {
UINT8 CHAPType;
CHAR16 CHAPName[ISCSI_CHAP_NAME_MAX_LEN];
CHAR16 CHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];
CHAR16 CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
CHAR16 ReverseCHAPName[ISCSI_CHAP_NAME_MAX_LEN];
CHAR16 ReverseCHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];
CHAR16 ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
} ISCSI_CONFIG_IFR_NVDATA;
#pragma pack()