NetworkPkg/IScsiDxe: distinguish "maximum" and "selected" CHAP digest sizes

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiCHAP.c

diff --git a/NetworkPkg/IScsiDxe/IScsiCHAP.c b/NetworkPkg/IScsiDxe/IScsiCHAP.c
index bb84f4359d35c01c7a66a90240f548b78a038280..744824e63d233e7fa0562796b913c5e9d13b8648 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiCHAP.c
+++ b/NetworkPkg/IScsiDxe/IScsiCHAP.c
@@ -112,7 +112,7 @@ IScsiCHAPAuthTarget (
 {\r
   EFI_STATUS  Status;\r
   UINT32      SecretSize;\r
-  UINT8       VerifyRsp[ISCSI_CHAP_RSP_LEN];\r
+  UINT8       VerifyRsp[ISCSI_CHAP_MAX_DIGEST_SIZE];\r
 \r
   Status      = EFI_SUCCESS;\r
 \r
@@ -122,11 +122,11 @@ IScsiCHAPAuthTarget (
              AuthData->AuthConfig->ReverseCHAPSecret,\r
              SecretSize,\r
              AuthData->OutChallenge,\r
-             ISCSI_CHAP_RSP_LEN,                      // ChallengeLength\r
+             MD5_DIGEST_SIZE,                         // ChallengeLength\r
              VerifyRsp\r
              );\r
 \r
-  if (CompareMem (VerifyRsp, TargetResponse, ISCSI_CHAP_RSP_LEN) != 0) {\r
+  if (CompareMem (VerifyRsp, TargetResponse, MD5_DIGEST_SIZE) != 0) {\r
     Status = EFI_SECURITY_VIOLATION;\r
   }\r
 \r
@@ -163,7 +163,7 @@ IScsiCHAPOnRspReceived (
   CHAR8                       *Challenge;\r
   CHAR8                       *Name;\r
   CHAR8                       *Response;\r
-  UINT8                       TargetRsp[ISCSI_CHAP_RSP_LEN];\r
+  UINT8                       TargetRsp[ISCSI_CHAP_MAX_DIGEST_SIZE];\r
   UINT32                      RspLen;\r
   UINTN                       Result;\r
 \r
@@ -340,9 +340,9 @@ IScsiCHAPOnRspReceived (
       goto ON_EXIT;\r
     }\r
 \r
-    RspLen = ISCSI_CHAP_RSP_LEN;\r
+    RspLen = MD5_DIGEST_SIZE;\r
     Status = IScsiHexToBin (TargetRsp, &RspLen, Response);\r
-    if (EFI_ERROR (Status) || RspLen != ISCSI_CHAP_RSP_LEN) {\r
+    if (EFI_ERROR (Status) || RspLen != MD5_DIGEST_SIZE) {\r
       Status = EFI_PROTOCOL_ERROR;\r
       goto ON_EXIT;\r
     }\r
@@ -411,13 +411,13 @@ IScsiCHAPToSendReq (
   }\r
   Status      = EFI_SUCCESS;\r
 \r
-  RspLen      = 2 * ISCSI_CHAP_RSP_LEN + 3;\r
+  RspLen      = 2 * ISCSI_CHAP_MAX_DIGEST_SIZE + 3;\r
   Response    = AllocateZeroPool (RspLen);\r
   if (Response == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  ChallengeLen  = 2 * ISCSI_CHAP_RSP_LEN + 3;\r
+  ChallengeLen  = 2 * ISCSI_CHAP_MAX_DIGEST_SIZE + 3;\r
   Challenge     = AllocateZeroPool (ChallengeLen);\r
   if (Challenge == NULL) {\r
     FreePool (Response);\r
@@ -482,7 +482,7 @@ IScsiCHAPToSendReq (
     //\r
     BinToHexStatus = IScsiBinToHex (\r
                        (UINT8 *) AuthData->CHAPResponse,\r
-                       ISCSI_CHAP_RSP_LEN,\r
+                       MD5_DIGEST_SIZE,\r
                        Response,\r
                        &RspLen\r
                        );\r
@@ -499,10 +499,10 @@ IScsiCHAPToSendReq (
       //\r
       // CHAP_C=<C>\r
       //\r
-      IScsiGenRandom ((UINT8 *) AuthData->OutChallenge, ISCSI_CHAP_RSP_LEN);\r
+      IScsiGenRandom ((UINT8 *) AuthData->OutChallenge, MD5_DIGEST_SIZE);\r
       BinToHexStatus = IScsiBinToHex (\r
                          (UINT8 *) AuthData->OutChallenge,\r
-                         ISCSI_CHAP_RSP_LEN,\r
+                         MD5_DIGEST_SIZE,\r
                          Challenge,\r
                          &ChallengeLen\r
                          );\r