NetworkPkg: Remove unused variables from IpSecDxe to fix GCC build.

[mirror_edk2.git] / NetworkPkg / IpSecDxe / Ikev2 / Payload.c

diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
index 6a2fdb83f3e84daf64f5d6cf2b24fdc8fd3f02ed..b92ae3a599f46cba6f13d3f476dc5ba799156bf5 100644 (file)
--- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
@@ -1,7 +1,8 @@
 /** @file\r
   The implementation of Payloads Creation.\r
 \r
-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -284,7 +285,6 @@ Ikev2GenerateCertIdPayload (
   IKE_PAYLOAD    *IdPayload;\r
   IKEV2_ID       *Id;\r
   UINTN          IdSize;\r
-  UINT8          IpVersion;\r
   UINTN          SubjectSize;\r
   UINT8          *CertSubject;\r
 \r
@@ -304,7 +304,6 @@ Ikev2GenerateCertIdPayload (
 \r
   SubjectSize = 0;\r
   CertSubject = NULL;\r
-  IpVersion = CommonSession->UdpService->IpVersion;\r
   IpSecCryptoIoGetSubjectFromCert (\r
     InCert,\r
     CertSize,\r
@@ -615,7 +614,6 @@ Ikev2CertGenerateAuthPayload (
   UINTN              DigestSize;\r
   PRF_DATA_FRAGMENT  Fragments[3];\r
   UINT8              *KeyBuf;\r
-  UINTN              KeySize;\r
   IKE_PAYLOAD        *AuthPayload;\r
   IKEV2_AUTH         *PayloadBuf;\r
   EFI_STATUS         Status;\r
@@ -663,7 +661,6 @@ Ikev2CertGenerateAuthPayload (
   ASSERT (KeyBuf != NULL);\r
 \r
   CopyMem (KeyBuf, Digest, DigestSize);\r
-  KeySize = DigestSize;\r
 \r
   //\r
   // Calculate Prf(SK_Pi/r, IDi/r)\r
@@ -1614,7 +1611,7 @@ Ikev2EncodeSa (
   //\r
   TotalTransforms = 0;\r
   //\r
-  // Caculate the Proposal numbers and Transform numbers.\r
+  // Calculate the Proposal numbers and Transform numbers.\r
   //\r
   for (ProposalIndex = 0; ProposalIndex < SaData->NumProposals; ProposalIndex++) {\r
 \r
@@ -1777,7 +1774,7 @@ Ikev2DecodeSa (
   Proposal               = (IKEV2_PROPOSAL *)((IKEV2_SA *)(Sa)+1);\r
 \r
   //\r
-  // Caculate the number of Proposal payload and the total numbers of\r
+  // Calculate the number of Proposal payload and the total numbers of\r
   // Transforms payload (the transforms in all proposal payload).\r
   //\r
   while (SaRemaining > sizeof (IKEV2_PROPOSAL)) {\r
@@ -2558,14 +2555,12 @@ Ikev2DecryptPacket (
   IKEV2_CHILD_SA_SESSION *ChildSaSession;\r
   EFI_STATUS             Status;\r
   UINT8                  PadLen;\r
-  UINTN                  CryptKeyLength;\r
   HASH_DATA_FRAGMENT     Fragments[1];\r
 \r
   IvSize         = 0;\r
   IkeSaSession   = NULL;\r
   CryptBlockSize = 0;\r
   CheckSumSize   = 0;\r
-  CryptKeyLength = 0;\r
 \r
   //\r
   // Check if the first payload is the Encrypted payload\r
@@ -2583,7 +2578,7 @@ Ikev2DecryptPacket (
   if (SessionCommon->IkeSessionType == IkeSessionTypeIkeSa) {\r
 \r
     CryptBlockSize = (UINT8) IpSecGetEncryptBlockSize ((UINT8) SessionCommon->SaParams->EncAlgId);\r
-    CryptKeyLength = IpSecGetEncryptKeyLength ((UINT8) SessionCommon->SaParams->EncAlgId);\r
+\r
     CheckSumSize   = (UINT8) IpSecGetIcvLength ((UINT8) SessionCommon->SaParams->IntegAlgId);\r
     IkeSaSession   = IKEV2_SA_SESSION_FROM_COMMON (SessionCommon);\r
 \r
@@ -2592,7 +2587,6 @@ Ikev2DecryptPacket (
     ChildSaSession = IKEV2_CHILD_SA_SESSION_FROM_COMMON (SessionCommon);\r
     IkeSaSession   = ChildSaSession->IkeSaSession;\r
     CryptBlockSize = (UINT8) IpSecGetEncryptBlockSize ((UINT8) IkeSaSession->SessionCommon.SaParams->EncAlgId);\r
-    CryptKeyLength = IpSecGetEncryptKeyLength ((UINT8) IkeSaSession->SessionCommon.SaParams->EncAlgId);\r
     CheckSumSize   = (UINT8) IpSecGetIcvLength ((UINT8) IkeSaSession->SessionCommon.SaParams->IntegAlgId);\r
   } else {\r
     //\r
@@ -2768,7 +2762,6 @@ Ikev2EncryptPacket (
   UINT8                  *EncryptPayloadBuf;  // Contain whole Encrypted Payload\r
   UINTN                  EncryptPayloadSize;  // Total size of the Encrypted payload\r
   UINT8                  *IntegrityBuf;       // Buffer to be intergity\r
-  UINT32                 IntegrityBufSize;    // Buffer size of IntegrityBuf\r
   UINT8                  *IvBuffer;           // Initialization Vector\r
   UINT8                  IvSize;              // Iv Size\r
   UINT8                  CheckSumSize;        // Integrity Check Sum Size depends on intergrity Auth\r
@@ -2780,7 +2773,6 @@ Ikev2EncryptPacket (
   EFI_STATUS             Status;\r
   LIST_ENTRY             *Entry;\r
   IKE_PAYLOAD            *IkePayload;\r
-  UINTN                  CryptKeyLength;\r
   HASH_DATA_FRAGMENT     Fragments[1];\r
 \r
   Status = EFI_SUCCESS;\r
@@ -2795,7 +2787,6 @@ Ikev2EncryptPacket (
   IkeSaSession      = NULL;\r
   CryptBlockSize    = 0;\r
   CheckSumSize      = 0;\r
-  CryptKeyLength    = 0;\r
   IntegrityBuf      = NULL;\r
   //\r
   // Get the Block Size\r
@@ -2803,7 +2794,6 @@ Ikev2EncryptPacket (
   if (SessionCommon->IkeSessionType == IkeSessionTypeIkeSa) {\r
 \r
     CryptBlockSize = (UINT8) IpSecGetEncryptBlockSize ((UINT8) SessionCommon->SaParams->EncAlgId);\r
-    CryptKeyLength = IpSecGetEncryptKeyLength ((UINT8) SessionCommon->SaParams->EncAlgId);\r
     CheckSumSize   = (UINT8) IpSecGetIcvLength ((UINT8) SessionCommon->SaParams->IntegAlgId);\r
     IkeSaSession   = IKEV2_SA_SESSION_FROM_COMMON (SessionCommon);\r
 \r
@@ -2812,7 +2802,6 @@ Ikev2EncryptPacket (
     ChildSaSession = IKEV2_CHILD_SA_SESSION_FROM_COMMON (SessionCommon);\r
     IkeSaSession   = ChildSaSession->IkeSaSession;\r
     CryptBlockSize = (UINT8) IpSecGetEncryptBlockSize ((UINT8) IkeSaSession->SessionCommon.SaParams->EncAlgId);\r
-    CryptKeyLength = IpSecGetEncryptKeyLength ((UINT8) IkeSaSession->SessionCommon.SaParams->EncAlgId);\r
     CheckSumSize   = (UINT8) IpSecGetIcvLength ((UINT8) IkeSaSession->SessionCommon.SaParams->IntegAlgId);\r
   }\r
 \r
@@ -2919,7 +2908,6 @@ Ikev2EncryptPacket (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
-  IntegrityBufSize               = IkePacket->Header->Length;\r
   IkeHdrHostToNet (IkePacket->Header);\r
 \r
   CopyMem (IntegrityBuf, IkePacket->Header, sizeof (IKE_HEADER));\r