diff --git a/SecurityPkg/DeviceSecurity/OsStub/CryptlibWrapper/CryptlibWrapper.inf b/SecurityPkg/DeviceSecurity/OsStub/CryptlibWrapper/CryptlibWrapper.inf
index bf08a508409..0b64ab0f4f0 100644
--- a/SecurityPkg/DeviceSecurity/OsStub/CryptlibWrapper/CryptlibWrapper.inf
+++ b/SecurityPkg/DeviceSecurity/OsStub/CryptlibWrapper/CryptlibWrapper.inf
@@ -1,7 +1,7 @@
 ## @file
 #  SPDM library.
 #
-#  Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2024, Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
diff --git a/SecurityPkg/DeviceSecurity/OsStub/MemLibWrapper/MemLibWrapper.inf b/SecurityPkg/DeviceSecurity/OsStub/MemLibWrapper/MemLibWrapper.inf
index ef815e368e1..f5b92aae6be 100644
--- a/SecurityPkg/DeviceSecurity/OsStub/MemLibWrapper/MemLibWrapper.inf
+++ b/SecurityPkg/DeviceSecurity/OsStub/MemLibWrapper/MemLibWrapper.inf
@@ -1,7 +1,7 @@
 ## @file
 #  SPDM library.
 #
-#  Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2024, Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
diff --git a/SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.c b/SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.c
index 99cb15972b8..6e9256e6ead 100644
--- a/SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.c
+++ b/SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.c
@@ -31,7 +31,10 @@ libspdm_sleep (
  * @param microseconds     The time interval for which execution is to be suspended, in milliseconds.
  *
  **/
-void libspdm_sleep_in_us(uint64_t microseconds)
+void
+libspdm_sleep_in_us (
+  uint64_t  microseconds
+  )
 {
   return;
 }
diff --git a/SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.inf b/SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.inf
index 07d9bf4ec8c..269b4bfbe19 100644
--- a/SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.inf
+++ b/SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.inf
@@ -1,7 +1,7 @@
 ## @file
 #  SPDM library.
 #
-#  Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2024, Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
index f2e56df9122..10133808447 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
@@ -16,16 +16,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Protocol/Tcg2Protocol.h>
 
 typedef struct {
-  EFI_GUID  Guid;
-  UINT32    Mask;
+  EFI_GUID    Guid;
+  UINT32      Mask;
 } TPM2_HASH_MASK;
 
-TPM2_HASH_MASK mTpm2HashMask[] = {
-  {HASH_ALGORITHM_SHA1_GUID,         HASH_ALG_SHA1},
-  {HASH_ALGORITHM_SHA256_GUID,       HASH_ALG_SHA256},
-  {HASH_ALGORITHM_SHA384_GUID,       HASH_ALG_SHA384},
-  {HASH_ALGORITHM_SHA512_GUID,       HASH_ALG_SHA512},
-  {HASH_ALGORITHM_SM3_256_GUID,      HASH_ALG_SM3_256},
+TPM2_HASH_MASK  mTpm2HashMask[] = {
+  { HASH_ALGORITHM_SHA1_GUID,    HASH_ALG_SHA1    },
+  { HASH_ALGORITHM_SHA256_GUID,  HASH_ALG_SHA256  },
+  { HASH_ALGORITHM_SHA384_GUID,  HASH_ALG_SHA384  },
+  { HASH_ALGORITHM_SHA512_GUID,  HASH_ALG_SHA512  },
+  { HASH_ALGORITHM_SM3_256_GUID, HASH_ALG_SM3_256 },
 };
 
 /**
@@ -48,6 +48,7 @@ Tpm2GetHashMaskFromAlgo (
       return mTpm2HashMask[Index].Mask;
     }
   }
+
   return 0;
 }
 
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
index 517aaf83624..2169c5e1859 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
@@ -193,16 +193,16 @@ HashCompleteAndExtend (
   OUT TPML_DIGEST_VALUES  *DigestList
   )
 {
-  TPML_DIGEST_VALUES                Digest;
-  HASH_HANDLE                       *HashCtx;
-  UINTN                             Index;
-  EFI_STATUS                        Status;
-  UINT32                            HashMask;
-  TPML_DIGEST_VALUES                TcgPcrEvent2Digest;
-  EFI_TCG2_EVENT_ALGORITHM_BITMAP   TpmHashAlgorithmBitmap;
-  UINT32                            ActivePcrBanks;
-  UINT32                            *BufferPtr;
-  UINT32                            DigestListBinSize;
+  TPML_DIGEST_VALUES               Digest;
+  HASH_HANDLE                      *HashCtx;
+  UINTN                            Index;
+  EFI_STATUS                       Status;
+  UINT32                           HashMask;
+  TPML_DIGEST_VALUES               TcgPcrEvent2Digest;
+  EFI_TCG2_EVENT_ALGORITHM_BITMAP  TpmHashAlgorithmBitmap;
+  UINT32                           ActivePcrBanks;
+  UINT32                           *BufferPtr;
+  UINT32                           DigestListBinSize;
 
   if (mHashInterfaceCount == 0) {
     return EFI_UNSUPPORTED;
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
index 89666902b1b..f11f7696b14 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
@@ -1172,4 +1172,3 @@ Tpm2NvExtend (
   ZeroMem (&RecvBuffer, sizeof (RecvBuffer));
   return Status;
 }
-