From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.7028.1623411167355257748 for ; Fri, 11 Jun 2021 04:32:47 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: linux.intel.com, ip: 192.55.52.88, mailfrom: maciej.rabeda@linux.intel.com) IronPort-SDR: 60t0WiNUTw2A6T+LSrAOoD3QD/iCM4bTmZJxkxWX2dwxmirxZ/ah29r8TyvGU9HzkPLtofW42F wUL3nbu5/pQA== X-IronPort-AV: E=McAfee;i="6200,9189,10011"; a="226931697" X-IronPort-AV: E=Sophos;i="5.83,265,1616482800"; d="scan'208,217";a="226931697" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2021 04:32:46 -0700 IronPort-SDR: 8FV36bX8ptwyMXyuCReUEEkKdE/D1un8Ij9DelHiIRf09Qxe67YDycGg5O4xLywlN2PBk66PFB 5VXkVcPFcW3A== X-IronPort-AV: E=Sophos;i="5.83,265,1616482800"; d="scan'208,217";a="483235970" Received: from mrabeda-mobl.ger.corp.intel.com (HELO [10.213.2.3]) ([10.213.2.3]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2021 04:32:43 -0700 Subject: Re: [PATCH 2/6] NetworkPkg/IScsiDxe: add horizontal whitespace to IScsiCHAP files To: Laszlo Ersek , edk2-devel-groups-io Cc: Jiaxin Wu , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Siyuan Fu References: <20210608130652.2434-1-lersek@redhat.com> <20210608130652.2434-3-lersek@redhat.com> From: "Maciej Rabeda" Message-ID: <792ea8c9-ccb4-0cd8-6aee-4a543249618f@linux.intel.com> Date: Fri, 11 Jun 2021 13:32:41 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210608130652.2434-3-lersek@redhat.com> Content-Type: multipart/alternative; boundary="------------B2110243E71774ABA6FA5405" Content-Language: pl --------------B2110243E71774ABA6FA5405 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Nicely aligned spacing... Feels Good Man by Daniel 168 Reviewed-by: Maciej Rabeda On 08-Jun-21 15:06, Laszlo Ersek wrote: > In the next patches, we'll need more room for various macro and parameter > names. For maintaining the current visual alignments, insert some > horizontal whitespace in preparation. "git show -b" produces no output for > this patch; the patch introduces no functional changes. > > Cc: Jiaxin Wu > Cc: Maciej Rabeda > Cc: Philippe Mathieu-Daudé > Cc: Siyuan Fu > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3355 > Signed-off-by: Laszlo Ersek > --- > NetworkPkg/IScsiDxe/IScsiCHAP.h | 24 ++++++++++---------- > NetworkPkg/IScsiDxe/IScsiCHAP.c | 12 +++++----- > 2 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/NetworkPkg/IScsiDxe/IScsiCHAP.h b/NetworkPkg/IScsiDxe/IScsiCHAP.h > index 35d5d6ec29e3..d6a90fc27fc3 100644 > --- a/NetworkPkg/IScsiDxe/IScsiCHAP.h > +++ b/NetworkPkg/IScsiDxe/IScsiCHAP.h > @@ -1,49 +1,49 @@ > /** @file > The header file of CHAP configuration. > > Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > > #ifndef _ISCSI_CHAP_H_ > #define _ISCSI_CHAP_H_ > > -#define ISCSI_AUTH_METHOD_CHAP "CHAP" > +#define ISCSI_AUTH_METHOD_CHAP "CHAP" > > -#define ISCSI_KEY_CHAP_ALGORITHM "CHAP_A" > -#define ISCSI_KEY_CHAP_IDENTIFIER "CHAP_I" > -#define ISCSI_KEY_CHAP_CHALLENGE "CHAP_C" > -#define ISCSI_KEY_CHAP_NAME "CHAP_N" > -#define ISCSI_KEY_CHAP_RESPONSE "CHAP_R" > +#define ISCSI_KEY_CHAP_ALGORITHM "CHAP_A" > +#define ISCSI_KEY_CHAP_IDENTIFIER "CHAP_I" > +#define ISCSI_KEY_CHAP_CHALLENGE "CHAP_C" > +#define ISCSI_KEY_CHAP_NAME "CHAP_N" > +#define ISCSI_KEY_CHAP_RESPONSE "CHAP_R" > > -#define ISCSI_CHAP_ALGORITHM_MD5 5 > +#define ISCSI_CHAP_ALGORITHM_MD5 5 > > /// > /// MD5_HASHSIZE > /// > -#define ISCSI_CHAP_RSP_LEN 16 > +#define ISCSI_CHAP_RSP_LEN 16 > > -#define ISCSI_CHAP_STEP_ONE 1 > -#define ISCSI_CHAP_STEP_TWO 2 > -#define ISCSI_CHAP_STEP_THREE 3 > -#define ISCSI_CHAP_STEP_FOUR 4 > +#define ISCSI_CHAP_STEP_ONE 1 > +#define ISCSI_CHAP_STEP_TWO 2 > +#define ISCSI_CHAP_STEP_THREE 3 > +#define ISCSI_CHAP_STEP_FOUR 4 > > > #pragma pack(1) > > typedef struct _ISCSI_CHAP_AUTH_CONFIG_NVDATA { > UINT8 CHAPType; > CHAR8 CHAPName[ISCSI_CHAP_NAME_STORAGE]; > CHAR8 CHAPSecret[ISCSI_CHAP_SECRET_STORAGE]; > CHAR8 ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE]; > CHAR8 ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE]; > } ISCSI_CHAP_AUTH_CONFIG_NVDATA; > > #pragma pack() > > /// > /// ISCSI CHAP Authentication Data > /// > typedef struct _ISCSI_CHAP_AUTH_DATA { > ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfig; > diff --git a/NetworkPkg/IScsiDxe/IScsiCHAP.c b/NetworkPkg/IScsiDxe/IScsiCHAP.c > index 7e930c0d1eab..bb84f4359d35 100644 > --- a/NetworkPkg/IScsiDxe/IScsiCHAP.c > +++ b/NetworkPkg/IScsiDxe/IScsiCHAP.c > @@ -14,44 +14,44 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > > @param[in] ChapIdentifier iSCSI CHAP identifier sent by authenticator. > @param[in] ChapSecret iSCSI CHAP secret of the authenticator. > @param[in] SecretLength The length of iSCSI CHAP secret. > @param[in] ChapChallenge The challenge message sent by authenticator. > @param[in] ChallengeLength The length of iSCSI CHAP challenge message. > @param[out] ChapResponse The calculation of the expected hash value. > > @retval EFI_SUCCESS The expected hash value was calculatedly > successfully. > @retval EFI_PROTOCOL_ERROR The length of the secret should be at least > the length of the hash value for the hashing > algorithm chosen. > @retval EFI_PROTOCOL_ERROR MD5 hash operation fail. > @retval EFI_OUT_OF_RESOURCES Fail to allocate resource to complete MD5. > > **/ > EFI_STATUS > IScsiCHAPCalculateResponse ( > - IN UINT32 ChapIdentifier, > - IN CHAR8 *ChapSecret, > - IN UINT32 SecretLength, > - IN UINT8 *ChapChallenge, > - IN UINT32 ChallengeLength, > - OUT UINT8 *ChapResponse > + IN UINT32 ChapIdentifier, > + IN CHAR8 *ChapSecret, > + IN UINT32 SecretLength, > + IN UINT8 *ChapChallenge, > + IN UINT32 ChallengeLength, > + OUT UINT8 *ChapResponse > ) > { > UINTN Md5ContextSize; > VOID *Md5Ctx; > CHAR8 IdByte[1]; > EFI_STATUS Status; > > if (SecretLength < ISCSI_CHAP_SECRET_MIN_LEN) { > return EFI_PROTOCOL_ERROR; > } > > Md5ContextSize = Md5GetContextSize (); > Md5Ctx = AllocatePool (Md5ContextSize); > if (Md5Ctx == NULL) { > return EFI_OUT_OF_RESOURCES; > } > > Status = EFI_PROTOCOL_ERROR; > --------------B2110243E71774ABA6FA5405 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 8bit Nicely aligned spacing...

Feels Good Man by Daniel 168

Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>

On 08-Jun-21 15:06, Laszlo Ersek wrote:
In the next patches, we'll need more room for various macro and parameter
names. For maintaining the current visual alignments, insert some
horizontal whitespace in preparation. "git show -b" produces no output for
this patch; the patch introduces no functional changes.

Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3355
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 NetworkPkg/IScsiDxe/IScsiCHAP.h | 24 ++++++++++----------
 NetworkPkg/IScsiDxe/IScsiCHAP.c | 12 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiCHAP.h b/NetworkPkg/IScsiDxe/IScsiCHAP.h
index 35d5d6ec29e3..d6a90fc27fc3 100644
--- a/NetworkPkg/IScsiDxe/IScsiCHAP.h
+++ b/NetworkPkg/IScsiDxe/IScsiCHAP.h
@@ -1,49 +1,49 @@
 /** @file
   The header file of CHAP configuration.
 
 Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #ifndef _ISCSI_CHAP_H_
 #define _ISCSI_CHAP_H_
 
-#define ISCSI_AUTH_METHOD_CHAP    "CHAP"
+#define ISCSI_AUTH_METHOD_CHAP                    "CHAP"
 
-#define ISCSI_KEY_CHAP_ALGORITHM  "CHAP_A"
-#define ISCSI_KEY_CHAP_IDENTIFIER "CHAP_I"
-#define ISCSI_KEY_CHAP_CHALLENGE  "CHAP_C"
-#define ISCSI_KEY_CHAP_NAME       "CHAP_N"
-#define ISCSI_KEY_CHAP_RESPONSE   "CHAP_R"
+#define ISCSI_KEY_CHAP_ALGORITHM                  "CHAP_A"
+#define ISCSI_KEY_CHAP_IDENTIFIER                 "CHAP_I"
+#define ISCSI_KEY_CHAP_CHALLENGE                  "CHAP_C"
+#define ISCSI_KEY_CHAP_NAME                       "CHAP_N"
+#define ISCSI_KEY_CHAP_RESPONSE                   "CHAP_R"
 
-#define ISCSI_CHAP_ALGORITHM_MD5  5
+#define ISCSI_CHAP_ALGORITHM_MD5                  5
 
 ///
 /// MD5_HASHSIZE
 ///
-#define ISCSI_CHAP_RSP_LEN        16
+#define ISCSI_CHAP_RSP_LEN                        16
 
-#define ISCSI_CHAP_STEP_ONE       1
-#define ISCSI_CHAP_STEP_TWO       2
-#define ISCSI_CHAP_STEP_THREE     3
-#define ISCSI_CHAP_STEP_FOUR      4
+#define ISCSI_CHAP_STEP_ONE                       1
+#define ISCSI_CHAP_STEP_TWO                       2
+#define ISCSI_CHAP_STEP_THREE                     3
+#define ISCSI_CHAP_STEP_FOUR                      4
 
 
 #pragma pack(1)
 
 typedef struct _ISCSI_CHAP_AUTH_CONFIG_NVDATA {
   UINT8 CHAPType;
   CHAR8 CHAPName[ISCSI_CHAP_NAME_STORAGE];
   CHAR8 CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
   CHAR8 ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE];
   CHAR8 ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
 } ISCSI_CHAP_AUTH_CONFIG_NVDATA;
 
 #pragma pack()
 
 ///
 /// ISCSI CHAP Authentication Data
 ///
 typedef struct _ISCSI_CHAP_AUTH_DATA {
   ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfig;
diff --git a/NetworkPkg/IScsiDxe/IScsiCHAP.c b/NetworkPkg/IScsiDxe/IScsiCHAP.c
index 7e930c0d1eab..bb84f4359d35 100644
--- a/NetworkPkg/IScsiDxe/IScsiCHAP.c
+++ b/NetworkPkg/IScsiDxe/IScsiCHAP.c
@@ -14,44 +14,44 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @param[in]   ChapIdentifier     iSCSI CHAP identifier sent by authenticator.
   @param[in]   ChapSecret         iSCSI CHAP secret of the authenticator.
   @param[in]   SecretLength       The length of iSCSI CHAP secret.
   @param[in]   ChapChallenge      The challenge message sent by authenticator.
   @param[in]   ChallengeLength    The length of iSCSI CHAP challenge message.
   @param[out]  ChapResponse       The calculation of the expected hash value.
 
   @retval EFI_SUCCESS             The expected hash value was calculatedly
                                   successfully.
   @retval EFI_PROTOCOL_ERROR      The length of the secret should be at least
                                   the length of the hash value for the hashing
                                   algorithm chosen.
   @retval EFI_PROTOCOL_ERROR      MD5 hash operation fail.
   @retval EFI_OUT_OF_RESOURCES    Fail to allocate resource to complete MD5.
 
 **/
 EFI_STATUS
 IScsiCHAPCalculateResponse (
-  IN  UINT32  ChapIdentifier,
-  IN  CHAR8   *ChapSecret,
-  IN  UINT32  SecretLength,
-  IN  UINT8   *ChapChallenge,
-  IN  UINT32  ChallengeLength,
-  OUT UINT8   *ChapResponse
+  IN  UINT32          ChapIdentifier,
+  IN  CHAR8           *ChapSecret,
+  IN  UINT32          SecretLength,
+  IN  UINT8           *ChapChallenge,
+  IN  UINT32          ChallengeLength,
+  OUT UINT8           *ChapResponse
   )
 {
   UINTN       Md5ContextSize;
   VOID        *Md5Ctx;
   CHAR8       IdByte[1];
   EFI_STATUS  Status;
 
   if (SecretLength < ISCSI_CHAP_SECRET_MIN_LEN) {
     return EFI_PROTOCOL_ERROR;
   }
 
   Md5ContextSize = Md5GetContextSize ();
   Md5Ctx = AllocatePool (Md5ContextSize);
   if (Md5Ctx == NULL) {
     return EFI_OUT_OF_RESOURCES;
   }
 
   Status = EFI_PROTOCOL_ERROR;
 

--------------B2110243E71774ABA6FA5405--