Re: [edk2] [Patch] NetworkPkg/IpSecDxe: correct one comment and remove the unused buf
Reviewed-by: Ye Ting-Original Message- From: Wu, Jiaxin 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 unused 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/Ikev2/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 = NULL; AuthPayload = NULL; Digest = NULL; Signature = NULL; SigSize = 0; @@ -696,21 +694,10 @@ Ikev2CertGenerateAuthPayload ( if (Digest == NULL) { return NULL; } // - // Store the AuthKey into KeyBuf - // - KeyBuf = AllocateZeroPool (DigestSize); - if (KeyBuf == NULL) { -Status = EFI_OUT_OF_RESOURCES; -goto EXIT; - } - - CopyMem (KeyBuf, Digest, DigestSize); - - // // Calculate Prf(SK_Pi/r, IDi/r) // Fragments[0].Data = IdPayload->PayloadBuf + sizeof (IKEV2_COMMON_PAYLOAD_HEADER); Fragments[0].DataSize = IdPayload->PayloadSize - sizeof (IKEV2_COMMON_PAYLOAD_HEADER); @@ -861,13 +848,10 @@ Ikev2CertGenerateAuthPayload ( // AuthPayload->PayloadBuf = (UINT8 *) PayloadBuf; AuthPayload->PayloadType = IKEV2_PAYLOAD_TYPE_AUTH; EXIT: - if (KeyBuf != NULL) { -FreePool (KeyBuf); - } if (Digest != NULL) { FreePool (Digest); } if (Signature != NULL) { FreePool (Signature); @@ -1490,11 +1474,11 @@ Ikev2ParserNotifyCookiePayload ( @param[in] CertificateLenThe length of Certificate in byte. @param[in] EncodeTypeSpecified 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 Certificate -Payload. Otherwise, create Certificate Request Payload. +Request Payload. Otherwise, create Certificate Payload. @retval a Pointer to IKE Payload whose payload buffer containing the Certificate payload or Certificated Request payload. **/ -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] NetworkPkg/IpSecDxe: correct one comment and remove the unused buf
Reviewed-by: Zhang Lubo-Original Message- From: Wu, Jiaxin 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 unused 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/Ikev2/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 = NULL; AuthPayload = NULL; Digest = NULL; Signature = NULL; SigSize = 0; @@ -696,21 +694,10 @@ Ikev2CertGenerateAuthPayload ( if (Digest == NULL) { return NULL; } // - // Store the AuthKey into KeyBuf - // - KeyBuf = AllocateZeroPool (DigestSize); - if (KeyBuf == NULL) { -Status = EFI_OUT_OF_RESOURCES; -goto EXIT; - } - - CopyMem (KeyBuf, Digest, DigestSize); - - // // Calculate Prf(SK_Pi/r, IDi/r) // Fragments[0].Data = IdPayload->PayloadBuf + sizeof (IKEV2_COMMON_PAYLOAD_HEADER); Fragments[0].DataSize = IdPayload->PayloadSize - sizeof (IKEV2_COMMON_PAYLOAD_HEADER); @@ -861,13 +848,10 @@ Ikev2CertGenerateAuthPayload ( // AuthPayload->PayloadBuf = (UINT8 *) PayloadBuf; AuthPayload->PayloadType = IKEV2_PAYLOAD_TYPE_AUTH; EXIT: - if (KeyBuf != NULL) { -FreePool (KeyBuf); - } if (Digest != NULL) { FreePool (Digest); } if (Signature != NULL) { FreePool (Signature); @@ -1490,11 +1474,11 @@ Ikev2ParserNotifyCookiePayload ( @param[in] CertificateLenThe length of Certificate in byte. @param[in] EncodeTypeSpecified 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 Certificate -Payload. Otherwise, create Certificate Request Payload. +Request Payload. Otherwise, create Certificate Payload. @retval a Pointer to IKE Payload whose payload buffer containing the Certificate payload or Certificated Request payload. **/ -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] NetworkPkg/IpSecDxe: correct one comment and remove the unused buf
Reviewed-by: Fu Siyuan> -Original Message- > From: Wu, Jiaxin > 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 > unused 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/Ikev2/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 = NULL; >AuthPayload = NULL; >Digest = NULL; >Signature = NULL; >SigSize = 0; > > @@ -696,21 +694,10 @@ Ikev2CertGenerateAuthPayload ( >if (Digest == NULL) { > return NULL; >} > >// > - // Store the AuthKey into KeyBuf > - // > - KeyBuf = AllocateZeroPool (DigestSize); > - if (KeyBuf == NULL) { > -Status = EFI_OUT_OF_RESOURCES; > -goto EXIT; > - } > - > - CopyMem (KeyBuf, Digest, DigestSize); > - > - // >// Calculate Prf(SK_Pi/r, IDi/r) >// >Fragments[0].Data = IdPayload->PayloadBuf + sizeof > (IKEV2_COMMON_PAYLOAD_HEADER); >Fragments[0].DataSize = IdPayload->PayloadSize - sizeof > (IKEV2_COMMON_PAYLOAD_HEADER); > > @@ -861,13 +848,10 @@ Ikev2CertGenerateAuthPayload ( >// >AuthPayload->PayloadBuf = (UINT8 *) PayloadBuf; >AuthPayload->PayloadType = IKEV2_PAYLOAD_TYPE_AUTH; > > EXIT: > - if (KeyBuf != NULL) { > -FreePool (KeyBuf); > - } >if (Digest != NULL) { > FreePool (Digest); >} >if (Signature != NULL) { > FreePool (Signature); > @@ -1490,11 +1474,11 @@ Ikev2ParserNotifyCookiePayload ( >@param[in] CertificateLenThe length of Certificate in byte. >@param[in] EncodeTypeSpecified 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 > Certificate > -Payload. Otherwise, create Certificate > Request Payload. > +Request Payload. Otherwise, create > Certificate Payload. > >@retval a Pointer to IKE Payload whose payload buffer containing the > Certificate > payload or Certificated Request payload. > > **/ > -- > 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] NetworkPkg/IpSecDxe: correct one comment and remove the unused buf
Cc: Fu SiyuanCc: 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/Ikev2/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 = NULL; AuthPayload = NULL; Digest = NULL; Signature = NULL; SigSize = 0; @@ -696,21 +694,10 @@ Ikev2CertGenerateAuthPayload ( if (Digest == NULL) { return NULL; } // - // Store the AuthKey into KeyBuf - // - KeyBuf = AllocateZeroPool (DigestSize); - if (KeyBuf == NULL) { -Status = EFI_OUT_OF_RESOURCES; -goto EXIT; - } - - CopyMem (KeyBuf, Digest, DigestSize); - - // // Calculate Prf(SK_Pi/r, IDi/r) // Fragments[0].Data = IdPayload->PayloadBuf + sizeof (IKEV2_COMMON_PAYLOAD_HEADER); Fragments[0].DataSize = IdPayload->PayloadSize - sizeof (IKEV2_COMMON_PAYLOAD_HEADER); @@ -861,13 +848,10 @@ Ikev2CertGenerateAuthPayload ( // AuthPayload->PayloadBuf = (UINT8 *) PayloadBuf; AuthPayload->PayloadType = IKEV2_PAYLOAD_TYPE_AUTH; EXIT: - if (KeyBuf != NULL) { -FreePool (KeyBuf); - } if (Digest != NULL) { FreePool (Digest); } if (Signature != NULL) { FreePool (Signature); @@ -1490,11 +1474,11 @@ Ikev2ParserNotifyCookiePayload ( @param[in] CertificateLenThe length of Certificate in byte. @param[in] EncodeTypeSpecified 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 Certificate -Payload. Otherwise, create Certificate Request Payload. +Request Payload. Otherwise, create Certificate Payload. @retval a Pointer to IKE Payload whose payload buffer containing the Certificate payload or Certificated Request payload. **/ -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel