SecurityPkg: Clean up source files

1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>

5 files changed, 83 insertions, 83 deletions

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c b/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
index 8ee34a702e..29da2d70e6 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
@@ -1,18 +1,18 @@
 /** @file

   This module implements measuring PeCoff image for Tcg2 Protocol.

-  

+

   Caution: This file requires additional review when modified.

   This driver will have external input - PE/COFF image.

   This external input must be validated carefully to avoid security issue like

   buffer overflow, integer overflow.

 

-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>

-This program and the accompanying materials 

-are licensed and made available under the terms and conditions of the BSD License 

-which accompanies this distribution.  The full text of the license may be found at 

+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>

+This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

 http://opensource.org/licenses/bsd-license.php

 

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

@@ -183,8 +183,8 @@ MeasurePeImageAndExtend (
   //

   if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

     //

-    // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value 

-    //       in the PE/COFF Header. If the MachineType is Itanium(IA64) and the 

+    // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value

+    //       in the PE/COFF Header. If the MachineType is Itanium(IA64) and the

     //       Magic value in the OptionalHeader is EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC

     //       then override the magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC

     //

@@ -195,7 +195,7 @@ MeasurePeImageAndExtend (
     //

     Magic = Hdr.Pe32->OptionalHeader.Magic;

   }

-  

+

   //

   // 3.  Calculate the distance from the base of the image header to the image checksum address.

   // 4.  Hash the image header from its base to beginning of the image checksum.

@@ -218,7 +218,7 @@ MeasurePeImageAndExtend (
   Status = HashUpdate (HashHandle, HashBase, HashSize);

   if (EFI_ERROR (Status)) {

     goto Finish;

-  }  

+  }

 

   //

   // 5.  Skip over the image checksum (it occupies a single ULONG).

@@ -247,7 +247,7 @@ MeasurePeImageAndExtend (
       if (EFI_ERROR (Status)) {

         goto Finish;

       }

-    }    

+    }

   } else {

     //

     // 7.  Hash everything from the end of the checksum to the start of the Cert Directory.

@@ -261,7 +261,7 @@ MeasurePeImageAndExtend (
     } else {

       //

       // Use PE32+ offset

-      //    

+      //

       HashBase = (UINT8 *) &Hdr.Pe32Plus->OptionalHeader.CheckSum + sizeof (UINT32);

       HashSize = (UINTN) (&Hdr.Pe32Plus->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_SECURITY]) - (UINTN) HashBase;

     }

@@ -290,7 +290,7 @@ MeasurePeImageAndExtend (
       HashBase = (UINT8 *) &Hdr.Pe32Plus->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_SECURITY + 1];

       HashSize = Hdr.Pe32Plus->OptionalHeader.SizeOfHeaders - (UINTN) (HashBase - ImageAddress);

     }

-    

+

     if (HashSize != 0) {

       Status  = HashUpdate (HashHandle, HashBase, HashSize);

       if (EFI_ERROR (Status)) {

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index e2f346217a..aa463b287e 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -1,14 +1,14 @@
 /** @file

   This module implements Tcg2 Protocol.

-  

-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>

+

+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

-This program and the accompanying materials 

-are licensed and made available under the terms and conditions of the BSD License 

-which accompanies this distribution.  The full text of the license may be found at 

+This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

 http://opensource.org/licenses/bsd-license.php

 

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

@@ -372,11 +372,11 @@ GetProcessorsCpuLocation (
 

   @retval EFI_SUCCESS            Operation completed successfully.

   @retval EFI_DEVICE_ERROR       The command was unsuccessful.

-                                 The ProtocolCapability variable will not be populated. 

+                                 The ProtocolCapability variable will not be populated.

   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.

                                  The ProtocolCapability variable will not be populated.

   @retval EFI_BUFFER_TOO_SMALL   The ProtocolCapability variable is too small to hold the full response.

-                                 It will be partially populated (required Size field will be set). 

+                                 It will be partially populated (required Size field will be set).

 **/

 EFI_STATUS

 EFIAPI

@@ -390,7 +390,7 @@ Tcg2GetCapability (
   if ((This == NULL) || (ProtocolCapability == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

-  

+

   DEBUG ((DEBUG_VERBOSE, "Size - 0x%x\n", ProtocolCapability->Size));

   DEBUG ((DEBUG_VERBOSE, " 1.1 - 0x%x, 1.0 - 0x%x\n", sizeof(EFI_TCG2_BOOT_SERVICE_CAPABILITY), sizeof(TREE_BOOT_SERVICE_CAPABILITY_1_0)));

 

@@ -398,7 +398,7 @@ Tcg2GetCapability (
     //

     // Handle the case that firmware support 1.1 but OS only support 1.0.

     //

-    if ((mTcgDxeData.BsCap.ProtocolVersion.Major > 0x01) || 

+    if ((mTcgDxeData.BsCap.ProtocolVersion.Major > 0x01) ||

         ((mTcgDxeData.BsCap.ProtocolVersion.Major == 0x01) && ((mTcgDxeData.BsCap.ProtocolVersion.Minor > 0x00)))) {

       if (ProtocolCapability->Size >= sizeof(TREE_BOOT_SERVICE_CAPABILITY_1_0)) {

         CopyMem (ProtocolCapability, &mTcgDxeData.BsCap, sizeof(TREE_BOOT_SERVICE_CAPABILITY_1_0));

@@ -563,7 +563,7 @@ DumpEvent2 (
 

 /**

   This function returns size of TCG PCR event 2.

-  

+

   @param[in]  TcgPcrEvent2     TCG PCR event 2 structure.

 

   @return size of TCG PCR event 2.

@@ -623,7 +623,7 @@ DumpEventLog (
   UINTN                     NumberOfEvents;

 

   DEBUG ((EFI_D_INFO, "EventLogFormat: (0x%x)\n", EventLogFormat));

-  

+

   switch (EventLogFormat) {

   case EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2:

     EventHdr = (TCG_PCR_EVENT_HDR *)(UINTN)EventLogLocation;

@@ -647,7 +647,7 @@ DumpEventLog (
     break;

   case EFI_TCG2_EVENT_LOG_FORMAT_TCG_2:

     //

-    // Dump first event	

+    // Dump first event

     //

     EventHdr = (TCG_PCR_EVENT_HDR *)(UINTN)EventLogLocation;

     DumpEvent (EventHdr);

@@ -682,7 +682,7 @@ DumpEventLog (
 

 /**

   The EFI_TCG2_PROTOCOL Get Event Log function call allows a caller to

-  retrieve the address of a given event log and its last entry. 

+  retrieve the address of a given event log and its last entry.

 

   @param[in]  This               Indicates the calling context

   @param[in]  EventLogFormat     The type of the event log for which the information is requested.

@@ -780,14 +780,14 @@ Tcg2GetEventLog (
 /**

   Add a new entry to the Event Log.

 

-  @param[in, out] EventLogPtr     Pointer to the Event Log data.  

-  @param[in, out] LogSize         Size of the Event Log.  

+  @param[in, out] EventLogPtr     Pointer to the Event Log data.

+  @param[in, out] LogSize         Size of the Event Log.

   @param[in]      MaxSize         Maximum size of the Event Log.

-  @param[in]      NewEventHdr     Pointer to a TCG_PCR_EVENT_HDR/TCG_PCR_EVENT_EX data structure.  

+  @param[in]      NewEventHdr     Pointer to a TCG_PCR_EVENT_HDR/TCG_PCR_EVENT_EX data structure.

   @param[in]      NewEventHdrSize New event header size.

-  @param[in]      NewEventData    Pointer to the new event data.  

+  @param[in]      NewEventData    Pointer to the new event data.

   @param[in]      NewEventSize    New event data size.

-  

+

   @retval EFI_SUCCESS           The new event log entry was added.

   @retval EFI_OUT_OF_RESOURCES  No enough memory to log the new event.

 

@@ -838,9 +838,9 @@ TcgCommLogEvent (
   Add a new entry to the Event Log.

 

   @param[in] EventLogFormat  The type of the event log for which the information is requested.

-  @param[in] NewEventHdr     Pointer to a TCG_PCR_EVENT_HDR/TCG_PCR_EVENT_EX data structure.  

+  @param[in] NewEventHdr     Pointer to a TCG_PCR_EVENT_HDR/TCG_PCR_EVENT_EX data structure.

   @param[in] NewEventHdrSize New event header size.

-  @param[in] NewEventData    Pointer to the new event data.  

+  @param[in] NewEventData    Pointer to the new event data.

   @param[in] NewEventSize    New event data size.

 

   @retval EFI_SUCCESS           The new event log entry was added.

@@ -859,7 +859,7 @@ TcgDxeLogEvent (
   EFI_STATUS                Status;

   UINTN                     Index;

   TCG_EVENT_LOG_AREA_STRUCT *EventLogAreaStruct;

-  

+

   for (Index = 0; Index < sizeof(mTcg2EventInfo)/sizeof(mTcg2EventInfo[0]); Index++) {

     if (EventLogFormat == mTcg2EventInfo[Index].LogFormat) {

       break;

@@ -889,7 +889,7 @@ TcgDxeLogEvent (
              NewEventData,

              NewEventSize

              );

-  

+

   if (Status == EFI_OUT_OF_RESOURCES) {

     EventLogAreaStruct->EventLogTruncated = TRUE;

     return EFI_VOLUME_FULL;

@@ -1122,11 +1122,11 @@ TcgDxeLogHashEvent (
   and add an entry to the Event Log.

 

   @param[in]      Flags         Bitmap providing additional information.

-  @param[in]      HashData      Physical address of the start of the data buffer 

+  @param[in]      HashData      Physical address of the start of the data buffer

                                 to be hashed, extended, and logged.

   @param[in]      HashDataLen   The length, in bytes, of the buffer referenced by HashData

-  @param[in, out] NewEventHdr   Pointer to a TCG_PCR_EVENT_HDR data structure.  

-  @param[in]      NewEventData  Pointer to the new event data.  

+  @param[in, out] NewEventHdr   Pointer to a TCG_PCR_EVENT_HDR data structure.

+  @param[in]      NewEventData  Pointer to the new event data.

 

   @retval EFI_SUCCESS           Operation completed successfully.

   @retval EFI_OUT_OF_RESOURCES  No enough memory to log the new event.

@@ -1176,13 +1176,13 @@ TcgDxeHashLogExtendEvent (
 /**

   The EFI_TCG2_PROTOCOL HashLogExtendEvent function call provides callers with

   an opportunity to extend and optionally log events without requiring

-  knowledge of actual TPM commands. 

+  knowledge of actual TPM commands.

   The extend operation will occur even if this function cannot create an event

-  log entry (e.g. due to the event log being full). 

+  log entry (e.g. due to the event log being full).

 

   @param[in]  This               Indicates the calling context

   @param[in]  Flags              Bitmap providing additional information.

-  @param[in]  DataToHash         Physical address of the start of the data buffer to be hashed. 

+  @param[in]  DataToHash         Physical address of the start of the data buffer to be hashed.

   @param[in]  DataToHashLen      The length in bytes of the buffer referenced by DataToHash.

   @param[in]  Event              Pointer to data buffer containing information about the event.

 

@@ -1272,7 +1272,7 @@ Tcg2HashLogExtendEvent (
   @retval EFI_SUCCESS            The command byte stream was successfully sent to the device and a response was successfully received.

   @retval EFI_DEVICE_ERROR       The command was not successfully sent to the device or a response was not successfully received from the device.

   @retval EFI_INVALID_PARAMETER  One or more of the parameters are incorrect.

-  @retval EFI_BUFFER_TOO_SMALL   The output parameter block is too small. 

+  @retval EFI_BUFFER_TOO_SMALL   The output parameter block is too small.

 **/

 EFI_STATUS

 EFIAPI

@@ -1322,7 +1322,7 @@ Tcg2SubmitCommand (
   @param[out] ActivePcrBanks  Pointer to the variable receiving the bitmap of currently active PCR banks.

 

   @retval EFI_SUCCESS           The bitmap of active PCR banks was stored in the ActivePcrBanks parameter.

-  @retval EFI_INVALID_PARAMETER One or more of the parameters are incorrect. 

+  @retval EFI_INVALID_PARAMETER One or more of the parameters are incorrect.

 **/

 EFI_STATUS

 EFIAPI

@@ -1412,7 +1412,7 @@ Tcg2GetResultOfSetActivePcrBanks (
   if ((OperationPresent == NULL) || (Response == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

-  

+

   ReturnCode = Tcg2PhysicalPresenceLibReturnOperationResponseToOsFunction (OperationPresent, Response);

   if (ReturnCode == TCG_PP_RETURN_TPM_OPERATION_RESPONSE_SUCCESS) {

     return EFI_SUCCESS;

@@ -1485,7 +1485,7 @@ SetupEventLog (
       mTcgDxeData.EventLogAreaStruct[Index].Lasa = Lasa;

       mTcgDxeData.EventLogAreaStruct[Index].Laml = PcdGet32 (PcdTcgLogAreaMinLen);

       //

-      // To initialize them as 0xFF is recommended 

+      // To initialize them as 0xFF is recommended

       // because the OS can know the last entry for that.

       //

       SetMem ((VOID *)(UINTN)Lasa, PcdGet32 (PcdTcgLogAreaMinLen), 0xFF);

@@ -1631,7 +1631,7 @@ SetupEventLog (
         mTcgDxeData.FinalEventLogAreaStruct[Index].EventLogTruncated = FALSE;

 

         //

-        // Install to configuration table for EFI_TCG2_EVENT_LOG_FORMAT_TCG_2 

+        // Install to configuration table for EFI_TCG2_EVENT_LOG_FORMAT_TCG_2

         //

         Status = gBS->InstallConfigurationTable (&gEfiTcg2FinalEventsTableGuid, (VOID *)mTcgDxeData.FinalEventsTable[Index]);

         if (EFI_ERROR (Status)) {

@@ -1652,7 +1652,7 @@ SetupEventLog (
       }

     }

   }

-  

+

   //

   // 3. Sync data from PEI to DXE

   //

@@ -1661,7 +1661,7 @@ SetupEventLog (
     if ((mTcgDxeData.BsCap.SupportedEventLogs & mTcg2EventInfo[Index].LogFormat) != 0) {

       GuidHob.Raw = GetHobList ();

       Status = EFI_SUCCESS;

-      while (!EFI_ERROR (Status) && 

+      while (!EFI_ERROR (Status) &&

              (GuidHob.Raw = GetNextGuidHob (mTcg2EventInfo[Index].EventGuid, GuidHob.Raw)) != NULL) {

         TcgEvent    = AllocateCopyPool (GET_GUID_HOB_DATA_SIZE (GuidHob.Guid), GET_GUID_HOB_DATA (GuidHob.Guid));

         ASSERT (TcgEvent != NULL);

@@ -1729,8 +1729,8 @@ SetupEventLog (
   Measure and log an action string, and extend the measurement result into PCR[PCRIndex].

 

   @param[in] PCRIndex         PCRIndex to extend

-  @param[in] String           A specific string that indicates an Action event.  

-  

+  @param[in] String           A specific string that indicates an Action event.

+

   @retval EFI_SUCCESS         Operation completed successfully.

   @retval EFI_DEVICE_ERROR    The operation was unsuccessful.

 

@@ -1778,7 +1778,7 @@ MeasureHandoffTables (
 

   if (PcdGet8 (PcdTpmPlatformClass) == TCG_PLATFORM_TYPE_SERVER) {

     //

-    // Tcg Server spec. 

+    // Tcg Server spec.

     // Measure each processor EFI_CPU_PHYSICAL_LOCATION with EV_TABLE_OF_DEVICES to PCR[1]

     //

     Status = GetProcessorsCpuLocation(&ProcessorLocBuf, &ProcessorNum);

@@ -1810,7 +1810,7 @@ MeasureHandoffTables (
 /**

   Measure and log Separator event, and extend the measurement result into a specific PCR.

 

-  @param[in] PCRIndex         PCR index.  

+  @param[in] PCRIndex         PCR index.

 

   @retval EFI_SUCCESS         Operation completed successfully.

   @retval EFI_DEVICE_ERROR    The operation was unsuccessful.

@@ -1842,13 +1842,13 @@ MeasureSeparatorEvent (
 /**

   Measure and log an EFI variable, and extend the measurement result into a specific PCR.

 

-  @param[in]  PCRIndex          PCR Index.  

-  @param[in]  EventType         Event type.  

+  @param[in]  PCRIndex          PCR Index.

+  @param[in]  EventType         Event type.

   @param[in]  VarName           A Null-terminated string that is the name of the vendor's variable.

   @param[in]  VendorGuid        A unique identifier for the vendor.

-  @param[in]  VarData           The content of the variable data.  

-  @param[in]  VarSize           The size of the variable data.  

- 

+  @param[in]  VarData           The content of the variable data.

+  @param[in]  VarSize           The size of the variable data.

+

   @retval EFI_SUCCESS           Operation completed successfully.

   @retval EFI_OUT_OF_RESOURCES  Out of memory.

   @retval EFI_DEVICE_ERROR      The operation was unsuccessful.

@@ -1928,13 +1928,13 @@ MeasureVariable (
 /**

   Read then Measure and log an EFI variable, and extend the measurement result into a specific PCR.

 

-  @param[in]  PCRIndex          PCR Index.  

-  @param[in]  EventType         Event type.  

+  @param[in]  PCRIndex          PCR Index.

+  @param[in]  EventType         Event type.

   @param[in]   VarName          A Null-terminated string that is the name of the vendor's variable.

   @param[in]   VendorGuid       A unique identifier for the vendor.

-  @param[out]  VarSize          The size of the variable data.  

-  @param[out]  VarData          Pointer to the content of the variable.  

- 

+  @param[out]  VarSize          The size of the variable data.

+  @param[out]  VarData          Pointer to the content of the variable.

+

   @retval EFI_SUCCESS           Operation completed successfully.

   @retval EFI_OUT_OF_RESOURCES  Out of memory.

   @retval EFI_DEVICE_ERROR      The operation was unsuccessful.

@@ -1987,9 +1987,9 @@ according to TCG PC Client PFP spec 0021 Section 2.4.4.2
 

   @param[in]   VarName          A Null-terminated string that is the name of the vendor's variable.

   @param[in]   VendorGuid       A unique identifier for the vendor.

-  @param[out]  VarSize          The size of the variable data.  

-  @param[out]  VarData          Pointer to the content of the variable.  

- 

+  @param[out]  VarSize          The size of the variable data.

+  @param[out]  VarData          Pointer to the content of the variable.

+

   @retval EFI_SUCCESS           Operation completed successfully.

   @retval EFI_OUT_OF_RESOURCES  Out of memory.

   @retval EFI_DEVICE_ERROR      The operation was unsuccessful.

@@ -2018,9 +2018,9 @@ ReadAndMeasureBootVariable (
 

   @param[in]   VarName          A Null-terminated string that is the name of the vendor's variable.

   @param[in]   VendorGuid       A unique identifier for the vendor.

-  @param[out]  VarSize          The size of the variable data.  

-  @param[out]  VarData          Pointer to the content of the variable.  

- 

+  @param[out]  VarSize          The size of the variable data.

+  @param[out]  VarData          Pointer to the content of the variable.

+

   @retval EFI_SUCCESS           Operation completed successfully.

   @retval EFI_OUT_OF_RESOURCES  Out of memory.

   @retval EFI_DEVICE_ERROR      The operation was unsuccessful.

@@ -2477,7 +2477,7 @@ OnResetNotificationInstall (
 

 /**

   The function install Tcg2 protocol.

-  

+

   @retval EFI_SUCCESS     Tcg2 protocol is installed.

   @retval other           Some error occurs.

 **/

@@ -2502,9 +2502,9 @@ InstallTcg2 (
 /**

   The driver's entry point. It publishes EFI Tcg2 Protocol.

 

-  @param[in] ImageHandle  The firmware allocated handle for the EFI image.  

+  @param[in] ImageHandle  The firmware allocated handle for the EFI image.

   @param[in] SystemTable  A pointer to the EFI System Table.

-  

+

   @retval EFI_SUCCESS     The entry point is executed successfully.

   @retval other           Some error occurs when executing this entry point.

 **/

@@ -2537,18 +2537,18 @@ DriverEntry (
     DEBUG ((EFI_D_ERROR, "TPM2 error!\n"));

     return EFI_DEVICE_ERROR;

   }

-  

+

   Status = Tpm2RequestUseTpm ();

   if (EFI_ERROR (Status)) {

     DEBUG ((EFI_D_ERROR, "TPM2 not detected!\n"));

     return Status;

   }

-  

+

   //

   // Fill information

   //

   ASSERT (TCG_EVENT_LOG_AREA_COUNT_MAX == sizeof(mTcg2EventInfo)/sizeof(mTcg2EventInfo[0]));

-  

+

   mTcgDxeData.BsCap.Size = sizeof(EFI_TCG2_BOOT_SERVICE_CAPABILITY);

   mTcgDxeData.BsCap.ProtocolVersion.Major = 1;

   mTcgDxeData.BsCap.ProtocolVersion.Minor = 1;

@@ -2655,7 +2655,7 @@ DriverEntry (
                     );

 

     //

-    // Measure Exit Boot Service failed 

+    // Measure Exit Boot Service failed

     //

     Status = gBS->CreateEventEx (

                     EVT_NOTIFY_SIGNAL,

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
index 59d6dc3dfb..2bc45bddf5 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
@@ -14,7 +14,7 @@
 #  This external input must be validated carefully to avoid security issue like

 #  buffer overflow, integer overflow.

 #

-# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution. The full text of the license may be found at

@@ -78,7 +78,7 @@
   ## SOMETIMES_CONSUMES      ## Variable:L"db"

   ## SOMETIMES_CONSUMES      ## Variable:L"dbx"

   gEfiImageSecurityDatabaseGuid

-    

+

   gTcgEventEntryHobGuid                              ## SOMETIMES_CONSUMES  ## HOB

   gTpmErrorHobGuid                                   ## SOMETIMES_CONSUMES  ## HOB

   gEfiEventExitBootServicesGuid                      ## CONSUMES            ## Event

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.uni b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.uni
index dadcd1a79e..9e14a4e3fd 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.uni
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.uni
@@ -2,13 +2,13 @@
 // Produces TCG2 protocol and measure boot environment

 //

 // This module will produce TCG2 protocol and measure boot environment.

-// 

+//

 // Caution: This module requires additional review when modified.

 // This driver will have external input - PE/COFF image.

 // This external input must be validated carefully to avoid security issue like

 // buffer overflow, integer overflow.

 //

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>

 //

 // This program and the accompanying materials

 // are licensed and made available under the terms and conditions of the BSD License

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2DxeExtra.uni b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2DxeExtra.uni
index 1cd59a33a3..d772c56797 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2DxeExtra.uni
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2DxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file

 // Tcg2Dxe Localized Strings and Content

 //

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>

 //

 // This program and the accompanying materials

 // are licensed and made available under the terms and conditions of the BSD License

@@ -12,6 +12,6 @@
 //

 // **/

 

-#string STR_PROPERTIES_MODULE_NAME 

-#language en-US 

+#string STR_PROPERTIES_MODULE_NAME

+#language en-US

 "TCG2 (Trusted Computing Group) DXE"