From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3D3FA81D43 for ; Tue, 29 Nov 2016 21:49:53 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP; 29 Nov 2016 21:49:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,720,1473145200"; d="scan'208";a="37080498" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga005.jf.intel.com with ESMTP; 29 Nov 2016 21:49:52 -0800 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 29 Nov 2016 21:49:52 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 29 Nov 2016 21:49:52 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.96]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.96]) with mapi id 14.03.0248.002; Wed, 30 Nov 2016 13:49:23 +0800 From: "Ye, Ting" To: "Wu, Jiaxin" , "edk2-devel@lists.01.org" CC: "Fu, Siyuan" , "Zhang, Lubo" Thread-Topic: [Patch] NetworkPkg/IpSecDxe: correct one comment and remove the unused buf Thread-Index: AQHSSrEvmxgV5n5EVEu5SZLg7GUNy6DxBYuw Date: Wed, 30 Nov 2016 05:49:23 +0000 Message-ID: References: <1480472781-122912-1-git-send-email-jiaxin.wu@intel.com> In-Reply-To: <1480472781-122912-1-git-send-email-jiaxin.wu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] NetworkPkg/IpSecDxe: correct one comment and remove the unused buf X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2016 05:49:53 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ye Ting =20 -----Original Message----- From: Wu, Jiaxin=20 Sent: Wednesday, November 30, 2016 10:26 AM To: edk2-devel@lists.01.org Cc: Fu, Siyuan ; Ye, Ting ; Zhang, = Lubo Subject: [Patch] NetworkPkg/IpSecDxe: correct one comment and remove the un= used buf Cc: Fu Siyuan Cc: Ye Ting Cc: Zhang Lubo Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiaxin Wu --- NetworkPkg/IpSecDxe/Ikev2/Payload.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c b/NetworkPkg/IpSecDxe/Ikev= 2/Payload.c index 675ecf6..f32b3a8 100644 --- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c +++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c @@ -655,11 +655,10 @@ Ikev2CertGenerateAuthPayload ( ) { UINT8 *Digest; UINTN DigestSize; PRF_DATA_FRAGMENT Fragments[3]; - UINT8 *KeyBuf; IKE_PAYLOAD *AuthPayload; IKEV2_AUTH *PayloadBuf; EFI_STATUS Status; UINT8 *Signature; UINTN SigSize; @@ -680,11 +679,10 @@ Ikev2CertGenerateAuthPayload ( // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ // // // Initial point // - KeyBuf =3D NULL; AuthPayload =3D NULL; Digest =3D NULL; Signature =3D NULL; SigSize =3D 0; =20 @@ -696,21 +694,10 @@ Ikev2CertGenerateAuthPayload ( if (Digest =3D=3D NULL) { return NULL; } =20 // - // Store the AuthKey into KeyBuf - // - KeyBuf =3D AllocateZeroPool (DigestSize); - if (KeyBuf =3D=3D NULL) { - Status =3D EFI_OUT_OF_RESOURCES; - goto EXIT; - } - =20 - CopyMem (KeyBuf, Digest, DigestSize); - - // // Calculate Prf(SK_Pi/r, IDi/r) // Fragments[0].Data =3D IdPayload->PayloadBuf + sizeof (IKEV2_COMMON_P= AYLOAD_HEADER); Fragments[0].DataSize =3D IdPayload->PayloadSize - sizeof (IKEV2_COMMON_= PAYLOAD_HEADER); =20 @@ -861,13 +848,10 @@ Ikev2CertGenerateAuthPayload ( // AuthPayload->PayloadBuf =3D (UINT8 *) PayloadBuf; AuthPayload->PayloadType =3D IKEV2_PAYLOAD_TYPE_AUTH; =20 EXIT: - if (KeyBuf !=3D NULL) { - FreePool (KeyBuf); - } if (Digest !=3D NULL) { FreePool (Digest); } if (Signature !=3D NULL) { FreePool (Signature); @@ -1490,11 +1474,11 @@ Ikev2ParserNotifyCookiePayload ( @param[in] CertificateLen The length of Certificate in byte. @param[in] EncodeType Specified the Certificate Encodeing which = is defined in RFC 4306. @param[in] IsRequest To indicate create Certificate Payload or = Certificate Request Payload. If it is TURE, create Cer= tificate - Payload. Otherwise, create Certificate Req= uest Payload. + Request Payload. Otherwise, create Certifi= cate Payload. =20 @retval a Pointer to IKE Payload whose payload buffer containing the Ce= rtificate payload or Certificated Request payload. =20 **/ --=20 1.9.5.msysgit.1