CryptoPkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the CryptoPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c

@@ -25,7 +25,7 @@ AesGetContextSize (
   // AES uses different key contexts for encryption and decryption, so here memory
   // for 2 copies of AES_KEY is allocated.
   //
-  return (UINTN) (2 * sizeof (AES_KEY));
+  return (UINTN)(2 * sizeof (AES_KEY));
 }
 
 /**
@@ -61,20 +61,22 @@ AesInit (
   //
   // Check input parameters.
   //
-  if (AesContext == NULL || Key == NULL || (KeyLength != 128 && KeyLength != 192 && KeyLength != 256)) {
+  if ((AesContext == NULL) || (Key == NULL) || ((KeyLength != 128) && (KeyLength != 192) && (KeyLength != 256))) {
     return FALSE;
   }
 
   //
   // Initialize AES encryption & decryption key schedule.
   //
-  AesKey = (AES_KEY *) AesContext;
-  if (AES_set_encrypt_key (Key, (UINT32) KeyLength, AesKey) != 0) {
+  AesKey = (AES_KEY *)AesContext;
+  if (AES_set_encrypt_key (Key, (UINT32)KeyLength, AesKey) != 0) {
     return FALSE;
   }
-  if (AES_set_decrypt_key (Key, (UINT32) KeyLength, AesKey + 1) != 0) {
+
+  if (AES_set_decrypt_key (Key, (UINT32)KeyLength, AesKey + 1) != 0) {
     return FALSE;
   }
+
   return TRUE;
 }
 
@@ -121,21 +123,21 @@ AesCbcEncrypt (
   //
   // Check input parameters.
   //
-  if (AesContext == NULL || Input == NULL || (InputSize % AES_BLOCK_SIZE) != 0) {
+  if ((AesContext == NULL) || (Input == NULL) || ((InputSize % AES_BLOCK_SIZE) != 0)) {
     return FALSE;
   }
 
-  if (Ivec == NULL || Output == NULL || InputSize > INT_MAX) {
+  if ((Ivec == NULL) || (Output == NULL) || (InputSize > INT_MAX)) {
     return FALSE;
   }
 
-  AesKey = (AES_KEY *) AesContext;
+  AesKey = (AES_KEY *)AesContext;
   CopyMem (IvecBuffer, Ivec, AES_BLOCK_SIZE);
 
   //
   // Perform AES data encryption with CBC mode
   //
-  AES_cbc_encrypt (Input, Output, (UINT32) InputSize, AesKey, IvecBuffer, AES_ENCRYPT);
+  AES_cbc_encrypt (Input, Output, (UINT32)InputSize, AesKey, IvecBuffer, AES_ENCRYPT);
 
   return TRUE;
 }
@@ -183,21 +185,21 @@ AesCbcDecrypt (
   //
   // Check input parameters.
   //
-  if (AesContext == NULL || Input == NULL || (InputSize % AES_BLOCK_SIZE) != 0) {
+  if ((AesContext == NULL) || (Input == NULL) || ((InputSize % AES_BLOCK_SIZE) != 0)) {
     return FALSE;
   }
 
-  if (Ivec == NULL || Output == NULL || InputSize > INT_MAX) {
+  if ((Ivec == NULL) || (Output == NULL) || (InputSize > INT_MAX)) {
     return FALSE;
   }
 
-  AesKey = (AES_KEY *) AesContext;
+  AesKey = (AES_KEY *)AesContext;
   CopyMem (IvecBuffer, Ivec, AES_BLOCK_SIZE);
 
   //
   // Perform AES data decryption with CBC mode
   //
-  AES_cbc_encrypt (Input, Output, (UINT32) InputSize, AesKey + 1, IvecBuffer, AES_DECRYPT);
+  AES_cbc_encrypt (Input, Output, (UINT32)InputSize, AesKey + 1, IvecBuffer, AES_DECRYPT);
 
   return TRUE;
 }

CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c

@@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/md5.h>
 
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES
+
 /**
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.
 
@@ -25,10 +26,9 @@ Md5GetContextSize (
   //
   // Retrieves the OpenSSL MD5 Context Size
   //
-  return (UINTN) (sizeof (MD5_CTX));
+  return (UINTN)(sizeof (MD5_CTX));
 }
 
-
 /**
   Initializes user-supplied memory pointed by Md5Context as MD5 hash context for
   subsequent use.
@@ -57,7 +57,7 @@ Md5Init (
   //
   // OpenSSL MD5 Context Initialization
   //
-  return (BOOLEAN) (MD5_Init ((MD5_CTX *) Md5Context));
+  return (BOOLEAN)(MD5_Init ((MD5_CTX *)Md5Context));
 }
 
 /**
@@ -83,7 +83,7 @@ Md5Duplicate (
   //
   // Check input parameters.
   //
-  if (Md5Context == NULL || NewMd5Context == NULL) {
+  if ((Md5Context == NULL) || (NewMd5Context == NULL)) {
     return FALSE;
   }
 
@@ -128,14 +128,14 @@ Md5Update (
   //
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL
   //
-  if (Data == NULL && (DataSize != 0)) {
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
   //
   // OpenSSL MD5 Hash Update
   //
-  return (BOOLEAN) (MD5_Update ((MD5_CTX *) Md5Context, Data, DataSize));
+  return (BOOLEAN)(MD5_Update ((MD5_CTX *)Md5Context, Data, DataSize));
 }
 
 /**
@@ -168,14 +168,14 @@ Md5Final (
   //
   // Check input parameters.
   //
-  if (Md5Context == NULL || HashValue == NULL) {
+  if ((Md5Context == NULL) || (HashValue == NULL)) {
     return FALSE;
   }
 
   //
   // OpenSSL MD5 Hash Finalization
   //
-  return (BOOLEAN) (MD5_Final (HashValue, (MD5_CTX *) Md5Context));
+  return (BOOLEAN)(MD5_Final (HashValue, (MD5_CTX *)Md5Context));
 }
 
 /**
@@ -210,7 +210,8 @@ Md5HashAll (
   if (HashValue == NULL) {
     return FALSE;
   }
-  if (Data == NULL && (DataSize != 0)) {
+
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
@@ -223,4 +224,5 @@ Md5HashAll (
     return TRUE;
   }
 }
+
 #endif

CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c

@@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/sha.h>
 
 #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES
+
 /**
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.
 
@@ -25,7 +26,7 @@ Sha1GetContextSize (
   //
   // Retrieves OpenSSL SHA Context Size
   //
-  return (UINTN) (sizeof (SHA_CTX));
+  return (UINTN)(sizeof (SHA_CTX));
 }
 
 /**
@@ -56,7 +57,7 @@ Sha1Init (
   //
   // OpenSSL SHA-1 Context Initialization
   //
-  return (BOOLEAN) (SHA1_Init ((SHA_CTX *) Sha1Context));
+  return (BOOLEAN)(SHA1_Init ((SHA_CTX *)Sha1Context));
 }
 
 /**
@@ -82,7 +83,7 @@ Sha1Duplicate (
   //
   // Check input parameters.
   //
-  if (Sha1Context == NULL || NewSha1Context == NULL) {
+  if ((Sha1Context == NULL) || (NewSha1Context == NULL)) {
     return FALSE;
   }
 
@@ -127,14 +128,14 @@ Sha1Update (
   //
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL
   //
-  if (Data == NULL && DataSize != 0) {
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
   //
   // OpenSSL SHA-1 Hash Update
   //
-  return (BOOLEAN) (SHA1_Update ((SHA_CTX *) Sha1Context, Data, DataSize));
+  return (BOOLEAN)(SHA1_Update ((SHA_CTX *)Sha1Context, Data, DataSize));
 }
 
 /**
@@ -167,14 +168,14 @@ Sha1Final (
   //
   // Check input parameters.
   //
-  if (Sha1Context == NULL || HashValue == NULL) {
+  if ((Sha1Context == NULL) || (HashValue == NULL)) {
     return FALSE;
   }
 
   //
   // OpenSSL SHA-1 Hash Finalization
   //
-  return (BOOLEAN) (SHA1_Final (HashValue, (SHA_CTX *) Sha1Context));
+  return (BOOLEAN)(SHA1_Final (HashValue, (SHA_CTX *)Sha1Context));
 }
 
 /**
@@ -209,7 +210,8 @@ Sha1HashAll (
   if (HashValue == NULL) {
     return FALSE;
   }
-  if (Data == NULL && DataSize != 0) {
+
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
@@ -222,4 +224,5 @@ Sha1HashAll (
     return TRUE;
   }
 }
+
 #endif

CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c

@@ -24,7 +24,7 @@ Sha256GetContextSize (
   //
   // Retrieves OpenSSL SHA-256 Context Size
   //
-  return (UINTN) (sizeof (SHA256_CTX));
+  return (UINTN)(sizeof (SHA256_CTX));
 }
 
 /**
@@ -55,7 +55,7 @@ Sha256Init (
   //
   // OpenSSL SHA-256 Context Initialization
   //
-  return (BOOLEAN) (SHA256_Init ((SHA256_CTX *) Sha256Context));
+  return (BOOLEAN)(SHA256_Init ((SHA256_CTX *)Sha256Context));
 }
 
 /**
@@ -81,7 +81,7 @@ Sha256Duplicate (
   //
   // Check input parameters.
   //
-  if (Sha256Context == NULL || NewSha256Context == NULL) {
+  if ((Sha256Context == NULL) || (NewSha256Context == NULL)) {
     return FALSE;
   }
 
@@ -126,14 +126,14 @@ Sha256Update (
   //
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL
   //
-  if (Data == NULL && DataSize != 0) {
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
   //
   // OpenSSL SHA-256 Hash Update
   //
-  return (BOOLEAN) (SHA256_Update ((SHA256_CTX *) Sha256Context, Data, DataSize));
+  return (BOOLEAN)(SHA256_Update ((SHA256_CTX *)Sha256Context, Data, DataSize));
 }
 
 /**
@@ -166,14 +166,14 @@ Sha256Final (
   //
   // Check input parameters.
   //
-  if (Sha256Context == NULL || HashValue == NULL) {
+  if ((Sha256Context == NULL) || (HashValue == NULL)) {
     return FALSE;
   }
 
   //
   // OpenSSL SHA-256 Hash Finalization
   //
-  return (BOOLEAN) (SHA256_Final (HashValue, (SHA256_CTX *) Sha256Context));
+  return (BOOLEAN)(SHA256_Final (HashValue, (SHA256_CTX *)Sha256Context));
 }
 
 /**
@@ -208,7 +208,8 @@ Sha256HashAll (
   if (HashValue == NULL) {
     return FALSE;
   }
-  if (Data == NULL && DataSize != 0) {
+
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 

CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c

@@ -24,7 +24,7 @@ Sha384GetContextSize (
   //
   // Retrieves OpenSSL SHA-384 Context Size
   //
-  return (UINTN) (sizeof (SHA512_CTX));
+  return (UINTN)(sizeof (SHA512_CTX));
 }
 
 /**
@@ -55,7 +55,7 @@ Sha384Init (
   //
   // OpenSSL SHA-384 Context Initialization
   //
-  return (BOOLEAN) (SHA384_Init ((SHA512_CTX *) Sha384Context));
+  return (BOOLEAN)(SHA384_Init ((SHA512_CTX *)Sha384Context));
 }
 
 /**
@@ -83,7 +83,7 @@ Sha384Duplicate (
   //
   // Check input parameters.
   //
-  if (Sha384Context == NULL || NewSha384Context == NULL) {
+  if ((Sha384Context == NULL) || (NewSha384Context == NULL)) {
     return FALSE;
   }
 
@@ -128,14 +128,14 @@ Sha384Update (
   //
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL
   //
-  if (Data == NULL && DataSize != 0) {
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
   //
   // OpenSSL SHA-384 Hash Update
   //
-  return (BOOLEAN) (SHA384_Update ((SHA512_CTX *) Sha384Context, Data, DataSize));
+  return (BOOLEAN)(SHA384_Update ((SHA512_CTX *)Sha384Context, Data, DataSize));
 }
 
 /**
@@ -168,14 +168,14 @@ Sha384Final (
   //
   // Check input parameters.
   //
-  if (Sha384Context == NULL || HashValue == NULL) {
+  if ((Sha384Context == NULL) || (HashValue == NULL)) {
     return FALSE;
   }
 
   //
   // OpenSSL SHA-384 Hash Finalization
   //
-  return (BOOLEAN) (SHA384_Final (HashValue, (SHA512_CTX *) Sha384Context));
+  return (BOOLEAN)(SHA384_Final (HashValue, (SHA512_CTX *)Sha384Context));
 }
 
 /**
@@ -210,7 +210,8 @@ Sha384HashAll (
   if (HashValue == NULL) {
     return FALSE;
   }
-  if (Data == NULL && DataSize != 0) {
+
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
@@ -239,7 +240,7 @@ Sha512GetContextSize (
   //
   // Retrieves OpenSSL SHA-512 Context Size
   //
-  return (UINTN) (sizeof (SHA512_CTX));
+  return (UINTN)(sizeof (SHA512_CTX));
 }
 
 /**
@@ -270,7 +271,7 @@ Sha512Init (
   //
   // OpenSSL SHA-512 Context Initialization
   //
-  return (BOOLEAN) (SHA512_Init ((SHA512_CTX *) Sha512Context));
+  return (BOOLEAN)(SHA512_Init ((SHA512_CTX *)Sha512Context));
 }
 
 /**
@@ -298,7 +299,7 @@ Sha512Duplicate (
   //
   // Check input parameters.
   //
-  if (Sha512Context == NULL || NewSha512Context == NULL) {
+  if ((Sha512Context == NULL) || (NewSha512Context == NULL)) {
     return FALSE;
   }
 
@@ -343,14 +344,14 @@ Sha512Update (
   //
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL
   //
-  if (Data == NULL && DataSize != 0) {
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
   //
   // OpenSSL SHA-512 Hash Update
   //
-  return (BOOLEAN) (SHA512_Update ((SHA512_CTX *) Sha512Context, Data, DataSize));
+  return (BOOLEAN)(SHA512_Update ((SHA512_CTX *)Sha512Context, Data, DataSize));
 }
 
 /**
@@ -383,14 +384,14 @@ Sha512Final (
   //
   // Check input parameters.
   //
-  if (Sha512Context == NULL || HashValue == NULL) {
+  if ((Sha512Context == NULL) || (HashValue == NULL)) {
     return FALSE;
   }
 
   //
   // OpenSSL SHA-512 Hash Finalization
   //
-  return (BOOLEAN) (SHA384_Final (HashValue, (SHA512_CTX *) Sha512Context));
+  return (BOOLEAN)(SHA384_Final (HashValue, (SHA512_CTX *)Sha512Context));
 }
 
 /**
@@ -425,7 +426,8 @@ Sha512HashAll (
   if (HashValue == NULL) {
     return FALSE;
   }
-  if (Data == NULL && DataSize != 0) {
+
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 

CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c

@@ -24,7 +24,7 @@ Sm3GetContextSize (
   //
   // Retrieves Openssl SM3 Context Size
   //
-  return (UINTN) (sizeof (SM3_CTX));
+  return (UINTN)(sizeof (SM3_CTX));
 }
 
 /**
@@ -55,7 +55,7 @@ Sm3Init (
   //
   // Openssl SM3 Context Initialization
   //
-  sm3_init ((SM3_CTX *) Sm3Context);
+  sm3_init ((SM3_CTX *)Sm3Context);
   return TRUE;
 }
 
@@ -84,7 +84,7 @@ Sm3Duplicate (
   //
   // Check input parameters.
   //
-  if (Sm3Context == NULL || NewSm3Context == NULL) {
+  if ((Sm3Context == NULL) || (NewSm3Context == NULL)) {
     return FALSE;
   }
 
@@ -129,14 +129,14 @@ Sm3Update (
   //
   // Check invalid parameters, in case that only DataLength was checked in Openssl
   //
-  if (Data == NULL && DataSize != 0) {
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
   //
   // Openssl SM3 Hash Update
   //
-  sm3_update ((SM3_CTX *) Sm3Context, Data, DataSize);
+  sm3_update ((SM3_CTX *)Sm3Context, Data, DataSize);
 
   return TRUE;
 }
@@ -171,14 +171,14 @@ Sm3Final (
   //
   // Check input parameters.
   //
-  if (Sm3Context == NULL || HashValue == NULL) {
+  if ((Sm3Context == NULL) || (HashValue == NULL)) {
     return FALSE;
   }
 
   //
   // Openssl SM3 Hash Finalization
   //
-  sm3_final (HashValue, (SM3_CTX *) Sm3Context);
+  sm3_final (HashValue, (SM3_CTX *)Sm3Context);
 
   return TRUE;
 }
@@ -209,7 +209,7 @@ Sm3HashAll (
   OUT  UINT8       *HashValue
   )
 {
-  SM3_CTX Ctx;
+  SM3_CTX  Ctx;
 
   //
   // Check input parameters.
@@ -217,18 +217,19 @@ Sm3HashAll (
   if (HashValue == NULL) {
     return FALSE;
   }
-  if (Data == NULL && DataSize != 0) {
+
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
   //
   // SM3 Hash Computation.
   //
-  sm3_init(&Ctx);
+  sm3_init (&Ctx);
 
-  sm3_update(&Ctx, Data, DataSize);
+  sm3_update (&Ctx, Data, DataSize);
 
-  sm3_final(HashValue, &Ctx);
+  sm3_final (HashValue, &Ctx);
 
   return TRUE;
 }

CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c

@@ -25,7 +25,7 @@ HmacSha256New (
   //
   // Allocates & Initializes HMAC_CTX Context by OpenSSL HMAC_CTX_new()
   //
-  return (VOID *) HMAC_CTX_new ();
+  return (VOID *)HMAC_CTX_new ();
 }
 
 /**
@@ -71,11 +71,11 @@ HmacSha256SetKey (
   //
   // Check input parameters.
   //
-  if (HmacSha256Context == NULL || KeySize > INT_MAX) {
+  if ((HmacSha256Context == NULL) || (KeySize > INT_MAX)) {
     return FALSE;
   }
 
-  if (HMAC_Init_ex ((HMAC_CTX *)HmacSha256Context, Key, (UINT32) KeySize, EVP_sha256(), NULL) != 1) {
+  if (HMAC_Init_ex ((HMAC_CTX *)HmacSha256Context, Key, (UINT32)KeySize, EVP_sha256 (), NULL) != 1) {
     return FALSE;
   }
 
@@ -105,7 +105,7 @@ HmacSha256Duplicate (
   //
   // Check input parameters.
   //
-  if (HmacSha256Context == NULL || NewHmacSha256Context == NULL) {
+  if ((HmacSha256Context == NULL) || (NewHmacSha256Context == NULL)) {
     return FALSE;
   }
 
@@ -152,7 +152,7 @@ HmacSha256Update (
   //
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL
   //
-  if (Data == NULL && DataSize != 0) {
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
@@ -198,7 +198,7 @@ HmacSha256Final (
   //
   // Check input parameters.
   //
-  if (HmacSha256Context == NULL || HmacValue == NULL) {
+  if ((HmacSha256Context == NULL) || (HmacValue == NULL)) {
     return FALSE;
   }
 
@@ -208,6 +208,7 @@ HmacSha256Final (
   if (HMAC_Final ((HMAC_CTX *)HmacSha256Context, HmacValue, &Length) != 1) {
     return FALSE;
   }
+
   if (HMAC_CTX_reset ((HMAC_CTX *)HmacSha256Context) != 1) {
     return FALSE;
   }

CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h

@@ -23,8 +23,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
-#define OBJ_get0_data(o) ((o)->data)
-#define OBJ_length(o) ((o)->length)
+#define OBJ_get0_data(o)  ((o)->data)
+#define OBJ_length(o)     ((o)->length)
 #endif
 
 /**

CryptoPkg/Library/BaseCryptLib/Kdf/CryptHkdf.c

@@ -39,37 +39,42 @@ HkdfSha256ExtractAndExpand (
   IN   UINTN        OutSize
   )
 {
-  EVP_PKEY_CTX *pHkdfCtx;
-  BOOLEAN Result;
+  EVP_PKEY_CTX  *pHkdfCtx;
+  BOOLEAN       Result;
 
-  if (Key == NULL || Salt == NULL || Info == NULL || Out == NULL ||
-    KeySize > INT_MAX || SaltSize > INT_MAX || InfoSize > INT_MAX || OutSize > INT_MAX ) {
+  if ((Key == NULL) || (Salt == NULL) || (Info == NULL) || (Out == NULL) ||
+      (KeySize > INT_MAX) || (SaltSize > INT_MAX) || (InfoSize > INT_MAX) || (OutSize > INT_MAX))
+  {
     return FALSE;
   }
 
-  pHkdfCtx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
+  pHkdfCtx = EVP_PKEY_CTX_new_id (EVP_PKEY_HKDF, NULL);
   if (pHkdfCtx == NULL) {
     return FALSE;
   }
 
-  Result = EVP_PKEY_derive_init(pHkdfCtx) > 0;
+  Result = EVP_PKEY_derive_init (pHkdfCtx) > 0;
   if (Result) {
-    Result = EVP_PKEY_CTX_set_hkdf_md(pHkdfCtx, EVP_sha256()) > 0;
-  }
-  if (Result) {
-    Result = EVP_PKEY_CTX_set1_hkdf_salt(pHkdfCtx, Salt, (UINT32)SaltSize) > 0;
-  }
-  if (Result) {
-    Result = EVP_PKEY_CTX_set1_hkdf_key(pHkdfCtx, Key, (UINT32)KeySize) > 0;
-  }
-  if (Result) {
-    Result = EVP_PKEY_CTX_add1_hkdf_info(pHkdfCtx, Info, (UINT32)InfoSize) > 0;
-  }
-  if (Result) {
-    Result = EVP_PKEY_derive(pHkdfCtx, Out, &OutSize) > 0;
+    Result = EVP_PKEY_CTX_set_hkdf_md (pHkdfCtx, EVP_sha256 ()) > 0;
   }
 
-  EVP_PKEY_CTX_free(pHkdfCtx);
+  if (Result) {
+    Result = EVP_PKEY_CTX_set1_hkdf_salt (pHkdfCtx, Salt, (UINT32)SaltSize) > 0;
+  }
+
+  if (Result) {
+    Result = EVP_PKEY_CTX_set1_hkdf_key (pHkdfCtx, Key, (UINT32)KeySize) > 0;
+  }
+
+  if (Result) {
+    Result = EVP_PKEY_CTX_add1_hkdf_info (pHkdfCtx, Info, (UINT32)InfoSize) > 0;
+  }
+
+  if (Result) {
+    Result = EVP_PKEY_derive (pHkdfCtx, Out, &OutSize) > 0;
+  }
+
+  EVP_PKEY_CTX_free (pHkdfCtx);
   pHkdfCtx = NULL;
   return Result;
 }

CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c

@@ -30,14 +30,14 @@ PasswordCallback (
 {
   INTN  KeyLength;
 
-  ZeroMem ((VOID *) Buf, (UINTN) Size);
+  ZeroMem ((VOID *)Buf, (UINTN)Size);
   if (Key != NULL) {
     //
     // Duplicate key phrase directly.
     //
-    KeyLength = (INTN) AsciiStrLen ((CHAR8 *)Key);
-    KeyLength = (KeyLength > Size ) ? Size : KeyLength;
-    CopyMem (Buf, Key, (UINTN) KeyLength);
+    KeyLength = (INTN)AsciiStrLen ((CHAR8 *)Key);
+    KeyLength = (KeyLength > Size) ? Size : KeyLength;
+    CopyMem (Buf, Key, (UINTN)KeyLength);
     return KeyLength;
   } else {
     return 0;
@@ -76,7 +76,7 @@ RsaGetPrivateKeyFromPem (
   //
   // Check input parameters.
   //
-  if (PemData == NULL || RsaContext == NULL || PemSize > INT_MAX) {
+  if ((PemData == NULL) || (RsaContext == NULL) || (PemSize > INT_MAX)) {
     return FALSE;
   }
 
@@ -87,9 +87,11 @@ RsaGetPrivateKeyFromPem (
   if (EVP_add_cipher (EVP_aes_128_cbc ()) == 0) {
     return FALSE;
   }
+
   if (EVP_add_cipher (EVP_aes_192_cbc ()) == 0) {
     return FALSE;
   }
+
   if (EVP_add_cipher (EVP_aes_256_cbc ()) == 0) {
     return FALSE;
   }
@@ -104,14 +106,14 @@ RsaGetPrivateKeyFromPem (
     goto _Exit;
   }
 
-  if (BIO_write (PemBio, PemData, (int) PemSize) <= 0) {
+  if (BIO_write (PemBio, PemData, (int)PemSize) <= 0) {
     goto _Exit;
   }
 
   //
   // Retrieve RSA Private Key from encrypted PEM data.
   //
-  *RsaContext = PEM_read_bio_RSAPrivateKey (PemBio, NULL, (pem_password_cb *) &PasswordCallback, (void *) Password);
+  *RsaContext = PEM_read_bio_RSAPrivateKey (PemBio, NULL, (pem_password_cb *)&PasswordCallback, (void *)Password);
   if (*RsaContext != NULL) {
     Status = TRUE;
   }

CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c

@@ -23,9 +23,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //
 // OID ASN.1 Value for SPC_INDIRECT_DATA_OBJID
 //
-UINT8 mSpcIndirectOidValue[] = {
+UINT8  mSpcIndirectOidValue[] = {
   0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x04
-  };
+};
 
 /**
   Verifies the validity of a PE/COFF Authenticode Signature as described in "Windows
@@ -109,20 +109,20 @@ AuthenticodeVerify (
   //       some authenticode-specific structure. Use opaque ASN.1 string to retrieve
   //       PKCS#7 ContentInfo here.
   //
-  SpcIndirectDataOid = OBJ_get0_data(Pkcs7->d.sign->contents->type);
-  if (OBJ_length(Pkcs7->d.sign->contents->type) != sizeof(mSpcIndirectOidValue) ||
-      CompareMem (
-        SpcIndirectDataOid,
-        mSpcIndirectOidValue,
-        sizeof (mSpcIndirectOidValue)
-        ) != 0) {
+  SpcIndirectDataOid = OBJ_get0_data (Pkcs7->d.sign->contents->type);
+  if ((OBJ_length (Pkcs7->d.sign->contents->type) != sizeof (mSpcIndirectOidValue)) ||
+      (CompareMem (
+         SpcIndirectDataOid,
+         mSpcIndirectOidValue,
+         sizeof (mSpcIndirectOidValue)
+         ) != 0))
+  {
     //
     // Un-matched SPC_INDIRECT_DATA_OBJID.
     //
     goto _Exit;
   }
 
-
   SpcIndirectDataContent = (UINT8 *)(Pkcs7->d.sign->contents->d.other->value.asn1_string->data);
 
   //
@@ -134,33 +134,30 @@ AuthenticodeVerify (
     //
     // Short Form of Length Encoding (Length < 128)
     //
-    ContentSize = (UINTN) (Asn1Byte & 0x7F);
+    ContentSize = (UINTN)(Asn1Byte & 0x7F);
     //
     // Skip the SEQUENCE Tag;
     //
     SpcIndirectDataContent += 2;
-
   } else if ((Asn1Byte & 0x81) == 0x81) {
     //
     // Long Form of Length Encoding (128 <= Length < 255, Single Octet)
     //
-    ContentSize = (UINTN) (*(UINT8 *)(SpcIndirectDataContent + 2));
+    ContentSize = (UINTN)(*(UINT8 *)(SpcIndirectDataContent + 2));
     //
     // Skip the SEQUENCE Tag;
     //
     SpcIndirectDataContent += 3;
-
   } else if ((Asn1Byte & 0x82) == 0x82) {
     //
     // Long Form of Length Encoding (Length > 255, Two Octet)
     //
-    ContentSize = (UINTN) (*(UINT8 *)(SpcIndirectDataContent + 2));
+    ContentSize = (UINTN)(*(UINT8 *)(SpcIndirectDataContent + 2));
     ContentSize = (ContentSize << 8) + (UINTN)(*(UINT8 *)(SpcIndirectDataContent + 3));
     //
     // Skip the SEQUENCE Tag;
     //
     SpcIndirectDataContent += 4;
-
   } else {
     goto _Exit;
   }
@@ -180,7 +177,7 @@ AuthenticodeVerify (
   //
   // Verifies the PKCS#7 Signed Data in PE/COFF Authenticode Signature
   //
-  Status = (BOOLEAN) Pkcs7Verify (OrigAuthData, DataSize, TrustedCert, CertSize, SpcIndirectDataContent, ContentSize);
+  Status = (BOOLEAN)Pkcs7Verify (OrigAuthData, DataSize, TrustedCert, CertSize, SpcIndirectDataContent, ContentSize);
 
 _Exit:
   //

CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c

@@ -26,7 +26,7 @@ DhNew (
   //
   // Allocates & Initializes DH Context by OpenSSL DH_new()
   //
-  return (VOID *) DH_new ();
+  return (VOID *)DH_new ();
 }
 
 /**
@@ -46,7 +46,7 @@ DhFree (
   //
   // Free OpenSSL DH Context
   //
-  DH_free ((DH *) DhContext);
+  DH_free ((DH *)DhContext);
 }
 
 /**
@@ -80,21 +80,21 @@ DhGenerateParameter (
   OUT     UINT8  *Prime
   )
 {
-  BOOLEAN RetVal;
-  BIGNUM  *BnP;
+  BOOLEAN  RetVal;
+  BIGNUM   *BnP;
 
   //
   // Check input parameters.
   //
-  if (DhContext == NULL || Prime == NULL || PrimeLength > INT_MAX) {
+  if ((DhContext == NULL) || (Prime == NULL) || (PrimeLength > INT_MAX)) {
     return FALSE;
   }
 
-  if (Generator != DH_GENERATOR_2 && Generator != DH_GENERATOR_5) {
+  if ((Generator != DH_GENERATOR_2) && (Generator != DH_GENERATOR_5)) {
     return FALSE;
   }
 
-  RetVal = (BOOLEAN) DH_generate_parameters_ex (DhContext, (UINT32) PrimeLength, (UINT32) Generator, NULL);
+  RetVal = (BOOLEAN)DH_generate_parameters_ex (DhContext, (UINT32)PrimeLength, (UINT32)Generator, NULL);
   if (!RetVal) {
     return FALSE;
   }
@@ -142,11 +142,11 @@ DhSetParameter (
   //
   // Check input parameters.
   //
-  if (DhContext == NULL || Prime == NULL || PrimeLength > INT_MAX) {
+  if ((DhContext == NULL) || (Prime == NULL) || (PrimeLength > INT_MAX)) {
     return FALSE;
   }
 
-  if (Generator != DH_GENERATOR_2 && Generator != DH_GENERATOR_5) {
+  if ((Generator != DH_GENERATOR_2) && (Generator != DH_GENERATOR_5)) {
     return FALSE;
   }
 
@@ -199,29 +199,29 @@ DhGenerateKey (
   IN OUT  UINTN  *PublicKeySize
   )
 {
-  BOOLEAN RetVal;
-  DH      *Dh;
-  BIGNUM  *DhPubKey;
-  INTN    Size;
+  BOOLEAN  RetVal;
+  DH       *Dh;
+  BIGNUM   *DhPubKey;
+  INTN     Size;
 
   //
   // Check input parameters.
   //
-  if (DhContext == NULL || PublicKeySize == NULL) {
+  if ((DhContext == NULL) || (PublicKeySize == NULL)) {
     return FALSE;
   }
 
-  if (PublicKey == NULL && *PublicKeySize != 0) {
+  if ((PublicKey == NULL) && (*PublicKeySize != 0)) {
     return FALSE;
   }
 
-  Dh = (DH *) DhContext;
+  Dh = (DH *)DhContext;
 
-  RetVal = (BOOLEAN) DH_generate_key (DhContext);
+  RetVal = (BOOLEAN)DH_generate_key (DhContext);
   if (RetVal) {
     DH_get0_key (Dh, (const BIGNUM **)&DhPubKey, NULL);
     Size = BN_num_bytes (DhPubKey);
-    if ((Size > 0) && (*PublicKeySize < (UINTN) Size)) {
+    if ((Size > 0) && (*PublicKeySize < (UINTN)Size)) {
       *PublicKeySize = Size;
       return FALSE;
     }
@@ -229,6 +229,7 @@ DhGenerateKey (
     if (PublicKey != NULL) {
       BN_bn2bin (DhPubKey, PublicKey);
     }
+
     *PublicKeySize = Size;
   }
 
@@ -275,7 +276,7 @@ DhComputeKey (
   //
   // Check input parameters.
   //
-  if (DhContext == NULL || PeerPublicKey == NULL || KeySize == NULL || Key == NULL) {
+  if ((DhContext == NULL) || (PeerPublicKey == NULL) || (KeySize == NULL) || (Key == NULL)) {
     return FALSE;
   }
 
@@ -283,7 +284,7 @@ DhComputeKey (
     return FALSE;
   }
 
-  Bn = BN_bin2bn (PeerPublicKey, (UINT32) PeerPublicKeySize, NULL);
+  Bn = BN_bin2bn (PeerPublicKey, (UINT32)PeerPublicKeySize, NULL);
   if (Bn == NULL) {
     return FALSE;
   }
@@ -294,7 +295,7 @@ DhComputeKey (
     return FALSE;
   }
 
-  if (*KeySize < (UINTN) Size) {
+  if (*KeySize < (UINTN)Size) {
     *KeySize = Size;
     BN_free (Bn);
     return FALSE;

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1Oaep.c

@@ -67,8 +67,9 @@ Pkcs1v2Encrypt (
   //
   // Check input parameters.
   //
-  if (PublicKey == NULL || InData == NULL ||
-      EncryptedData == NULL || EncryptedDataSize == NULL) {
+  if ((PublicKey == NULL) || (InData == NULL) ||
+      (EncryptedData == NULL) || (EncryptedDataSize == NULL))
+  {
     return FALSE;
   }
 
@@ -82,15 +83,15 @@ Pkcs1v2Encrypt (
     return FALSE;
   }
 
-  *EncryptedData        = NULL;
-  *EncryptedDataSize    = 0;
-  Result                = FALSE;
-  TempPointer           = NULL;
-  CertData              = NULL;
-  InternalPublicKey     = NULL;
-  PkeyCtx               = NULL;
-  OutData               = NULL;
-  OutDataSize           = 0;
+  *EncryptedData     = NULL;
+  *EncryptedDataSize = 0;
+  Result             = FALSE;
+  TempPointer        = NULL;
+  CertData           = NULL;
+  InternalPublicKey  = NULL;
+  PkeyCtx            = NULL;
+  OutData            = NULL;
+  OutDataSize        = 0;
 
   //
   // If it provides a seed then use it.
@@ -107,7 +108,7 @@ Pkcs1v2Encrypt (
   // Parse the X509 cert and extract the public key.
   //
   TempPointer = PublicKey;
-  CertData = d2i_X509 (&CertData, &TempPointer, (UINT32)PublicKeySize);
+  CertData    = d2i_X509 (&CertData, &TempPointer, (UINT32)PublicKeySize);
   if (CertData == NULL) {
     //
     // Fail to parse X509 cert.
@@ -137,11 +138,13 @@ Pkcs1v2Encrypt (
     //
     goto _Exit;
   }
+
   //
   // Initialize the context and set the desired padding.
   //
-  if (EVP_PKEY_encrypt_init (PkeyCtx) <= 0 ||
-      EVP_PKEY_CTX_set_rsa_padding (PkeyCtx, RSA_PKCS1_OAEP_PADDING) <= 0) {
+  if ((EVP_PKEY_encrypt_init (PkeyCtx) <= 0) ||
+      (EVP_PKEY_CTX_set_rsa_padding (PkeyCtx, RSA_PKCS1_OAEP_PADDING) <= 0))
+  {
     //
     // Fail to initialize the context.
     //
@@ -177,7 +180,7 @@ Pkcs1v2Encrypt (
     // Fail to encrypt data, need to free the output buffer.
     //
     FreePool (OutData);
-    OutData = NULL;
+    OutData     = NULL;
     OutDataSize = 0;
     goto _Exit;
   }
@@ -185,20 +188,22 @@ Pkcs1v2Encrypt (
   //
   // Encrypt done.
   //
-  *EncryptedData = OutData;
+  *EncryptedData     = OutData;
   *EncryptedDataSize = OutDataSize;
-  Result = TRUE;
+  Result             = TRUE;
 
 _Exit:
   //
   // Release Resources
   //
   if (CertData != NULL) {
-    X509_free (CertData );
+    X509_free (CertData);
   }
+
   if (InternalPublicKey != NULL) {
     EVP_PKEY_free (InternalPublicKey);
   }
+
   if (PkeyCtx != NULL) {
     EVP_PKEY_CTX_free (PkeyCtx);
   }

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2.c

@@ -58,25 +58,28 @@ Pkcs5HashPassword (
   if ((Password == NULL) || (Salt == NULL) || (OutKey == NULL)) {
     return FALSE;
   }
+
   if ((PasswordLength == 0) || (PasswordLength > INT_MAX) ||
       (SaltLength == 0) || (SaltLength > INT_MAX) ||
       (KeyLength == 0) || (KeyLength > INT_MAX) ||
-      (IterationCount < 1) || (IterationCount > INT_MAX)) {
+      (IterationCount < 1) || (IterationCount > INT_MAX))
+  {
     return FALSE;
   }
+
   //
   // Make sure the digest algorithm is supported.
   //
   switch (DigestSize) {
-  case SHA1_DIGEST_SIZE:
-    HashAlg = EVP_sha1();
-    break;
-  case SHA256_DIGEST_SIZE:
-    HashAlg = EVP_sha256();
-    break;
-  default:
-    return FALSE;
-    break;
+    case SHA1_DIGEST_SIZE:
+      HashAlg = EVP_sha1 ();
+      break;
+    case SHA256_DIGEST_SIZE:
+      HashAlg = EVP_sha256 ();
+      break;
+    default:
+      return FALSE;
+      break;
   }
 
   //

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c

@@ -62,8 +62,9 @@ Pkcs7Sign (
   //
   // Check input parameters.
   //
-  if (PrivateKey == NULL || KeyPassword == NULL || InData == NULL ||
-    SignCert == NULL || SignedData == NULL || SignedDataSize == NULL || InDataSize > INT_MAX) {
+  if ((PrivateKey == NULL) || (KeyPassword == NULL) || (InData == NULL) ||
+      (SignCert == NULL) || (SignedData == NULL) || (SignedDataSize == NULL) || (InDataSize > INT_MAX))
+  {
     return FALSE;
   }
 
@@ -79,8 +80,8 @@ Pkcs7Sign (
   Status = RsaGetPrivateKeyFromPem (
              PrivateKey,
              PrivateKeySize,
-             (CONST CHAR8 *) KeyPassword,
-             (VOID **) &RsaContext
+             (CONST CHAR8 *)KeyPassword,
+             (VOID **)&RsaContext
              );
   if (!Status) {
     return Status;
@@ -94,9 +95,11 @@ Pkcs7Sign (
   if (EVP_add_digest (EVP_md5 ()) == 0) {
     goto _Exit;
   }
+
   if (EVP_add_digest (EVP_sha1 ()) == 0) {
     goto _Exit;
   }
+
   if (EVP_add_digest (EVP_sha256 ()) == 0) {
     goto _Exit;
   }
@@ -110,7 +113,8 @@ Pkcs7Sign (
   if (Key == NULL) {
     goto _Exit;
   }
-  if (EVP_PKEY_assign_RSA (Key, (RSA *) RsaContext) == 0) {
+
+  if (EVP_PKEY_assign_RSA (Key, (RSA *)RsaContext) == 0) {
     goto _Exit;
   }
 
@@ -122,7 +126,7 @@ Pkcs7Sign (
     goto _Exit;
   }
 
-  if (BIO_write (DataBio, InData, (int) InDataSize) <= 0) {
+  if (BIO_write (DataBio, InData, (int)InDataSize) <= 0) {
     goto _Exit;
   }
 
@@ -130,9 +134,9 @@ Pkcs7Sign (
   // Create the PKCS#7 signedData structure.
   //
   Pkcs7 = PKCS7_sign (
-            (X509 *) SignCert,
+            (X509 *)SignCert,
             Key,
-            (STACK_OF(X509) *) OtherCerts,
+            (STACK_OF (X509) *) OtherCerts,
             DataBio,
             PKCS7_BINARY | PKCS7_NOATTR | PKCS7_DETACHED
             );
@@ -148,13 +152,13 @@ Pkcs7Sign (
     goto _Exit;
   }
 
-  P7Data     = malloc (P7DataSize);
+  P7Data = malloc (P7DataSize);
   if (P7Data == NULL) {
     goto _Exit;
   }
 
   Tmp        = P7Data;
-  P7DataSize = i2d_PKCS7 (Pkcs7, (unsigned char **) &Tmp);
+  P7DataSize = i2d_PKCS7 (Pkcs7, (unsigned char **)&Tmp);
   ASSERT (P7DataSize > 19);
 
   //

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7SignNull.c

@@ -51,4 +51,3 @@ Pkcs7Sign (
   ASSERT (FALSE);
   return FALSE;
 }
-

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c

@@ -26,11 +26,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 STATIC
 BOOLEAN
 Pkcs7TypeIsOther (
-  IN PKCS7 *P7
+  IN PKCS7  *P7
   )
 {
-  BOOLEAN Others;
-  INTN    Nid = OBJ_obj2nid (P7->type);
+  BOOLEAN  Others;
+  INTN     Nid = OBJ_obj2nid (P7->type);
 
   switch (Nid) {
     case NID_pkcs7_data:
@@ -57,17 +57,18 @@ Pkcs7TypeIsOther (
   @return ASN1_OCTET_STRING ASN.1 string.
 **/
 STATIC
-ASN1_OCTET_STRING*
+ASN1_OCTET_STRING *
 Pkcs7GetOctetString (
-  IN PKCS7 *P7
+  IN PKCS7  *P7
   )
 {
   if (PKCS7_type_is_data (P7)) {
     return P7->d.data;
   }
 
-  if (Pkcs7TypeIsOther(P7) && (P7->d.other != NULL) &&
-      (P7->d.other->type == V_ASN1_OCTET_STRING)) {
+  if (Pkcs7TypeIsOther (P7) && (P7->d.other != NULL) &&
+      (P7->d.other->type == V_ASN1_OCTET_STRING))
+  {
     return P7->d.other->value.octet_string;
   }
 
@@ -171,9 +172,11 @@ Pkcs7GetAttachedContent (
         *ContentSize = 0;
         goto _Exit;
       }
+
       CopyMem (*Content, OctStr->data, *ContentSize);
     }
   }
+
   Status = TRUE;
 
 _Exit:

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c

@@ -22,7 +22,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/x509v3.h>
 #include <openssl/pkcs7.h>
 
-UINT8 mOidValue[9] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x02 };
+UINT8  mOidValue[9] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x02 };
 
 /**
   Check input P7Data is a wrapped ContentInfo structure or not. If not construct
@@ -56,8 +56,8 @@ WrapPkcs7Data (
   OUT UINTN        *WrapDataSize
   )
 {
-  BOOLEAN          Wrapped;
-  UINT8            *SignedData;
+  BOOLEAN  Wrapped;
+  UINT8    *SignedData;
 
   //
   // Check whether input P7Data is a wrapped ContentInfo structure or not.
@@ -72,7 +72,7 @@ WrapPkcs7Data (
   }
 
   if (Wrapped) {
-    *WrapData     = (UINT8 *) P7Data;
+    *WrapData     = (UINT8 *)P7Data;
     *WrapDataSize = P7Length;
   } else {
     //
@@ -96,8 +96,8 @@ WrapPkcs7Data (
     //
     // Part2: Length1 = P7Length + 19 - 4, in big endian.
     //
-    SignedData[2] = (UINT8) (((UINT16) (*WrapDataSize - 4)) >> 8);
-    SignedData[3] = (UINT8) (((UINT16) (*WrapDataSize - 4)) & 0xff);
+    SignedData[2] = (UINT8)(((UINT16)(*WrapDataSize - 4)) >> 8);
+    SignedData[3] = (UINT8)(((UINT16)(*WrapDataSize - 4)) & 0xff);
 
     //
     // Part3: 0x06, 0x09.
@@ -119,8 +119,8 @@ WrapPkcs7Data (
     //
     // Part6: Length2 = P7Length, in big endian.
     //
-    SignedData[17] = (UINT8) (((UINT16) P7Length) >> 8);
-    SignedData[18] = (UINT8) (((UINT16) P7Length) & 0xff);
+    SignedData[17] = (UINT8)(((UINT16)P7Length) >> 8);
+    SignedData[18] = (UINT8)(((UINT16)P7Length) & 0xff);
 
     //
     // Part7: P7Data.
@@ -147,19 +147,20 @@ WrapPkcs7Data (
 **/
 BOOLEAN
 X509PopCertificate (
-  IN  VOID  *X509Stack,
-  OUT UINT8 **Cert,
-  OUT UINTN *CertSize
+  IN  VOID   *X509Stack,
+  OUT UINT8  **Cert,
+  OUT UINTN  *CertSize
   )
 {
-  BIO             *CertBio;
-  X509            *X509Cert;
-  STACK_OF(X509)  *CertStack;
-  BOOLEAN         Status;
-  INT32           Result;
-  BUF_MEM         *Ptr;
-  INT32           Length;
-  VOID            *Buffer;
+  BIO   *CertBio;
+  X509  *X509Cert;
+
+  STACK_OF (X509)  *CertStack;
+  BOOLEAN  Status;
+  INT32    Result;
+  BUF_MEM  *Ptr;
+  INT32    Length;
+  VOID     *Buffer;
 
   Status = FALSE;
 
@@ -167,7 +168,7 @@ X509PopCertificate (
     return Status;
   }
 
-  CertStack = (STACK_OF(X509) *) X509Stack;
+  CertStack = (STACK_OF (X509) *) X509Stack;
 
   X509Cert = sk_X509_pop (CertStack);
 
@@ -258,23 +259,25 @@ Pkcs7GetSigners (
   OUT UINTN        *CertLength
   )
 {
-  PKCS7            *Pkcs7;
-  BOOLEAN          Status;
-  UINT8            *SignedData;
-  CONST UINT8      *Temp;
-  UINTN            SignedDataSize;
-  BOOLEAN          Wrapped;
-  STACK_OF(X509)   *Stack;
-  UINT8            Index;
-  UINT8            *CertBuf;
-  UINT8            *OldBuf;
-  UINTN            BufferSize;
-  UINTN            OldSize;
-  UINT8            *SingleCert;
-  UINTN            SingleCertSize;
+  PKCS7        *Pkcs7;
+  BOOLEAN      Status;
+  UINT8        *SignedData;
+  CONST UINT8  *Temp;
+  UINTN        SignedDataSize;
+  BOOLEAN      Wrapped;
+
+  STACK_OF (X509)   *Stack;
+  UINT8  Index;
+  UINT8  *CertBuf;
+  UINT8  *OldBuf;
+  UINTN  BufferSize;
+  UINTN  OldSize;
+  UINT8  *SingleCert;
+  UINTN  SingleCertSize;
 
   if ((P7Data == NULL) || (CertStack == NULL) || (StackLength == NULL) ||
-      (TrustedCert == NULL) || (CertLength == NULL) || (P7Length > INT_MAX)) {
+      (TrustedCert == NULL) || (CertLength == NULL) || (P7Length > INT_MAX))
+  {
     return FALSE;
   }
 
@@ -297,8 +300,8 @@ Pkcs7GetSigners (
     goto _Exit;
   }
 
-  Temp = SignedData;
-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &Temp, (int) SignedDataSize);
+  Temp  = SignedData;
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&Temp, (int)SignedDataSize);
   if (Pkcs7 == NULL) {
     goto _Exit;
   }
@@ -310,7 +313,7 @@ Pkcs7GetSigners (
     goto _Exit;
   }
 
-  Stack = PKCS7_get0_signers(Pkcs7, NULL, PKCS7_BINARY);
+  Stack = PKCS7_get0_signers (Pkcs7, NULL, PKCS7_BINARY);
   if (Stack == NULL) {
     goto _Exit;
   }
@@ -350,7 +353,7 @@ Pkcs7GetSigners (
       OldBuf = NULL;
     }
 
-    WriteUnaligned32 ((UINT32 *) (CertBuf + OldSize), (UINT32) SingleCertSize);
+    WriteUnaligned32 ((UINT32 *)(CertBuf + OldSize), (UINT32)SingleCertSize);
     CopyMem (CertBuf + OldSize + sizeof (UINT32), SingleCert, SingleCertSize);
 
     free (SingleCert);
@@ -363,7 +366,7 @@ Pkcs7GetSigners (
     //
     CertBuf[0] = Index;
 
-    *CertLength = BufferSize - OldSize - sizeof (UINT32);
+    *CertLength  = BufferSize - OldSize - sizeof (UINT32);
     *TrustedCert = malloc (*CertLength);
     if (*TrustedCert == NULL) {
       goto _Exit;
@@ -372,7 +375,7 @@ Pkcs7GetSigners (
     CopyMem (*TrustedCert, CertBuf + OldSize + sizeof (UINT32), *CertLength);
     *CertStack   = CertBuf;
     *StackLength = BufferSize;
-    Status = TRUE;
+    Status       = TRUE;
   }
 
 _Exit:
@@ -388,7 +391,7 @@ _Exit:
   }
 
   if (Stack != NULL) {
-    sk_X509_pop_free(Stack, X509_free);
+    sk_X509_pop_free (Stack, X509_free);
   }
 
   if (SingleCert !=  NULL) {
@@ -416,7 +419,7 @@ _Exit:
 VOID
 EFIAPI
 Pkcs7FreeSigners (
-  IN  UINT8        *Certs
+  IN  UINT8  *Certs
   )
 {
   if (Certs == NULL) {
@@ -459,43 +462,45 @@ Pkcs7GetCertificatesList (
   OUT UINTN        *UnchainLength
   )
 {
-  BOOLEAN          Status;
-  UINT8            *NewP7Data;
-  UINTN            NewP7Length;
-  BOOLEAN          Wrapped;
-  UINT8            Index;
-  PKCS7            *Pkcs7;
-  X509_STORE_CTX   *CertCtx;
-  STACK_OF(X509)   *CtxChain;
-  STACK_OF(X509)   *CtxUntrusted;
-  X509             *CtxCert;
-  STACK_OF(X509)   *Signers;
-  X509             *Signer;
-  X509             *Cert;
-  X509             *Issuer;
-  X509_NAME        *IssuerName;
-  UINT8            *CertBuf;
-  UINT8            *OldBuf;
-  UINTN            BufferSize;
-  UINTN            OldSize;
-  UINT8            *SingleCert;
-  UINTN            CertSize;
+  BOOLEAN         Status;
+  UINT8           *NewP7Data;
+  UINTN           NewP7Length;
+  BOOLEAN         Wrapped;
+  UINT8           Index;
+  PKCS7           *Pkcs7;
+  X509_STORE_CTX  *CertCtx;
+
+  STACK_OF (X509)   *CtxChain;
+  STACK_OF (X509)   *CtxUntrusted;
+  X509  *CtxCert;
+
+  STACK_OF (X509)   *Signers;
+  X509       *Signer;
+  X509       *Cert;
+  X509       *Issuer;
+  X509_NAME  *IssuerName;
+  UINT8      *CertBuf;
+  UINT8      *OldBuf;
+  UINTN      BufferSize;
+  UINTN      OldSize;
+  UINT8      *SingleCert;
+  UINTN      CertSize;
 
   //
   // Initializations
   //
-  Status         = FALSE;
-  NewP7Data      = NULL;
-  Pkcs7          = NULL;
-  CertCtx        = NULL;
-  CtxChain       = NULL;
-  CtxCert        = NULL;
-  CtxUntrusted   = NULL;
-  Cert           = NULL;
-  SingleCert     = NULL;
-  CertBuf        = NULL;
-  OldBuf         = NULL;
-  Signers        = NULL;
+  Status       = FALSE;
+  NewP7Data    = NULL;
+  Pkcs7        = NULL;
+  CertCtx      = NULL;
+  CtxChain     = NULL;
+  CtxCert      = NULL;
+  CtxUntrusted = NULL;
+  Cert         = NULL;
+  SingleCert   = NULL;
+  CertBuf      = NULL;
+  OldBuf       = NULL;
+  Signers      = NULL;
 
   ZeroMem (&CertCtx, sizeof (CertCtx));
 
@@ -503,7 +508,8 @@ Pkcs7GetCertificatesList (
   // Parameter Checking
   //
   if ((P7Data == NULL) || (SignerChainCerts == NULL) || (ChainLength == NULL) ||
-      (UnchainCerts == NULL) || (UnchainLength == NULL) || (P7Length > INT_MAX)) {
+      (UnchainCerts == NULL) || (UnchainLength == NULL) || (P7Length > INT_MAX))
+  {
     return Status;
   }
 
@@ -523,7 +529,7 @@ Pkcs7GetCertificatesList (
   //
   // Decodes PKCS#7 SignedData
   //
-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &NewP7Data, (int) NewP7Length);
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&NewP7Data, (int)NewP7Length);
   if ((Pkcs7 == NULL) || (!PKCS7_type_is_signed (Pkcs7))) {
     goto _Error;
   }
@@ -537,15 +543,18 @@ Pkcs7GetCertificatesList (
   if ((Signers == NULL) || (sk_X509_num (Signers) != 1)) {
     goto _Error;
   }
+
   Signer = sk_X509_value (Signers, 0);
 
   CertCtx = X509_STORE_CTX_new ();
   if (CertCtx == NULL) {
     goto _Error;
   }
+
   if (!X509_STORE_CTX_init (CertCtx, NULL, Signer, Pkcs7->d.sign->cert)) {
     goto _Error;
   }
+
   //
   // Initialize Chained & Untrusted stack
   //
@@ -553,10 +562,12 @@ Pkcs7GetCertificatesList (
   CtxCert  = X509_STORE_CTX_get0_cert (CertCtx);
   if (CtxChain == NULL) {
     if (((CtxChain = sk_X509_new_null ()) == NULL) ||
-        (!sk_X509_push (CtxChain, CtxCert))) {
+        (!sk_X509_push (CtxChain, CtxCert)))
+    {
       goto _Error;
     }
   }
+
   CtxUntrusted = X509_STORE_CTX_get0_untrusted (CertCtx);
   if (CtxUntrusted != NULL) {
     (VOID)sk_X509_delete_ptr (CtxUntrusted, Signer);
@@ -566,7 +577,7 @@ Pkcs7GetCertificatesList (
   // Build certificates stack chained from Signer's certificate.
   //
   Cert = Signer;
-  for (; ;) {
+  for ( ; ;) {
     //
     // Self-Issue checking
     //
@@ -581,13 +592,14 @@ Pkcs7GetCertificatesList (
     // Found the issuer of the current certificate
     //
     if (CtxUntrusted != NULL) {
-      Issuer = NULL;
+      Issuer     = NULL;
       IssuerName = X509_get_issuer_name (Cert);
       Issuer     = X509_find_by_subject (CtxUntrusted, IssuerName);
       if (Issuer != NULL) {
         if (!sk_X509_push (CtxChain, Issuer)) {
           goto _Error;
         }
+
         (VOID)sk_X509_delete_ptr (CtxUntrusted, Issuer);
 
         Cert = Issuer;
@@ -629,13 +641,14 @@ Pkcs7GetCertificatesList (
         Status = FALSE;
         goto _Error;
       }
+
       if (OldBuf != NULL) {
         CopyMem (CertBuf, OldBuf, OldSize);
         free (OldBuf);
         OldBuf = NULL;
       }
 
-      WriteUnaligned32 ((UINT32 *) (CertBuf + OldSize), (UINT32) CertSize);
+      WriteUnaligned32 ((UINT32 *)(CertBuf + OldSize), (UINT32)CertSize);
       CopyMem (CertBuf + OldSize + sizeof (UINT32), SingleCert, CertSize);
 
       free (SingleCert);
@@ -672,13 +685,14 @@ Pkcs7GetCertificatesList (
         Status = FALSE;
         goto _Error;
       }
+
       if (OldBuf != NULL) {
         CopyMem (CertBuf, OldBuf, OldSize);
         free (OldBuf);
         OldBuf = NULL;
       }
 
-      WriteUnaligned32 ((UINT32 *) (CertBuf + OldSize), (UINT32) CertSize);
+      WriteUnaligned32 ((UINT32 *)(CertBuf + OldSize), (UINT32)CertSize);
       CopyMem (CertBuf + OldSize + sizeof (UINT32), SingleCert, CertSize);
 
       free (SingleCert);
@@ -709,6 +723,7 @@ _Error:
   if (Pkcs7 != NULL) {
     PKCS7_free (Pkcs7);
   }
+
   sk_X509_free (Signers);
 
   if (CertCtx != NULL) {
@@ -768,21 +783,22 @@ Pkcs7Verify (
   IN  UINTN        DataLength
   )
 {
-  PKCS7       *Pkcs7;
-  BIO         *DataBio;
-  BOOLEAN     Status;
-  X509        *Cert;
-  X509_STORE  *CertStore;
-  UINT8       *SignedData;
-  CONST UINT8 *Temp;
-  UINTN       SignedDataSize;
-  BOOLEAN     Wrapped;
+  PKCS7        *Pkcs7;
+  BIO          *DataBio;
+  BOOLEAN      Status;
+  X509         *Cert;
+  X509_STORE   *CertStore;
+  UINT8        *SignedData;
+  CONST UINT8  *Temp;
+  UINTN        SignedDataSize;
+  BOOLEAN      Wrapped;
 
   //
   // Check input parameters.
   //
-  if (P7Data == NULL || TrustedCert == NULL || InData == NULL ||
-    P7Length > INT_MAX || CertLength > INT_MAX || DataLength > INT_MAX) {
+  if ((P7Data == NULL) || (TrustedCert == NULL) || (InData == NULL) ||
+      (P7Length > INT_MAX) || (CertLength > INT_MAX) || (DataLength > INT_MAX))
+  {
     return FALSE;
   }
 
@@ -797,18 +813,23 @@ Pkcs7Verify (
   if (EVP_add_digest (EVP_md5 ()) == 0) {
     return FALSE;
   }
+
   if (EVP_add_digest (EVP_sha1 ()) == 0) {
     return FALSE;
   }
+
   if (EVP_add_digest (EVP_sha256 ()) == 0) {
     return FALSE;
   }
+
   if (EVP_add_digest (EVP_sha384 ()) == 0) {
     return FALSE;
   }
+
   if (EVP_add_digest (EVP_sha512 ()) == 0) {
     return FALSE;
   }
+
   if (EVP_add_digest_alias (SN_sha1WithRSAEncryption, SN_sha1WithRSA) == 0) {
     return FALSE;
   }
@@ -827,8 +848,8 @@ Pkcs7Verify (
     goto _Exit;
   }
 
-  Temp = SignedData;
-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &Temp, (int) SignedDataSize);
+  Temp  = SignedData;
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&Temp, (int)SignedDataSize);
   if (Pkcs7 == NULL) {
     goto _Exit;
   }
@@ -844,7 +865,7 @@ Pkcs7Verify (
   // Read DER-encoded root certificate and Construct X509 Certificate
   //
   Temp = TrustedCert;
-  Cert = d2i_X509 (NULL, &Temp, (long) CertLength);
+  Cert = d2i_X509 (NULL, &Temp, (long)CertLength);
   if (Cert == NULL) {
     goto _Exit;
   }
@@ -856,6 +877,7 @@ Pkcs7Verify (
   if (CertStore == NULL) {
     goto _Exit;
   }
+
   if (!(X509_STORE_add_cert (CertStore, Cert))) {
     goto _Exit;
   }
@@ -864,7 +886,7 @@ Pkcs7Verify (
   // For generic PKCS#7 handling, InData may be NULL if the content is present
   // in PKCS#7 structure. So ignore NULL checking here.
   //
-  DataBio = BIO_new_mem_buf (InData, (int) DataLength);
+  DataBio = BIO_new_mem_buf (InData, (int)DataLength);
   if (DataBio == NULL) {
     goto _Exit;
   }
@@ -873,8 +895,10 @@ Pkcs7Verify (
   // Allow partial certificate chains, terminated by a non-self-signed but
   // still trusted intermediate certificate. Also disable time checks.
   //
-  X509_STORE_set_flags (CertStore,
-                        X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME);
+  X509_STORE_set_flags (
+    CertStore,
+    X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME
+    );
 
   //
   // OpenSSL PKCS7 Verification by default checks for SMIME (email signing) and
@@ -886,7 +910,7 @@ Pkcs7Verify (
   //
   // Verifies the PKCS#7 signedData structure
   //
-  Status = (BOOLEAN) PKCS7_verify (Pkcs7, NULL, CertStore, DataBio, NULL, PKCS7_BINARY);
+  Status = (BOOLEAN)PKCS7_verify (Pkcs7, NULL, CertStore, DataBio, NULL, PKCS7_BINARY);
 
 _Exit:
   //
@@ -903,4 +927,3 @@ _Exit:
 
   return Status;
 }
-

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c

@@ -64,19 +64,20 @@
 **/
 EFI_STATUS
 GetSignerCertificate (
-  IN CONST PKCS7 *CertChain,
-  OUT X509       **SignerCert
+  IN CONST PKCS7  *CertChain,
+  OUT X509        **SignerCert
   )
 {
-  EFI_STATUS      Status;
-  STACK_OF(X509)  *Signers;
-  INT32           NumberSigners;
+  EFI_STATUS  Status;
 
-  Status         = EFI_SUCCESS;
-  Signers        = NULL;
-  NumberSigners  = 0;
+  STACK_OF (X509)  *Signers;
+  INT32  NumberSigners;
 
-  if (CertChain == NULL || SignerCert == NULL) {
+  Status        = EFI_SUCCESS;
+  Signers       = NULL;
+  NumberSigners = 0;
+
+  if ((CertChain == NULL) || (SignerCert == NULL)) {
     Status = EFI_INVALID_PARAMETER;
     goto Exit;
   }
@@ -84,7 +85,7 @@ GetSignerCertificate (
   //
   // Get the signers from the chain.
   //
-  Signers = PKCS7_get0_signers ((PKCS7*) CertChain, NULL, PKCS7_BINARY);
+  Signers = PKCS7_get0_signers ((PKCS7 *)CertChain, NULL, PKCS7_BINARY);
   if (Signers == NULL) {
     //
     // Fail to get signers form PKCS7
@@ -118,7 +119,6 @@ Exit:
   return Status;
 }
 
-
 /**
   Determines if the specified EKU represented in ASN1 form is present
   in a given certificate.
@@ -134,8 +134,8 @@ Exit:
 **/
 EFI_STATUS
 IsEkuInCertificate (
-  IN CONST X509  *Cert,
-  IN ASN1_OBJECT *Asn1ToFind
+  IN CONST X509   *Cert,
+  IN ASN1_OBJECT  *Asn1ToFind
   )
 {
   EFI_STATUS          Status;
@@ -147,15 +147,15 @@ IsEkuInCertificate (
   ASN1_OBJECT         *Asn1InCert;
   INTN                Index;
 
-  Status            = EFI_NOT_FOUND;
-  ClonedCert        = NULL;
-  Extension         = NULL;
-  Eku               = NULL;
-  ExtensionIndex    = -1;
-  NumExtensions     = 0;
-  Asn1InCert        = NULL;
+  Status         = EFI_NOT_FOUND;
+  ClonedCert     = NULL;
+  Extension      = NULL;
+  Eku            = NULL;
+  ExtensionIndex = -1;
+  NumExtensions  = 0;
+  Asn1InCert     = NULL;
 
-  if (Cert == NULL || Asn1ToFind == NULL) {
+  if ((Cert == NULL) || (Asn1ToFind == NULL)) {
     Status = EFI_INVALID_PARAMETER;
     goto Exit;
   }
@@ -164,7 +164,7 @@ IsEkuInCertificate (
   // Clone the certificate.  This is required because the Extension API's
   // only work once per instance of an X509 object.
   //
-  ClonedCert = X509_dup ((X509*)Cert);
+  ClonedCert = X509_dup ((X509 *)Cert);
   if (ClonedCert == NULL) {
     //
     // Fail to duplicate cert.
@@ -193,7 +193,7 @@ IsEkuInCertificate (
     goto Exit;
   }
 
-  Eku = (EXTENDED_KEY_USAGE*)X509V3_EXT_d2i (Extension);
+  Eku = (EXTENDED_KEY_USAGE *)X509V3_EXT_d2i (Extension);
   if (Eku == NULL) {
     //
     // Fail to get Eku from extension.
@@ -215,8 +215,9 @@ IsEkuInCertificate (
       goto Exit;
     }
 
-    if (Asn1InCert->length == Asn1ToFind->length &&
-        CompareMem (Asn1InCert->data, Asn1ToFind->data, Asn1InCert->length) == 0) {
+    if ((Asn1InCert->length == Asn1ToFind->length) &&
+        (CompareMem (Asn1InCert->data, Asn1ToFind->data, Asn1InCert->length) == 0))
+    {
       //
       // Found Eku in certificate.
       //
@@ -241,7 +242,6 @@ Exit:
   return Status;
 }
 
-
 /**
   Determines if the specified EKUs are present in a signing certificate.
 
@@ -256,23 +256,23 @@ Exit:
   @retval EFI_NOT_FOUND             One or more EKU's were not found in the signature.
 **/
 EFI_STATUS
-CheckEKUs(
-  IN CONST X509     *SignerCert,
-  IN CONST CHAR8    *RequiredEKUs[],
-  IN CONST UINT32   RequiredEKUsSize,
-  IN BOOLEAN        RequireAllPresent
+CheckEKUs (
+  IN CONST X509    *SignerCert,
+  IN CONST CHAR8   *RequiredEKUs[],
+  IN CONST UINT32  RequiredEKUsSize,
+  IN BOOLEAN       RequireAllPresent
   )
 {
-  EFI_STATUS    Status;
-  ASN1_OBJECT   *Asn1ToFind;
-  UINT32        NumEkusFound;
-  UINT32        Index;
+  EFI_STATUS   Status;
+  ASN1_OBJECT  *Asn1ToFind;
+  UINT32       NumEkusFound;
+  UINT32       Index;
 
   Status       = EFI_SUCCESS;
   Asn1ToFind   = NULL;
   NumEkusFound = 0;
 
-  if (SignerCert == NULL || RequiredEKUs == NULL || RequiredEKUsSize == 0) {
+  if ((SignerCert == NULL) || (RequiredEKUs == NULL) || (RequiredEKUsSize == 0)) {
     Status = EFI_INVALID_PARAMETER;
     goto Exit;
   }
@@ -282,7 +282,7 @@ CheckEKUs(
     // Finding required EKU in cert.
     //
     if (Asn1ToFind != NULL) {
-      ASN1_OBJECT_free(Asn1ToFind);
+      ASN1_OBJECT_free (Asn1ToFind);
       Asn1ToFind = NULL;
     }
 
@@ -314,11 +314,12 @@ CheckEKUs(
 Exit:
 
   if (Asn1ToFind != NULL) {
-    ASN1_OBJECT_free(Asn1ToFind);
+    ASN1_OBJECT_free (Asn1ToFind);
   }
 
   if (RequireAllPresent &&
-      NumEkusFound == RequiredEKUsSize) {
+      (NumEkusFound == RequiredEKUsSize))
+  {
     //
     // Found all required EKUs in certificate.
     //
@@ -361,43 +362,45 @@ Exit:
 EFI_STATUS
 EFIAPI
 VerifyEKUsInPkcs7Signature (
-  IN CONST UINT8    *Pkcs7Signature,
-  IN CONST UINT32   SignatureSize,
-  IN CONST CHAR8    *RequiredEKUs[],
-  IN CONST UINT32   RequiredEKUsSize,
-  IN BOOLEAN        RequireAllPresent
+  IN CONST UINT8   *Pkcs7Signature,
+  IN CONST UINT32  SignatureSize,
+  IN CONST CHAR8   *RequiredEKUs[],
+  IN CONST UINT32  RequiredEKUsSize,
+  IN BOOLEAN       RequireAllPresent
   )
 {
-  EFI_STATUS        Status;
-  PKCS7             *Pkcs7;
-  STACK_OF(X509)    *CertChain;
-  INT32             SignatureType;
-  INT32             NumberCertsInSignature;
-  X509              *SignerCert;
-  UINT8             *SignedData;
-  UINT8             *Temp;
-  UINTN             SignedDataSize;
-  BOOLEAN           IsWrapped;
-  BOOLEAN           Ok;
+  EFI_STATUS  Status;
+  PKCS7       *Pkcs7;
 
-  Status                    = EFI_SUCCESS;
-  Pkcs7                     = NULL;
-  CertChain                 = NULL;
-  SignatureType             = 0;
-  NumberCertsInSignature    = 0;
-  SignerCert                = NULL;
-  SignedData                = NULL;
-  SignedDataSize            = 0;
-  IsWrapped                 = FALSE;
-  Ok                        = FALSE;
+  STACK_OF (X509)    *CertChain;
+  INT32    SignatureType;
+  INT32    NumberCertsInSignature;
+  X509     *SignerCert;
+  UINT8    *SignedData;
+  UINT8    *Temp;
+  UINTN    SignedDataSize;
+  BOOLEAN  IsWrapped;
+  BOOLEAN  Ok;
+
+  Status                 = EFI_SUCCESS;
+  Pkcs7                  = NULL;
+  CertChain              = NULL;
+  SignatureType          = 0;
+  NumberCertsInSignature = 0;
+  SignerCert             = NULL;
+  SignedData             = NULL;
+  SignedDataSize         = 0;
+  IsWrapped              = FALSE;
+  Ok                     = FALSE;
 
   //
-  //Validate the input parameters.
+  // Validate the input parameters.
   //
-  if (Pkcs7Signature   == NULL ||
-      SignatureSize    == 0    ||
-      RequiredEKUs     == NULL ||
-      RequiredEKUsSize == 0) {
+  if ((Pkcs7Signature   == NULL) ||
+      (SignatureSize    == 0) ||
+      (RequiredEKUs     == NULL) ||
+      (RequiredEKUsSize == 0))
+  {
     Status = EFI_INVALID_PARAMETER;
     goto Exit;
   }
@@ -409,11 +412,13 @@ VerifyEKUsInPkcs7Signature (
   //
   // Wrap the PKCS7 data if needed.
   //
-  Ok = WrapPkcs7Data (Pkcs7Signature,
-                      SignatureSize,
-                      &IsWrapped,
-                      &SignedData,
-                      &SignedDataSize);
+  Ok = WrapPkcs7Data (
+         Pkcs7Signature,
+         SignatureSize,
+         &IsWrapped,
+         &SignedData,
+         &SignedDataSize
+         );
   if (!Ok) {
     //
     // Fail to Wrap the PKCS7 data.
@@ -441,18 +446,20 @@ VerifyEKUsInPkcs7Signature (
   //
   SignatureType = OBJ_obj2nid (Pkcs7->type);
   switch (SignatureType) {
-  case NID_pkcs7_signed:
-    if (Pkcs7->d.sign != NULL) {
-      CertChain = Pkcs7->d.sign->cert;
-    }
-    break;
-  case NID_pkcs7_signedAndEnveloped:
-    if (Pkcs7->d.signed_and_enveloped != NULL) {
-      CertChain = Pkcs7->d.signed_and_enveloped->cert;
-    }
-    break;
-  default:
-    break;
+    case NID_pkcs7_signed:
+      if (Pkcs7->d.sign != NULL) {
+        CertChain = Pkcs7->d.sign->cert;
+      }
+
+      break;
+    case NID_pkcs7_signedAndEnveloped:
+      if (Pkcs7->d.signed_and_enveloped != NULL) {
+        CertChain = Pkcs7->d.signed_and_enveloped->cert;
+      }
+
+      break;
+    default:
+      break;
   }
 
   //
@@ -483,7 +490,7 @@ VerifyEKUsInPkcs7Signature (
   // Get the leaf signer.
   //
   Status = GetSignerCertificate (Pkcs7, &SignerCert);
-  if (Status != EFI_SUCCESS || SignerCert == NULL) {
+  if ((Status != EFI_SUCCESS) || (SignerCert == NULL)) {
     //
     // Fail to get the end-entity leaf signer certificate.
     //
@@ -514,4 +521,3 @@ Exit:
 
   return Status;
 }
-

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEkuRuntime.c

@@ -44,14 +44,13 @@
 EFI_STATUS
 EFIAPI
 VerifyEKUsInPkcs7Signature (
-  IN CONST UINT8    *Pkcs7Signature,
-  IN CONST UINT32   SignatureSize,
-  IN CONST CHAR8    *RequiredEKUs[],
-  IN CONST UINT32   RequiredEKUsSize,
-  IN BOOLEAN        RequireAllPresent
+  IN CONST UINT8   *Pkcs7Signature,
+  IN CONST UINT32  SignatureSize,
+  IN CONST CHAR8   *RequiredEKUs[],
+  IN CONST UINT32  RequiredEKUsSize,
+  IN BOOLEAN       RequireAllPresent
   )
 {
   ASSERT (FALSE);
   return RETURN_UNSUPPORTED;
 }
-

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyNull.c

@@ -57,7 +57,7 @@ Pkcs7GetSigners (
 VOID
 EFIAPI
 Pkcs7FreeSigners (
-  IN  UINT8        *Certs
+  IN  UINT8  *Certs
   )
 {
   ASSERT (FALSE);

CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyRuntime.c

@@ -36,4 +36,3 @@ Pkcs7GetAttachedContent (
   ASSERT (FALSE);
   return FALSE;
 }
-

CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c

@@ -34,7 +34,7 @@ RsaNew (
   //
   // Allocates & Initializes RSA Context by OpenSSL RSA_new()
   //
-  return (VOID *) RSA_new ();
+  return (VOID *)RSA_new ();
 }
 
 /**
@@ -52,7 +52,7 @@ RsaFree (
   //
   // Free OpenSSL RSA Context
   //
-  RSA_free ((RSA *) RsaContext);
+  RSA_free ((RSA *)RsaContext);
 }
 
 /**
@@ -99,7 +99,7 @@ RsaSetKey (
   //
   // Check input parameters.
   //
-  if (RsaContext == NULL || BnSize > INT_MAX) {
+  if ((RsaContext == NULL) || (BnSize > INT_MAX)) {
     return FALSE;
   }
 
@@ -115,7 +115,7 @@ RsaSetKey (
   //
   // Retrieve the components from RSA object.
   //
-  RsaKey = (RSA *) RsaContext;
+  RsaKey = (RSA *)RsaContext;
   RSA_get0_key (RsaKey, (const BIGNUM **)&BnN, (const BIGNUM **)&BnE, (const BIGNUM **)&BnD);
   RSA_get0_factors (RsaKey, (const BIGNUM **)&BnP, (const BIGNUM **)&BnQ);
   RSA_get0_crt_params (RsaKey, (const BIGNUM **)&BnDp, (const BIGNUM **)&BnDq, (const BIGNUM **)&BnQInv);
@@ -126,118 +126,127 @@ RsaSetKey (
   //       (N, e) are needed.
   //
   switch (KeyTag) {
-
-  //
-  // RSA Public Modulus (N), Public Exponent (e) and Private Exponent (d)
-  //
-  case RsaKeyN:
-  case RsaKeyE:
-  case RsaKeyD:
-    if (BnN == NULL) {
-      BnN = BN_new ();
-    }
-    if (BnE == NULL) {
-      BnE = BN_new ();
-    }
-    if (BnD == NULL) {
-      BnD = BN_new ();
-    }
-
-    if ((BnN == NULL) || (BnE == NULL) || (BnD == NULL)) {
-      return FALSE;
-    }
-
-    switch (KeyTag) {
+    //
+    // RSA Public Modulus (N), Public Exponent (e) and Private Exponent (d)
+    //
     case RsaKeyN:
-      BnN = BN_bin2bn (BigNumber, (UINT32)BnSize, BnN);
-      break;
     case RsaKeyE:
-      BnE = BN_bin2bn (BigNumber, (UINT32)BnSize, BnE);
-      break;
     case RsaKeyD:
-      BnD = BN_bin2bn (BigNumber, (UINT32)BnSize, BnD);
+      if (BnN == NULL) {
+        BnN = BN_new ();
+      }
+
+      if (BnE == NULL) {
+        BnE = BN_new ();
+      }
+
+      if (BnD == NULL) {
+        BnD = BN_new ();
+      }
+
+      if ((BnN == NULL) || (BnE == NULL) || (BnD == NULL)) {
+        return FALSE;
+      }
+
+      switch (KeyTag) {
+        case RsaKeyN:
+          BnN = BN_bin2bn (BigNumber, (UINT32)BnSize, BnN);
+          break;
+        case RsaKeyE:
+          BnE = BN_bin2bn (BigNumber, (UINT32)BnSize, BnE);
+          break;
+        case RsaKeyD:
+          BnD = BN_bin2bn (BigNumber, (UINT32)BnSize, BnD);
+          break;
+        default:
+          return FALSE;
+      }
+
+      if (RSA_set0_key (RsaKey, BN_dup (BnN), BN_dup (BnE), BN_dup (BnD)) == 0) {
+        return FALSE;
+      }
+
       break;
-    default:
-      return FALSE;
-    }
-    if (RSA_set0_key (RsaKey, BN_dup(BnN), BN_dup(BnE), BN_dup(BnD)) == 0) {
-      return FALSE;
-    }
 
-    break;
-
-  //
-  // RSA Secret Prime Factor of Modulus (p and q)
-  //
-  case RsaKeyP:
-  case RsaKeyQ:
-    if (BnP == NULL) {
-      BnP = BN_new ();
-    }
-    if (BnQ == NULL) {
-      BnQ = BN_new ();
-    }
-    if ((BnP == NULL) || (BnQ == NULL)) {
-      return FALSE;
-    }
-
-    switch (KeyTag) {
+    //
+    // RSA Secret Prime Factor of Modulus (p and q)
+    //
     case RsaKeyP:
-      BnP = BN_bin2bn (BigNumber, (UINT32)BnSize, BnP);
-      break;
     case RsaKeyQ:
-      BnQ = BN_bin2bn (BigNumber, (UINT32)BnSize, BnQ);
+      if (BnP == NULL) {
+        BnP = BN_new ();
+      }
+
+      if (BnQ == NULL) {
+        BnQ = BN_new ();
+      }
+
+      if ((BnP == NULL) || (BnQ == NULL)) {
+        return FALSE;
+      }
+
+      switch (KeyTag) {
+        case RsaKeyP:
+          BnP = BN_bin2bn (BigNumber, (UINT32)BnSize, BnP);
+          break;
+        case RsaKeyQ:
+          BnQ = BN_bin2bn (BigNumber, (UINT32)BnSize, BnQ);
+          break;
+        default:
+          return FALSE;
+      }
+
+      if (RSA_set0_factors (RsaKey, BN_dup (BnP), BN_dup (BnQ)) == 0) {
+        return FALSE;
+      }
+
       break;
-    default:
-      return FALSE;
-    }
-    if (RSA_set0_factors (RsaKey, BN_dup(BnP), BN_dup(BnQ)) == 0) {
-      return FALSE;
-    }
 
-    break;
-
-  //
-  // p's CRT Exponent (== d mod (p - 1)),  q's CRT Exponent (== d mod (q - 1)),
-  // and CRT Coefficient (== 1/q mod p)
-  //
-  case RsaKeyDp:
-  case RsaKeyDq:
-  case RsaKeyQInv:
-    if (BnDp == NULL) {
-      BnDp = BN_new ();
-    }
-    if (BnDq == NULL) {
-      BnDq = BN_new ();
-    }
-    if (BnQInv == NULL) {
-      BnQInv = BN_new ();
-    }
-    if ((BnDp == NULL) || (BnDq == NULL) || (BnQInv == NULL)) {
-      return FALSE;
-    }
-
-    switch (KeyTag) {
+    //
+    // p's CRT Exponent (== d mod (p - 1)),  q's CRT Exponent (== d mod (q - 1)),
+    // and CRT Coefficient (== 1/q mod p)
+    //
     case RsaKeyDp:
-      BnDp = BN_bin2bn (BigNumber, (UINT32)BnSize, BnDp);
-      break;
     case RsaKeyDq:
-      BnDq = BN_bin2bn (BigNumber, (UINT32)BnSize, BnDq);
-      break;
     case RsaKeyQInv:
-      BnQInv = BN_bin2bn (BigNumber, (UINT32)BnSize, BnQInv);
+      if (BnDp == NULL) {
+        BnDp = BN_new ();
+      }
+
+      if (BnDq == NULL) {
+        BnDq = BN_new ();
+      }
+
+      if (BnQInv == NULL) {
+        BnQInv = BN_new ();
+      }
+
+      if ((BnDp == NULL) || (BnDq == NULL) || (BnQInv == NULL)) {
+        return FALSE;
+      }
+
+      switch (KeyTag) {
+        case RsaKeyDp:
+          BnDp = BN_bin2bn (BigNumber, (UINT32)BnSize, BnDp);
+          break;
+        case RsaKeyDq:
+          BnDq = BN_bin2bn (BigNumber, (UINT32)BnSize, BnDq);
+          break;
+        case RsaKeyQInv:
+          BnQInv = BN_bin2bn (BigNumber, (UINT32)BnSize, BnQInv);
+          break;
+        default:
+          return FALSE;
+      }
+
+      if (RSA_set0_crt_params (RsaKey, BN_dup (BnDp), BN_dup (BnDq), BN_dup (BnQInv)) == 0) {
+        return FALSE;
+      }
+
       break;
+
     default:
       return FALSE;
-    }
-    if (RSA_set0_crt_params (RsaKey, BN_dup(BnDp), BN_dup(BnDq), BN_dup(BnQInv)) == 0) {
-      return FALSE;
-    }
-
-    break;
-
-  default:
-    return FALSE;
   }
 
   return TRUE;
@@ -272,17 +281,17 @@ RsaPkcs1Verify (
   IN  UINTN        SigSize
   )
 {
-  INT32    DigestType;
-  UINT8    *SigBuf;
+  INT32  DigestType;
+  UINT8  *SigBuf;
 
   //
   // Check input parameters.
   //
-  if (RsaContext == NULL || MessageHash == NULL || Signature == NULL) {
+  if ((RsaContext == NULL) || (MessageHash == NULL) || (Signature == NULL)) {
     return FALSE;
   }
 
-  if (SigSize > INT_MAX || SigSize == 0) {
+  if ((SigSize > INT_MAX) || (SigSize == 0)) {
     return FALSE;
   }
 
@@ -291,37 +300,37 @@ RsaPkcs1Verify (
   //   Only MD5, SHA-1, SHA-256, SHA-384 or SHA-512 algorithm is supported.
   //
   switch (HashSize) {
-  case MD5_DIGEST_SIZE:
-    DigestType = NID_md5;
-    break;
+    case MD5_DIGEST_SIZE:
+      DigestType = NID_md5;
+      break;
 
-  case SHA1_DIGEST_SIZE:
-    DigestType = NID_sha1;
-    break;
+    case SHA1_DIGEST_SIZE:
+      DigestType = NID_sha1;
+      break;
 
-  case SHA256_DIGEST_SIZE:
-    DigestType = NID_sha256;
-    break;
+    case SHA256_DIGEST_SIZE:
+      DigestType = NID_sha256;
+      break;
 
-  case SHA384_DIGEST_SIZE:
-    DigestType = NID_sha384;
-    break;
+    case SHA384_DIGEST_SIZE:
+      DigestType = NID_sha384;
+      break;
 
-  case SHA512_DIGEST_SIZE:
-    DigestType = NID_sha512;
-    break;
+    case SHA512_DIGEST_SIZE:
+      DigestType = NID_sha512;
+      break;
 
-  default:
-    return FALSE;
+    default:
+      return FALSE;
   }
 
-  SigBuf = (UINT8 *) Signature;
-  return (BOOLEAN) RSA_verify (
-                     DigestType,
-                     MessageHash,
-                     (UINT32) HashSize,
-                     SigBuf,
-                     (UINT32) SigSize,
-                     (RSA *) RsaContext
-                     );
+  SigBuf = (UINT8 *)Signature;
+  return (BOOLEAN)RSA_verify (
+                    DigestType,
+                    MessageHash,
+                    (UINT32)HashSize,
+                    SigBuf,
+                    (UINT32)SigSize,
+                    (RSA *)RsaContext
+                    );
 }

CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c

@@ -54,82 +54,81 @@ RsaGetKey (
   IN OUT  UINTN        *BnSize
   )
 {
-  RSA    *RsaKey;
-  BIGNUM *BnKey;
-  UINTN  Size;
+  RSA     *RsaKey;
+  BIGNUM  *BnKey;
+  UINTN   Size;
 
   //
   // Check input parameters.
   //
-  if (RsaContext == NULL || BnSize == NULL) {
+  if ((RsaContext == NULL) || (BnSize == NULL)) {
     return FALSE;
   }
 
-  RsaKey  = (RSA *) RsaContext;
+  RsaKey  = (RSA *)RsaContext;
   Size    = *BnSize;
   *BnSize = 0;
   BnKey   = NULL;
 
   switch (KeyTag) {
+    //
+    // RSA Public Modulus (N)
+    //
+    case RsaKeyN:
+      RSA_get0_key (RsaKey, (const BIGNUM **)&BnKey, NULL, NULL);
+      break;
 
-  //
-  // RSA Public Modulus (N)
-  //
-  case RsaKeyN:
-    RSA_get0_key (RsaKey, (const BIGNUM **)&BnKey, NULL, NULL);
-    break;
+    //
+    // RSA Public Exponent (e)
+    //
+    case RsaKeyE:
+      RSA_get0_key (RsaKey, NULL, (const BIGNUM **)&BnKey, NULL);
+      break;
 
-  //
-  // RSA Public Exponent (e)
-  //
-  case RsaKeyE:
-    RSA_get0_key (RsaKey, NULL, (const BIGNUM **)&BnKey, NULL);
-    break;
+    //
+    // RSA Private Exponent (d)
+    //
+    case RsaKeyD:
+      RSA_get0_key (RsaKey, NULL, NULL, (const BIGNUM **)&BnKey);
+      break;
 
-  //
-  // RSA Private Exponent (d)
-  //
-  case RsaKeyD:
-    RSA_get0_key (RsaKey, NULL, NULL, (const BIGNUM **)&BnKey);
-    break;
+    //
+    // RSA Secret Prime Factor of Modulus (p)
+    //
+    case RsaKeyP:
+      RSA_get0_factors (RsaKey, (const BIGNUM **)&BnKey, NULL);
+      break;
 
-  //
-  // RSA Secret Prime Factor of Modulus (p)
-  //
-  case RsaKeyP:
-    RSA_get0_factors (RsaKey, (const BIGNUM **)&BnKey, NULL);
-    break;
+    //
+    // RSA Secret Prime Factor of Modules (q)
+    //
+    case RsaKeyQ:
+      RSA_get0_factors (RsaKey, NULL, (const BIGNUM **)&BnKey);
+      break;
 
-  //
-  // RSA Secret Prime Factor of Modules (q)
-  //
-  case RsaKeyQ:
-    RSA_get0_factors (RsaKey, NULL, (const BIGNUM **)&BnKey);
-    break;
+    //
+    // p's CRT Exponent (== d mod (p - 1))
+    //
+    case RsaKeyDp:
+      RSA_get0_crt_params (RsaKey, (const BIGNUM **)&BnKey, NULL, NULL);
+      break;
 
-  //
-  // p's CRT Exponent (== d mod (p - 1))
-  //
-  case RsaKeyDp:
-    RSA_get0_crt_params (RsaKey, (const BIGNUM **)&BnKey, NULL, NULL);
-    break;
+    //
+    // q's CRT Exponent (== d mod (q - 1))
+    //
+    case RsaKeyDq:
+      RSA_get0_crt_params (RsaKey, NULL, (const BIGNUM **)&BnKey, NULL);
+      break;
 
-  //
-  // q's CRT Exponent (== d mod (q - 1))
-  //
-  case RsaKeyDq:
-    RSA_get0_crt_params (RsaKey, NULL, (const BIGNUM **)&BnKey, NULL);
-    break;
+    //
+    // The CRT Coefficient (== 1/q mod p)
+    //
+    case RsaKeyQInv:
+      RSA_get0_crt_params (RsaKey, NULL, NULL, (const BIGNUM **)&BnKey);
+      break;
 
-  //
-  // The CRT Coefficient (== 1/q mod p)
-  //
-  case RsaKeyQInv:
-    RSA_get0_crt_params (RsaKey, NULL, NULL, (const BIGNUM **)&BnKey);
-    break;
-
-  default:
-    return FALSE;
+    default:
+      return FALSE;
   }
 
   if (BnKey == NULL) {
@@ -148,7 +147,8 @@ RsaGetKey (
     *BnSize = Size;
     return TRUE;
   }
-  *BnSize = BN_bn2bin (BnKey, BigNumber) ;
+
+  *BnSize = BN_bn2bin (BnKey, BigNumber);
 
   return TRUE;
 }
@@ -189,7 +189,7 @@ RsaGenerateKey (
   //
   // Check input parameters.
   //
-  if (RsaContext == NULL || ModulusLength > INT_MAX || PublicExponentSize > INT_MAX) {
+  if ((RsaContext == NULL) || (ModulusLength > INT_MAX) || (PublicExponentSize > INT_MAX)) {
     return FALSE;
   }
 
@@ -205,13 +205,13 @@ RsaGenerateKey (
       goto _Exit;
     }
   } else {
-    if (BN_bin2bn (PublicExponent, (UINT32) PublicExponentSize, KeyE) == NULL) {
+    if (BN_bin2bn (PublicExponent, (UINT32)PublicExponentSize, KeyE) == NULL) {
       goto _Exit;
     }
   }
 
-  if (RSA_generate_key_ex ((RSA *) RsaContext, (UINT32) ModulusLength, KeyE, NULL) == 1) {
-   RetVal = TRUE;
+  if (RSA_generate_key_ex ((RSA *)RsaContext, (UINT32)ModulusLength, KeyE, NULL) == 1) {
+    RetVal = TRUE;
   }
 
 _Exit:
@@ -253,12 +253,13 @@ RsaCheckKey (
     return FALSE;
   }
 
-  if  (RSA_check_key ((RSA *) RsaContext) != 1) {
+  if (RSA_check_key ((RSA *)RsaContext) != 1) {
     Reason = ERR_GET_REASON (ERR_peek_last_error ());
-    if (Reason == RSA_R_P_NOT_PRIME ||
-        Reason == RSA_R_Q_NOT_PRIME ||
-        Reason == RSA_R_N_DOES_NOT_EQUAL_P_Q ||
-        Reason == RSA_R_D_E_NOT_CONGRUENT_TO_1) {
+    if ((Reason == RSA_R_P_NOT_PRIME) ||
+        (Reason == RSA_R_Q_NOT_PRIME) ||
+        (Reason == RSA_R_N_DOES_NOT_EQUAL_P_Q) ||
+        (Reason == RSA_R_D_E_NOT_CONGRUENT_TO_1))
+    {
       return FALSE;
     }
   }
@@ -301,18 +302,18 @@ RsaPkcs1Sign (
   IN OUT  UINTN        *SigSize
   )
 {
-  RSA      *Rsa;
-  UINTN    Size;
-  INT32    DigestType;
+  RSA    *Rsa;
+  UINTN  Size;
+  INT32  DigestType;
 
   //
   // Check input parameters.
   //
-  if (RsaContext == NULL || MessageHash == NULL) {
+  if ((RsaContext == NULL) || (MessageHash == NULL)) {
     return FALSE;
   }
 
-  Rsa = (RSA *) RsaContext;
+  Rsa  = (RSA *)RsaContext;
   Size = RSA_size (Rsa);
 
   if (*SigSize < Size) {
@@ -329,36 +330,36 @@ RsaPkcs1Sign (
   //   Only MD5, SHA-1, SHA-256, SHA-384 or SHA-512 algorithm is supported.
   //
   switch (HashSize) {
-  case MD5_DIGEST_SIZE:
-    DigestType = NID_md5;
-    break;
+    case MD5_DIGEST_SIZE:
+      DigestType = NID_md5;
+      break;
 
-  case SHA1_DIGEST_SIZE:
-    DigestType = NID_sha1;
-    break;
+    case SHA1_DIGEST_SIZE:
+      DigestType = NID_sha1;
+      break;
 
-  case SHA256_DIGEST_SIZE:
-    DigestType = NID_sha256;
-    break;
+    case SHA256_DIGEST_SIZE:
+      DigestType = NID_sha256;
+      break;
 
-  case SHA384_DIGEST_SIZE:
-    DigestType = NID_sha384;
-    break;
+    case SHA384_DIGEST_SIZE:
+      DigestType = NID_sha384;
+      break;
 
-  case SHA512_DIGEST_SIZE:
-    DigestType = NID_sha512;
-    break;
+    case SHA512_DIGEST_SIZE:
+      DigestType = NID_sha512;
+      break;
 
-  default:
-    return FALSE;
+    default:
+      return FALSE;
   }
 
-  return (BOOLEAN) RSA_sign (
-                     DigestType,
-                     MessageHash,
-                     (UINT32) HashSize,
-                     Signature,
-                     (UINT32 *) SigSize,
-                     (RSA *) RsaContext
-                     );
+  return (BOOLEAN)RSA_sign (
+                    DigestType,
+                    MessageHash,
+                    (UINT32)HashSize,
+                    Signature,
+                    (UINT32 *)SigSize,
+                    (RSA *)RsaContext
+                    );
 }

CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExtNull.c

@@ -115,5 +115,3 @@ RsaPkcs1Sign (
   ASSERT (FALSE);
   return FALSE;
 }
-
-

CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPss.c

@@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 
-
 /**
   Retrieve a pointer to EVP message digest object.
 
@@ -25,27 +24,26 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 STATIC
 const
-EVP_MD*
+EVP_MD *
 GetEvpMD (
-  IN UINT16 DigestLen
+  IN UINT16  DigestLen
   )
 {
-  switch (DigestLen){
+  switch (DigestLen) {
     case SHA256_DIGEST_SIZE:
-      return EVP_sha256();
+      return EVP_sha256 ();
       break;
     case SHA384_DIGEST_SIZE:
-      return EVP_sha384();
+      return EVP_sha384 ();
       break;
     case SHA512_DIGEST_SIZE:
-      return EVP_sha512();
+      return EVP_sha512 ();
       break;
     default:
       return NULL;
   }
 }
 
-
 /**
   Verifies the RSA signature with RSASSA-PSS signature scheme defined in RFC 8017.
   Implementation determines salt length automatically from the signature encoding.
@@ -76,76 +74,84 @@ RsaPssVerify (
   IN  UINT16       SaltLen
   )
 {
-  BOOLEAN Result;
-  EVP_PKEY *EvpRsaKey;
-  EVP_MD_CTX *EvpVerifyCtx;
-  EVP_PKEY_CTX *KeyCtx;
+  BOOLEAN       Result;
+  EVP_PKEY      *EvpRsaKey;
+  EVP_MD_CTX    *EvpVerifyCtx;
+  EVP_PKEY_CTX  *KeyCtx;
   CONST EVP_MD  *HashAlg;
 
-  Result = FALSE;
-  EvpRsaKey = NULL;
+  Result       = FALSE;
+  EvpRsaKey    = NULL;
   EvpVerifyCtx = NULL;
-  KeyCtx = NULL;
-  HashAlg = NULL;
+  KeyCtx       = NULL;
+  HashAlg      = NULL;
 
   if (RsaContext == NULL) {
     return FALSE;
   }
-  if (Message == NULL || MsgSize == 0 || MsgSize > INT_MAX) {
+
+  if ((Message == NULL) || (MsgSize == 0) || (MsgSize > INT_MAX)) {
     return FALSE;
   }
-  if (Signature == NULL || SigSize == 0 || SigSize > INT_MAX) {
+
+  if ((Signature == NULL) || (SigSize == 0) || (SigSize > INT_MAX)) {
     return FALSE;
   }
+
   if (SaltLen != DigestLen) {
     return FALSE;
   }
 
-  HashAlg = GetEvpMD(DigestLen);
+  HashAlg = GetEvpMD (DigestLen);
 
   if (HashAlg == NULL) {
     return FALSE;
   }
 
-  EvpRsaKey = EVP_PKEY_new();
+  EvpRsaKey = EVP_PKEY_new ();
   if (EvpRsaKey == NULL) {
     goto _Exit;
   }
 
-  EVP_PKEY_set1_RSA(EvpRsaKey, RsaContext);
+  EVP_PKEY_set1_RSA (EvpRsaKey, RsaContext);
 
-  EvpVerifyCtx = EVP_MD_CTX_create();
+  EvpVerifyCtx = EVP_MD_CTX_create ();
   if (EvpVerifyCtx == NULL) {
     goto _Exit;
   }
 
-  Result = EVP_DigestVerifyInit(EvpVerifyCtx, &KeyCtx, HashAlg, NULL, EvpRsaKey) > 0;
+  Result = EVP_DigestVerifyInit (EvpVerifyCtx, &KeyCtx, HashAlg, NULL, EvpRsaKey) > 0;
   if (KeyCtx == NULL) {
     goto _Exit;
   }
 
   if (Result) {
-    Result = EVP_PKEY_CTX_set_rsa_padding(KeyCtx, RSA_PKCS1_PSS_PADDING) > 0;
-  }
-  if (Result) {
-    Result = EVP_PKEY_CTX_set_rsa_pss_saltlen(KeyCtx, SaltLen) > 0;
-  }
-  if (Result) {
-    Result = EVP_PKEY_CTX_set_rsa_mgf1_md(KeyCtx, HashAlg) > 0;
-  }
-  if (Result) {
-    Result = EVP_DigestVerifyUpdate(EvpVerifyCtx, Message, (UINT32)MsgSize) > 0;
-  }
-  if (Result) {
-    Result = EVP_DigestVerifyFinal(EvpVerifyCtx, Signature, (UINT32)SigSize) > 0;
+    Result = EVP_PKEY_CTX_set_rsa_padding (KeyCtx, RSA_PKCS1_PSS_PADDING) > 0;
   }
 
-_Exit :
-  if (EvpRsaKey != NULL) {
-    EVP_PKEY_free(EvpRsaKey);
+  if (Result) {
+    Result = EVP_PKEY_CTX_set_rsa_pss_saltlen (KeyCtx, SaltLen) > 0;
   }
+
+  if (Result) {
+    Result = EVP_PKEY_CTX_set_rsa_mgf1_md (KeyCtx, HashAlg) > 0;
+  }
+
+  if (Result) {
+    Result = EVP_DigestVerifyUpdate (EvpVerifyCtx, Message, (UINT32)MsgSize) > 0;
+  }
+
+  if (Result) {
+    Result = EVP_DigestVerifyFinal (EvpVerifyCtx, Signature, (UINT32)SigSize) > 0;
+  }
+
+_Exit:
+  if (EvpRsaKey != NULL) {
+    EVP_PKEY_free (EvpRsaKey);
+  }
+
   if (EvpVerifyCtx != NULL) {
-    EVP_MD_CTX_destroy(EvpVerifyCtx);
+    EVP_MD_CTX_destroy (EvpVerifyCtx);
   }
 
   return Result;

CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPssSign.c

@@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 
-
 /**
   Retrieve a pointer to EVP message digest object.
 
@@ -25,27 +24,26 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 STATIC
 const
-EVP_MD*
+EVP_MD *
 GetEvpMD (
-  IN UINT16 DigestLen
+  IN UINT16  DigestLen
   )
 {
-  switch (DigestLen){
+  switch (DigestLen) {
     case SHA256_DIGEST_SIZE:
-      return EVP_sha256();
+      return EVP_sha256 ();
       break;
     case SHA384_DIGEST_SIZE:
-      return EVP_sha384();
+      return EVP_sha384 ();
       break;
     case SHA512_DIGEST_SIZE:
-      return EVP_sha512();
+      return EVP_sha512 ();
       break;
     default:
       return NULL;
   }
 }
 
-
 /**
   Carries out the RSA-SSA signature generation with EMSA-PSS encoding scheme.
 
@@ -90,23 +88,24 @@ RsaPssSign (
   IN OUT  UINTN        *SigSize
   )
 {
-  BOOLEAN               Result;
-  UINTN                 RsaSigSize;
-  EVP_PKEY              *EvpRsaKey;
-  EVP_MD_CTX            *EvpVerifyCtx;
-  EVP_PKEY_CTX          *KeyCtx;
-  CONST EVP_MD          *HashAlg;
+  BOOLEAN       Result;
+  UINTN         RsaSigSize;
+  EVP_PKEY      *EvpRsaKey;
+  EVP_MD_CTX    *EvpVerifyCtx;
+  EVP_PKEY_CTX  *KeyCtx;
+  CONST EVP_MD  *HashAlg;
 
-  Result = FALSE;
-  EvpRsaKey = NULL;
+  Result       = FALSE;
+  EvpRsaKey    = NULL;
   EvpVerifyCtx = NULL;
-  KeyCtx = NULL;
-  HashAlg = NULL;
+  KeyCtx       = NULL;
+  HashAlg      = NULL;
 
   if (RsaContext == NULL) {
     return FALSE;
   }
-  if (Message == NULL || MsgSize == 0 || MsgSize > INT_MAX) {
+
+  if ((Message == NULL) || (MsgSize == 0) || (MsgSize > INT_MAX)) {
     return FALSE;
   }
 
@@ -124,51 +123,56 @@ RsaPssSign (
     return FALSE;
   }
 
-  HashAlg = GetEvpMD(DigestLen);
+  HashAlg = GetEvpMD (DigestLen);
 
   if (HashAlg == NULL) {
     return FALSE;
   }
 
-  EvpRsaKey = EVP_PKEY_new();
+  EvpRsaKey = EVP_PKEY_new ();
   if (EvpRsaKey == NULL) {
     goto _Exit;
   }
 
-  EVP_PKEY_set1_RSA(EvpRsaKey, RsaContext);
+  EVP_PKEY_set1_RSA (EvpRsaKey, RsaContext);
 
-  EvpVerifyCtx = EVP_MD_CTX_create();
+  EvpVerifyCtx = EVP_MD_CTX_create ();
   if (EvpVerifyCtx == NULL) {
     goto _Exit;
   }
 
-  Result = EVP_DigestSignInit(EvpVerifyCtx, &KeyCtx, HashAlg, NULL, EvpRsaKey) > 0;
+  Result = EVP_DigestSignInit (EvpVerifyCtx, &KeyCtx, HashAlg, NULL, EvpRsaKey) > 0;
   if (KeyCtx == NULL) {
     goto _Exit;
   }
 
   if (Result) {
-    Result = EVP_PKEY_CTX_set_rsa_padding(KeyCtx, RSA_PKCS1_PSS_PADDING) > 0;
-  }
-  if (Result) {
-    Result = EVP_PKEY_CTX_set_rsa_pss_saltlen(KeyCtx, SaltLen) > 0;
-  }
-  if (Result) {
-    Result = EVP_PKEY_CTX_set_rsa_mgf1_md(KeyCtx, HashAlg) > 0;
-  }
-  if (Result) {
-    Result = EVP_DigestSignUpdate(EvpVerifyCtx, Message, (UINT32)MsgSize) > 0;
-  }
-  if (Result) {
-    Result = EVP_DigestSignFinal(EvpVerifyCtx, Signature, SigSize) > 0;
+    Result = EVP_PKEY_CTX_set_rsa_padding (KeyCtx, RSA_PKCS1_PSS_PADDING) > 0;
   }
 
-_Exit :
-  if (EvpRsaKey != NULL) {
-    EVP_PKEY_free(EvpRsaKey);
+  if (Result) {
+    Result = EVP_PKEY_CTX_set_rsa_pss_saltlen (KeyCtx, SaltLen) > 0;
   }
+
+  if (Result) {
+    Result = EVP_PKEY_CTX_set_rsa_mgf1_md (KeyCtx, HashAlg) > 0;
+  }
+
+  if (Result) {
+    Result = EVP_DigestSignUpdate (EvpVerifyCtx, Message, (UINT32)MsgSize) > 0;
+  }
+
+  if (Result) {
+    Result = EVP_DigestSignFinal (EvpVerifyCtx, Signature, SigSize) > 0;
+  }
+
+_Exit:
+  if (EvpRsaKey != NULL) {
+    EVP_PKEY_free (EvpRsaKey);
+  }
+
   if (EvpVerifyCtx != NULL) {
-    EVP_MD_CTX_destroy(EvpVerifyCtx);
+    EVP_MD_CTX_destroy (EvpVerifyCtx);
   }
 
   return Result;

CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c

@@ -21,9 +21,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //
 // OID ASN.1 Value for SPC_RFC3161_OBJID ("1.3.6.1.4.1.311.3.3.1")
 //
-UINT8 mSpcRFC3161OidValue[] = {
+UINT8  mSpcRFC3161OidValue[] = {
   0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x03, 0x03, 0x01
-  };
+};
 
 ///
 /// The messageImprint field SHOULD contain the hash of the datum to be
@@ -36,8 +36,8 @@ UINT8 mSpcRFC3161OidValue[] = {
 ///   hashedMessage                OCTET STRING  }
 ///
 typedef struct {
-  X509_ALGOR         *HashAlgorithm;
-  ASN1_OCTET_STRING  *HashedMessage;
+  X509_ALGOR           *HashAlgorithm;
+  ASN1_OCTET_STRING    *HashedMessage;
 } TS_MESSAGE_IMPRINT;
 
 //
@@ -60,9 +60,9 @@ IMPLEMENT_ASN1_FUNCTIONS (TS_MESSAGE_IMPRINT)
 ///       micros     [1] INTEGER  (1..999)    OPTIONAL  }
 ///
 typedef struct {
-  ASN1_INTEGER  *Seconds;
-  ASN1_INTEGER  *Millis;
-  ASN1_INTEGER  *Micros;
+  ASN1_INTEGER    *Seconds;
+  ASN1_INTEGER    *Millis;
+  ASN1_INTEGER    *Micros;
 } TS_ACCURACY;
 
 //
@@ -70,7 +70,7 @@ typedef struct {
 //
 DECLARE_ASN1_FUNCTIONS (TS_ACCURACY)
 ASN1_SEQUENCE (TS_ACCURACY) = {
-  ASN1_OPT     (TS_ACCURACY, Seconds, ASN1_INTEGER),
+  ASN1_OPT (TS_ACCURACY,     Seconds, ASN1_INTEGER),
   ASN1_IMP_OPT (TS_ACCURACY, Millis,  ASN1_INTEGER, 0),
   ASN1_IMP_OPT (TS_ACCURACY, Micros,  ASN1_INTEGER, 1)
 } ASN1_SEQUENCE_END (TS_ACCURACY)
@@ -99,16 +99,16 @@ IMPLEMENT_ASN1_FUNCTIONS (TS_ACCURACY)
 ///     extensions                   [1] IMPLICIT Extensions   OPTIONAL  }
 ///
 typedef struct {
-  ASN1_INTEGER              *Version;
-  ASN1_OBJECT               *Policy;
-  TS_MESSAGE_IMPRINT        *MessageImprint;
-  ASN1_INTEGER              *SerialNumber;
-  ASN1_GENERALIZEDTIME      *GenTime;
-  TS_ACCURACY               *Accuracy;
-  ASN1_BOOLEAN              Ordering;
-  ASN1_INTEGER              *Nonce;
-  GENERAL_NAME              *Tsa;
-  STACK_OF(X509_EXTENSION)  *Extensions;
+  ASN1_INTEGER            *Version;
+  ASN1_OBJECT             *Policy;
+  TS_MESSAGE_IMPRINT      *MessageImprint;
+  ASN1_INTEGER            *SerialNumber;
+  ASN1_GENERALIZEDTIME    *GenTime;
+  TS_ACCURACY             *Accuracy;
+  ASN1_BOOLEAN            Ordering;
+  ASN1_INTEGER            *Nonce;
+  GENERAL_NAME            *Tsa;
+  STACK_OF (X509_EXTENSION)  *Extensions;
 } TS_TST_INFO;
 
 //
@@ -116,20 +116,19 @@ typedef struct {
 //
 DECLARE_ASN1_FUNCTIONS (TS_TST_INFO)
 ASN1_SEQUENCE (TS_TST_INFO) = {
-  ASN1_SIMPLE (TS_TST_INFO, Version, ASN1_INTEGER),
-  ASN1_SIMPLE (TS_TST_INFO, Policy, ASN1_OBJECT),
-  ASN1_SIMPLE (TS_TST_INFO, MessageImprint, TS_MESSAGE_IMPRINT),
-  ASN1_SIMPLE (TS_TST_INFO, SerialNumber, ASN1_INTEGER),
-  ASN1_SIMPLE (TS_TST_INFO, GenTime, ASN1_GENERALIZEDTIME),
-  ASN1_OPT    (TS_TST_INFO, Accuracy, TS_ACCURACY),
-  ASN1_OPT    (TS_TST_INFO, Ordering, ASN1_FBOOLEAN),
-  ASN1_OPT    (TS_TST_INFO, Nonce, ASN1_INTEGER),
-  ASN1_EXP_OPT(TS_TST_INFO, Tsa, GENERAL_NAME, 0),
-  ASN1_IMP_SEQUENCE_OF_OPT (TS_TST_INFO, Extensions, X509_EXTENSION, 1)
+  ASN1_SIMPLE (TS_TST_INFO,              Version,        ASN1_INTEGER),
+  ASN1_SIMPLE (TS_TST_INFO,              Policy,         ASN1_OBJECT),
+  ASN1_SIMPLE (TS_TST_INFO,              MessageImprint, TS_MESSAGE_IMPRINT),
+  ASN1_SIMPLE (TS_TST_INFO,              SerialNumber,   ASN1_INTEGER),
+  ASN1_SIMPLE (TS_TST_INFO,              GenTime,        ASN1_GENERALIZEDTIME),
+  ASN1_OPT (TS_TST_INFO,                 Accuracy,       TS_ACCURACY),
+  ASN1_OPT (TS_TST_INFO,                 Ordering,       ASN1_FBOOLEAN),
+  ASN1_OPT (TS_TST_INFO,                 Nonce,          ASN1_INTEGER),
+  ASN1_EXP_OPT (TS_TST_INFO,             Tsa,            GENERAL_NAME,         0),
+  ASN1_IMP_SEQUENCE_OF_OPT (TS_TST_INFO, Extensions,     X509_EXTENSION,       1)
 } ASN1_SEQUENCE_END (TS_TST_INFO)
 IMPLEMENT_ASN1_FUNCTIONS (TS_TST_INFO)
 
-
 /**
   Convert ASN.1 GeneralizedTime to EFI Time.
 
@@ -154,17 +153,19 @@ ConvertAsn1TimeToEfiTime (
     return FALSE;
   }
 
-  Str = (CONST CHAR8*)Asn1Time->data;
+  Str = (CONST CHAR8 *)Asn1Time->data;
   SetMem (EfiTime, sizeof (EFI_TIME), 0);
 
   Index = 0;
-  if (Asn1Time->type == V_ASN1_UTCTIME) {               /* two digit year */
+  if (Asn1Time->type == V_ASN1_UTCTIME) {
+    /* two digit year */
     EfiTime->Year  = (Str[Index++] - '0') * 10;
     EfiTime->Year += (Str[Index++] - '0');
     if (EfiTime->Year < 70) {
       EfiTime->Year += 100;
     }
-  } else if (Asn1Time->type == V_ASN1_GENERALIZEDTIME) { /* four digit year */
+  } else if (Asn1Time->type == V_ASN1_GENERALIZEDTIME) {
+    /* four digit year */
     EfiTime->Year  = (Str[Index++] - '0') * 1000;
     EfiTime->Year += (Str[Index++] - '0') * 100;
     EfiTime->Year += (Str[Index++] - '0') * 10;
@@ -174,20 +175,20 @@ ConvertAsn1TimeToEfiTime (
     }
   }
 
-  EfiTime->Month   = (Str[Index++] - '0') * 10;
-  EfiTime->Month  += (Str[Index++] - '0');
+  EfiTime->Month  = (Str[Index++] - '0') * 10;
+  EfiTime->Month += (Str[Index++] - '0');
   if ((EfiTime->Month < 1) || (EfiTime->Month > 12)) {
     return FALSE;
   }
 
-  EfiTime->Day     = (Str[Index++] - '0') * 10;
-  EfiTime->Day    += (Str[Index++] - '0');
+  EfiTime->Day  = (Str[Index++] - '0') * 10;
+  EfiTime->Day += (Str[Index++] - '0');
   if ((EfiTime->Day < 1) || (EfiTime->Day > 31)) {
     return FALSE;
   }
 
-  EfiTime->Hour    = (Str[Index++] - '0') * 10;
-  EfiTime->Hour   += (Str[Index++] - '0');
+  EfiTime->Hour  = (Str[Index++] - '0') * 10;
+  EfiTime->Hour += (Str[Index++] - '0');
   if (EfiTime->Hour > 23) {
     return FALSE;
   }
@@ -275,22 +276,27 @@ CheckTSTInfo (
     goto _Exit;
   }
 
-  MdSize = EVP_MD_size (Md);
+  MdSize    = EVP_MD_size (Md);
   HashedMsg = AllocateZeroPool (MdSize);
   if (HashedMsg == NULL) {
     goto _Exit;
   }
+
   MdCtx = EVP_MD_CTX_new ();
   if (MdCtx == NULL) {
     goto _Exit;
   }
+
   if ((EVP_DigestInit_ex (MdCtx, Md, NULL) != 1) ||
       (EVP_DigestUpdate (MdCtx, TimestampedData, DataSize) != 1) ||
-      (EVP_DigestFinal (MdCtx, HashedMsg, NULL) != 1)) {
+      (EVP_DigestFinal (MdCtx, HashedMsg, NULL) != 1))
+  {
     goto _Exit;
   }
+
   if ((MdSize == (UINTN)ASN1_STRING_length (Imprint->HashedMessage)) &&
-      (CompareMem (HashedMsg, ASN1_STRING_get0_data (Imprint->HashedMessage), MdSize) != 0)) {
+      (CompareMem (HashedMsg, ASN1_STRING_get0_data (Imprint->HashedMessage), MdSize) != 0))
+  {
     goto _Exit;
   }
 
@@ -376,7 +382,8 @@ TimestampTokenVerify (
   // Check input parameters
   //
   if ((TSToken == NULL) || (TsaCert == NULL) || (TimestampedData == NULL) ||
-      (TokenSize > INT_MAX) || (CertSize > INT_MAX) || (DataSize > INT_MAX)) {
+      (TokenSize > INT_MAX) || (CertSize > INT_MAX) || (DataSize > INT_MAX))
+  {
     return FALSE;
   }
 
@@ -386,6 +393,7 @@ TimestampTokenVerify (
   if (SigningTime != NULL) {
     SetMem (SigningTime, sizeof (EFI_TIME), 0);
   }
+
   Pkcs7     = NULL;
   Cert      = NULL;
   CertStore = NULL;
@@ -397,7 +405,7 @@ TimestampTokenVerify (
   // TimeStamp Token should contain one valid DER-encoded ASN.1 PKCS#7 structure.
   //
   TokenTemp = TSToken;
-  Pkcs7     = d2i_PKCS7 (NULL, (const unsigned char **) &TokenTemp, (int) TokenSize);
+  Pkcs7     = d2i_PKCS7 (NULL, (const unsigned char **)&TokenTemp, (int)TokenSize);
   if (Pkcs7 == NULL) {
     goto _Exit;
   }
@@ -413,7 +421,7 @@ TimestampTokenVerify (
   // Read the trusted TSA certificate (DER-encoded), and Construct X509 Certificate.
   //
   CertTemp = TsaCert;
-  Cert = d2i_X509 (NULL, &CertTemp, (long) CertSize);
+  Cert     = d2i_X509 (NULL, &CertTemp, (long)CertSize);
   if (Cert == NULL) {
     goto _Exit;
   }
@@ -430,8 +438,10 @@ TimestampTokenVerify (
   // Allow partial certificate chains, terminated by a non-self-signed but
   // still trusted intermediate certificate. Also disable time checks.
   //
-  X509_STORE_set_flags (CertStore,
-                        X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME);
+  X509_STORE_set_flags (
+    CertStore,
+    X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME
+    );
 
   X509_STORE_set_purpose (CertStore, X509_PURPOSE_ANY);
 
@@ -442,6 +452,7 @@ TimestampTokenVerify (
   if (OutBio == NULL) {
     goto _Exit;
   }
+
   if (!PKCS7_verify (Pkcs7, NULL, CertStore, NULL, OutBio, PKCS7_BINARY)) {
     goto _Exit;
   }
@@ -453,14 +464,18 @@ TimestampTokenVerify (
   if (TstData == NULL) {
     goto _Exit;
   }
-  TstSize = BIO_read (OutBio, (void *) TstData, 2048);
+
+  TstSize = BIO_read (OutBio, (void *)TstData, 2048);
 
   //
   // Construct TS_TST_INFO structure from the signed contents.
   //
   TstTemp = TstData;
-  TstInfo = d2i_TS_TST_INFO (NULL, (const unsigned char **) &TstTemp,
-              (int)TstSize);
+  TstInfo = d2i_TS_TST_INFO (
+              NULL,
+              (const unsigned char **)&TstTemp,
+              (int)TstSize
+              );
   if (TstInfo == NULL) {
     goto _Exit;
   }
@@ -527,19 +542,21 @@ ImageTimestampVerify (
   OUT EFI_TIME     *SigningTime
   )
 {
-  BOOLEAN                      Status;
-  PKCS7                        *Pkcs7;
-  CONST UINT8                  *Temp;
-  STACK_OF(PKCS7_SIGNER_INFO)  *SignerInfos;
-  PKCS7_SIGNER_INFO            *SignInfo;
-  UINTN                        Index;
-  STACK_OF(X509_ATTRIBUTE)     *Sk;
-  X509_ATTRIBUTE               *Xa;
-  ASN1_OBJECT                  *XaObj;
-  ASN1_TYPE                    *Asn1Type;
-  ASN1_OCTET_STRING            *EncDigest;
-  UINT8                        *TSToken;
-  UINTN                        TokenSize;
+  BOOLEAN      Status;
+  PKCS7        *Pkcs7;
+  CONST UINT8  *Temp;
+
+  STACK_OF (PKCS7_SIGNER_INFO)  *SignerInfos;
+  PKCS7_SIGNER_INFO  *SignInfo;
+  UINTN              Index;
+
+  STACK_OF (X509_ATTRIBUTE)     *Sk;
+  X509_ATTRIBUTE     *Xa;
+  ASN1_OBJECT        *XaObj;
+  ASN1_TYPE          *Asn1Type;
+  ASN1_OCTET_STRING  *EncDigest;
+  UINT8              *TSToken;
+  UINTN              TokenSize;
 
   //
   // Input Parameters Checking.
@@ -556,22 +573,23 @@ ImageTimestampVerify (
   // Register & Initialize necessary digest algorithms for PKCS#7 Handling.
   //
   if ((EVP_add_digest (EVP_md5 ()) == 0) || (EVP_add_digest (EVP_sha1 ()) == 0) ||
-      (EVP_add_digest (EVP_sha256 ()) == 0) || (EVP_add_digest_alias (SN_sha1WithRSAEncryption, SN_sha1WithRSA)) == 0) {
+      (EVP_add_digest (EVP_sha256 ()) == 0) || ((EVP_add_digest_alias (SN_sha1WithRSAEncryption, SN_sha1WithRSA)) == 0))
+  {
     return FALSE;
   }
 
   //
   // Initialization.
   //
-  Status    = FALSE;
-  Pkcs7     = NULL;
-  SignInfo  = NULL;
+  Status   = FALSE;
+  Pkcs7    = NULL;
+  SignInfo = NULL;
 
   //
   // Decode ASN.1-encoded Authenticode data into PKCS7 structure.
   //
   Temp  = AuthData;
-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &Temp, (int) DataSize);
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&Temp, (int)DataSize);
   if (Pkcs7 == NULL) {
     goto _Exit;
   }
@@ -605,12 +623,13 @@ ImageTimestampVerify (
   // of SignerInfo.
   //
   Sk = SignInfo->unauth_attr;
-  if (Sk == NULL) {             // No timestamp counterSignature.
+  if (Sk == NULL) {
+    // No timestamp counterSignature.
     goto _Exit;
   }
 
   Asn1Type = NULL;
-  for (Index = 0; Index < (UINTN) sk_X509_ATTRIBUTE_num (Sk); Index++) {
+  for (Index = 0; Index < (UINTN)sk_X509_ATTRIBUTE_num (Sk); Index++) {
     //
     // Search valid RFC3161 timestamp counterSignature based on OBJID.
     //
@@ -618,21 +637,26 @@ ImageTimestampVerify (
     if (Xa == NULL) {
       continue;
     }
-    XaObj = X509_ATTRIBUTE_get0_object(Xa);
+
+    XaObj = X509_ATTRIBUTE_get0_object (Xa);
     if (XaObj == NULL) {
       continue;
     }
-    if ((OBJ_length(XaObj) != sizeof (mSpcRFC3161OidValue)) ||
-        (CompareMem (OBJ_get0_data(XaObj), mSpcRFC3161OidValue, sizeof (mSpcRFC3161OidValue)) != 0)) {
+
+    if ((OBJ_length (XaObj) != sizeof (mSpcRFC3161OidValue)) ||
+        (CompareMem (OBJ_get0_data (XaObj), mSpcRFC3161OidValue, sizeof (mSpcRFC3161OidValue)) != 0))
+    {
       continue;
     }
-    Asn1Type = X509_ATTRIBUTE_get0_type(Xa, 0);
+
+    Asn1Type = X509_ATTRIBUTE_get0_type (Xa, 0);
   }
 
   if (Asn1Type == NULL) {
     Status = FALSE;
     goto _Exit;
   }
+
   TSToken   = Asn1Type->value.octet_string->data;
   TokenSize = Asn1Type->value.octet_string->length;
 

CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c

@@ -38,7 +38,7 @@ X509ConstructCertificate (
   //
   // Check input parameters.
   //
-  if (Cert == NULL || SingleX509Cert == NULL || CertSize > INT_MAX) {
+  if ((Cert == NULL) || (SingleX509Cert == NULL) || (CertSize > INT_MAX)) {
     return FALSE;
   }
 
@@ -46,12 +46,12 @@ X509ConstructCertificate (
   // Read DER-encoded X509 Certificate and Construct X509 object.
   //
   Temp     = Cert;
-  X509Cert = d2i_X509 (NULL, &Temp, (long) CertSize);
+  X509Cert = d2i_X509 (NULL, &Temp, (long)CertSize);
   if (X509Cert == NULL) {
     return FALSE;
   }
 
-  *SingleX509Cert = (UINT8 *) X509Cert;
+  *SingleX509Cert = (UINT8 *)X509Cert;
 
   return TRUE;
 }
@@ -82,12 +82,13 @@ X509ConstructCertificateStackV (
   IN      VA_LIST  Args
   )
 {
-  UINT8           *Cert;
-  UINTN           CertSize;
-  X509            *X509Cert;
-  STACK_OF(X509)  *CertStack;
-  BOOLEAN         Status;
-  UINTN           Index;
+  UINT8  *Cert;
+  UINTN  CertSize;
+  X509   *X509Cert;
+
+  STACK_OF (X509)  *CertStack;
+  BOOLEAN  Status;
+  UINTN    Index;
 
   //
   // Check input parameters.
@@ -101,7 +102,7 @@ X509ConstructCertificateStackV (
   //
   // Initialize X509 stack object.
   //
-  CertStack = (STACK_OF(X509) *) (*X509Stack);
+  CertStack = (STACK_OF (X509) *)(*X509Stack);
   if (CertStack == NULL) {
     CertStack = sk_X509_new_null ();
     if (CertStack == NULL) {
@@ -127,15 +128,16 @@ X509ConstructCertificateStackV (
     // Construct X509 Object from the given DER-encoded certificate data.
     //
     X509Cert = NULL;
-    Status = X509ConstructCertificate (
-               (CONST UINT8 *) Cert,
-               CertSize,
-               (UINT8 **) &X509Cert
-               );
+    Status   = X509ConstructCertificate (
+                 (CONST UINT8 *)Cert,
+                 CertSize,
+                 (UINT8 **)&X509Cert
+                 );
     if (!Status) {
       if (X509Cert != NULL) {
         X509_free (X509Cert);
       }
+
       break;
     }
 
@@ -148,7 +150,7 @@ X509ConstructCertificateStackV (
   if (!Status) {
     sk_X509_pop_free (CertStack, X509_free);
   } else {
-    *X509Stack = (UINT8 *) CertStack;
+    *X509Stack = (UINT8 *)CertStack;
   }
 
   return Status;
@@ -210,7 +212,7 @@ X509Free (
   //
   // Free OpenSSL X509 object.
   //
-  X509_free ((X509 *) X509Cert);
+  X509_free ((X509 *)X509Cert);
 }
 
 /**
@@ -237,7 +239,7 @@ X509StackFree (
   //
   // Free OpenSSL X509 stack object.
   //
-  sk_X509_pop_free ((STACK_OF(X509) *) X509Stack, X509_free);
+  sk_X509_pop_free ((STACK_OF (X509) *) X509Stack, X509_free);
 }
 
 /**
@@ -274,7 +276,7 @@ X509GetSubjectName (
   //
   // Check input parameters.
   //
-  if (Cert == NULL || SubjectSize == NULL) {
+  if ((Cert == NULL) || (SubjectSize == NULL)) {
     return FALSE;
   }
 
@@ -283,7 +285,7 @@ X509GetSubjectName (
   //
   // Read DER-encoded X509 Certificate and Construct X509 object.
   //
-  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);
+  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **)&X509Cert);
   if ((X509Cert == NULL) || (!Status)) {
     Status = FALSE;
     goto _Exit;
@@ -299,14 +301,15 @@ X509GetSubjectName (
     goto _Exit;
   }
 
-  X509NameSize = i2d_X509_NAME(X509Name, NULL);
+  X509NameSize = i2d_X509_NAME (X509Name, NULL);
   if (*SubjectSize < X509NameSize) {
     *SubjectSize = X509NameSize;
     goto _Exit;
   }
+
   *SubjectSize = X509NameSize;
   if (CertSubject != NULL) {
-    i2d_X509_NAME(X509Name, &CertSubject);
+    i2d_X509_NAME (X509Name, &CertSubject);
     Status = TRUE;
   }
 
@@ -351,11 +354,11 @@ _Exit:
 STATIC
 RETURN_STATUS
 InternalX509GetNIDName (
-  IN      CONST UINT8   *Cert,
-  IN      UINTN         CertSize,
-  IN      INT32         Request_NID,
-  OUT     CHAR8         *CommonName   OPTIONAL,
-  IN OUT  UINTN         *CommonNameSize
+  IN      CONST UINT8  *Cert,
+  IN      UINTN        CertSize,
+  IN      INT32        Request_NID,
+  OUT     CHAR8        *CommonName   OPTIONAL,
+  IN OUT  UINTN        *CommonNameSize
   )
 {
   RETURN_STATUS    ReturnStatus;
@@ -377,6 +380,7 @@ InternalX509GetNIDName (
   if ((Cert == NULL) || (CertSize > INT_MAX) || (CommonNameSize == NULL)) {
     return ReturnStatus;
   }
+
   if ((CommonName != NULL) && (*CommonNameSize == 0)) {
     return ReturnStatus;
   }
@@ -385,7 +389,7 @@ InternalX509GetNIDName (
   //
   // Read DER-encoded X509 Certificate and Construct X509 object.
   //
-  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);
+  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **)&X509Cert);
   if ((X509Cert == NULL) || (!Status)) {
     //
     // Invalid X.509 Certificate
@@ -443,12 +447,12 @@ InternalX509GetNIDName (
 
   if (CommonName == NULL) {
     *CommonNameSize = Length + 1;
-    ReturnStatus = RETURN_BUFFER_TOO_SMALL;
+    ReturnStatus    = RETURN_BUFFER_TOO_SMALL;
   } else {
     *CommonNameSize = MIN ((UINTN)Length, *CommonNameSize - 1) + 1;
     CopyMem (CommonName, UTF8Name, *CommonNameSize - 1);
     CommonName[*CommonNameSize - 1] = '\0';
-    ReturnStatus = RETURN_SUCCESS;
+    ReturnStatus                    = RETURN_SUCCESS;
   }
 
 _Exit:
@@ -458,6 +462,7 @@ _Exit:
   if (X509Cert != NULL) {
     X509_free (X509Cert);
   }
+
   if (UTF8Name != NULL) {
     OPENSSL_free (UTF8Name);
   }
@@ -532,10 +537,10 @@ X509GetCommonName (
 RETURN_STATUS
 EFIAPI
 X509GetOrganizationName (
-  IN      CONST UINT8   *Cert,
-  IN      UINTN         CertSize,
-  OUT     CHAR8         *NameBuffer   OPTIONAL,
-  IN OUT  UINTN         *NameBufferSize
+  IN      CONST UINT8  *Cert,
+  IN      UINTN        CertSize,
+  OUT     CHAR8        *NameBuffer   OPTIONAL,
+  IN OUT  UINTN        *NameBufferSize
   )
 {
   return InternalX509GetNIDName (Cert, CertSize, NID_organizationName, NameBuffer, NameBufferSize);
@@ -572,7 +577,7 @@ RsaGetPublicKeyFromX509 (
   //
   // Check input parameters.
   //
-  if (Cert == NULL || RsaContext == NULL) {
+  if ((Cert == NULL) || (RsaContext == NULL)) {
     return FALSE;
   }
 
@@ -582,7 +587,7 @@ RsaGetPublicKeyFromX509 (
   //
   // Read DER-encoded X509 Certificate and Construct X509 object.
   //
-  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);
+  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **)&X509Cert);
   if ((X509Cert == NULL) || (!Status)) {
     Status = FALSE;
     goto _Exit;
@@ -654,7 +659,7 @@ X509VerifyCert (
   //
   // Check input parameters.
   //
-  if (Cert == NULL || CACert == NULL) {
+  if ((Cert == NULL) || (CACert == NULL)) {
     return FALSE;
   }
 
@@ -670,9 +675,11 @@ X509VerifyCert (
   if (EVP_add_digest (EVP_md5 ()) == 0) {
     goto _Exit;
   }
+
   if (EVP_add_digest (EVP_sha1 ()) == 0) {
     goto _Exit;
   }
+
   if (EVP_add_digest (EVP_sha256 ()) == 0) {
     goto _Exit;
   }
@@ -680,7 +687,7 @@ X509VerifyCert (
   //
   // Read DER-encoded certificate to be verified and Construct X509 object.
   //
-  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);
+  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **)&X509Cert);
   if ((X509Cert == NULL) || (!Status)) {
     Status = FALSE;
     goto _Exit;
@@ -689,7 +696,7 @@ X509VerifyCert (
   //
   // Read DER-encoded root certificate and Construct X509 object.
   //
-  Status = X509ConstructCertificate (CACert, CACertSize, (UINT8 **) &X509CACert);
+  Status = X509ConstructCertificate (CACert, CACertSize, (UINT8 **)&X509CACert);
   if ((X509CACert == NULL) || (!Status)) {
     Status = FALSE;
     goto _Exit;
@@ -704,6 +711,7 @@ X509VerifyCert (
   if (CertStore == NULL) {
     goto _Exit;
   }
+
   if (!(X509_STORE_add_cert (CertStore, X509CACert))) {
     goto _Exit;
   }
@@ -712,8 +720,10 @@ X509VerifyCert (
   // Allow partial certificate chains, terminated by a non-self-signed but
   // still trusted intermediate certificate. Also disable time checks.
   //
-  X509_STORE_set_flags (CertStore,
-                        X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME);
+  X509_STORE_set_flags (
+    CertStore,
+    X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME
+    );
 
   //
   // Set up X509_STORE_CTX for the subsequent verification operation.
@@ -722,6 +732,7 @@ X509VerifyCert (
   if (CertCtx == NULL) {
     goto _Exit;
   }
+
   if (!X509_STORE_CTX_init (CertCtx, CertStore, X509Cert, NULL)) {
     goto _Exit;
   }
@@ -729,7 +740,7 @@ X509VerifyCert (
   //
   // X509 Certificate Verification.
   //
-  Status = (BOOLEAN) X509_verify_cert (CertCtx);
+  Status = (BOOLEAN)X509_verify_cert (CertCtx);
   X509_STORE_CTX_cleanup (CertCtx);
 
 _Exit:
@@ -787,7 +798,8 @@ X509GetTBSCert (
   // Check input parameters.
   //
   if ((Cert == NULL) || (TBSCert == NULL) ||
-      (TBSCertSize == NULL) || (CertSize > INT_MAX)) {
+      (TBSCertSize == NULL) || (CertSize > INT_MAX))
+  {
     return FALSE;
   }
 

CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c

@@ -205,10 +205,10 @@ X509GetCommonName (
 RETURN_STATUS
 EFIAPI
 X509GetOrganizationName (
-  IN      CONST UINT8   *Cert,
-  IN      UINTN         CertSize,
-  OUT     CHAR8         *NameBuffer   OPTIONAL,
-  IN OUT  UINTN         *NameBufferSize
+  IN      CONST UINT8  *Cert,
+  IN      UINTN        CertSize,
+  OUT     CHAR8        *NameBuffer   OPTIONAL,
+  IN OUT  UINTN        *NameBufferSize
   )
 {
   ASSERT (FALSE);

CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c

@@ -55,7 +55,7 @@ RandomSeed (
   // NOTE: A cryptographic PRNG must be seeded with unpredictable data.
   //
   if (Seed != NULL) {
-    RAND_seed (Seed, (UINT32) SeedSize);
+    RAND_seed (Seed, (UINT32)SeedSize);
   } else {
     RAND_seed (DefaultSeed, sizeof (DefaultSeed));
   }
@@ -89,14 +89,14 @@ RandomBytes (
   //
   // Check input parameters.
   //
-  if (Output == NULL || Size > INT_MAX) {
+  if ((Output == NULL) || (Size > INT_MAX)) {
     return FALSE;
   }
 
   //
   // Generate random data.
   //
-  if (RAND_bytes (Output, (UINT32) Size) != 1) {
+  if (RAND_bytes (Output, (UINT32)Size) != 1) {
     return FALSE;
   }
 

CryptoPkg/Library/BaseCryptLib/Rand/CryptRandNull.c

@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include "InternalCryptLib.h"
 
-
 /**
   Sets up the seed value for the pseudorandom number generator.
 

CryptoPkg/Library/BaseCryptLib/Rand/CryptRandTsc.c

@@ -53,7 +53,7 @@ RandomSeed (
   // NOTE: A cryptographic PRNG must be seeded with unpredictable data.
   //
   if (Seed != NULL) {
-    RAND_seed (Seed, (UINT32) SeedSize);
+    RAND_seed (Seed, (UINT32)SeedSize);
   } else {
     //
     // Retrieve current time.
@@ -97,14 +97,14 @@ RandomBytes (
   //
   // Check input parameters.
   //
-  if (Output == NULL || Size > INT_MAX) {
+  if ((Output == NULL) || (Size > INT_MAX)) {
     return FALSE;
   }
 
   //
   // Generate random data.
   //
-  if (RAND_bytes (Output, (UINT32) Size) != 1) {
+  if (RAND_bytes (Output, (UINT32)Size) != 1) {
     return FALSE;
   }
 

CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c

@@ -13,21 +13,24 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //
 // Extra header to record the memory buffer size from malloc routine.
 //
-#define CRYPTMEM_HEAD_SIGNATURE    SIGNATURE_32('c','m','h','d')
+#define CRYPTMEM_HEAD_SIGNATURE  SIGNATURE_32('c','m','h','d')
 typedef struct {
   UINT32    Signature;
   UINT32    Reserved;
   UINTN     Size;
 } CRYPTMEM_HEAD;
 
-#define CRYPTMEM_OVERHEAD      sizeof(CRYPTMEM_HEAD)
+#define CRYPTMEM_OVERHEAD  sizeof(CRYPTMEM_HEAD)
 
 //
 // -- Memory-Allocation Routines --
 //
 
 /* Allocates memory blocks */
-void *malloc (size_t size)
+void *
+malloc (
+  size_t  size
+  )
 {
   CRYPTMEM_HEAD  *PoolHdr;
   UINTN          NewSize;
@@ -38,7 +41,7 @@ void *malloc (size_t size)
   //
   NewSize = (UINTN)(size) + CRYPTMEM_OVERHEAD;
 
-  Data  = AllocatePool (NewSize);
+  Data = AllocatePool (NewSize);
   if (Data != NULL) {
     PoolHdr = (CRYPTMEM_HEAD *)Data;
     //
@@ -57,7 +60,11 @@ void *malloc (size_t size)
 }
 
 /* Reallocate memory blocks */
-void *realloc (void *ptr, size_t size)
+void *
+realloc (
+  void    *ptr,
+  size_t  size
+  )
 {
   CRYPTMEM_HEAD  *OldPoolHdr;
   CRYPTMEM_HEAD  *NewPoolHdr;
@@ -66,9 +73,9 @@ void *realloc (void *ptr, size_t size)
   VOID           *Data;
 
   NewSize = (UINTN)size + CRYPTMEM_OVERHEAD;
-  Data = AllocatePool (NewSize);
+  Data    = AllocatePool (NewSize);
   if (Data != NULL) {
-    NewPoolHdr = (CRYPTMEM_HEAD *)Data;
+    NewPoolHdr            = (CRYPTMEM_HEAD *)Data;
     NewPoolHdr->Signature = CRYPTMEM_HEAD_SIGNATURE;
     NewPoolHdr->Size      = size;
     if (ptr != NULL) {
@@ -96,7 +103,10 @@ void *realloc (void *ptr, size_t size)
 }
 
 /* De-allocates or frees a memory block */
-void free (void *ptr)
+void
+free (
+  void  *ptr
+  )
 {
   CRYPTMEM_HEAD  *PoolHdr;
 

CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c

@@ -23,15 +23,22 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // -- Time Management Routines --
 //
 
-time_t time (time_t *timer)
+time_t
+time (
+  time_t  *timer
+  )
 {
   if (timer != NULL) {
     *timer = 0;
   }
+
   return 0;
 }
 
-struct tm * gmtime (const time_t *timer)
+struct tm *
+gmtime (
+  const time_t  *timer
+  )
 {
   return NULL;
 }

CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c

@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include <CrtLibSupport.h>
 
-int errno = 0;
+int  errno = 0;
 
 FILE  *stderr = NULL;
 FILE  *stdin  = NULL;
@@ -35,15 +35,15 @@ QuickSortWorker (
   IN        VOID          *Buffer
   )
 {
-  VOID        *Pivot;
-  UINTN       LoopCount;
-  UINTN       NextSwapLocation;
+  VOID   *Pivot;
+  UINTN  LoopCount;
+  UINTN  NextSwapLocation;
 
-  ASSERT(BufferToSort    != NULL);
-  ASSERT(CompareFunction != NULL);
-  ASSERT(Buffer          != NULL);
+  ASSERT (BufferToSort    != NULL);
+  ASSERT (CompareFunction != NULL);
+  ASSERT (Buffer          != NULL);
 
-  if (Count < 2 || ElementSize  < 1) {
+  if ((Count < 2) || (ElementSize  < 1)) {
     return;
   }
 
@@ -58,8 +58,7 @@ QuickSortWorker (
   // Now get the pivot such that all on "left" are below it
   // and everything "right" are above it
   //
-  for (LoopCount = 0; LoopCount < Count - 1;  LoopCount++)
-  {
+  for (LoopCount = 0; LoopCount < Count - 1; LoopCount++) {
     //
     // If the element is less than the pivot
     //
@@ -77,6 +76,7 @@ QuickSortWorker (
       NextSwapLocation++;
     }
   }
+
   //
   // Swap pivot to its final position (NextSwapLocation)
   //
@@ -107,28 +107,37 @@ QuickSortWorker (
   return;
 }
 
-//---------------------------------------------------------
+// ---------------------------------------------------------
 // Standard C Run-time Library Interface Wrapper
-//---------------------------------------------------------
+// ---------------------------------------------------------
 
 //
 // -- String Manipulation Routines --
 //
 
-char *strchr(const char *str, int ch)
+char *
+strchr (
+  const char  *str,
+  int         ch
+  )
 {
   return ScanMem8 (str, AsciiStrSize (str), (UINT8)ch);
 }
 
 /* Scan a string for the last occurrence of a character */
-char *strrchr (const char *str, int c)
+char *
+strrchr (
+  const char  *str,
+  int         c
+  )
 {
-  char * save;
+  char  *save;
 
   for (save = NULL; ; ++str) {
     if (*str == c) {
       save = (char *)str;
     }
+
     if (*str == 0) {
       return (save);
     }
@@ -136,19 +145,25 @@ char *strrchr (const char *str, int c)
 }
 
 /* Compare first n bytes of string s1 with string s2, ignoring case */
-int strncasecmp (const char *s1, const char *s2, size_t n)
+int
+strncasecmp (
+  const char  *s1,
+  const char  *s2,
+  size_t      n
+  )
 {
-  int Val;
+  int  Val;
 
-  ASSERT(s1 != NULL);
-  ASSERT(s2 != NULL);
+  ASSERT (s1 != NULL);
+  ASSERT (s2 != NULL);
 
   if (n != 0) {
     do {
-      Val = tolower(*s1) - tolower(*s2);
+      Val = tolower (*s1) - tolower (*s2);
       if (Val != 0) {
         return Val;
       }
+
       ++s1;
       ++s2;
       if (*s1 == '\0') {
@@ -156,11 +171,17 @@ int strncasecmp (const char *s1, const char *s2, size_t n)
       }
     } while (--n != 0);
   }
+
   return 0;
 }
 
 /* Read formatted data from a string */
-int sscanf (const char *buffer, const char *format, ...)
+int
+sscanf (
+  const char  *buffer,
+  const char  *format,
+  ...
+  )
 {
   //
   // Null sscanf() function implementation to satisfy the linker, since
@@ -170,14 +191,21 @@ int sscanf (const char *buffer, const char *format, ...)
 }
 
 /* Maps errnum to an error-message string */
-char * strerror (int errnum)
+char *
+strerror (
+  int  errnum
+  )
 {
   return NULL;
 }
 
 /* Computes the length of the maximum initial segment of the string pointed to by s1
    which consists entirely of characters from the string pointed to by s2. */
-size_t strspn (const char *s1 , const char *s2)
+size_t
+strspn (
+  const char  *s1,
+  const char  *s2
+  )
 {
   UINT8   Map[32];
   UINT32  Index;
@@ -207,11 +235,15 @@ size_t strspn (const char *s1 , const char *s2)
 
 /* Computes the length of the maximum initial segment of the string pointed to by s1
    which consists entirely of characters not from the string pointed to by s2. */
-size_t strcspn (const char *s1, const char *s2)
+size_t
+strcspn (
+  const char  *s1,
+  const char  *s2
+  )
 {
-  UINT8  Map[32];
-  UINT32 Index;
-  size_t Count;
+  UINT8   Map[32];
+  UINT32  Index;
+  size_t  Count;
 
   for (Index = 0; Index < 32; Index++) {
     Map[Index] = 0;
@@ -224,9 +256,9 @@ size_t strcspn (const char *s1, const char *s2)
 
   Map[0] |= 1;
 
-  Count   = 0;
+  Count = 0;
   while (!(Map[*s1 >> 3] & (1 << (*s1 & 7)))) {
-    Count ++;
+    Count++;
     s1++;
   }
 
@@ -238,7 +270,10 @@ size_t strcspn (const char *s1, const char *s2)
 //
 
 /* Determines if a particular character is a decimal-digit character */
-int isdigit (int c)
+int
+isdigit (
+  int  c
+  )
 {
   //
   // <digit> ::= [0-9]
@@ -247,7 +282,10 @@ int isdigit (int c)
 }
 
 /* Determine if an integer represents character that is a hex digit */
-int isxdigit (int c)
+int
+isxdigit (
+  int  c
+  )
 {
   //
   // <hexdigit> ::= [0-9] | [a-f] | [A-F]
@@ -258,7 +296,10 @@ int isxdigit (int c)
 }
 
 /* Determines if a particular character represents a space character */
-int isspace (int c)
+int
+isspace (
+  int  c
+  )
 {
   //
   // <space> ::= [ ]
@@ -267,7 +308,10 @@ int isspace (int c)
 }
 
 /* Determine if a particular character is an alphanumeric character */
-int isalnum (int c)
+int
+isalnum (
+  int  c
+  )
 {
   //
   // <alnum> ::= [0-9] | [a-z] | [A-Z]
@@ -278,7 +322,10 @@ int isalnum (int c)
 }
 
 /* Determines if a particular character is in upper case */
-int isupper (int c)
+int
+isupper (
+  int  c
+  )
 {
   //
   // <uppercase letter> := [A-Z]
@@ -291,7 +338,12 @@ int isupper (int c)
 //
 
 /* Convert strings to a long-integer value */
-long strtol (const char *nptr, char **endptr, int base)
+long
+strtol (
+  const char  *nptr,
+  char        **endptr,
+  int         base
+  )
 {
   //
   // Null strtol() function implementation to satisfy the linker, since there is
@@ -301,7 +353,12 @@ long strtol (const char *nptr, char **endptr, int base)
 }
 
 /* Convert strings to an unsigned long-integer value */
-unsigned long strtoul (const char *nptr, char **endptr, int base)
+unsigned long
+strtoul (
+  const char  *nptr,
+  char        **endptr,
+  int         base
+  )
 {
   //
   // Null strtoul() function implementation to satisfy the linker, since there is
@@ -311,11 +368,15 @@ unsigned long strtoul (const char *nptr, char **endptr, int base)
 }
 
 /* Convert character to lowercase */
-int tolower (int c)
+int
+tolower (
+  int  c
+  )
 {
   if (('A' <= (c)) && ((c) <= 'Z')) {
     return (c - ('A' - 'a'));
   }
+
   return (c);
 }
 
@@ -324,7 +385,13 @@ int tolower (int c)
 //
 
 /* Performs a quick sort */
-void qsort (void *base, size_t num, size_t width, int (*compare)(const void *, const void *))
+void
+qsort (
+  void *base,
+  size_t num,
+  size_t width,
+  int ( *compare )(const void *, const void *)
+  )
 {
   VOID  *Buffer;
 
@@ -351,7 +418,10 @@ void qsort (void *base, size_t num, size_t width, int (*compare)(const void *, c
 //
 
 /* Get a value from the current environment */
-char *getenv (const char *varname)
+char *
+getenv (
+  const char  *varname
+  )
 {
   //
   // Null getenv() function implementation to satisfy the linker, since there is
@@ -361,7 +431,10 @@ char *getenv (const char *varname)
 }
 
 /* Get a value from the current environment */
-char *secure_getenv (const char *varname)
+char *
+secure_getenv (
+  const char  *varname
+  )
 {
   //
   // Null secure_getenv() function implementation to satisfy the linker, since
@@ -378,7 +451,13 @@ char *secure_getenv (const char *varname)
 //
 
 /* Write data to a stream */
-size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)
+size_t
+fwrite (
+  const void  *buffer,
+  size_t      size,
+  size_t      count,
+  FILE        *stream
+  )
 {
   return 0;
 }
@@ -387,12 +466,23 @@ size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)
 //  -- Dummy OpenSSL Support Routines --
 //
 
-int BIO_printf (void *bio, const char *format, ...)
+int
+BIO_printf (
+  void        *bio,
+  const char  *format,
+  ...
+  )
 {
   return 0;
 }
 
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
+int
+BIO_snprintf (
+  char        *buf,
+  size_t      n,
+  const char  *format,
+  ...
+  )
 {
   return 0;
 }
@@ -403,7 +493,7 @@ typedef
 VOID
 (EFIAPI *NoReturnFuncPtr)(
   VOID
-  ) __attribute__((__noreturn__));
+  ) __attribute__ ((__noreturn__));
 
 STATIC
 VOID
@@ -414,60 +504,95 @@ NopFunction (
 {
 }
 
-void abort (void)
+void
+abort (
+  void
+  )
 {
-  NoReturnFuncPtr NoReturnFunc;
+  NoReturnFuncPtr  NoReturnFunc;
 
-  NoReturnFunc = (NoReturnFuncPtr) NopFunction;
+  NoReturnFunc = (NoReturnFuncPtr)NopFunction;
 
   NoReturnFunc ();
 }
 
 #else
 
-void abort (void)
+void
+abort (
+  void
+  )
 {
   // Do nothing
 }
 
 #endif
 
-int fclose (FILE *f)
+int
+fclose (
+  FILE  *f
+  )
 {
   return 0;
 }
 
-FILE *fopen (const char *c, const char *m)
+FILE *
+fopen (
+  const char  *c,
+  const char  *m
+  )
 {
   return NULL;
 }
 
-size_t fread (void *b, size_t c, size_t i, FILE *f)
+size_t
+fread (
+  void    *b,
+  size_t  c,
+  size_t  i,
+  FILE    *f
+  )
 {
   return 0;
 }
 
-uid_t getuid (void)
+uid_t
+getuid (
+  void
+  )
 {
   return 0;
 }
 
-uid_t geteuid (void)
+uid_t
+geteuid (
+  void
+  )
 {
   return 0;
 }
 
-gid_t getgid (void)
+gid_t
+getgid (
+  void
+  )
 {
   return 0;
 }
 
-gid_t getegid (void)
+gid_t
+getegid (
+  void
+  )
 {
   return 0;
 }
 
-int printf (char const *fmt, ...)
+int
+printf (
+  char const  *fmt,
+  ...
+  )
 {
   return 0;
 }

CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c

@@ -13,42 +13,42 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MemoryAllocationLib.h>
 #include <Guid/EventGroup.h>
 
-//----------------------------------------------------------------
+// ----------------------------------------------------------------
 // Initial version. Needs further optimizations.
-//----------------------------------------------------------------
+// ----------------------------------------------------------------
 
 //
 // Definitions for Runtime Memory Operations
 //
-#define RT_PAGE_SIZE                0x200
-#define RT_PAGE_MASK                0x1FF
-#define RT_PAGE_SHIFT               9
+#define RT_PAGE_SIZE   0x200
+#define RT_PAGE_MASK   0x1FF
+#define RT_PAGE_SHIFT  9
 
-#define RT_SIZE_TO_PAGES(a)         (((a) >> RT_PAGE_SHIFT) + (((a) & RT_PAGE_MASK) ? 1 : 0))
-#define RT_PAGES_TO_SIZE(a)         ((a) << RT_PAGE_SHIFT)
+#define RT_SIZE_TO_PAGES(a)  (((a) >> RT_PAGE_SHIFT) + (((a) & RT_PAGE_MASK) ? 1 : 0))
+#define RT_PAGES_TO_SIZE(a)  ((a) << RT_PAGE_SHIFT)
 
 //
 // Page Flag Definitions
 //
-#define RT_PAGE_FREE                0x00000000
-#define RT_PAGE_USED                0x00000001
+#define RT_PAGE_FREE  0x00000000
+#define RT_PAGE_USED  0x00000001
 
-#define MIN_REQUIRED_BLOCKS         600
+#define MIN_REQUIRED_BLOCKS  600
 
 //
 // Memory Page Table
 //
 typedef struct {
-  UINTN   StartPageOffset;      // Offset of the starting page allocated.
+  UINTN     StartPageOffset;    // Offset of the starting page allocated.
                                 // Only available for USED pages.
-  UINT32  PageFlag;             // Page Attributes.
+  UINT32    PageFlag;           // Page Attributes.
 } RT_MEMORY_PAGE_ENTRY;
 
 typedef struct {
-  UINTN                 PageCount;
-  UINTN                 LastEmptyPageOffset;
-  UINT8                 *DataAreaBase;         // Pointer to data Area.
-  RT_MEMORY_PAGE_ENTRY  Pages[1];              // Page Table Entries.
+  UINTN                   PageCount;
+  UINTN                   LastEmptyPageOffset;
+  UINT8                   *DataAreaBase;       // Pointer to data Area.
+  RT_MEMORY_PAGE_ENTRY    Pages[1];            // Page Table Entries.
 } RT_MEMORY_PAGE_TABLE;
 
 //
@@ -59,8 +59,7 @@ RT_MEMORY_PAGE_TABLE  *mRTPageTable = NULL;
 //
 // Event for Runtime Address Conversion.
 //
-STATIC EFI_EVENT      mVirtualAddressChangeEvent;
-
+STATIC EFI_EVENT  mVirtualAddressChangeEvent;
 
 /**
   Initializes pre-allocated memory pointed by ScratchBuffer for subsequent
@@ -114,7 +113,6 @@ InitializeScratchMemory (
   return EFI_SUCCESS;
 }
 
-
 /**
   Look-up Free memory Region for object allocation.
 
@@ -182,6 +180,7 @@ LookupFreeMemRegion (
     //
     return (UINTN)(-1);
   }
+
   for (Index = 0; Index < (StartPageIndex - ReqPages); ) {
     //
     // Check Consecutive ReqPages Pages.
@@ -203,7 +202,8 @@ LookupFreeMemRegion (
     // Failed! Skip current adjacent Used pages
     //
     while ((SubIndex < (StartPageIndex - ReqPages)) &&
-           ((mRTPageTable->Pages[SubIndex + Index].PageFlag & RT_PAGE_USED) != 0)) {
+           ((mRTPageTable->Pages[SubIndex + Index].PageFlag & RT_PAGE_USED) != 0))
+    {
       SubIndex++;
     }
 
@@ -216,7 +216,6 @@ LookupFreeMemRegion (
   return (UINTN)(-1);
 }
 
-
 /**
   Allocates a buffer at runtime phase.
 
@@ -274,7 +273,6 @@ RuntimeAllocateMem (
   return AllocPtr;
 }
 
-
 /**
   Frees a buffer that was previously allocated at runtime phase.
 
@@ -290,19 +288,20 @@ RuntimeFreeMem (
   UINTN  StartPageIndex;
 
   StartOffset    = (UINTN)Buffer - (UINTN)mRTPageTable->DataAreaBase;
-  StartPageIndex = RT_SIZE_TO_PAGES (mRTPageTable->Pages[RT_SIZE_TO_PAGES(StartOffset)].StartPageOffset);
+  StartPageIndex = RT_SIZE_TO_PAGES (mRTPageTable->Pages[RT_SIZE_TO_PAGES (StartOffset)].StartPageOffset);
 
   while (StartPageIndex < mRTPageTable->PageCount) {
     if (((mRTPageTable->Pages[StartPageIndex].PageFlag & RT_PAGE_USED) != 0) &&
-        (mRTPageTable->Pages[StartPageIndex].StartPageOffset == StartOffset)) {
-        //
-        // Free this page
-        //
-        mRTPageTable->Pages[StartPageIndex].PageFlag       &= ~RT_PAGE_USED;
-        mRTPageTable->Pages[StartPageIndex].PageFlag       |= RT_PAGE_FREE;
-        mRTPageTable->Pages[StartPageIndex].StartPageOffset = 0;
+        (mRTPageTable->Pages[StartPageIndex].StartPageOffset == StartOffset))
+    {
+      //
+      // Free this page
+      //
+      mRTPageTable->Pages[StartPageIndex].PageFlag       &= ~RT_PAGE_USED;
+      mRTPageTable->Pages[StartPageIndex].PageFlag       |= RT_PAGE_FREE;
+      mRTPageTable->Pages[StartPageIndex].StartPageOffset = 0;
 
-        StartPageIndex++;
+      StartPageIndex++;
     } else {
       break;
     }
@@ -311,7 +310,6 @@ RuntimeFreeMem (
   return;
 }
 
-
 /**
   Notification function of EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE.
 
@@ -325,18 +323,17 @@ RuntimeFreeMem (
 VOID
 EFIAPI
 RuntimeCryptLibAddressChangeEvent (
-  IN  EFI_EVENT        Event,
-  IN  VOID             *Context
+  IN  EFI_EVENT  Event,
+  IN  VOID       *Context
   )
 {
   //
   // Converts a pointer for runtime memory management to a new virtual address.
   //
-  EfiConvertPointer (0x0, (VOID **) &mRTPageTable->DataAreaBase);
-  EfiConvertPointer (0x0, (VOID **) &mRTPageTable);
+  EfiConvertPointer (0x0, (VOID **)&mRTPageTable->DataAreaBase);
+  EfiConvertPointer (0x0, (VOID **)&mRTPageTable);
 }
 
-
 /**
   Constructor routine for runtime crypt library instance.
 
@@ -384,19 +381,25 @@ RuntimeCryptLibConstructor (
   return Status;
 }
 
-
 //
 // -- Memory-Allocation Routines Wrapper for UEFI-OpenSSL Library --
 //
 
 /* Allocates memory blocks */
-void *malloc (size_t size)
+void *
+malloc (
+  size_t  size
+  )
 {
-  return RuntimeAllocateMem ((UINTN) size);
+  return RuntimeAllocateMem ((UINTN)size);
 }
 
 /* Reallocate memory blocks */
-void *realloc (void *ptr, size_t size)
+void *
+realloc (
+  void    *ptr,
+  size_t  size
+  )
 {
   VOID   *NewPtr;
   UINTN  StartOffset;
@@ -415,9 +418,10 @@ void *realloc (void *ptr, size_t size)
   PageCount      = 0;
   while (StartPageIndex < mRTPageTable->PageCount) {
     if (((mRTPageTable->Pages[StartPageIndex].PageFlag & RT_PAGE_USED) != 0) &&
-        (mRTPageTable->Pages[StartPageIndex].StartPageOffset == StartOffset)) {
-        StartPageIndex++;
-        PageCount++;
+        (mRTPageTable->Pages[StartPageIndex].StartPageOffset == StartOffset))
+    {
+      StartPageIndex++;
+      PageCount++;
     } else {
       break;
     }
@@ -430,7 +434,7 @@ void *realloc (void *ptr, size_t size)
     return ptr;
   }
 
-  NewPtr = RuntimeAllocateMem ((UINTN) size);
+  NewPtr = RuntimeAllocateMem ((UINTN)size);
   if (NewPtr == NULL) {
     return NULL;
   }
@@ -443,7 +447,10 @@ void *realloc (void *ptr, size_t size)
 }
 
 /* Deallocates or frees a memory block */
-void free (void *ptr)
+void
+free (
+  void  *ptr
+  )
 {
   //
   // In Standard C, free() handles a null pointer argument transparently. This

CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c

@@ -15,17 +15,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // -- Time Management Routines --
 //
 
-#define IsLeap(y)   (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
-#define SECSPERMIN  (60)
-#define SECSPERHOUR (60 * 60)
-#define SECSPERDAY  (24 * SECSPERHOUR)
+#define IsLeap(y)  (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
+#define SECSPERMIN   (60)
+#define SECSPERHOUR  (60 * 60)
+#define SECSPERDAY   (24 * SECSPERHOUR)
 
 //
 //  The arrays give the cumulative number of days up to the first of the
 //  month number used as the index (1 -> 12) for regular and leap years.
 //  The value at index 13 is for the whole year.
 //
-UINTN CumulativeDays[2][14] = {
+UINTN  CumulativeDays[2][14] = {
   {
     0,
     0,
@@ -61,10 +61,13 @@ UINTN CumulativeDays[2][14] = {
 };
 
 /* Get the system time as seconds elapsed since midnight, January 1, 1970. */
-//INTN time(
+// INTN time(
 //  INTN *timer
 //  )
-time_t time (time_t *timer)
+time_t
+time (
+  time_t  *timer
+  )
 {
   EFI_STATUS  Status;
   EFI_TIME    Time;
@@ -84,7 +87,7 @@ time_t time (time_t *timer)
   // UTime should now be set to 00:00:00 on Jan 1 of the current year.
   //
   for (Year = 1970, CalTime = 0; Year != Time.Year; Year++) {
-    CalTime = CalTime + (time_t)(CumulativeDays[IsLeap(Year)][13] * SECSPERDAY);
+    CalTime = CalTime + (time_t)(CumulativeDays[IsLeap (Year)][13] * SECSPERDAY);
   }
 
   //
@@ -92,7 +95,7 @@ time_t time (time_t *timer)
   //
   CalTime = CalTime +
             (time_t)((Time.TimeZone != EFI_UNSPECIFIED_TIMEZONE) ? (Time.TimeZone * 60) : 0) +
-            (time_t)(CumulativeDays[IsLeap(Time.Year)][Time.Month] * SECSPERDAY) +
+            (time_t)(CumulativeDays[IsLeap (Time.Year)][Time.Month] * SECSPERDAY) +
             (time_t)(((Time.Day > 0) ? Time.Day - 1 : 0) * SECSPERDAY) +
             (time_t)(Time.Hour * SECSPERHOUR) +
             (time_t)(Time.Minute * 60) +
@@ -108,7 +111,10 @@ time_t time (time_t *timer)
 //
 // Convert a time value from type time_t to struct tm.
 //
-struct tm * gmtime (const time_t *timer)
+struct tm *
+gmtime (
+  const time_t  *timer
+  )
 {
   struct tm  *GmTime;
   UINT16     DayNo;
@@ -127,38 +133,38 @@ struct tm * gmtime (const time_t *timer)
     return NULL;
   }
 
-  ZeroMem ((VOID *) GmTime, (UINTN) sizeof (struct tm));
+  ZeroMem ((VOID *)GmTime, (UINTN)sizeof (struct tm));
 
-  DayNo        = (UINT16) (*timer / SECSPERDAY);
-  DayRemainder = (UINT16) (*timer % SECSPERDAY);
+  DayNo        = (UINT16)(*timer / SECSPERDAY);
+  DayRemainder = (UINT16)(*timer % SECSPERDAY);
 
-  GmTime->tm_sec  = (int) (DayRemainder % SECSPERMIN);
-  GmTime->tm_min  = (int) ((DayRemainder % SECSPERHOUR) / SECSPERMIN);
-  GmTime->tm_hour = (int) (DayRemainder / SECSPERHOUR);
-  GmTime->tm_wday = (int) ((DayNo + 4) % 7);
+  GmTime->tm_sec  = (int)(DayRemainder % SECSPERMIN);
+  GmTime->tm_min  = (int)((DayRemainder % SECSPERHOUR) / SECSPERMIN);
+  GmTime->tm_hour = (int)(DayRemainder / SECSPERHOUR);
+  GmTime->tm_wday = (int)((DayNo + 4) % 7);
 
   for (Year = 1970, YearNo = 0; DayNo > 0; Year++) {
-    TotalDays = (UINT16) (IsLeap (Year) ? 366 : 365);
+    TotalDays = (UINT16)(IsLeap (Year) ? 366 : 365);
     if (DayNo >= TotalDays) {
-      DayNo = (UINT16) (DayNo - TotalDays);
+      DayNo = (UINT16)(DayNo - TotalDays);
       YearNo++;
     } else {
       break;
     }
   }
 
-  GmTime->tm_year = (int) (YearNo + (1970 - 1900));
-  GmTime->tm_yday = (int) DayNo;
+  GmTime->tm_year = (int)(YearNo + (1970 - 1900));
+  GmTime->tm_yday = (int)DayNo;
 
   for (MonthNo = 12; MonthNo > 1; MonthNo--) {
-    if (DayNo >= CumulativeDays[IsLeap(Year)][MonthNo]) {
-      DayNo = (UINT16) (DayNo - (UINT16) (CumulativeDays[IsLeap(Year)][MonthNo]));
+    if (DayNo >= CumulativeDays[IsLeap (Year)][MonthNo]) {
+      DayNo = (UINT16)(DayNo - (UINT16)(CumulativeDays[IsLeap (Year)][MonthNo]));
       break;
     }
   }
 
-  GmTime->tm_mon  = (int) MonthNo - 1;
-  GmTime->tm_mday = (int) DayNo + 1;
+  GmTime->tm_mon  = (int)MonthNo - 1;
+  GmTime->tm_mday = (int)DayNo + 1;
 
   GmTime->tm_isdst  = 0;
   GmTime->tm_gmtoff = 0;

CryptoPkg/Library/BaseCryptLib/SysCall/UnitTestHostCrtWrapper.c

@@ -14,28 +14,38 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/DebugLib.h>
 
 /* Convert character to lowercase */
-int tolower (int c)
+int
+tolower (
+  int  c
+  )
 {
   if (('A' <= (c)) && ((c) <= 'Z')) {
     return (c - ('A' - 'a'));
   }
+
   return (c);
 }
 
 /* Compare first n bytes of string s1 with string s2, ignoring case */
-int strncasecmp (const char *s1, const char *s2, size_t n)
+int
+strncasecmp (
+  const char  *s1,
+  const char  *s2,
+  size_t      n
+  )
 {
-  int Val;
+  int  Val;
 
-  ASSERT(s1 != NULL);
-  ASSERT(s2 != NULL);
+  ASSERT (s1 != NULL);
+  ASSERT (s2 != NULL);
 
   if (n != 0) {
     do {
-      Val = tolower(*s1) - tolower(*s2);
+      Val = tolower (*s1) - tolower (*s2);
       if (Val != 0) {
         return Val;
       }
+
       ++s1;
       ++s2;
       if (*s1 == '\0') {
@@ -43,11 +53,17 @@ int strncasecmp (const char *s1, const char *s2, size_t n)
       }
     } while (--n != 0);
   }
+
   return 0;
 }
 
 /* Read formatted data from a string */
-int sscanf (const char *buffer, const char *format, ...)
+int
+sscanf (
+  const char  *buffer,
+  const char  *format,
+  ...
+  )
 {
   //
   // Null sscanf() function implementation to satisfy the linker, since
@@ -60,34 +76,57 @@ int sscanf (const char *buffer, const char *format, ...)
 //  -- Dummy OpenSSL Support Routines --
 //
 
-int BIO_printf (void *bio, const char *format, ...)
+int
+BIO_printf (
+  void        *bio,
+  const char  *format,
+  ...
+  )
 {
   return 0;
 }
 
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
+int
+BIO_snprintf (
+  char        *buf,
+  size_t      n,
+  const char  *format,
+  ...
+  )
 {
   return 0;
 }
 
-uid_t getuid (void)
+uid_t
+getuid (
+  void
+  )
 {
   return 0;
 }
 
-uid_t geteuid (void)
+uid_t
+geteuid (
+  void
+  )
 {
   return 0;
 }
 
-gid_t getgid (void)
+gid_t
+getgid (
+  void
+  )
 {
   return 0;
 }
 
-gid_t getegid (void)
+gid_t
+getegid (
+  void
+  )
 {
   return 0;
 }
 
-int errno = 0;
+int  errno = 0;

CryptoPkg/Library/BaseCryptLib/SysCall/inet_pton.c

@@ -18,28 +18,28 @@
  * Portions copyright (c) 1999, 2000
  * Intel Corporation.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- * 
+ *
  *    This product includes software developed by Intel Corporation and
  *    its contributors.
- * 
+ *
  * 4. Neither the name of Intel Corporation or its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION AND CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -51,11 +51,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_pton.c,v 1.1.1.1 2003/11/19 01:51:30 kyu3 Exp $";
+#if defined (LIBC_SCCS) && !defined (lint)
+static char  rcsid[] = "$Id: inet_pton.c,v 1.1.1.1 2003/11/19 01:51:30 kyu3 Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -72,186 +72,229 @@ static char rcsid[] = "$Id: inet_pton.c,v 1.1.1.1 2003/11/19 01:51:30 kyu3 Exp $
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static int	inet_pton4 (const char *src, u_char *dst);
-static int	inet_pton6 (const char *src, u_char *dst);
+static int
+inet_pton4 (
+  const char  *src,
+  u_char      *dst
+  );
+
+static int
+inet_pton6 (
+  const char  *src,
+  u_char      *dst
+  );
 
 /* int
  * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
- *	to network format (which is usually some kind of binary format).
+ *      convert from presentation format (which usually means ASCII printable)
+ *      to network format (which is usually some kind of binary format).
  * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
+ *      1 if the address was valid for the specified address family
+ *      0 if the address wasn't valid (`dst' is untouched in this case)
+ *      -1 if some other error occurred (`dst' is untouched in this case, too)
  * author:
- *	Paul Vixie, 1996.
+ *      Paul Vixie, 1996.
  */
 int
-inet_pton(
-	int af,
-	const char *src,
-	void *dst
-	)
+inet_pton (
+  int         af,
+  const char  *src,
+  void        *dst
+  )
 {
-	switch (af) {
-	case AF_INET:
-		return (inet_pton4(src, dst));
-	case AF_INET6:
-		return (inet_pton6(src, dst));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-	/* NOTREACHED */
+  switch (af) {
+    case AF_INET:
+      return (inet_pton4 (src, dst));
+    case AF_INET6:
+      return (inet_pton6 (src, dst));
+    default:
+      errno = EAFNOSUPPORT;
+      return (-1);
+  }
+
+  /* NOTREACHED */
 }
 
 /* int
  * inet_pton4(src, dst)
- *	like inet_aton() but without all the hexadecimal and shorthand.
+ *      like inet_aton() but without all the hexadecimal and shorthand.
  * return:
- *	1 if `src' is a valid dotted quad, else 0.
+ *      1 if `src' is a valid dotted quad, else 0.
  * notice:
- *	does not touch `dst' unless it's returning 1.
+ *      does not touch `dst' unless it's returning 1.
  * author:
- *	Paul Vixie, 1996.
+ *      Paul Vixie, 1996.
  */
 static int
-inet_pton4(
-	const char *src,
-	u_char *dst
-	)
+inet_pton4 (
+  const char  *src,
+  u_char      *dst
+  )
 {
-	static const char digits[] = "0123456789";
-	int saw_digit, octets, ch;
-	u_char tmp[NS_INADDRSZ], *tp;
+  static const char  digits[] = "0123456789";
+  int                saw_digit, octets, ch;
+  u_char             tmp[NS_INADDRSZ], *tp;
 
-	saw_digit = 0;
-	octets = 0;
-	*(tp = tmp) = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
+  saw_digit   = 0;
+  octets      = 0;
+  *(tp = tmp) = 0;
+  while ((ch = *src++) != '\0') {
+    const char  *pch;
 
-		if ((pch = strchr(digits, ch)) != NULL) {
-			u_int new = *tp * 10 + (u_int)(pch - digits);
+    if ((pch = strchr (digits, ch)) != NULL) {
+      u_int  new = *tp * 10 + (u_int)(pch - digits);
 
-			if (new > 255)
-				return (0);
-			*tp = (u_char)new;
-			if (! saw_digit) {
-				if (++octets > 4)
-					return (0);
-				saw_digit = 1;
-			}
-		} else if (ch == '.' && saw_digit) {
-			if (octets == 4)
-				return (0);
-			*++tp = 0;
-			saw_digit = 0;
-		} else
-			return (0);
-	}
-	if (octets < 4)
-		return (0);
+      if (new > 255) {
+        return (0);
+      }
 
-	memcpy(dst, tmp, NS_INADDRSZ);
-	return (1);
+      *tp = (u_char)new;
+      if (!saw_digit) {
+        if (++octets > 4) {
+          return (0);
+        }
+
+        saw_digit = 1;
+      }
+    } else if ((ch == '.') && saw_digit) {
+      if (octets == 4) {
+        return (0);
+      }
+
+      *++tp     = 0;
+      saw_digit = 0;
+    } else {
+      return (0);
+    }
+  }
+
+  if (octets < 4) {
+    return (0);
+  }
+
+  memcpy (dst, tmp, NS_INADDRSZ);
+  return (1);
 }
 
 /* int
  * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
+ *      convert presentation level address to network order binary form.
  * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
+ *      1 if `src' is a valid [RFC1884 2.2] address, else 0.
  * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
+ *      (1) does not touch `dst' unless it's returning 1.
+ *      (2) :: in a full address is silently ignored.
  * credit:
- *	inspired by Mark Andrews.
+ *      inspired by Mark Andrews.
  * author:
- *	Paul Vixie, 1996.
+ *      Paul Vixie, 1996.
  */
 static int
-inet_pton6(
-	const char *src,
-	u_char *dst
-	)
+inet_pton6 (
+  const char  *src,
+  u_char      *dst
+  )
 {
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
+  static const char  xdigits_l[] = "0123456789abcdef",
+                     xdigits_u[] = "0123456789ABCDEF";
+  u_char      tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
+  const char  *xdigits, *curtok;
+  int         ch, saw_xdigit;
+  u_int       val;
 
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
+  memset ((tp = tmp), '\0', NS_IN6ADDRSZ);
+  endp   = tp + NS_IN6ADDRSZ;
+  colonp = NULL;
+  /* Leading :: requires some special handling. */
+  if (*src == ':') {
+    if (*++src != ':') {
+      return (0);
+    }
+  }
 
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (val > 0xffff)
-				return (0);
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_pton4(curtok, tp) > 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		return (0);
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			return (0);
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = (int)(tp - colonp);
-		int i;
+  curtok     = src;
+  saw_xdigit = 0;
+  val        = 0;
+  while ((ch = *src++) != '\0') {
+    const char  *pch;
 
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		return (0);
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-	return (1);
+    if ((pch = strchr ((xdigits = xdigits_l), ch)) == NULL) {
+      pch = strchr ((xdigits = xdigits_u), ch);
+    }
+
+    if (pch != NULL) {
+      val <<= 4;
+      val  |= (pch - xdigits);
+      if (val > 0xffff) {
+        return (0);
+      }
+
+      saw_xdigit = 1;
+      continue;
+    }
+
+    if (ch == ':') {
+      curtok = src;
+      if (!saw_xdigit) {
+        if (colonp) {
+          return (0);
+        }
+
+        colonp = tp;
+        continue;
+      }
+
+      if (tp + NS_INT16SZ > endp) {
+        return (0);
+      }
+
+      *tp++      = (u_char)(val >> 8) & 0xff;
+      *tp++      = (u_char)val & 0xff;
+      saw_xdigit = 0;
+      val        = 0;
+      continue;
+    }
+
+    if ((ch == '.') && ((tp + NS_INADDRSZ) <= endp) &&
+        (inet_pton4 (curtok, tp) > 0))
+    {
+      tp        += NS_INADDRSZ;
+      saw_xdigit = 0;
+      break;                    /* '\0' was seen by inet_pton4(). */
+    }
+
+    return (0);
+  }
+
+  if (saw_xdigit) {
+    if (tp + NS_INT16SZ > endp) {
+      return (0);
+    }
+
+    *tp++ = (u_char)(val >> 8) & 0xff;
+    *tp++ = (u_char)val & 0xff;
+  }
+
+  if (colonp != NULL) {
+    /*
+     * Since some memmove()'s erroneously fail to handle
+     * overlapping regions, we'll do the shift by hand.
+     */
+    const int  n = (int)(tp - colonp);
+    int        i;
+
+    for (i = 1; i <= n; i++) {
+      endp[-i]      = colonp[n - i];
+      colonp[n - i] = 0;
+    }
+
+    tp = endp;
+  }
+
+  if (tp != endp) {
+    return (0);
+  }
+
+  memcpy (dst, tmp, NS_IN6ADDRSZ);
+  return (1);
 }

CryptoPkg/Library/BaseCryptLibNull/Hash/CryptMd5Null.c

@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include "InternalCryptLib.h"
 
-
 /**
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.
 
@@ -26,7 +25,6 @@ Md5GetContextSize (
   return 0;
 }
 
-
 /**
   Initializes user-supplied memory pointed by Md5Context as MD5 hash context for
   subsequent use.
@@ -154,12 +152,12 @@ value (16 bytes).
 **/
 BOOLEAN
 EFIAPI
-Md5HashAll(
+Md5HashAll (
   IN   CONST VOID  *Data,
   IN   UINTN       DataSize,
   OUT  UINT8       *HashValue
-)
+  )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return FALSE;
 }

CryptoPkg/Library/BaseCryptLibNull/Hash/CryptSha1Null.c

@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include "InternalCryptLib.h"
 
-
 /**
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.
 

CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7SignNull.c

@@ -51,4 +51,3 @@ Pkcs7Sign (
   ASSERT (FALSE);
   return FALSE;
 }
-

CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyEkuNull.c

@@ -51,16 +51,14 @@
 **/
 EFI_STATUS
 GetSignerCertificate (
-  IN CONST VOID *CertChain,
+  IN CONST VOID  *CertChain,
   OUT VOID       **SignerCert
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_NOT_READY;
-
 }
 
-
 /**
   Determines if the specified EKU represented in ASN1 form is present
   in a given certificate.
@@ -77,14 +75,13 @@ GetSignerCertificate (
 EFI_STATUS
 IsEkuInCertificate (
   IN CONST VOID  *Cert,
-  IN VOID *Asn1ToFind
+  IN VOID        *Asn1ToFind
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_NOT_READY;
 }
 
-
 /**
   Determines if the specified EKUs are present in a signing certificate.
 
@@ -99,14 +96,14 @@ IsEkuInCertificate (
   @retval EFI_NOT_FOUND             One or more EKU's were not found in the signature.
 **/
 EFI_STATUS
-CheckEKUs(
-  IN CONST VOID     *SignerCert,
-  IN CONST CHAR8    *RequiredEKUs[],
-  IN CONST UINT32   RequiredEKUsSize,
-  IN BOOLEAN        RequireAllPresent
+CheckEKUs (
+  IN CONST VOID    *SignerCert,
+  IN CONST CHAR8   *RequiredEKUs[],
+  IN CONST UINT32  RequiredEKUsSize,
+  IN BOOLEAN       RequireAllPresent
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_NOT_READY;
 }
 
@@ -143,14 +140,13 @@ CheckEKUs(
 EFI_STATUS
 EFIAPI
 VerifyEKUsInPkcs7Signature (
-  IN CONST UINT8    *Pkcs7Signature,
-  IN CONST UINT32   SignatureSize,
-  IN CONST CHAR8    *RequiredEKUs[],
-  IN CONST UINT32   RequiredEKUsSize,
-  IN BOOLEAN        RequireAllPresent
+  IN CONST UINT8   *Pkcs7Signature,
+  IN CONST UINT32  SignatureSize,
+  IN CONST CHAR8   *RequiredEKUs[],
+  IN CONST UINT32  RequiredEKUsSize,
+  IN BOOLEAN       RequireAllPresent
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_NOT_READY;
 }
-

CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyNull.c

@@ -57,7 +57,7 @@ Pkcs7GetSigners (
 VOID
 EFIAPI
 Pkcs7FreeSigners (
-  IN  UINT8        *Certs
+  IN  UINT8  *Certs
   )
 {
   ASSERT (FALSE);

CryptoPkg/Library/BaseCryptLibNull/Pk/CryptRsaExtNull.c

@@ -115,5 +115,3 @@ RsaPkcs1Sign (
   ASSERT (FALSE);
   return FALSE;
 }
-
-

CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c

@@ -205,10 +205,10 @@ X509GetCommonName (
 RETURN_STATUS
 EFIAPI
 X509GetOrganizationName (
-  IN      CONST UINT8   *Cert,
-  IN      UINTN         CertSize,
-  OUT     CHAR8         *NameBuffer   OPTIONAL,
-  IN OUT  UINTN         *NameBufferSize
+  IN      CONST UINT8  *Cert,
+  IN      UINTN        CertSize,
+  OUT     CHAR8        *NameBuffer   OPTIONAL,
+  IN OUT  UINTN        *NameBufferSize
   )
 {
   ASSERT (FALSE);

CryptoPkg/Library/BaseCryptLibNull/Rand/CryptRandNull.c

@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include "InternalCryptLib.h"
 
-
 /**
   Sets up the seed value for the pseudorandom number generator.
 

CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c

@@ -95,11 +95,12 @@ CryptoServiceNotAvailable (
   ASSERT_EFI_ERROR (EFI_UNSUPPORTED);
 }
 
-//=====================================================================================
+// =====================================================================================
 //    One-Way Cryptographic Hash Primitives
-//=====================================================================================
+// =====================================================================================
 
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES
+
 /**
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.
 
@@ -257,9 +258,11 @@ Md5HashAll (
 {
   CALL_CRYPTO_SERVICE (Md5HashAll, (Data, DataSize, HashValue), FALSE);
 }
+
 #endif
 
 #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES
+
 /**
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.
 
@@ -417,6 +420,7 @@ Sha1HashAll (
 {
   CALL_CRYPTO_SERVICE (Sha1HashAll, (Data, DataSize, HashValue), FALSE);
 }
+
 #endif
 
 /**
@@ -1015,9 +1019,9 @@ Sm3HashAll (
   CALL_CRYPTO_SERVICE (Sm3HashAll, (Data, DataSize, HashValue), FALSE);
 }
 
-//=====================================================================================
+// =====================================================================================
 //    MAC (Message Authentication Code) Primitive
-//=====================================================================================
+// =====================================================================================
 
 /**
   Allocates and initializes one HMAC_CTX context for subsequent HMAC-SHA256 use.
@@ -1165,9 +1169,9 @@ HmacSha256Final (
   CALL_CRYPTO_SERVICE (HmacSha256Final, (HmacSha256Context, HmacValue), FALSE);
 }
 
-//=====================================================================================
+// =====================================================================================
 //    Symmetric Cryptography Primitive
-//=====================================================================================
+// =====================================================================================
 
 /**
   Retrieves the size, in bytes, of the context buffer required for AES operations.
@@ -1304,9 +1308,9 @@ AesCbcDecrypt (
   CALL_CRYPTO_SERVICE (AesCbcDecrypt, (AesContext, Input, InputSize, Ivec, Output), FALSE);
 }
 
-//=====================================================================================
+// =====================================================================================
 //    Asymmetric Cryptography Primitive
-//=====================================================================================
+// =====================================================================================
 
 /**
   Allocates and initializes one RSA context for subsequent use.
@@ -1788,10 +1792,10 @@ X509GetCommonName (
 RETURN_STATUS
 EFIAPI
 X509GetOrganizationName (
-  IN      CONST UINT8   *Cert,
-  IN      UINTN         CertSize,
-  OUT     CHAR8         *NameBuffer   OPTIONAL,
-  IN OUT  UINTN         *NameBufferSize
+  IN      CONST UINT8  *Cert,
+  IN      UINTN        CertSize,
+  OUT     CHAR8        *NameBuffer   OPTIONAL,
+  IN OUT  UINTN        *NameBufferSize
   )
 {
   CALL_CRYPTO_SERVICE (X509GetOrganizationName, (Cert, CertSize, NameBuffer, NameBufferSize), RETURN_UNSUPPORTED);
@@ -2120,7 +2124,7 @@ Pkcs7GetSigners (
 VOID
 EFIAPI
 Pkcs7FreeSigners (
-  IN  UINT8        *Certs
+  IN  UINT8  *Certs
   )
 {
   CALL_VOID_CRYPTO_SERVICE (Pkcs7FreeSigners, (Certs));
@@ -2287,7 +2291,6 @@ VerifyEKUsInPkcs7Signature (
   CALL_CRYPTO_SERVICE (VerifyEKUsInPkcs7Signature, (Pkcs7Signature, SignatureSize, RequiredEKUs, RequiredEKUsSize, RequireAllPresent), FALSE);
 }
 
-
 /**
   Extracts the attached content from a PKCS#7 signed data if existed. The input signed
   data could be wrapped in a ContentInfo structure.
@@ -2391,9 +2394,9 @@ ImageTimestampVerify (
   CALL_CRYPTO_SERVICE (ImageTimestampVerify, (AuthData, DataSize, TsaCert, CertSize, SigningTime), FALSE);
 }
 
-//=====================================================================================
+// =====================================================================================
 //    DH Key Exchange Primitive
-//=====================================================================================
+// =====================================================================================
 
 /**
   Allocates and Initializes one Diffie-Hellman Context for subsequent use.
@@ -2574,9 +2577,9 @@ DhComputeKey (
   CALL_CRYPTO_SERVICE (DhComputeKey, (DhContext, PeerPublicKey, PeerPublicKeySize, Key, KeySize), FALSE);
 }
 
-//=====================================================================================
+// =====================================================================================
 //    Pseudo-Random Generation Primitive
-//=====================================================================================
+// =====================================================================================
 
 /**
   Sets up the seed value for the pseudorandom number generator.
@@ -2630,9 +2633,9 @@ RandomBytes (
   CALL_CRYPTO_SERVICE (RandomBytes, (Output, Size), FALSE);
 }
 
-//=====================================================================================
+// =====================================================================================
 //    Key Derivation Function Primitive
-//=====================================================================================
+// =====================================================================================
 
 /**
   Derive key data using HMAC-SHA256 based KDF.
@@ -2695,7 +2698,7 @@ TlsInitialize (
 VOID
 EFIAPI
 TlsCtxFree (
-  IN   VOID                  *TlsCtx
+  IN   VOID  *TlsCtx
   )
 {
   CALL_VOID_CRYPTO_SERVICE (TlsCtxFree, (TlsCtx));
@@ -2715,8 +2718,8 @@ TlsCtxFree (
 VOID *
 EFIAPI
 TlsCtxNew (
-  IN     UINT8                    MajorVer,
-  IN     UINT8                    MinorVer
+  IN     UINT8  MajorVer,
+  IN     UINT8  MinorVer
   )
 {
   CALL_CRYPTO_SERVICE (TlsCtxNew, (MajorVer, MinorVer), NULL);
@@ -2734,7 +2737,7 @@ TlsCtxNew (
 VOID
 EFIAPI
 TlsFree (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   CALL_VOID_CRYPTO_SERVICE (TlsFree, (Tls));
@@ -2756,7 +2759,7 @@ TlsFree (
 VOID *
 EFIAPI
 TlsNew (
-  IN     VOID                     *TlsCtx
+  IN     VOID  *TlsCtx
   )
 {
   CALL_CRYPTO_SERVICE (TlsNew, (TlsCtx), NULL);
@@ -2776,7 +2779,7 @@ TlsNew (
 BOOLEAN
 EFIAPI
 TlsInHandshake (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   CALL_CRYPTO_SERVICE (TlsInHandshake, (Tls), FALSE);
@@ -2811,11 +2814,11 @@ TlsInHandshake (
 EFI_STATUS
 EFIAPI
 TlsDoHandshake (
-  IN     VOID                     *Tls,
-  IN     UINT8                    *BufferIn  OPTIONAL,
-  IN     UINTN                    BufferInSize  OPTIONAL,
-     OUT UINT8                    *BufferOut  OPTIONAL,
-  IN OUT UINTN                    *BufferOutSize
+  IN     VOID   *Tls,
+  IN     UINT8  *BufferIn  OPTIONAL,
+  IN     UINTN  BufferInSize  OPTIONAL,
+  OUT UINT8     *BufferOut  OPTIONAL,
+  IN OUT UINTN  *BufferOutSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsDoHandshake, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);
@@ -2849,11 +2852,11 @@ TlsDoHandshake (
 EFI_STATUS
 EFIAPI
 TlsHandleAlert (
-  IN     VOID                     *Tls,
-  IN     UINT8                    *BufferIn  OPTIONAL,
-  IN     UINTN                    BufferInSize  OPTIONAL,
-     OUT UINT8                    *BufferOut  OPTIONAL,
-  IN OUT UINTN                    *BufferOutSize
+  IN     VOID   *Tls,
+  IN     UINT8  *BufferIn  OPTIONAL,
+  IN     UINTN  BufferInSize  OPTIONAL,
+  OUT UINT8     *BufferOut  OPTIONAL,
+  IN OUT UINTN  *BufferOutSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsHandleAlert, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);
@@ -2880,9 +2883,9 @@ TlsHandleAlert (
 EFI_STATUS
 EFIAPI
 TlsCloseNotify (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *Buffer,
-  IN OUT UINTN                    *BufferSize
+  IN     VOID   *Tls,
+  IN OUT UINT8  *Buffer,
+  IN OUT UINTN  *BufferSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsCloseNotify, (Tls, Buffer, BufferSize), EFI_UNSUPPORTED);
@@ -2905,9 +2908,9 @@ TlsCloseNotify (
 INTN
 EFIAPI
 TlsCtrlTrafficOut (
-  IN     VOID                     *Tls,
-  IN OUT VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN OUT VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsCtrlTrafficOut, (Tls, Buffer, BufferSize), 0);
@@ -2930,9 +2933,9 @@ TlsCtrlTrafficOut (
 INTN
 EFIAPI
 TlsCtrlTrafficIn (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN     VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsCtrlTrafficIn, (Tls, Buffer, BufferSize), 0);
@@ -2956,9 +2959,9 @@ TlsCtrlTrafficIn (
 INTN
 EFIAPI
 TlsRead (
-  IN     VOID                     *Tls,
-  IN OUT VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN OUT VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsRead, (Tls, Buffer, BufferSize), 0);
@@ -2982,9 +2985,9 @@ TlsRead (
 INTN
 EFIAPI
 TlsWrite (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN     VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsWrite, (Tls, Buffer, BufferSize), 0);
@@ -3007,9 +3010,9 @@ TlsWrite (
 EFI_STATUS
 EFIAPI
 TlsSetVersion (
-  IN     VOID                     *Tls,
-  IN     UINT8                    MajorVer,
-  IN     UINT8                    MinorVer
+  IN     VOID   *Tls,
+  IN     UINT8  MajorVer,
+  IN     UINT8  MinorVer
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetVersion, (Tls, MajorVer, MinorVer), EFI_UNSUPPORTED);
@@ -3031,8 +3034,8 @@ TlsSetVersion (
 EFI_STATUS
 EFIAPI
 TlsSetConnectionEnd (
-  IN     VOID                     *Tls,
-  IN     BOOLEAN                  IsServer
+  IN     VOID     *Tls,
+  IN     BOOLEAN  IsServer
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetConnectionEnd, (Tls, IsServer), EFI_UNSUPPORTED);
@@ -3059,9 +3062,9 @@ TlsSetConnectionEnd (
 EFI_STATUS
 EFIAPI
 TlsSetCipherList (
-  IN     VOID                     *Tls,
-  IN     UINT16                   *CipherId,
-  IN     UINTN                    CipherNum
+  IN     VOID    *Tls,
+  IN     UINT16  *CipherId,
+  IN     UINTN   CipherNum
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetCipherList, (Tls, CipherId, CipherNum), EFI_UNSUPPORTED);
@@ -3082,7 +3085,7 @@ TlsSetCipherList (
 EFI_STATUS
 EFIAPI
 TlsSetCompressionMethod (
-  IN     UINT8                    CompMethod
+  IN     UINT8  CompMethod
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetCompressionMethod, (CompMethod), EFI_UNSUPPORTED);
@@ -3100,8 +3103,8 @@ TlsSetCompressionMethod (
 VOID
 EFIAPI
 TlsSetVerify (
-  IN     VOID                     *Tls,
-  IN     UINT32                   VerifyMode
+  IN     VOID    *Tls,
+  IN     UINT32  VerifyMode
   )
 {
   CALL_VOID_CRYPTO_SERVICE (TlsSetVerify, (Tls, VerifyMode));
@@ -3122,9 +3125,9 @@ TlsSetVerify (
 EFI_STATUS
 EFIAPI
 TlsSetVerifyHost (
-  IN     VOID                     *Tls,
-  IN     UINT32                   Flags,
-  IN     CHAR8                    *HostName
+  IN     VOID    *Tls,
+  IN     UINT32  Flags,
+  IN     CHAR8   *HostName
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetVerifyHost, (Tls, Flags, HostName), EFI_UNSUPPORTED);
@@ -3148,9 +3151,9 @@ TlsSetVerifyHost (
 EFI_STATUS
 EFIAPI
 TlsSetSessionId (
-  IN     VOID                     *Tls,
-  IN     UINT8                    *SessionId,
-  IN     UINT16                   SessionIdLen
+  IN     VOID    *Tls,
+  IN     UINT8   *SessionId,
+  IN     UINT16  SessionIdLen
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);
@@ -3176,9 +3179,9 @@ TlsSetSessionId (
 EFI_STATUS
 EFIAPI
 TlsSetCaCertificate (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Tls,
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);
@@ -3204,9 +3207,9 @@ TlsSetCaCertificate (
 EFI_STATUS
 EFIAPI
 TlsSetHostPublicCert (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Tls,
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);
@@ -3231,9 +3234,9 @@ TlsSetHostPublicCert (
 EFI_STATUS
 EFIAPI
 TlsSetHostPrivateKey (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Tls,
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);
@@ -3256,8 +3259,8 @@ TlsSetHostPrivateKey (
 EFI_STATUS
 EFIAPI
 TlsSetCertRevocationList (
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsSetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);
@@ -3279,7 +3282,7 @@ TlsSetCertRevocationList (
 UINT16
 EFIAPI
 TlsGetVersion (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetVersion, (Tls), 0);
@@ -3301,7 +3304,7 @@ TlsGetVersion (
 UINT8
 EFIAPI
 TlsGetConnectionEnd (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetConnectionEnd, (Tls), 0);
@@ -3324,8 +3327,8 @@ TlsGetConnectionEnd (
 EFI_STATUS
 EFIAPI
 TlsGetCurrentCipher (
-  IN     VOID                     *Tls,
-  IN OUT UINT16                   *CipherId
+  IN     VOID    *Tls,
+  IN OUT UINT16  *CipherId
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetCurrentCipher, (Tls, CipherId), EFI_UNSUPPORTED);
@@ -3350,8 +3353,8 @@ TlsGetCurrentCipher (
 EFI_STATUS
 EFIAPI
 TlsGetCurrentCompressionId (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *CompressionId
+  IN     VOID   *Tls,
+  IN OUT UINT8  *CompressionId
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetCurrentCompressionId, (Tls, CompressionId), EFI_UNSUPPORTED);
@@ -3373,7 +3376,7 @@ TlsGetCurrentCompressionId (
 UINT32
 EFIAPI
 TlsGetVerify (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetVerify, (Tls), 0);
@@ -3397,9 +3400,9 @@ TlsGetVerify (
 EFI_STATUS
 EFIAPI
 TlsGetSessionId (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *SessionId,
-  IN OUT UINT16                   *SessionIdLen
+  IN     VOID    *Tls,
+  IN OUT UINT8   *SessionId,
+  IN OUT UINT16  *SessionIdLen
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);
@@ -3419,8 +3422,8 @@ TlsGetSessionId (
 VOID
 EFIAPI
 TlsGetClientRandom (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *ClientRandom
+  IN     VOID   *Tls,
+  IN OUT UINT8  *ClientRandom
   )
 {
   CALL_VOID_CRYPTO_SERVICE (TlsGetClientRandom, (Tls, ClientRandom));
@@ -3440,8 +3443,8 @@ TlsGetClientRandom (
 VOID
 EFIAPI
 TlsGetServerRandom (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *ServerRandom
+  IN     VOID   *Tls,
+  IN OUT UINT8  *ServerRandom
   )
 {
   CALL_VOID_CRYPTO_SERVICE (TlsGetServerRandom, (Tls, ServerRandom));
@@ -3464,8 +3467,8 @@ TlsGetServerRandom (
 EFI_STATUS
 EFIAPI
 TlsGetKeyMaterial (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *KeyMaterial
+  IN     VOID   *Tls,
+  IN OUT UINT8  *KeyMaterial
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetKeyMaterial, (Tls, KeyMaterial), EFI_UNSUPPORTED);
@@ -3490,9 +3493,9 @@ TlsGetKeyMaterial (
 EFI_STATUS
 EFIAPI
 TlsGetCaCertificate (
-  IN     VOID                     *Tls,
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  IN     VOID   *Tls,
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);
@@ -3518,9 +3521,9 @@ TlsGetCaCertificate (
 EFI_STATUS
 EFIAPI
 TlsGetHostPublicCert (
-  IN     VOID                     *Tls,
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  IN     VOID   *Tls,
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);
@@ -3545,9 +3548,9 @@ TlsGetHostPublicCert (
 EFI_STATUS
 EFIAPI
 TlsGetHostPrivateKey (
-  IN     VOID                     *Tls,
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  IN     VOID   *Tls,
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);
@@ -3571,8 +3574,8 @@ TlsGetHostPrivateKey (
 EFI_STATUS
 EFIAPI
 TlsGetCertRevocationList (
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
   CALL_CRYPTO_SERVICE (TlsGetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);

CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.c

@@ -57,8 +57,8 @@ DxeCryptLibConstructor (
                   (VOID **)&mCryptoProtocol
                   );
 
-  if (EFI_ERROR (Status) || mCryptoProtocol == NULL) {
-    DEBUG((DEBUG_ERROR, "[DxeCryptLib] Failed to locate Crypto Protocol. Status = %r\n", Status));
+  if (EFI_ERROR (Status) || (mCryptoProtocol == NULL)) {
+    DEBUG ((DEBUG_ERROR, "[DxeCryptLib] Failed to locate Crypto Protocol. Status = %r\n", Status));
     ASSERT_EFI_ERROR (Status);
     ASSERT (mCryptoProtocol != NULL);
     mCryptoProtocol = NULL;
@@ -67,7 +67,7 @@ DxeCryptLibConstructor (
 
   Version = mCryptoProtocol->GetVersion ();
   if (Version < EDKII_CRYPTO_VERSION) {
-    DEBUG((DEBUG_ERROR, "[DxeCryptLib] Crypto Protocol unsupported version %d\n", Version));
+    DEBUG ((DEBUG_ERROR, "[DxeCryptLib] Crypto Protocol unsupported version %d\n", Version));
     ASSERT (Version >= EDKII_CRYPTO_VERSION);
     mCryptoProtocol = NULL;
     return EFI_NOT_FOUND;

CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.c

@@ -33,14 +33,14 @@ GetCryptoServices (
   UINTN             Version;
 
   CryptoPpi = NULL;
-  Status = PeiServicesLocatePpi (
-             &gEdkiiCryptoPpiGuid,
-             0,
-             NULL,
-             (VOID **)&CryptoPpi
-             );
-  if (EFI_ERROR (Status) || CryptoPpi == NULL) {
-    DEBUG((DEBUG_ERROR, "[PeiCryptLib] Failed to locate Crypto PPI. Status = %r\n", Status));
+  Status    = PeiServicesLocatePpi (
+                &gEdkiiCryptoPpiGuid,
+                0,
+                NULL,
+                (VOID **)&CryptoPpi
+                );
+  if (EFI_ERROR (Status) || (CryptoPpi == NULL)) {
+    DEBUG ((DEBUG_ERROR, "[PeiCryptLib] Failed to locate Crypto PPI. Status = %r\n", Status));
     ASSERT_EFI_ERROR (Status);
     ASSERT (CryptoPpi != NULL);
     return NULL;
@@ -48,7 +48,7 @@ GetCryptoServices (
 
   Version = CryptoPpi->GetVersion ();
   if (Version < EDKII_CRYPTO_VERSION) {
-    DEBUG((DEBUG_ERROR, "[PeiCryptLib] Crypto PPI unsupported version %d\n", Version));
+    DEBUG ((DEBUG_ERROR, "[PeiCryptLib] Crypto PPI unsupported version %d\n", Version));
     ASSERT (Version >= EDKII_CRYPTO_VERSION);
     return NULL;
   }

CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.c

@@ -59,8 +59,8 @@ SmmCryptLibConstructor (
                     NULL,
                     (VOID **)&mSmmCryptoProtocol
                     );
-  if (EFI_ERROR (Status) || mSmmCryptoProtocol == NULL) {
-    DEBUG((DEBUG_ERROR, "[SmmCryptLib] Failed to locate Crypto SMM Protocol. Status = %r\n", Status));
+  if (EFI_ERROR (Status) || (mSmmCryptoProtocol == NULL)) {
+    DEBUG ((DEBUG_ERROR, "[SmmCryptLib] Failed to locate Crypto SMM Protocol. Status = %r\n", Status));
     ASSERT_EFI_ERROR (Status);
     ASSERT (mSmmCryptoProtocol != NULL);
     mSmmCryptoProtocol = NULL;
@@ -69,7 +69,7 @@ SmmCryptLibConstructor (
 
   Version = mSmmCryptoProtocol->GetVersion ();
   if (Version < EDKII_CRYPTO_VERSION) {
-    DEBUG((DEBUG_ERROR, "[SmmCryptLib] Crypto SMM Protocol unsupported version %d\n", Version));
+    DEBUG ((DEBUG_ERROR, "[SmmCryptLib] Crypto SMM Protocol unsupported version %d\n", Version));
     ASSERT (Version >= EDKII_CRYPTO_VERSION);
     mSmmCryptoProtocol = NULL;
     return EFI_NOT_FOUND;

CryptoPkg/Library/Include/CrtLibSupport.h

@@ -16,8 +16,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/DebugLib.h>
 #include <Library/PrintLib.h>
 
-#define OPENSSLDIR ""
-#define ENGINESDIR ""
+#define OPENSSLDIR  ""
+#define ENGINESDIR  ""
 
 #define MAX_STRING_SIZE  0x1000
 
@@ -39,50 +39,50 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // define our own here.
 //
 #ifdef CONFIG_HEADER_BN_H
-#error CONFIG_HEADER_BN_H already defined
+  #error CONFIG_HEADER_BN_H already defined
 #endif
 
 #define CONFIG_HEADER_BN_H
 
-#if !defined(SIXTY_FOUR_BIT) && !defined (THIRTY_TWO_BIT)
-#if defined(MDE_CPU_X64) || defined(MDE_CPU_AARCH64) || defined(MDE_CPU_IA64) || defined(MDE_CPU_RISCV64)
+#if !defined (SIXTY_FOUR_BIT) && !defined (THIRTY_TWO_BIT)
+  #if defined (MDE_CPU_X64) || defined (MDE_CPU_AARCH64) || defined (MDE_CPU_IA64) || defined (MDE_CPU_RISCV64)
 //
 // With GCC we would normally use SIXTY_FOUR_BIT_LONG, but MSVC needs
 // SIXTY_FOUR_BIT, because 'long' is 32-bit and only 'long long' is
 // 64-bit. Since using 'long long' works fine on GCC too, just do that.
 //
 #define SIXTY_FOUR_BIT
-#elif defined(MDE_CPU_IA32) || defined(MDE_CPU_ARM) || defined(MDE_CPU_EBC)
+  #elif defined (MDE_CPU_IA32) || defined (MDE_CPU_ARM) || defined (MDE_CPU_EBC)
 #define THIRTY_TWO_BIT
-#else
-#error Unknown target architecture
-#endif
+  #else
+    #error Unknown target architecture
+  #endif
 #endif
 
 //
 // Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h
 //
-#if !defined(__CC_ARM) // if va_list is not already defined
+#if !defined (__CC_ARM) // if va_list is not already defined
 #define va_list   VA_LIST
 #define va_arg    VA_ARG
 #define va_start  VA_START
 #define va_end    VA_END
 #else // __CC_ARM
-#define va_start(Marker, Parameter)   __va_start(Marker, Parameter)
-#define va_arg(Marker, TYPE)          __va_arg(Marker, TYPE)
-#define va_end(Marker)                ((void)0)
+#define va_start(Marker, Parameter)  __va_start(Marker, Parameter)
+#define va_arg(Marker, TYPE)         __va_arg(Marker, TYPE)
+#define va_end(Marker)               ((void)0)
 #endif
 
 //
 // Definitions for global constants used by CRT library routines
 //
-#define EINVAL       22               /* Invalid argument */
-#define EAFNOSUPPORT 47               /* Address family not supported by protocol family */
-#define INT_MAX      0x7FFFFFFF       /* Maximum (signed) int value */
-#define LONG_MAX     0X7FFFFFFFL      /* max value for a long */
-#define LONG_MIN     (-LONG_MAX-1)    /* min value for a long */
-#define ULONG_MAX    0xFFFFFFFF       /* Maximum unsigned long value */
-#define CHAR_BIT     8                /* Number of bits in a char */
+#define EINVAL        22              /* Invalid argument */
+#define EAFNOSUPPORT  47              /* Address family not supported by protocol family */
+#define INT_MAX       0x7FFFFFFF      /* Maximum (signed) int value */
+#define LONG_MAX      0X7FFFFFFFL     /* max value for a long */
+#define LONG_MIN      (-LONG_MAX-1)   /* min value for a long */
+#define ULONG_MAX     0xFFFFFFFF      /* Maximum unsigned long value */
+#define CHAR_BIT      8               /* Number of bits in a char */
 
 //
 // Address families.
@@ -100,124 +100,316 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //
 // Basic types mapping
 //
-typedef UINTN          size_t;
-typedef UINTN          u_int;
-typedef INTN           ptrdiff_t;
-typedef INTN           ssize_t;
-typedef INT32          time_t;
-typedef UINT8          __uint8_t;
-typedef UINT8          sa_family_t;
-typedef UINT8          u_char;
-typedef UINT32         uid_t;
-typedef UINT32         gid_t;
-typedef CHAR16         wchar_t;
+typedef UINTN   size_t;
+typedef UINTN   u_int;
+typedef INTN    ptrdiff_t;
+typedef INTN    ssize_t;
+typedef INT32   time_t;
+typedef UINT8   __uint8_t;
+typedef UINT8   sa_family_t;
+typedef UINT8   u_char;
+typedef UINT32  uid_t;
+typedef UINT32  gid_t;
+typedef CHAR16  wchar_t;
 
 //
 // File operations are not required for EFI building,
 // so FILE is mapped to VOID * to pass build
 //
-typedef VOID  *FILE;
+typedef VOID *FILE;
 
 //
 // Structures Definitions
 //
 struct tm {
-  int   tm_sec;     /* seconds after the minute [0-60] */
-  int   tm_min;     /* minutes after the hour [0-59] */
-  int   tm_hour;    /* hours since midnight [0-23] */
-  int   tm_mday;    /* day of the month [1-31] */
-  int   tm_mon;     /* months since January [0-11] */
-  int   tm_year;    /* years since 1900 */
-  int   tm_wday;    /* days since Sunday [0-6] */
-  int   tm_yday;    /* days since January 1 [0-365] */
-  int   tm_isdst;   /* Daylight Savings Time flag */
-  long  tm_gmtoff;  /* offset from CUT in seconds */
-  char  *tm_zone;   /* timezone abbreviation */
+  int     tm_sec;    /* seconds after the minute [0-60] */
+  int     tm_min;    /* minutes after the hour [0-59] */
+  int     tm_hour;   /* hours since midnight [0-23] */
+  int     tm_mday;   /* day of the month [1-31] */
+  int     tm_mon;    /* months since January [0-11] */
+  int     tm_year;   /* years since 1900 */
+  int     tm_wday;   /* days since Sunday [0-6] */
+  int     tm_yday;   /* days since January 1 [0-365] */
+  int     tm_isdst;  /* Daylight Savings Time flag */
+  long    tm_gmtoff; /* offset from CUT in seconds */
+  char    *tm_zone;  /* timezone abbreviation */
 };
 
 struct timeval {
-  long tv_sec;      /* time value, in seconds */
-  long tv_usec;     /* time value, in microseconds */
+  long    tv_sec;   /* time value, in seconds */
+  long    tv_usec;  /* time value, in microseconds */
 };
 
 struct sockaddr {
-  __uint8_t    sa_len;       /* total length */
-  sa_family_t  sa_family;    /* address family */
-  char         sa_data[14];  /* actually longer; address value */
+  __uint8_t      sa_len;      /* total length */
+  sa_family_t    sa_family;   /* address family */
+  char           sa_data[14]; /* actually longer; address value */
 };
 
 //
 // Global variables
 //
-extern int  errno;
-extern FILE *stderr;
+extern int   errno;
+extern FILE  *stderr;
 
 //
 // Function prototypes of CRT Library routines
 //
-void           *malloc     (size_t);
-void           *realloc    (void *, size_t);
-void           free        (void *);
-void           *memset     (void *, int, size_t);
-int            memcmp      (const void *, const void *, size_t);
-int            isdigit     (int);
-int            isspace     (int);
-int            isxdigit    (int);
-int            isalnum     (int);
-int            isupper     (int);
-int            tolower     (int);
-int            strcmp      (const char *, const char *);
-int            strncasecmp (const char *, const char *, size_t);
-char           *strchr     (const char *, int);
-char           *strrchr    (const char *, int);
-unsigned long  strtoul     (const char *, char **, int);
-long           strtol      (const char *, char **, int);
-char           *strerror   (int);
-size_t         strspn      (const char *, const char *);
-size_t         strcspn     (const char *, const char *);
-int            printf      (const char *, ...);
-int            sscanf      (const char *, const char *, ...);
-FILE           *fopen      (const char *, const char *);
-size_t         fread       (void *, size_t, size_t, FILE *);
-size_t         fwrite      (const void *, size_t, size_t, FILE *);
-int            fclose      (FILE *);
-int            fprintf     (FILE *, const char *, ...);
-time_t         time        (time_t *);
-struct tm      *gmtime     (const time_t *);
-uid_t          getuid      (void);
-uid_t          geteuid     (void);
-gid_t          getgid      (void);
-gid_t          getegid     (void);
-int            issetugid   (void);
-void           qsort       (void *, size_t, size_t, int (*)(const void *, const void *));
-char           *getenv     (const char *);
-char           *secure_getenv (const char *);
-#if defined(__GNUC__) && (__GNUC__ >= 2)
-void           abort       (void) __attribute__((__noreturn__));
+void           *
+malloc     (
+  size_t
+  );
+
+void           *
+realloc    (
+  void *,
+  size_t
+  );
+
+void
+free        (
+  void *
+  );
+
+void           *
+memset     (
+  void *,
+  int,
+  size_t
+  );
+
+int
+memcmp      (
+  const void *,
+  const void *,
+  size_t
+  );
+
+int
+isdigit     (
+  int
+  );
+
+int
+isspace     (
+  int
+  );
+
+int
+isxdigit    (
+  int
+  );
+
+int
+isalnum     (
+  int
+  );
+
+int
+isupper     (
+  int
+  );
+
+int
+tolower     (
+  int
+  );
+
+int
+strcmp      (
+  const char *,
+  const char *
+  );
+
+int
+strncasecmp (
+  const char *,
+  const char *,
+  size_t
+  );
+
+char           *
+strchr     (
+  const char *,
+  int
+  );
+
+char           *
+strrchr    (
+  const char *,
+  int
+  );
+
+unsigned long
+strtoul     (
+  const char *,
+  char **,
+  int
+  );
+
+long
+strtol      (
+  const char *,
+  char **,
+  int
+  );
+
+char           *
+strerror   (
+  int
+  );
+
+size_t
+strspn      (
+  const char *,
+  const char *
+  );
+
+size_t
+strcspn     (
+  const char *,
+  const char *
+  );
+
+int
+printf      (
+  const char *,
+  ...
+  );
+
+int
+sscanf      (
+  const char *,
+  const char *,
+  ...
+  );
+
+FILE           *
+fopen      (
+  const char *,
+  const char *
+  );
+
+size_t
+fread       (
+  void *,
+  size_t,
+  size_t,
+  FILE *
+  );
+
+size_t
+fwrite      (
+  const void *,
+  size_t,
+  size_t,
+  FILE *
+  );
+
+int
+fclose      (
+  FILE *
+  );
+
+int
+fprintf     (
+  FILE *,
+  const char *,
+  ...
+  );
+
+time_t
+time        (
+  time_t *
+  );
+
+struct tm      *
+gmtime     (
+  const time_t *
+  );
+
+uid_t
+getuid      (
+  void
+  );
+
+uid_t
+geteuid     (
+  void
+  );
+
+gid_t
+getgid      (
+  void
+  );
+
+gid_t
+getegid     (
+  void
+  );
+
+int
+issetugid   (
+  void
+  );
+
+void
+qsort       (
+  void *,
+  size_t,
+  size_t,
+  int (*)(const void *, const void *)
+  );
+
+char           *
+getenv     (
+  const char *
+  );
+
+char           *
+secure_getenv (
+  const char *
+  );
+
+#if defined (__GNUC__) && (__GNUC__ >= 2)
+void
+abort       (
+  void
+  ) __attribute__ ((__noreturn__));
+
 #else
-void           abort       (void);
+void
+abort       (
+  void
+  );
+
 #endif
-int            inet_pton   (int, const char *, void *);
+int
+inet_pton   (
+  int,
+  const char *,
+  void *
+  );
 
 //
 // Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions
 //
-#define memcpy(dest,source,count)         CopyMem(dest,source,(UINTN)(count))
-#define memset(dest,ch,count)             SetMem(dest,(UINTN)(count),(UINT8)(ch))
-#define memchr(buf,ch,count)              ScanMem8(buf,(UINTN)(count),(UINT8)ch)
-#define memcmp(buf1,buf2,count)           (int)(CompareMem(buf1,buf2,(UINTN)(count)))
-#define memmove(dest,source,count)        CopyMem(dest,source,(UINTN)(count))
-#define strlen(str)                       (size_t)(AsciiStrnLenS(str,MAX_STRING_SIZE))
-#define strcpy(strDest,strSource)         AsciiStrCpyS(strDest,MAX_STRING_SIZE,strSource)
-#define strncpy(strDest,strSource,count)  AsciiStrnCpyS(strDest,MAX_STRING_SIZE,strSource,(UINTN)count)
-#define strcat(strDest,strSource)         AsciiStrCatS(strDest,MAX_STRING_SIZE,strSource)
-#define strncmp(string1,string2,count)    (int)(AsciiStrnCmp(string1,string2,(UINTN)(count)))
-#define strcasecmp(str1,str2)             (int)AsciiStriCmp(str1,str2)
-#define sprintf(buf,...)                  AsciiSPrint(buf,MAX_STRING_SIZE,__VA_ARGS__)
-#define localtime(timer)                  NULL
+#define memcpy(dest, source, count)         CopyMem(dest,source,(UINTN)(count))
+#define memset(dest, ch, count)             SetMem(dest,(UINTN)(count),(UINT8)(ch))
+#define memchr(buf, ch, count)              ScanMem8(buf,(UINTN)(count),(UINT8)ch)
+#define memcmp(buf1, buf2, count)           (int)(CompareMem(buf1,buf2,(UINTN)(count)))
+#define memmove(dest, source, count)        CopyMem(dest,source,(UINTN)(count))
+#define strlen(str)                         (size_t)(AsciiStrnLenS(str,MAX_STRING_SIZE))
+#define strcpy(strDest, strSource)          AsciiStrCpyS(strDest,MAX_STRING_SIZE,strSource)
+#define strncpy(strDest, strSource, count)  AsciiStrnCpyS(strDest,MAX_STRING_SIZE,strSource,(UINTN)count)
+#define strcat(strDest, strSource)          AsciiStrCatS(strDest,MAX_STRING_SIZE,strSource)
+#define strncmp(string1, string2, count)    (int)(AsciiStrnCmp(string1,string2,(UINTN)(count)))
+#define strcasecmp(str1, str2)              (int)AsciiStriCmp(str1,str2)
+#define sprintf(buf, ...)                   AsciiSPrint(buf,MAX_STRING_SIZE,__VA_ARGS__)
+#define localtime(timer)                    NULL
 #define assert(expression)
-#define offsetof(type,member)             OFFSET_OF(type,member)
-#define atoi(nptr)                        AsciiStrDecimalToUintn(nptr)
-#define gettimeofday(tvp,tz)              do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0)
+#define offsetof(type, member)  OFFSET_OF(type,member)
+#define atoi(nptr)              AsciiStrDecimalToUintn(nptr)
+#define gettimeofday(tvp, tz)   do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0)
 
 #endif

CryptoPkg/Library/Include/crypto/dso_conf.h

@@ -1,5 +1,6 @@
 /* WARNING: do not edit! */
 /* Generated from include/crypto/dso_conf.h.in */
+
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -10,7 +11,7 @@
  */
 
 #ifndef OSSL_CRYPTO_DSO_CONF_H
-# define OSSL_CRYPTO_DSO_CONF_H
-# define DSO_NONE
-# define DSO_EXTENSION ".so"
+#define OSSL_CRYPTO_DSO_CONF_H
+#define DSO_NONE
+#define DSO_EXTENSION  ".so"
 #endif

CryptoPkg/Library/Include/openssl/opensslconf.h

@@ -17,7 +17,7 @@ extern "C" {
 #endif
 
 #ifdef OPENSSL_ALGORITHM_DEFINES
-# error OPENSSL_ALGORITHM_DEFINES no longer supported
+  #error OPENSSL_ALGORITHM_DEFINES no longer supported
 #endif
 
 /*
@@ -25,232 +25,231 @@ extern "C" {
  */
 
 #ifndef OPENSSL_SYS_UEFI
-# define OPENSSL_SYS_UEFI 1
+#define OPENSSL_SYS_UEFI  1
 #endif
-#define OPENSSL_MIN_API 0x10100000L
+#define OPENSSL_MIN_API  0x10100000L
 #ifndef OPENSSL_NO_BF
-# define OPENSSL_NO_BF
+#define OPENSSL_NO_BF
 #endif
 #ifndef OPENSSL_NO_BLAKE2
-# define OPENSSL_NO_BLAKE2
+#define OPENSSL_NO_BLAKE2
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-# define OPENSSL_NO_CAMELLIA
+#define OPENSSL_NO_CAMELLIA
 #endif
 #ifndef OPENSSL_NO_CAST
-# define OPENSSL_NO_CAST
+#define OPENSSL_NO_CAST
 #endif
 #ifndef OPENSSL_NO_CHACHA
-# define OPENSSL_NO_CHACHA
+#define OPENSSL_NO_CHACHA
 #endif
 #ifndef OPENSSL_NO_CMS
-# define OPENSSL_NO_CMS
+#define OPENSSL_NO_CMS
 #endif
 #ifndef OPENSSL_NO_CT
-# define OPENSSL_NO_CT
+#define OPENSSL_NO_CT
 #endif
 #ifndef OPENSSL_NO_DES
-# define OPENSSL_NO_DES
+#define OPENSSL_NO_DES
 #endif
 #ifndef OPENSSL_NO_DSA
-# define OPENSSL_NO_DSA
+#define OPENSSL_NO_DSA
 #endif
 #ifndef OPENSSL_NO_EC
-# define OPENSSL_NO_EC
+#define OPENSSL_NO_EC
 #endif
 #ifndef OPENSSL_NO_IDEA
-# define OPENSSL_NO_IDEA
+#define OPENSSL_NO_IDEA
 #endif
 #ifndef OPENSSL_NO_MD2
-# define OPENSSL_NO_MD2
+#define OPENSSL_NO_MD2
 #endif
 #ifndef OPENSSL_NO_MD4
-# define OPENSSL_NO_MD4
+#define OPENSSL_NO_MD4
 #endif
 #ifndef OPENSSL_NO_MDC2
-# define OPENSSL_NO_MDC2
+#define OPENSSL_NO_MDC2
 #endif
 #ifndef OPENSSL_NO_POLY1305
-# define OPENSSL_NO_POLY1305
+#define OPENSSL_NO_POLY1305
 #endif
 #ifndef OPENSSL_NO_RC2
-# define OPENSSL_NO_RC2
+#define OPENSSL_NO_RC2
 #endif
 #ifndef OPENSSL_NO_RC4
-# define OPENSSL_NO_RC4
+#define OPENSSL_NO_RC4
 #endif
 #ifndef OPENSSL_NO_RC5
-# define OPENSSL_NO_RC5
+#define OPENSSL_NO_RC5
 #endif
 #ifndef OPENSSL_NO_RMD160
-# define OPENSSL_NO_RMD160
+#define OPENSSL_NO_RMD160
 #endif
 #ifndef OPENSSL_NO_SEED
-# define OPENSSL_NO_SEED
+#define OPENSSL_NO_SEED
 #endif
 #ifndef OPENSSL_NO_SM2
-# define OPENSSL_NO_SM2
+#define OPENSSL_NO_SM2
 #endif
 #ifndef OPENSSL_NO_SRP
-# define OPENSSL_NO_SRP
+#define OPENSSL_NO_SRP
 #endif
 #ifndef OPENSSL_NO_TS
-# define OPENSSL_NO_TS
+#define OPENSSL_NO_TS
 #endif
 #ifndef OPENSSL_NO_WHIRLPOOL
-# define OPENSSL_NO_WHIRLPOOL
+#define OPENSSL_NO_WHIRLPOOL
 #endif
 #ifndef OPENSSL_RAND_SEED_NONE
-# define OPENSSL_RAND_SEED_NONE
+#define OPENSSL_RAND_SEED_NONE
 #endif
 #ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
+#define OPENSSL_NO_AFALGENG
 #endif
 #ifndef OPENSSL_NO_APPS
-# define OPENSSL_NO_APPS
+#define OPENSSL_NO_APPS
 #endif
 #ifndef OPENSSL_NO_ASAN
-# define OPENSSL_NO_ASAN
+#define OPENSSL_NO_ASAN
 #endif
 #ifndef OPENSSL_NO_ASYNC
-# define OPENSSL_NO_ASYNC
+#define OPENSSL_NO_ASYNC
 #endif
 #ifndef OPENSSL_NO_AUTOERRINIT
-# define OPENSSL_NO_AUTOERRINIT
+#define OPENSSL_NO_AUTOERRINIT
 #endif
 #ifndef OPENSSL_NO_AUTOLOAD_CONFIG
-# define OPENSSL_NO_AUTOLOAD_CONFIG
+#define OPENSSL_NO_AUTOLOAD_CONFIG
 #endif
 #ifndef OPENSSL_NO_CAPIENG
-# define OPENSSL_NO_CAPIENG
+#define OPENSSL_NO_CAPIENG
 #endif
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
-# define OPENSSL_NO_CRYPTO_MDEBUG
+#define OPENSSL_NO_CRYPTO_MDEBUG
 #endif
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
-# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
+#define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
 #endif
 #ifndef OPENSSL_NO_DEPRECATED
-# define OPENSSL_NO_DEPRECATED
+#define OPENSSL_NO_DEPRECATED
 #endif
 #ifndef OPENSSL_NO_DEVCRYPTOENG
-# define OPENSSL_NO_DEVCRYPTOENG
+#define OPENSSL_NO_DEVCRYPTOENG
 #endif
 #ifndef OPENSSL_NO_DGRAM
-# define OPENSSL_NO_DGRAM
+#define OPENSSL_NO_DGRAM
 #endif
 #ifndef OPENSSL_NO_DTLS
-# define OPENSSL_NO_DTLS
+#define OPENSSL_NO_DTLS
 #endif
 #ifndef OPENSSL_NO_DTLS1
-# define OPENSSL_NO_DTLS1
+#define OPENSSL_NO_DTLS1
 #endif
 #ifndef OPENSSL_NO_DTLS1_2
-# define OPENSSL_NO_DTLS1_2
+#define OPENSSL_NO_DTLS1_2
 #endif
 #ifndef OPENSSL_NO_EC2M
-# define OPENSSL_NO_EC2M
+#define OPENSSL_NO_EC2M
 #endif
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#define OPENSSL_NO_EC_NISTP_64_GCC_128
 #endif
 #ifndef OPENSSL_NO_ECDH
-# define OPENSSL_NO_ECDH
+#define OPENSSL_NO_ECDH
 #endif
 #ifndef OPENSSL_NO_ECDSA
-# define OPENSSL_NO_ECDSA
+#define OPENSSL_NO_ECDSA
 #endif
 #ifndef OPENSSL_NO_EGD
-# define OPENSSL_NO_EGD
+#define OPENSSL_NO_EGD
 #endif
 #ifndef OPENSSL_NO_ENGINE
-# define OPENSSL_NO_ENGINE
+#define OPENSSL_NO_ENGINE
 #endif
 #ifndef OPENSSL_NO_ERR
-# define OPENSSL_NO_ERR
+#define OPENSSL_NO_ERR
 #endif
 #ifndef OPENSSL_NO_EXTERNAL_TESTS
-# define OPENSSL_NO_EXTERNAL_TESTS
+#define OPENSSL_NO_EXTERNAL_TESTS
 #endif
 #ifndef OPENSSL_NO_FILENAMES
-# define OPENSSL_NO_FILENAMES
+#define OPENSSL_NO_FILENAMES
 #endif
 #ifndef OPENSSL_NO_FUZZ_AFL
-# define OPENSSL_NO_FUZZ_AFL
+#define OPENSSL_NO_FUZZ_AFL
 #endif
 #ifndef OPENSSL_NO_FUZZ_LIBFUZZER
-# define OPENSSL_NO_FUZZ_LIBFUZZER
+#define OPENSSL_NO_FUZZ_LIBFUZZER
 #endif
 #ifndef OPENSSL_NO_GOST
-# define OPENSSL_NO_GOST
+#define OPENSSL_NO_GOST
 #endif
 #ifndef OPENSSL_NO_HEARTBEATS
-# define OPENSSL_NO_HEARTBEATS
+#define OPENSSL_NO_HEARTBEATS
 #endif
 #ifndef OPENSSL_NO_HW
-# define OPENSSL_NO_HW
+#define OPENSSL_NO_HW
 #endif
 #ifndef OPENSSL_NO_MSAN
-# define OPENSSL_NO_MSAN
+#define OPENSSL_NO_MSAN
 #endif
 #ifndef OPENSSL_NO_OCB
-# define OPENSSL_NO_OCB
+#define OPENSSL_NO_OCB
 #endif
 #ifndef OPENSSL_NO_POSIX_IO
-# define OPENSSL_NO_POSIX_IO
+#define OPENSSL_NO_POSIX_IO
 #endif
 #ifndef OPENSSL_NO_RFC3779
-# define OPENSSL_NO_RFC3779
+#define OPENSSL_NO_RFC3779
 #endif
 #ifndef OPENSSL_NO_SCRYPT
-# define OPENSSL_NO_SCRYPT
+#define OPENSSL_NO_SCRYPT
 #endif
 #ifndef OPENSSL_NO_SCTP
-# define OPENSSL_NO_SCTP
+#define OPENSSL_NO_SCTP
 #endif
 #ifndef OPENSSL_NO_SOCK
-# define OPENSSL_NO_SOCK
+#define OPENSSL_NO_SOCK
 #endif
 #ifndef OPENSSL_NO_SSL_TRACE
-# define OPENSSL_NO_SSL_TRACE
+#define OPENSSL_NO_SSL_TRACE
 #endif
 #ifndef OPENSSL_NO_SSL3
-# define OPENSSL_NO_SSL3
+#define OPENSSL_NO_SSL3
 #endif
 #ifndef OPENSSL_NO_SSL3_METHOD
-# define OPENSSL_NO_SSL3_METHOD
+#define OPENSSL_NO_SSL3_METHOD
 #endif
 #ifndef OPENSSL_NO_STDIO
-# define OPENSSL_NO_STDIO
+#define OPENSSL_NO_STDIO
 #endif
 #ifndef OPENSSL_NO_TESTS
-# define OPENSSL_NO_TESTS
+#define OPENSSL_NO_TESTS
 #endif
 #ifndef OPENSSL_NO_TLS1_3
-# define OPENSSL_NO_TLS1_3
+#define OPENSSL_NO_TLS1_3
 #endif
 #ifndef OPENSSL_NO_UBSAN
-# define OPENSSL_NO_UBSAN
+#define OPENSSL_NO_UBSAN
 #endif
 #ifndef OPENSSL_NO_UI_CONSOLE
-# define OPENSSL_NO_UI_CONSOLE
+#define OPENSSL_NO_UI_CONSOLE
 #endif
 #ifndef OPENSSL_NO_UNIT_TEST
-# define OPENSSL_NO_UNIT_TEST
+#define OPENSSL_NO_UNIT_TEST
 #endif
 #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-# define OPENSSL_NO_WEAK_SSL_CIPHERS
+#define OPENSSL_NO_WEAK_SSL_CIPHERS
 #endif
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
-# define OPENSSL_NO_DYNAMIC_ENGINE
+#define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
 
-
 /*
  * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
  * don't like that.  This will hopefully silence them.
  */
-#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
+#define NON_EMPTY_TRANSLATION_UNIT  static void *dummy = &dummy;
 
 /*
  * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
@@ -259,37 +258,37 @@ extern "C" {
  * functions.
  */
 #ifndef DECLARE_DEPRECATED
-# define DECLARE_DEPRECATED(f)   f;
-# ifdef __GNUC__
-#  if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
-#   undef DECLARE_DEPRECATED
-#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
-#  endif
-#elif defined(__SUNPRO_C)
-#if (__SUNPRO_C >= 0x5130)
-#undef DECLARE_DEPRECATED
-#define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
-#endif
-# endif
+#define DECLARE_DEPRECATED(f)  f;
+  #ifdef __GNUC__
+    #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+      #undef DECLARE_DEPRECATED
+#define DECLARE_DEPRECATED(f)  f __attribute__ ((deprecated));
+    #endif
+  #elif defined (__SUNPRO_C)
+    #if (__SUNPRO_C >= 0x5130)
+      #undef DECLARE_DEPRECATED
+#define DECLARE_DEPRECATED(f)  f __attribute__ ((deprecated));
+    #endif
+  #endif
 #endif
 
 #ifndef OPENSSL_FILE
-# ifdef OPENSSL_NO_FILENAMES
-#  define OPENSSL_FILE ""
-#  define OPENSSL_LINE 0
-# else
-#  define OPENSSL_FILE __FILE__
-#  define OPENSSL_LINE __LINE__
-# endif
+  #ifdef OPENSSL_NO_FILENAMES
+#define OPENSSL_FILE  ""
+#define OPENSSL_LINE  0
+  #else
+#define OPENSSL_FILE  __FILE__
+#define OPENSSL_LINE  __LINE__
+  #endif
 #endif
 
 #ifndef OPENSSL_MIN_API
-# define OPENSSL_MIN_API 0
+#define OPENSSL_MIN_API  0
 #endif
 
-#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
-# undef OPENSSL_API_COMPAT
-# define OPENSSL_API_COMPAT OPENSSL_MIN_API
+#if !defined (OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
+  #undef OPENSSL_API_COMPAT
+#define OPENSSL_API_COMPAT  OPENSSL_MIN_API
 #endif
 
 /*
@@ -297,51 +296,51 @@ extern "C" {
  * OpenSSL version number matches.
  */
 #if OPENSSL_VERSION_NUMBER < 0x10200000L
-# define DEPRECATEDIN_1_2_0(f)   f;
+#define DEPRECATEDIN_1_2_0(f)  f;
 #elif OPENSSL_API_COMPAT < 0x10200000L
-# define DEPRECATEDIN_1_2_0(f)   DECLARE_DEPRECATED(f)
+#define DEPRECATEDIN_1_2_0(f)  DECLARE_DEPRECATED(f)
 #else
-# define DEPRECATEDIN_1_2_0(f)
+#define DEPRECATEDIN_1_2_0(f)
 #endif
 
 #if OPENSSL_API_COMPAT < 0x10100000L
-# define DEPRECATEDIN_1_1_0(f)   DECLARE_DEPRECATED(f)
+#define DEPRECATEDIN_1_1_0(f)  DECLARE_DEPRECATED(f)
 #else
-# define DEPRECATEDIN_1_1_0(f)
+#define DEPRECATEDIN_1_1_0(f)
 #endif
 
 #if OPENSSL_API_COMPAT < 0x10000000L
-# define DEPRECATEDIN_1_0_0(f)   DECLARE_DEPRECATED(f)
+#define DEPRECATEDIN_1_0_0(f)  DECLARE_DEPRECATED(f)
 #else
-# define DEPRECATEDIN_1_0_0(f)
+#define DEPRECATEDIN_1_0_0(f)
 #endif
 
 #if OPENSSL_API_COMPAT < 0x00908000L
-# define DEPRECATEDIN_0_9_8(f)   DECLARE_DEPRECATED(f)
+#define DEPRECATEDIN_0_9_8(f)  DECLARE_DEPRECATED(f)
 #else
-# define DEPRECATEDIN_0_9_8(f)
+#define DEPRECATEDIN_0_9_8(f)
 #endif
 
 /* Generate 80386 code? */
 #undef I386_ONLY
 
 #undef OPENSSL_UNISTD
-#define OPENSSL_UNISTD <unistd.h>
+#define OPENSSL_UNISTD  <unistd.h>
 
 #undef OPENSSL_EXPORT_VAR_AS_FUNCTION
 
 /*
  * The following are cipher-specific, but are part of the public API.
  */
-#if !defined(OPENSSL_SYS_UEFI)
-# undef BN_LLONG
+#if !defined (OPENSSL_SYS_UEFI)
+  #undef BN_LLONG
 /* Only one for the following should be defined */
-# undef SIXTY_FOUR_BIT_LONG
-# undef SIXTY_FOUR_BIT
-# define THIRTY_TWO_BIT
+  #undef SIXTY_FOUR_BIT_LONG
+  #undef SIXTY_FOUR_BIT
+#define THIRTY_TWO_BIT
 #endif
 
-#define RC4_INT unsigned int
+#define RC4_INT  unsigned int
 
 #ifdef  __cplusplus
 }

CryptoPkg/Library/Include/sys/syscall.h

@@ -8,4 +8,3 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include <CrtLibSupport.h>
-

CryptoPkg/Library/IntrinsicLib/CopyMem.c

@@ -10,21 +10,38 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Base.h>
 #include <Library/BaseMemoryLib.h>
 
-#if defined(__clang__) && !defined(__APPLE__)
+#if defined (__clang__) && !defined (__APPLE__)
 
 /* Copies bytes between buffers */
-static __attribute__((__used__))
-void * __memcpy (void *dest, const void *src, unsigned int count)
+static __attribute__ ((__used__))
+void *
+__memcpy (
+  void          *dest,
+  const void    *src,
+  unsigned int  count
+  )
 {
   return CopyMem (dest, src, (UINTN)count);
 }
-__attribute__((__alias__("__memcpy")))
-void * memcpy (void *dest, const void *src, unsigned int count);
+
+__attribute__ ((__alias__ ("__memcpy")))
+void *
+memcpy (
+  void          *dest,
+  const void    *src,
+  unsigned int  count
+  );
 
 #else
 /* Copies bytes between buffers */
-void * memcpy (void *dest, const void *src, unsigned int count)
+void *
+memcpy (
+  void          *dest,
+  const void    *src,
+  unsigned int  count
+  )
 {
   return CopyMem (dest, src, (UINTN)count);
 }
+
 #endif

CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c

@@ -11,7 +11,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * Floating point to integer conversion.
  */
-__declspec(naked) void _ftol2 (void)
+__declspec(naked) void
+_ftol2 (
+  void
+  )
 {
   _asm {
     fistp qword ptr [esp-8]

CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c

@@ -8,16 +8,19 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-
 /*
  * Shifts a 64-bit signed value left by a particular number of bits.
  */
-__declspec(naked) void __cdecl _allshl (void)
+__declspec(naked) void __cdecl
+_allshl (
+  void
+  )
 {
   _asm {
     ;
     ; Handle shifting of 64 or more bits (return 0)
     ;
+
     cmp     cl, 64
     jae     short ReturnZero
 

CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c

@@ -8,11 +8,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-
 /*
  * Shifts a 64-bit unsigned value right by a certain number of bits.
  */
-__declspec(naked) void __cdecl _aullshr (void)
+__declspec(naked) void __cdecl
+_aullshr (
+  void
+  )
 {
   _asm {
     ;
@@ -41,8 +43,9 @@ More32:
     ret
 
     ;
-    ; Invalid number (less then 32bits), return 0
+    ; Invalid number (less  then 32bits), return 0
     ;
+
 _Exit:
     xor     eax, eax
     xor     edx, edx

CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c

@@ -11,20 +11,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseLib.h>
 
-typedef UINTN  size_t;
+typedef UINTN size_t;
 
-#if defined(__GNUC__) || defined(__clang__)
-  #define GLOBAL_USED __attribute__((used))
+#if defined (__GNUC__) || defined (__clang__)
+#define GLOBAL_USED  __attribute__((used))
 #else
-  #define GLOBAL_USED
+#define GLOBAL_USED
 #endif
 
 /* OpenSSL will use floating point support, and C compiler produces the _fltused
    symbol by default. Simply define this symbol here to satisfy the linker. */
-int  GLOBAL_USED _fltused = 1;
+int  GLOBAL_USED  _fltused = 1;
 
 /* Sets buffers to a specified character */
-void * memset (void *dest, int ch, size_t count)
+void *
+memset (
+  void    *dest,
+  int     ch,
+  size_t  count
+  )
 {
   //
   // NOTE: Here we use one base implementation for memset, instead of the direct
@@ -49,12 +54,21 @@ void * memset (void *dest, int ch, size_t count)
 }
 
 /* Compare bytes in two buffers. */
-int memcmp (const void *buf1, const void *buf2, size_t count)
+int
+memcmp (
+  const void  *buf1,
+  const void  *buf2,
+  size_t      count
+  )
 {
-  return (int)CompareMem(buf1, buf2, count);
+  return (int)CompareMem (buf1, buf2, count);
 }
 
-int strcmp (const char *s1, const char *s2)
+int
+strcmp (
+  const char  *s1,
+  const char  *s2
+  )
 {
-  return (int)AsciiStrCmp(s1, s2);
+  return (int)AsciiStrCmp (s1, s2);
 }

CryptoPkg/Library/OpensslLib/OpensslLibConstructor.c

@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include <Uefi.h>
 
-
 /**
   An internal OpenSSL function which fetches a local copy of the hardware
   capability flags.
@@ -41,4 +40,3 @@ OpensslLibConstructor (
 
   return EFI_SUCCESS;
 }
-

CryptoPkg/Library/OpensslLib/X64/ApiHooks.c

@@ -14,9 +14,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 VOID *
 __imp_RtlVirtualUnwind (
-  VOID *    Args
+  VOID  *Args
   )
 {
   return NULL;
 }
-

CryptoPkg/Library/OpensslLib/buildinf.h

@@ -1,4 +1,4 @@
 #define PLATFORM  "UEFI"
 #define DATE      "Fri Dec 22 01:23:45 PDT 2017"
 
-const char * compiler_flags = "compiler: information not available from edk2";
+const char  *compiler_flags = "compiler: information not available from edk2";

CryptoPkg/Library/OpensslLib/ossl_store.c

@@ -11,7 +11,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
  *
  * Dummy Implement for UEFI
  */
-void ossl_store_cleanup_int(void)
+void
+ossl_store_cleanup_int (
+  void
+  )
 {
 }
-

CryptoPkg/Library/OpensslLib/rand_pool.c

@@ -29,22 +29,21 @@ STATIC
 BOOLEAN
 EFIAPI
 RandGetBytes (
-  IN UINTN         Length,
-  OUT UINT8       *RandBuffer
+  IN UINTN   Length,
+  OUT UINT8  *RandBuffer
   )
 {
-  BOOLEAN     Ret;
-  UINT64      TempRand;
+  BOOLEAN  Ret;
+  UINT64   TempRand;
 
   Ret = FALSE;
 
   if (RandBuffer == NULL) {
-    DEBUG((DEBUG_ERROR, "[OPENSSL_RAND_POOL] NULL RandBuffer. No random numbers are generated and your system is not secure\n"));
+    DEBUG ((DEBUG_ERROR, "[OPENSSL_RAND_POOL] NULL RandBuffer. No random numbers are generated and your system is not secure\n"));
     ASSERT (RandBuffer != NULL); // Since we can't generate random numbers, we should assert. Otherwise we will just blow up later.
     return Ret;
   }
 
-
   while (Length > 0) {
     // Use RngLib to get random number
     Ret = GetRandomNumber64 (&TempRand);
@@ -52,12 +51,12 @@ RandGetBytes (
     if (!Ret) {
       return Ret;
     }
+
     if (Length >= sizeof (TempRand)) {
-      *((UINT64*) RandBuffer) = TempRand;
-      RandBuffer += sizeof (UINT64);
-      Length -= sizeof (TempRand);
-    }
-    else {
+      *((UINT64 *)RandBuffer) = TempRand;
+      RandBuffer             += sizeof (UINT64);
+      Length                 -= sizeof (TempRand);
+    } else {
       CopyMem (RandBuffer, &TempRand, Length);
       Length = 0;
     }
@@ -76,12 +75,12 @@ RandGetBytes (
  */
 size_t
 rand_pool_acquire_entropy (
-  RAND_POOL *pool
+  RAND_POOL  *pool
   )
 {
   BOOLEAN        Ret;
   size_t         Bytes_needed;
-  unsigned char *Buffer;
+  unsigned char  *Buffer;
 
   Bytes_needed = rand_pool_bytes_needed (pool, 1 /*entropy_factor*/);
   if (Bytes_needed > 0) {
@@ -91,8 +90,7 @@ rand_pool_acquire_entropy (
       Ret = RandGetBytes (Bytes_needed, Buffer);
       if (FALSE == Ret) {
         rand_pool_add_end (pool, 0, 0);
-      }
-      else {
+      } else {
         rand_pool_add_end (pool, Bytes_needed, 8 * Bytes_needed);
       }
     }
@@ -108,13 +106,14 @@ rand_pool_acquire_entropy (
  */
 int
 rand_pool_add_nonce_data (
-  RAND_POOL *pool
+  RAND_POOL  *pool
   )
 {
-  UINT8 data[16];
-  RandGetBytes (sizeof(data), data);
+  UINT8  data[16];
 
-  return rand_pool_add (pool, (unsigned char*)&data, sizeof(data), 0);
+  RandGetBytes (sizeof (data), data);
+
+  return rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0);
 }
 
 /*
@@ -124,13 +123,14 @@ rand_pool_add_nonce_data (
  */
 int
 rand_pool_add_additional_data (
-  RAND_POOL *pool
+  RAND_POOL  *pool
   )
 {
-  UINT8 data[16];
-  RandGetBytes (sizeof(data), data);
+  UINT8  data[16];
 
-  return rand_pool_add (pool, (unsigned char*)&data, sizeof(data), 0);
+  RandGetBytes (sizeof (data), data);
+
+  return rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0);
 }
 
 /*
@@ -152,7 +152,7 @@ rand_pool_init (
  * This is OpenSSL required interface.
  */
 VOID
-rand_pool_cleanup(
+rand_pool_cleanup (
   VOID
   )
 {
@@ -165,7 +165,7 @@ rand_pool_cleanup(
  */
 VOID
 rand_pool_keep_random_devices_open (
-  int keep
+  int  keep
   )
 {
 }

CryptoPkg/Library/TlsLib/InternalTlsLib.h

@@ -26,16 +26,15 @@ typedef struct {
   // Main SSL Connection which is created by a server or a client
   // per established connection.
   //
-  SSL                             *Ssl;
+  SSL    *Ssl;
   //
   // Memory BIO for the TLS/SSL Reading operations.
   //
-  BIO                             *InBio;
+  BIO    *InBio;
   //
   // Memory BIO for the TLS/SSL Writing operations.
   //
-  BIO                             *OutBio;
+  BIO    *OutBio;
 } TLS_CONNECTION;
 
 #endif
-

CryptoPkg/Library/TlsLib/TlsConfig.c

@@ -13,15 +13,15 @@ typedef struct {
   //
   // IANA/IETF defined Cipher Suite ID
   //
-  UINT16                          IanaCipher;
+  UINT16         IanaCipher;
   //
   // OpenSSL-used Cipher Suite String
   //
-  CONST CHAR8                     *OpensslCipher;
+  CONST CHAR8    *OpensslCipher;
   //
   // Length of OpensslCipher
   //
-  UINTN                           OpensslCipherLength;
+  UINTN          OpensslCipherLength;
 } TLS_CIPHER_MAPPING;
 
 //
@@ -38,30 +38,30 @@ typedef struct {
 //
 // Keep the table uniquely sorted by the IanaCipher field, in increasing order.
 //
-STATIC CONST TLS_CIPHER_MAPPING TlsCipherMappingTable[] = {
-  MAP ( 0x0001, "NULL-MD5" ),                       /// TLS_RSA_WITH_NULL_MD5
-  MAP ( 0x0002, "NULL-SHA" ),                       /// TLS_RSA_WITH_NULL_SHA
-  MAP ( 0x0004, "RC4-MD5" ),                        /// TLS_RSA_WITH_RC4_128_MD5
-  MAP ( 0x0005, "RC4-SHA" ),                        /// TLS_RSA_WITH_RC4_128_SHA
-  MAP ( 0x000A, "DES-CBC3-SHA" ),                   /// TLS_RSA_WITH_3DES_EDE_CBC_SHA, mandatory TLS 1.1
-  MAP ( 0x0016, "DHE-RSA-DES-CBC3-SHA" ),           /// TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-  MAP ( 0x002F, "AES128-SHA" ),                     /// TLS_RSA_WITH_AES_128_CBC_SHA, mandatory TLS 1.2
-  MAP ( 0x0030, "DH-DSS-AES128-SHA" ),              /// TLS_DH_DSS_WITH_AES_128_CBC_SHA
-  MAP ( 0x0031, "DH-RSA-AES128-SHA" ),              /// TLS_DH_RSA_WITH_AES_128_CBC_SHA
-  MAP ( 0x0033, "DHE-RSA-AES128-SHA" ),             /// TLS_DHE_RSA_WITH_AES_128_CBC_SHA
-  MAP ( 0x0035, "AES256-SHA" ),                     /// TLS_RSA_WITH_AES_256_CBC_SHA
-  MAP ( 0x0036, "DH-DSS-AES256-SHA" ),              /// TLS_DH_DSS_WITH_AES_256_CBC_SHA
-  MAP ( 0x0037, "DH-RSA-AES256-SHA" ),              /// TLS_DH_RSA_WITH_AES_256_CBC_SHA
-  MAP ( 0x0039, "DHE-RSA-AES256-SHA" ),             /// TLS_DHE_RSA_WITH_AES_256_CBC_SHA
-  MAP ( 0x003B, "NULL-SHA256" ),                    /// TLS_RSA_WITH_NULL_SHA256
-  MAP ( 0x003C, "AES128-SHA256" ),                  /// TLS_RSA_WITH_AES_128_CBC_SHA256
-  MAP ( 0x003D, "AES256-SHA256" ),                  /// TLS_RSA_WITH_AES_256_CBC_SHA256
-  MAP ( 0x003E, "DH-DSS-AES128-SHA256" ),           /// TLS_DH_DSS_WITH_AES_128_CBC_SHA256
-  MAP ( 0x003F, "DH-RSA-AES128-SHA256" ),           /// TLS_DH_RSA_WITH_AES_128_CBC_SHA256
-  MAP ( 0x0067, "DHE-RSA-AES128-SHA256" ),          /// TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
-  MAP ( 0x0068, "DH-DSS-AES256-SHA256" ),           /// TLS_DH_DSS_WITH_AES_256_CBC_SHA256
-  MAP ( 0x0069, "DH-RSA-AES256-SHA256" ),           /// TLS_DH_RSA_WITH_AES_256_CBC_SHA256
-  MAP ( 0x006B, "DHE-RSA-AES256-SHA256" ),          /// TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
+STATIC CONST TLS_CIPHER_MAPPING  TlsCipherMappingTable[] = {
+  MAP (0x0001, "NULL-MD5"),                         /// TLS_RSA_WITH_NULL_MD5
+  MAP (0x0002, "NULL-SHA"),                         /// TLS_RSA_WITH_NULL_SHA
+  MAP (0x0004, "RC4-MD5"),                          /// TLS_RSA_WITH_RC4_128_MD5
+  MAP (0x0005, "RC4-SHA"),                          /// TLS_RSA_WITH_RC4_128_SHA
+  MAP (0x000A, "DES-CBC3-SHA"),                     /// TLS_RSA_WITH_3DES_EDE_CBC_SHA, mandatory TLS 1.1
+  MAP (0x0016, "DHE-RSA-DES-CBC3-SHA"),             /// TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+  MAP (0x002F, "AES128-SHA"),                       /// TLS_RSA_WITH_AES_128_CBC_SHA, mandatory TLS 1.2
+  MAP (0x0030, "DH-DSS-AES128-SHA"),                /// TLS_DH_DSS_WITH_AES_128_CBC_SHA
+  MAP (0x0031, "DH-RSA-AES128-SHA"),                /// TLS_DH_RSA_WITH_AES_128_CBC_SHA
+  MAP (0x0033, "DHE-RSA-AES128-SHA"),               /// TLS_DHE_RSA_WITH_AES_128_CBC_SHA
+  MAP (0x0035, "AES256-SHA"),                       /// TLS_RSA_WITH_AES_256_CBC_SHA
+  MAP (0x0036, "DH-DSS-AES256-SHA"),                /// TLS_DH_DSS_WITH_AES_256_CBC_SHA
+  MAP (0x0037, "DH-RSA-AES256-SHA"),                /// TLS_DH_RSA_WITH_AES_256_CBC_SHA
+  MAP (0x0039, "DHE-RSA-AES256-SHA"),               /// TLS_DHE_RSA_WITH_AES_256_CBC_SHA
+  MAP (0x003B, "NULL-SHA256"),                      /// TLS_RSA_WITH_NULL_SHA256
+  MAP (0x003C, "AES128-SHA256"),                    /// TLS_RSA_WITH_AES_128_CBC_SHA256
+  MAP (0x003D, "AES256-SHA256"),                    /// TLS_RSA_WITH_AES_256_CBC_SHA256
+  MAP (0x003E, "DH-DSS-AES128-SHA256"),             /// TLS_DH_DSS_WITH_AES_128_CBC_SHA256
+  MAP (0x003F, "DH-RSA-AES128-SHA256"),             /// TLS_DH_RSA_WITH_AES_128_CBC_SHA256
+  MAP (0x0067, "DHE-RSA-AES128-SHA256"),            /// TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
+  MAP (0x0068, "DH-DSS-AES256-SHA256"),             /// TLS_DH_DSS_WITH_AES_256_CBC_SHA256
+  MAP (0x0069, "DH-RSA-AES256-SHA256"),             /// TLS_DH_RSA_WITH_AES_256_CBC_SHA256
+  MAP (0x006B, "DHE-RSA-AES256-SHA256"),            /// TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
 };
 
 /**
@@ -76,12 +76,12 @@ STATIC CONST TLS_CIPHER_MAPPING TlsCipherMappingTable[] = {
 STATIC
 CONST TLS_CIPHER_MAPPING *
 TlsGetCipherMapping (
-  IN     UINT16                   CipherId
+  IN     UINT16  CipherId
   )
 {
-  INTN                      Left;
-  INTN                      Right;
-  INTN                      Middle;
+  INTN  Left;
+  INTN  Right;
+  INTN  Middle;
 
   //
   // Binary Search Cipher Mapping Table for IANA-OpenSSL Cipher Translation
@@ -102,7 +102,7 @@ TlsGetCipherMapping (
     if (CipherId < TlsCipherMappingTable[Middle].IanaCipher) {
       Right = Middle - 1;
     } else {
-      Left  = Middle + 1;
+      Left = Middle + 1;
     }
   }
 
@@ -129,16 +129,16 @@ TlsGetCipherMapping (
 EFI_STATUS
 EFIAPI
 TlsSetVersion (
-  IN     VOID                     *Tls,
-  IN     UINT8                    MajorVer,
-  IN     UINT8                    MinorVer
+  IN     VOID   *Tls,
+  IN     UINT8  MajorVer,
+  IN     UINT8  MinorVer
   )
 {
   TLS_CONNECTION  *TlsConn;
   UINT16          ProtoVersion;
 
   TlsConn = (TLS_CONNECTION *)Tls;
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -148,35 +148,35 @@ TlsSetVersion (
   // Bound TLS method to the particular specified version.
   //
   switch (ProtoVersion) {
-  case TLS1_VERSION:
-    //
-    // TLS 1.0
-    //
-    SSL_set_min_proto_version (TlsConn->Ssl, TLS1_VERSION);
-    SSL_set_max_proto_version (TlsConn->Ssl, TLS1_VERSION);
-    break;
-  case TLS1_1_VERSION:
-    //
-    // TLS 1.1
-    //
-    SSL_set_min_proto_version (TlsConn->Ssl, TLS1_1_VERSION);
-    SSL_set_max_proto_version (TlsConn->Ssl, TLS1_1_VERSION);
-    break;
-  case TLS1_2_VERSION:
-    //
-    // TLS 1.2
-    //
-    SSL_set_min_proto_version (TlsConn->Ssl, TLS1_2_VERSION);
-    SSL_set_max_proto_version (TlsConn->Ssl, TLS1_2_VERSION);
-    break;
-  default:
-    //
-    // Unsupported Protocol Version
-    //
-    return EFI_UNSUPPORTED;
+    case TLS1_VERSION:
+      //
+      // TLS 1.0
+      //
+      SSL_set_min_proto_version (TlsConn->Ssl, TLS1_VERSION);
+      SSL_set_max_proto_version (TlsConn->Ssl, TLS1_VERSION);
+      break;
+    case TLS1_1_VERSION:
+      //
+      // TLS 1.1
+      //
+      SSL_set_min_proto_version (TlsConn->Ssl, TLS1_1_VERSION);
+      SSL_set_max_proto_version (TlsConn->Ssl, TLS1_1_VERSION);
+      break;
+    case TLS1_2_VERSION:
+      //
+      // TLS 1.2
+      //
+      SSL_set_min_proto_version (TlsConn->Ssl, TLS1_2_VERSION);
+      SSL_set_max_proto_version (TlsConn->Ssl, TLS1_2_VERSION);
+      break;
+    default:
+      //
+      // Unsupported Protocol Version
+      //
+      return EFI_UNSUPPORTED;
   }
 
-  return EFI_SUCCESS;;
+  return EFI_SUCCESS;
 }
 
 /**
@@ -195,14 +195,14 @@ TlsSetVersion (
 EFI_STATUS
 EFIAPI
 TlsSetConnectionEnd (
-  IN     VOID                     *Tls,
-  IN     BOOLEAN                  IsServer
+  IN     VOID     *Tls,
+  IN     BOOLEAN  IsServer
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {
+  TlsConn = (TLS_CONNECTION *)Tls;
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -216,7 +216,7 @@ TlsSetConnectionEnd (
     // Set TLS to work in Server mode.
     // It is unsupported for UEFI version currently.
     //
-    //SSL_set_accept_state (TlsConn->Ssl);
+    // SSL_set_accept_state (TlsConn->Ssl);
     return EFI_UNSUPPORTED;
   }
 
@@ -244,24 +244,24 @@ TlsSetConnectionEnd (
 EFI_STATUS
 EFIAPI
 TlsSetCipherList (
-  IN     VOID                     *Tls,
-  IN     UINT16                   *CipherId,
-  IN     UINTN                    CipherNum
+  IN     VOID    *Tls,
+  IN     UINT16  *CipherId,
+  IN     UINTN   CipherNum
   )
 {
-  TLS_CONNECTION           *TlsConn;
-  EFI_STATUS               Status;
-  CONST TLS_CIPHER_MAPPING **MappedCipher;
-  UINTN                    MappedCipherBytes;
-  UINTN                    MappedCipherCount;
-  UINTN                    CipherStringSize;
-  UINTN                    Index;
-  CONST TLS_CIPHER_MAPPING *Mapping;
-  CHAR8                    *CipherString;
-  CHAR8                    *CipherStringPosition;
+  TLS_CONNECTION            *TlsConn;
+  EFI_STATUS                Status;
+  CONST TLS_CIPHER_MAPPING  **MappedCipher;
+  UINTN                     MappedCipherBytes;
+  UINTN                     MappedCipherCount;
+  UINTN                     CipherStringSize;
+  UINTN                     Index;
+  CONST TLS_CIPHER_MAPPING  *Mapping;
+  CHAR8                     *CipherString;
+  CHAR8                     *CipherStringPosition;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || CipherId == NULL) {
+  TlsConn = (TLS_CONNECTION *)Tls;
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (CipherId == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -269,11 +269,15 @@ TlsSetCipherList (
   // Allocate the MappedCipher array for recording the mappings that we find
   // for the input IANA identifiers in CipherId.
   //
-  Status = SafeUintnMult (CipherNum, sizeof (*MappedCipher),
-             &MappedCipherBytes);
+  Status = SafeUintnMult (
+             CipherNum,
+             sizeof (*MappedCipher),
+             &MappedCipherBytes
+             );
   if (EFI_ERROR (Status)) {
     return EFI_OUT_OF_RESOURCES;
   }
+
   MappedCipher = AllocatePool (MappedCipherBytes);
   if (MappedCipher == NULL) {
     return EFI_OUT_OF_RESOURCES;
@@ -284,15 +288,20 @@ TlsSetCipherList (
   // CipherString.
   //
   MappedCipherCount = 0;
-  CipherStringSize = 0;
+  CipherStringSize  = 0;
   for (Index = 0; Index < CipherNum; Index++) {
     //
     // Look up the IANA-to-OpenSSL mapping.
     //
     Mapping = TlsGetCipherMapping (CipherId[Index]);
     if (Mapping == NULL) {
-      DEBUG ((DEBUG_VERBOSE, "%a:%a: skipping CipherId=0x%04x\n",
-        gEfiCallerBaseName, __FUNCTION__, CipherId[Index]));
+      DEBUG ((
+        DEBUG_VERBOSE,
+        "%a:%a: skipping CipherId=0x%04x\n",
+        gEfiCallerBaseName,
+        __FUNCTION__,
+        CipherId[Index]
+        ));
       //
       // Skipping the cipher is valid because CipherId is an ordered
       // preference list of ciphers, thus we can filter it as long as we
@@ -300,6 +309,7 @@ TlsSetCipherList (
       //
       continue;
     }
+
     //
     // Accumulate Mapping->OpensslCipherLength into CipherStringSize. If this
     // is not the first successful mapping, account for a colon (":") prefix
@@ -312,12 +322,17 @@ TlsSetCipherList (
         goto FreeMappedCipher;
       }
     }
-    Status = SafeUintnAdd (CipherStringSize, Mapping->OpensslCipherLength,
-               &CipherStringSize);
+
+    Status = SafeUintnAdd (
+               CipherStringSize,
+               Mapping->OpensslCipherLength,
+               &CipherStringSize
+               );
     if (EFI_ERROR (Status)) {
       Status = EFI_OUT_OF_RESOURCES;
       goto FreeMappedCipher;
     }
+
     //
     // Record the mapping.
     //
@@ -329,16 +344,22 @@ TlsSetCipherList (
   // terminating NUL character in CipherStringSize; allocate CipherString.
   //
   if (MappedCipherCount == 0) {
-    DEBUG ((DEBUG_ERROR, "%a:%a: no CipherId could be mapped\n",
-      gEfiCallerBaseName, __FUNCTION__));
+    DEBUG ((
+      DEBUG_ERROR,
+      "%a:%a: no CipherId could be mapped\n",
+      gEfiCallerBaseName,
+      __FUNCTION__
+      ));
     Status = EFI_UNSUPPORTED;
     goto FreeMappedCipher;
   }
+
   Status = SafeUintnAdd (CipherStringSize, 1, &CipherStringSize);
   if (EFI_ERROR (Status)) {
     Status = EFI_OUT_OF_RESOURCES;
     goto FreeMappedCipher;
   }
+
   CipherString = AllocatePool (CipherStringSize);
   if (CipherString == NULL) {
     Status = EFI_OUT_OF_RESOURCES;
@@ -358,8 +379,12 @@ TlsSetCipherList (
     if (Index > 0) {
       *(CipherStringPosition++) = ':';
     }
-    CopyMem (CipherStringPosition, Mapping->OpensslCipher,
-      Mapping->OpensslCipherLength);
+
+    CopyMem (
+      CipherStringPosition,
+      Mapping->OpensslCipher,
+      Mapping->OpensslCipherLength
+      );
     CipherStringPosition += Mapping->OpensslCipherLength;
   }
 
@@ -376,28 +401,35 @@ TlsSetCipherList (
   // DebugLib instances.)
   //
   DEBUG_CODE_BEGIN ();
-    UINTN FullLength;
-    UINTN SegmentLength;
+  UINTN  FullLength;
+  UINTN  SegmentLength;
 
-    FullLength = CipherStringSize - 1;
-    DEBUG ((DEBUG_VERBOSE, "%a:%a: CipherString={\n", gEfiCallerBaseName,
-      __FUNCTION__));
-    for (CipherStringPosition = CipherString;
-         CipherStringPosition < CipherString + FullLength;
-         CipherStringPosition += SegmentLength) {
-      SegmentLength = FullLength - (CipherStringPosition - CipherString);
-      if (SegmentLength > 79) {
-        SegmentLength = 79;
-      }
-      DEBUG ((DEBUG_VERBOSE, "%.*a\n", SegmentLength, CipherStringPosition));
+  FullLength = CipherStringSize - 1;
+  DEBUG ((
+    DEBUG_VERBOSE,
+    "%a:%a: CipherString={\n",
+    gEfiCallerBaseName,
+    __FUNCTION__
+    ));
+  for (CipherStringPosition = CipherString;
+       CipherStringPosition < CipherString + FullLength;
+       CipherStringPosition += SegmentLength)
+  {
+    SegmentLength = FullLength - (CipherStringPosition - CipherString);
+    if (SegmentLength > 79) {
+      SegmentLength = 79;
     }
-    DEBUG ((DEBUG_VERBOSE, "}\n"));
-    //
-    // Restore the pre-debug value of CipherStringPosition by skipping over the
-    // trailing NUL.
-    //
-    CipherStringPosition++;
-    ASSERT (CipherStringPosition == CipherString + CipherStringSize);
+
+    DEBUG ((DEBUG_VERBOSE, "%.*a\n", SegmentLength, CipherStringPosition));
+  }
+
+  DEBUG ((DEBUG_VERBOSE, "}\n"));
+  //
+  // Restore the pre-debug value of CipherStringPosition by skipping over the
+  // trailing NUL.
+  //
+  CipherStringPosition++;
+  ASSERT (CipherStringPosition == CipherString + CipherStringSize);
   DEBUG_CODE_END ();
 
   //
@@ -434,7 +466,7 @@ FreeMappedCipher:
 EFI_STATUS
 EFIAPI
 TlsSetCompressionMethod (
-  IN     UINT8                    CompMethod
+  IN     UINT8  CompMethod
   )
 {
   COMP_METHOD  *Cm;
@@ -451,7 +483,7 @@ TlsSetCompressionMethod (
     //
     return EFI_SUCCESS;
   } else if (CompMethod == 1) {
-    Cm = COMP_zlib();
+    Cm = COMP_zlib ();
   } else {
     return EFI_UNSUPPORTED;
   }
@@ -480,14 +512,14 @@ TlsSetCompressionMethod (
 VOID
 EFIAPI
 TlsSetVerify (
-  IN     VOID                     *Tls,
-  IN     UINT32                   VerifyMode
+  IN     VOID    *Tls,
+  IN     UINT32  VerifyMode
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {
+  TlsConn = (TLS_CONNECTION *)Tls;
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {
     return;
   }
 
@@ -512,23 +544,23 @@ TlsSetVerify (
 EFI_STATUS
 EFIAPI
 TlsSetVerifyHost (
-  IN     VOID                     *Tls,
-  IN     UINT32                   Flags,
-  IN     CHAR8                    *HostName
+  IN     VOID    *Tls,
+  IN     UINT32  Flags,
+  IN     CHAR8   *HostName
   )
 {
-  TLS_CONNECTION    *TlsConn;
-  X509_VERIFY_PARAM *VerifyParam;
-  UINTN             BinaryAddressSize;
-  UINT8             BinaryAddress[MAX (NS_INADDRSZ, NS_IN6ADDRSZ)];
-  INTN              ParamStatus;
+  TLS_CONNECTION     *TlsConn;
+  X509_VERIFY_PARAM  *VerifyParam;
+  UINTN              BinaryAddressSize;
+  UINT8              BinaryAddress[MAX (NS_INADDRSZ, NS_IN6ADDRSZ)];
+  INTN               ParamStatus;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || HostName == NULL) {
-     return EFI_INVALID_PARAMETER;
+  TlsConn = (TLS_CONNECTION *)Tls;
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (HostName == NULL)) {
+    return EFI_INVALID_PARAMETER;
   }
 
-  SSL_set_hostflags(TlsConn->Ssl, Flags);
+  SSL_set_hostflags (TlsConn->Ssl, Flags);
 
   VerifyParam = SSL_get0_param (TlsConn->Ssl);
   ASSERT (VerifyParam != NULL);
@@ -541,11 +573,20 @@ TlsSetVerifyHost (
   }
 
   if (BinaryAddressSize > 0) {
-    DEBUG ((DEBUG_VERBOSE, "%a:%a: parsed \"%a\" as an IPv%c address "
-      "literal\n", gEfiCallerBaseName, __FUNCTION__, HostName,
-      (UINTN)((BinaryAddressSize == NS_IN6ADDRSZ) ? '6' : '4')));
-    ParamStatus = X509_VERIFY_PARAM_set1_ip (VerifyParam, BinaryAddress,
-                    BinaryAddressSize);
+    DEBUG ((
+      DEBUG_VERBOSE,
+      "%a:%a: parsed \"%a\" as an IPv%c address "
+      "literal\n",
+      gEfiCallerBaseName,
+      __FUNCTION__,
+      HostName,
+      (UINTN)((BinaryAddressSize == NS_IN6ADDRSZ) ? '6' : '4')
+      ));
+    ParamStatus = X509_VERIFY_PARAM_set1_ip (
+                    VerifyParam,
+                    BinaryAddress,
+                    BinaryAddressSize
+                    );
   } else {
     ParamStatus = X509_VERIFY_PARAM_set1_host (VerifyParam, HostName, 0);
   }
@@ -571,18 +612,18 @@ TlsSetVerifyHost (
 EFI_STATUS
 EFIAPI
 TlsSetSessionId (
-  IN     VOID                     *Tls,
-  IN     UINT8                    *SessionId,
-  IN     UINT16                   SessionIdLen
+  IN     VOID    *Tls,
+  IN     UINT8   *SessionId,
+  IN     UINT16  SessionIdLen
   )
 {
   TLS_CONNECTION  *TlsConn;
   SSL_SESSION     *Session;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
   Session = NULL;
 
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || SessionId == NULL) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (SessionId == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -616,9 +657,9 @@ TlsSetSessionId (
 EFI_STATUS
 EFIAPI
 TlsSetCaCertificate (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Tls,
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
   BIO             *BioCert;
@@ -634,10 +675,10 @@ TlsSetCaCertificate (
   Cert      = NULL;
   X509Store = NULL;
   Status    = EFI_SUCCESS;
-  TlsConn   = (TLS_CONNECTION *) Tls;
+  TlsConn   = (TLS_CONNECTION *)Tls;
   Ret       = 0;
 
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || Data == NULL || DataSize == 0) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (Data == NULL) || (DataSize == 0)) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -645,7 +686,7 @@ TlsSetCaCertificate (
   // DER-encoded binary X.509 certificate or PEM-encoded X.509 certificate.
   // Determine whether certificate is from DER encoding, if so, translate it to X509 structure.
   //
-  Cert = d2i_X509 (NULL, (const unsigned char ** )&Data, (long) DataSize);
+  Cert = d2i_X509 (NULL, (const unsigned char **)&Data, (long)DataSize);
   if (Cert == NULL) {
     //
     // Certificate is from PEM encoding.
@@ -656,7 +697,7 @@ TlsSetCaCertificate (
       goto ON_EXIT;
     }
 
-    if (BIO_write (BioCert, Data, (UINT32) DataSize) <= 0) {
+    if (BIO_write (BioCert, Data, (UINT32)DataSize) <= 0) {
       Status = EFI_ABORTED;
       goto ON_EXIT;
     }
@@ -671,8 +712,8 @@ TlsSetCaCertificate (
   SslCtx    = SSL_get_SSL_CTX (TlsConn->Ssl);
   X509Store = SSL_CTX_get_cert_store (SslCtx);
   if (X509Store == NULL) {
-      Status = EFI_ABORTED;
-      goto ON_EXIT;
+    Status = EFI_ABORTED;
+    goto ON_EXIT;
   }
 
   //
@@ -684,8 +725,9 @@ TlsSetCaCertificate (
     //
     // Ignore "already in table" errors
     //
-    if (!(ERR_GET_FUNC (ErrorCode) == X509_F_X509_STORE_ADD_CERT &&
-        ERR_GET_REASON (ErrorCode) == X509_R_CERT_ALREADY_IN_HASH_TABLE)) {
+    if (!((ERR_GET_FUNC (ErrorCode) == X509_F_X509_STORE_ADD_CERT) &&
+          (ERR_GET_REASON (ErrorCode) == X509_R_CERT_ALREADY_IN_HASH_TABLE)))
+    {
       Status = EFI_ABORTED;
       goto ON_EXIT;
     }
@@ -723,9 +765,9 @@ ON_EXIT:
 EFI_STATUS
 EFIAPI
 TlsSetHostPublicCert (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Tls,
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
   BIO             *BioCert;
@@ -736,9 +778,9 @@ TlsSetHostPublicCert (
   BioCert = NULL;
   Cert    = NULL;
   Status  = EFI_SUCCESS;
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
 
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || Data == NULL || DataSize == 0) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (Data == NULL) || (DataSize == 0)) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -746,7 +788,7 @@ TlsSetHostPublicCert (
   // DER-encoded binary X.509 certificate or PEM-encoded X.509 certificate.
   // Determine whether certificate is from DER encoding, if so, translate it to X509 structure.
   //
-  Cert = d2i_X509 (NULL, (const unsigned char ** )&Data, (long) DataSize);
+  Cert = d2i_X509 (NULL, (const unsigned char **)&Data, (long)DataSize);
   if (Cert == NULL) {
     //
     // Certificate is from PEM encoding.
@@ -757,7 +799,7 @@ TlsSetHostPublicCert (
       goto ON_EXIT;
     }
 
-    if (BIO_write (BioCert, Data, (UINT32) DataSize) <= 0) {
+    if (BIO_write (BioCert, Data, (UINT32)DataSize) <= 0) {
       Status = EFI_ABORTED;
       goto ON_EXIT;
     }
@@ -805,9 +847,9 @@ ON_EXIT:
 EFI_STATUS
 EFIAPI
 TlsSetHostPrivateKey (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Tls,
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
   return EFI_UNSUPPORTED;
@@ -830,8 +872,8 @@ TlsSetHostPrivateKey (
 EFI_STATUS
 EFIAPI
 TlsSetCertRevocationList (
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
   return EFI_UNSUPPORTED;
@@ -853,12 +895,12 @@ TlsSetCertRevocationList (
 UINT16
 EFIAPI
 TlsGetVersion (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
 
   ASSERT (TlsConn != NULL);
 
@@ -881,12 +923,12 @@ TlsGetVersion (
 UINT8
 EFIAPI
 TlsGetConnectionEnd (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
 
   ASSERT (TlsConn != NULL);
 
@@ -910,17 +952,17 @@ TlsGetConnectionEnd (
 EFI_STATUS
 EFIAPI
 TlsGetCurrentCipher (
-  IN     VOID                     *Tls,
-  IN OUT UINT16                   *CipherId
+  IN     VOID    *Tls,
+  IN OUT UINT16  *CipherId
   )
 {
   TLS_CONNECTION    *TlsConn;
   CONST SSL_CIPHER  *Cipher;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
   Cipher  = NULL;
 
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || CipherId == NULL) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (CipherId == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -953,8 +995,8 @@ TlsGetCurrentCipher (
 EFI_STATUS
 EFIAPI
 TlsGetCurrentCompressionId (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *CompressionId
+  IN     VOID   *Tls,
+  IN OUT UINT8  *CompressionId
   )
 {
   return EFI_UNSUPPORTED;
@@ -976,12 +1018,12 @@ TlsGetCurrentCompressionId (
 UINT32
 EFIAPI
 TlsGetVerify (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
 
   ASSERT (TlsConn != NULL);
 
@@ -1006,19 +1048,19 @@ TlsGetVerify (
 EFI_STATUS
 EFIAPI
 TlsGetSessionId (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *SessionId,
-  IN OUT UINT16                   *SessionIdLen
+  IN     VOID    *Tls,
+  IN OUT UINT8   *SessionId,
+  IN OUT UINT16  *SessionIdLen
   )
 {
   TLS_CONNECTION  *TlsConn;
   SSL_SESSION     *Session;
   CONST UINT8     *SslSessionId;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
   Session = NULL;
 
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || SessionId == NULL || SessionIdLen == NULL) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (SessionId == NULL) || (SessionIdLen == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -1047,15 +1089,15 @@ TlsGetSessionId (
 VOID
 EFIAPI
 TlsGetClientRandom (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *ClientRandom
+  IN     VOID   *Tls,
+  IN OUT UINT8  *ClientRandom
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
 
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || ClientRandom == NULL) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (ClientRandom == NULL)) {
     return;
   }
 
@@ -1076,15 +1118,15 @@ TlsGetClientRandom (
 VOID
 EFIAPI
 TlsGetServerRandom (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *ServerRandom
+  IN     VOID   *Tls,
+  IN OUT UINT8  *ServerRandom
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
 
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || ServerRandom == NULL) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (ServerRandom == NULL)) {
     return;
   }
 
@@ -1108,17 +1150,17 @@ TlsGetServerRandom (
 EFI_STATUS
 EFIAPI
 TlsGetKeyMaterial (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *KeyMaterial
+  IN     VOID   *Tls,
+  IN OUT UINT8  *KeyMaterial
   )
 {
   TLS_CONNECTION  *TlsConn;
   SSL_SESSION     *Session;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
   Session = NULL;
 
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || KeyMaterial == NULL) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (KeyMaterial == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -1152,9 +1194,9 @@ TlsGetKeyMaterial (
 EFI_STATUS
 EFIAPI
 TlsGetCaCertificate (
-  IN     VOID                     *Tls,
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  IN     VOID   *Tls,
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
   return EFI_UNSUPPORTED;
@@ -1180,22 +1222,22 @@ TlsGetCaCertificate (
 EFI_STATUS
 EFIAPI
 TlsGetHostPublicCert (
-  IN     VOID                     *Tls,
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  IN     VOID   *Tls,
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
   X509            *Cert;
   TLS_CONNECTION  *TlsConn;
 
   Cert    = NULL;
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
 
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || DataSize == NULL || (*DataSize != 0 && Data == NULL)) {
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (DataSize == NULL) || ((*DataSize != 0) && (Data == NULL))) {
     return EFI_INVALID_PARAMETER;
   }
 
-  Cert = SSL_get_certificate(TlsConn->Ssl);
+  Cert = SSL_get_certificate (TlsConn->Ssl);
   if (Cert == NULL) {
     return EFI_NOT_FOUND;
   }
@@ -1203,12 +1245,12 @@ TlsGetHostPublicCert (
   //
   // Only DER encoding is supported currently.
   //
-  if (*DataSize < (UINTN) i2d_X509 (Cert, NULL)) {
-    *DataSize = (UINTN) i2d_X509 (Cert, NULL);
+  if (*DataSize < (UINTN)i2d_X509 (Cert, NULL)) {
+    *DataSize = (UINTN)i2d_X509 (Cert, NULL);
     return EFI_BUFFER_TOO_SMALL;
   }
 
-  *DataSize = (UINTN) i2d_X509 (Cert, (unsigned char **) &Data);
+  *DataSize = (UINTN)i2d_X509 (Cert, (unsigned char **)&Data);
 
   return EFI_SUCCESS;
 }
@@ -1232,9 +1274,9 @@ TlsGetHostPublicCert (
 EFI_STATUS
 EFIAPI
 TlsGetHostPrivateKey (
-  IN     VOID                     *Tls,
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  IN     VOID   *Tls,
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
   return EFI_UNSUPPORTED;
@@ -1258,8 +1300,8 @@ TlsGetHostPrivateKey (
 EFI_STATUS
 EFIAPI
 TlsGetCertRevocationList (
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
   return EFI_UNSUPPORTED;

CryptoPkg/Library/TlsLib/TlsInit.c

@@ -26,7 +26,7 @@ TlsInitialize (
   VOID
   )
 {
-  INTN            Ret;
+  INTN  Ret;
 
   //
   // Performs initialization of crypto and ssl library, and loads required
@@ -55,7 +55,7 @@ TlsInitialize (
 VOID
 EFIAPI
 TlsCtxFree (
-  IN   VOID                  *TlsCtx
+  IN   VOID  *TlsCtx
   )
 {
   if (TlsCtx == NULL) {
@@ -63,7 +63,7 @@ TlsCtxFree (
   }
 
   if (TlsCtx != NULL) {
-    SSL_CTX_free ((SSL_CTX *) (TlsCtx));
+    SSL_CTX_free ((SSL_CTX *)(TlsCtx));
   }
 }
 
@@ -81,8 +81,8 @@ TlsCtxFree (
 VOID *
 EFIAPI
 TlsCtxNew (
-  IN     UINT8                    MajorVer,
-  IN     UINT8                    MinorVer
+  IN     UINT8  MajorVer,
+  IN     UINT8  MinorVer
   )
 {
   SSL_CTX  *TlsCtx;
@@ -106,7 +106,7 @@ TlsCtxNew (
   //
   SSL_CTX_set_min_proto_version (TlsCtx, ProtoVersion);
 
-  return (VOID *) TlsCtx;
+  return (VOID *)TlsCtx;
 }
 
 /**
@@ -121,12 +121,12 @@ TlsCtxNew (
 VOID
 EFIAPI
 TlsFree (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
+  TlsConn = (TLS_CONNECTION *)Tls;
   if (TlsConn == NULL) {
     return;
   }
@@ -157,7 +157,7 @@ TlsFree (
 VOID *
 EFIAPI
 TlsNew (
-  IN     VOID                     *TlsCtx
+  IN     VOID  *TlsCtx
   )
 {
   TLS_CONNECTION  *TlsConn;
@@ -169,7 +169,7 @@ TlsNew (
   //
   // Allocate one new TLS_CONNECTION object
   //
-  TlsConn = (TLS_CONNECTION *) OPENSSL_malloc (sizeof (TLS_CONNECTION));
+  TlsConn = (TLS_CONNECTION *)OPENSSL_malloc (sizeof (TLS_CONNECTION));
   if (TlsConn == NULL) {
     return NULL;
   }
@@ -179,9 +179,9 @@ TlsNew (
   //
   // Create a new SSL Object
   //
-  TlsConn->Ssl = SSL_new ((SSL_CTX *) TlsCtx);
+  TlsConn->Ssl = SSL_new ((SSL_CTX *)TlsCtx);
   if (TlsConn->Ssl == NULL) {
-    TlsFree ((VOID *) TlsConn);
+    TlsFree ((VOID *)TlsConn);
     return NULL;
   }
 
@@ -202,7 +202,7 @@ TlsNew (
   //
   TlsConn->InBio = BIO_new (BIO_s_mem ());
   if (TlsConn->InBio == NULL) {
-    TlsFree ((VOID *) TlsConn);
+    TlsFree ((VOID *)TlsConn);
     return NULL;
   }
 
@@ -219,7 +219,7 @@ TlsNew (
   //
   TlsConn->OutBio = BIO_new (BIO_s_mem ());
   if (TlsConn->OutBio == NULL) {
-    TlsFree ((VOID *) TlsConn);
+    TlsFree ((VOID *)TlsConn);
     return NULL;
   }
 
@@ -244,9 +244,10 @@ TlsNew (
   if (X509Store == NULL) {
     X509Store = X509_STORE_new ();
     if (X509Store == NULL) {
-      TlsFree ((VOID *) TlsConn);
+      TlsFree ((VOID *)TlsConn);
       return NULL;
     }
+
     SSL_CTX_set1_verify_cert_store (SslCtx, X509Store);
     X509_STORE_free (X509Store);
   }
@@ -258,6 +259,5 @@ TlsNew (
     X509Store,
     X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME
     );
-  return (VOID *) TlsConn;
+  return (VOID *)TlsConn;
 }
-

CryptoPkg/Library/TlsLib/TlsProcess.c

@@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include "InternalTlsLib.h"
 
-#define MAX_BUFFER_SIZE   32768
+#define MAX_BUFFER_SIZE  32768
 
 /**
   Checks if the TLS handshake was done.
@@ -26,13 +26,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 BOOLEAN
 EFIAPI
 TlsInHandshake (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {
+  TlsConn = (TLS_CONNECTION *)Tls;
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {
     return FALSE;
   }
 
@@ -71,11 +71,11 @@ TlsInHandshake (
 EFI_STATUS
 EFIAPI
 TlsDoHandshake (
-  IN     VOID                     *Tls,
-  IN     UINT8                    *BufferIn  OPTIONAL,
-  IN     UINTN                    BufferInSize  OPTIONAL,
-     OUT UINT8                    *BufferOut  OPTIONAL,
-  IN OUT UINTN                    *BufferOutSize
+  IN     VOID   *Tls,
+  IN     UINT8  *BufferIn  OPTIONAL,
+  IN     UINTN  BufferInSize  OPTIONAL,
+  OUT UINT8     *BufferOut  OPTIONAL,
+  IN OUT UINTN  *BufferOutSize
   )
 {
   TLS_CONNECTION  *TlsConn;
@@ -83,45 +83,47 @@ TlsDoHandshake (
   INTN            Ret;
   UINTN           ErrorCode;
 
-  TlsConn           = (TLS_CONNECTION *) Tls;
+  TlsConn           = (TLS_CONNECTION *)Tls;
   PendingBufferSize = 0;
   Ret               = 1;
 
-  if (TlsConn == NULL || \
-    TlsConn->Ssl == NULL || TlsConn->InBio == NULL || TlsConn->OutBio == NULL || \
-    BufferOutSize == NULL || \
-    (BufferIn == NULL && BufferInSize != 0) || \
-    (BufferIn != NULL && BufferInSize == 0) || \
-    (BufferOut == NULL && *BufferOutSize != 0)) {
+  if ((TlsConn == NULL) || \
+      (TlsConn->Ssl == NULL) || (TlsConn->InBio == NULL) || (TlsConn->OutBio == NULL) || \
+      (BufferOutSize == NULL) || \
+      ((BufferIn == NULL) && (BufferInSize != 0)) || \
+      ((BufferIn != NULL) && (BufferInSize == 0)) || \
+      ((BufferOut == NULL) && (*BufferOutSize != 0)))
+  {
     return EFI_INVALID_PARAMETER;
   }
 
-  if(BufferIn == NULL && BufferInSize == 0) {
+  if ((BufferIn == NULL) && (BufferInSize == 0)) {
     //
     // If RequestBuffer is NULL and RequestSize is 0, and TLS session
     // status is EfiTlsSessionNotStarted, the TLS session will be initiated
     // and the response packet needs to be ClientHello.
     //
-    PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);
+    PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);
     if (PendingBufferSize == 0) {
       SSL_set_connect_state (TlsConn->Ssl);
-      Ret = SSL_do_handshake (TlsConn->Ssl);
-      PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);
+      Ret               = SSL_do_handshake (TlsConn->Ssl);
+      PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);
     }
   } else {
-    PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);
+    PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);
     if (PendingBufferSize == 0) {
-      BIO_write (TlsConn->InBio, BufferIn, (UINT32) BufferInSize);
-      Ret = SSL_do_handshake (TlsConn->Ssl);
-      PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);
+      BIO_write (TlsConn->InBio, BufferIn, (UINT32)BufferInSize);
+      Ret               = SSL_do_handshake (TlsConn->Ssl);
+      PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);
     }
   }
 
   if (Ret < 1) {
-    Ret = SSL_get_error (TlsConn->Ssl, (int) Ret);
-    if (Ret == SSL_ERROR_SSL ||
-        Ret == SSL_ERROR_SYSCALL ||
-        Ret == SSL_ERROR_ZERO_RETURN) {
+    Ret = SSL_get_error (TlsConn->Ssl, (int)Ret);
+    if ((Ret == SSL_ERROR_SSL) ||
+        (Ret == SSL_ERROR_SYSCALL) ||
+        (Ret == SSL_ERROR_ZERO_RETURN))
+    {
       DEBUG ((
         DEBUG_ERROR,
         "%a SSL_HANDSHAKE_ERROR State=0x%x SSL_ERROR_%a\n",
@@ -130,21 +132,23 @@ TlsDoHandshake (
         Ret == SSL_ERROR_SSL ? "SSL" : Ret == SSL_ERROR_SYSCALL ? "SYSCALL" : "ZERO_RETURN"
         ));
       DEBUG_CODE_BEGIN ();
-        while (TRUE) {
-          ErrorCode = ERR_get_error ();
-          if (ErrorCode == 0) {
-            break;
-          }
-          DEBUG ((
-            DEBUG_ERROR,
-            "%a ERROR 0x%x=L%x:F%x:R%x\n",
-            __FUNCTION__,
-            ErrorCode,
-            ERR_GET_LIB (ErrorCode),
-            ERR_GET_FUNC (ErrorCode),
-            ERR_GET_REASON (ErrorCode)
-            ));
+      while (TRUE) {
+        ErrorCode = ERR_get_error ();
+        if (ErrorCode == 0) {
+          break;
         }
+
+        DEBUG ((
+          DEBUG_ERROR,
+          "%a ERROR 0x%x=L%x:F%x:R%x\n",
+          __FUNCTION__,
+          ErrorCode,
+          ERR_GET_LIB (ErrorCode),
+          ERR_GET_FUNC (ErrorCode),
+          ERR_GET_REASON (ErrorCode)
+          ));
+      }
+
       DEBUG_CODE_END ();
       return EFI_ABORTED;
     }
@@ -156,7 +160,7 @@ TlsDoHandshake (
   }
 
   if (PendingBufferSize > 0) {
-    *BufferOutSize = BIO_read (TlsConn->OutBio, BufferOut, (UINT32) PendingBufferSize);
+    *BufferOutSize = BIO_read (TlsConn->OutBio, BufferOut, (UINT32)PendingBufferSize);
   } else {
     *BufferOutSize = 0;
   }
@@ -192,11 +196,11 @@ TlsDoHandshake (
 EFI_STATUS
 EFIAPI
 TlsHandleAlert (
-  IN     VOID                     *Tls,
-  IN     UINT8                    *BufferIn  OPTIONAL,
-  IN     UINTN                    BufferInSize  OPTIONAL,
-     OUT UINT8                    *BufferOut  OPTIONAL,
-  IN OUT UINTN                    *BufferOutSize
+  IN     VOID   *Tls,
+  IN     UINT8  *BufferIn  OPTIONAL,
+  IN     UINTN  BufferInSize  OPTIONAL,
+  OUT UINT8     *BufferOut  OPTIONAL,
+  IN OUT UINTN  *BufferOutSize
   )
 {
   TLS_CONNECTION  *TlsConn;
@@ -204,28 +208,29 @@ TlsHandleAlert (
   UINT8           *TempBuffer;
   INTN            Ret;
 
-  TlsConn           = (TLS_CONNECTION *) Tls;
+  TlsConn           = (TLS_CONNECTION *)Tls;
   PendingBufferSize = 0;
   TempBuffer        = NULL;
   Ret               = 0;
 
-  if (TlsConn == NULL || \
-    TlsConn->Ssl == NULL || TlsConn->InBio == NULL || TlsConn->OutBio == NULL || \
-    BufferOutSize == NULL || \
-    (BufferIn == NULL && BufferInSize != 0) || \
-    (BufferIn != NULL && BufferInSize == 0) || \
-    (BufferOut == NULL && *BufferOutSize != 0)) {
+  if ((TlsConn == NULL) || \
+      (TlsConn->Ssl == NULL) || (TlsConn->InBio == NULL) || (TlsConn->OutBio == NULL) || \
+      (BufferOutSize == NULL) || \
+      ((BufferIn == NULL) && (BufferInSize != 0)) || \
+      ((BufferIn != NULL) && (BufferInSize == 0)) || \
+      ((BufferOut == NULL) && (*BufferOutSize != 0)))
+  {
     return EFI_INVALID_PARAMETER;
   }
 
-  PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);
-  if (PendingBufferSize == 0 && BufferIn != NULL && BufferInSize != 0) {
-    Ret = BIO_write (TlsConn->InBio, BufferIn, (UINT32) BufferInSize);
-    if (Ret != (INTN) BufferInSize) {
+  PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);
+  if ((PendingBufferSize == 0) && (BufferIn != NULL) && (BufferInSize != 0)) {
+    Ret = BIO_write (TlsConn->InBio, BufferIn, (UINT32)BufferInSize);
+    if (Ret != (INTN)BufferInSize) {
       return EFI_ABORTED;
     }
 
-    TempBuffer = (UINT8 *) OPENSSL_malloc (MAX_BUFFER_SIZE);
+    TempBuffer = (UINT8 *)OPENSSL_malloc (MAX_BUFFER_SIZE);
 
     //
     // ssl3_send_alert() will be called in ssl3_read_bytes() function.
@@ -235,7 +240,7 @@ TlsHandleAlert (
 
     OPENSSL_free (TempBuffer);
 
-    PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);
+    PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);
   }
 
   if (PendingBufferSize > *BufferOutSize) {
@@ -244,7 +249,7 @@ TlsHandleAlert (
   }
 
   if (PendingBufferSize > 0) {
-    *BufferOutSize = BIO_read (TlsConn->OutBio, BufferOut, (UINT32) PendingBufferSize);
+    *BufferOutSize = BIO_read (TlsConn->OutBio, BufferOut, (UINT32)PendingBufferSize);
   } else {
     *BufferOutSize = 0;
   }
@@ -273,31 +278,32 @@ TlsHandleAlert (
 EFI_STATUS
 EFIAPI
 TlsCloseNotify (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *Buffer,
-  IN OUT UINTN                    *BufferSize
+  IN     VOID   *Tls,
+  IN OUT UINT8  *Buffer,
+  IN OUT UINTN  *BufferSize
   )
 {
   TLS_CONNECTION  *TlsConn;
   UINTN           PendingBufferSize;
 
-  TlsConn           = (TLS_CONNECTION *) Tls;
+  TlsConn           = (TLS_CONNECTION *)Tls;
   PendingBufferSize = 0;
 
-  if (TlsConn == NULL || \
-    TlsConn->Ssl == NULL || TlsConn->InBio == NULL || TlsConn->OutBio == NULL || \
-    BufferSize == NULL || \
-    (Buffer == NULL && *BufferSize != 0)) {
+  if ((TlsConn == NULL) || \
+      (TlsConn->Ssl == NULL) || (TlsConn->InBio == NULL) || (TlsConn->OutBio == NULL) || \
+      (BufferSize == NULL) || \
+      ((Buffer == NULL) && (*BufferSize != 0)))
+  {
     return EFI_INVALID_PARAMETER;
   }
 
-  PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);
+  PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);
   if (PendingBufferSize == 0) {
     //
     // ssl3_send_alert() and ssl3_dispatch_alert() function will be called.
     //
     SSL_shutdown (TlsConn->Ssl);
-    PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);
+    PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);
   }
 
   if (PendingBufferSize > *BufferSize) {
@@ -306,7 +312,7 @@ TlsCloseNotify (
   }
 
   if (PendingBufferSize > 0) {
-    *BufferSize = BIO_read (TlsConn->OutBio, Buffer, (UINT32) PendingBufferSize);
+    *BufferSize = BIO_read (TlsConn->OutBio, Buffer, (UINT32)PendingBufferSize);
   } else {
     *BufferSize = 0;
   }
@@ -331,22 +337,22 @@ TlsCloseNotify (
 INTN
 EFIAPI
 TlsCtrlTrafficOut (
-  IN     VOID                     *Tls,
-  IN OUT VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN OUT VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
-  if (TlsConn == NULL || TlsConn->OutBio == 0) {
+  TlsConn = (TLS_CONNECTION *)Tls;
+  if ((TlsConn == NULL) || (TlsConn->OutBio == 0)) {
     return -1;
   }
 
   //
   // Read and return the amount of data from the BIO.
   //
-  return BIO_read (TlsConn->OutBio, Buffer, (UINT32) BufferSize);
+  return BIO_read (TlsConn->OutBio, Buffer, (UINT32)BufferSize);
 }
 
 /**
@@ -366,23 +372,24 @@ TlsCtrlTrafficOut (
 INTN
 EFIAPI
 TlsCtrlTrafficIn (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN     VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
-  if (TlsConn == NULL || TlsConn->InBio == 0) {
+  TlsConn = (TLS_CONNECTION *)Tls;
+  if ((TlsConn == NULL) || (TlsConn->InBio == 0)) {
     return -1;
   }
 
   //
   // Write and return the amount of data to the BIO.
   //
-  return BIO_write (TlsConn->InBio, Buffer, (UINT32) BufferSize);
+  return BIO_write (TlsConn->InBio, Buffer, (UINT32)BufferSize);
 }
+
 /**
   Attempts to read bytes from the specified TLS connection into the buffer.
 
@@ -401,22 +408,22 @@ TlsCtrlTrafficIn (
 INTN
 EFIAPI
 TlsRead (
-  IN     VOID                     *Tls,
-  IN OUT VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN OUT VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {
+  TlsConn = (TLS_CONNECTION *)Tls;
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {
     return -1;
   }
 
   //
   // Read bytes from the specified TLS connection.
   //
-  return SSL_read (TlsConn->Ssl, Buffer, (UINT32) BufferSize);
+  return SSL_read (TlsConn->Ssl, Buffer, (UINT32)BufferSize);
 }
 
 /**
@@ -437,20 +444,20 @@ TlsRead (
 INTN
 EFIAPI
 TlsWrite (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN     VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
   TLS_CONNECTION  *TlsConn;
 
-  TlsConn = (TLS_CONNECTION *) Tls;
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {
+  TlsConn = (TLS_CONNECTION *)Tls;
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {
     return -1;
   }
 
   //
   // Write bytes to the specified TLS connection.
   //
-  return SSL_write (TlsConn->Ssl, Buffer, (UINT32) BufferSize);
+  return SSL_write (TlsConn->Ssl, Buffer, (UINT32)BufferSize);
 }

CryptoPkg/Library/TlsLibNull/TlsConfigNull.c

@@ -26,12 +26,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS
 EFIAPI
 TlsSetVersion (
-  IN     VOID                     *Tls,
-  IN     UINT8                    MajorVer,
-  IN     UINT8                    MinorVer
+  IN     VOID   *Tls,
+  IN     UINT8  MajorVer,
+  IN     UINT8  MinorVer
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -51,11 +51,11 @@ TlsSetVersion (
 EFI_STATUS
 EFIAPI
 TlsSetConnectionEnd (
-  IN     VOID                     *Tls,
-  IN     BOOLEAN                  IsServer
+  IN     VOID     *Tls,
+  IN     BOOLEAN  IsServer
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -80,12 +80,12 @@ TlsSetConnectionEnd (
 EFI_STATUS
 EFIAPI
 TlsSetCipherList (
-  IN     VOID                     *Tls,
-  IN     UINT16                   *CipherId,
-  IN     UINTN                    CipherNum
+  IN     VOID    *Tls,
+  IN     UINT16  *CipherId,
+  IN     UINTN   CipherNum
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -104,10 +104,10 @@ TlsSetCipherList (
 EFI_STATUS
 EFIAPI
 TlsSetCompressionMethod (
-  IN     UINT8                    CompMethod
+  IN     UINT8  CompMethod
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -123,14 +123,15 @@ TlsSetCompressionMethod (
 VOID
 EFIAPI
 TlsSetVerify (
-  IN     VOID                     *Tls,
-  IN     UINT32                   VerifyMode
+  IN     VOID    *Tls,
+  IN     UINT32  VerifyMode
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
 }
 
 // MU_CHANGE - Proposed fixes for TCBZ960, invalid domain name (CN) accepted. [BEGIN]
+
 /**
   Set the specified host name to be verified.
 
@@ -146,12 +147,12 @@ TlsSetVerify (
 EFI_STATUS
 EFIAPI
 TlsSetVerifyHost (
-  IN     VOID                     *Tls,
-  IN     UINT32                   Flags,
-  IN     CHAR8                    *HostName
+  IN     VOID    *Tls,
+  IN     UINT32  Flags,
+  IN     CHAR8   *HostName
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -175,12 +176,12 @@ TlsSetVerifyHost (
 EFI_STATUS
 EFIAPI
 TlsSetSessionId (
-  IN     VOID                     *Tls,
-  IN     UINT8                    *SessionId,
-  IN     UINT16                   SessionIdLen
+  IN     VOID    *Tls,
+  IN     UINT8   *SessionId,
+  IN     UINT16  SessionIdLen
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -204,12 +205,12 @@ TlsSetSessionId (
 EFI_STATUS
 EFIAPI
 TlsSetCaCertificate (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Tls,
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -233,12 +234,12 @@ TlsSetCaCertificate (
 EFI_STATUS
 EFIAPI
 TlsSetHostPublicCert (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Tls,
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -261,12 +262,12 @@ TlsSetHostPublicCert (
 EFI_STATUS
 EFIAPI
 TlsSetHostPrivateKey (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Tls,
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -287,11 +288,11 @@ TlsSetHostPrivateKey (
 EFI_STATUS
 EFIAPI
 TlsSetCertRevocationList (
-  IN     VOID                     *Data,
-  IN     UINTN                    DataSize
+  IN     VOID   *Data,
+  IN     UINTN  DataSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -311,10 +312,10 @@ TlsSetCertRevocationList (
 UINT16
 EFIAPI
 TlsGetVersion (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return 0;
 }
 
@@ -334,10 +335,10 @@ TlsGetVersion (
 UINT8
 EFIAPI
 TlsGetConnectionEnd (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return 0;
 }
 
@@ -358,11 +359,11 @@ TlsGetConnectionEnd (
 EFI_STATUS
 EFIAPI
 TlsGetCurrentCipher (
-  IN     VOID                     *Tls,
-  IN OUT UINT16                   *CipherId
+  IN     VOID    *Tls,
+  IN OUT UINT16  *CipherId
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -385,11 +386,11 @@ TlsGetCurrentCipher (
 EFI_STATUS
 EFIAPI
 TlsGetCurrentCompressionId (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *CompressionId
+  IN     VOID   *Tls,
+  IN OUT UINT8  *CompressionId
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -409,10 +410,10 @@ TlsGetCurrentCompressionId (
 UINT32
 EFIAPI
 TlsGetVerify (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return 0;
 }
 
@@ -434,12 +435,12 @@ TlsGetVerify (
 EFI_STATUS
 EFIAPI
 TlsGetSessionId (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *SessionId,
-  IN OUT UINT16                   *SessionIdLen
+  IN     VOID    *Tls,
+  IN OUT UINT8   *SessionId,
+  IN OUT UINT16  *SessionIdLen
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -457,11 +458,11 @@ TlsGetSessionId (
 VOID
 EFIAPI
 TlsGetClientRandom (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *ClientRandom
+  IN     VOID   *Tls,
+  IN OUT UINT8  *ClientRandom
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
 }
 
 /**
@@ -478,11 +479,11 @@ TlsGetClientRandom (
 VOID
 EFIAPI
 TlsGetServerRandom (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *ServerRandom
+  IN     VOID   *Tls,
+  IN OUT UINT8  *ServerRandom
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
 }
 
 /**
@@ -502,11 +503,11 @@ TlsGetServerRandom (
 EFI_STATUS
 EFIAPI
 TlsGetKeyMaterial (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *KeyMaterial
+  IN     VOID   *Tls,
+  IN OUT UINT8  *KeyMaterial
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -529,12 +530,12 @@ TlsGetKeyMaterial (
 EFI_STATUS
 EFIAPI
 TlsGetCaCertificate (
-  IN     VOID                     *Tls,
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  IN     VOID   *Tls,
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -558,12 +559,12 @@ TlsGetCaCertificate (
 EFI_STATUS
 EFIAPI
 TlsGetHostPublicCert (
-  IN     VOID                     *Tls,
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  IN     VOID   *Tls,
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -586,12 +587,12 @@ TlsGetHostPublicCert (
 EFI_STATUS
 EFIAPI
 TlsGetHostPrivateKey (
-  IN     VOID                     *Tls,
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  IN     VOID   *Tls,
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -613,10 +614,10 @@ TlsGetHostPrivateKey (
 EFI_STATUS
 EFIAPI
 TlsGetCertRevocationList (
-  OUT    VOID                     *Data,
-  IN OUT UINTN                    *DataSize
+  OUT    VOID   *Data,
+  IN OUT UINTN  *DataSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }

CryptoPkg/Library/TlsLibNull/TlsInitNull.c

@@ -26,7 +26,7 @@ TlsInitialize (
   VOID
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return FALSE;
 }
 
@@ -39,10 +39,10 @@ TlsInitialize (
 VOID
 EFIAPI
 TlsCtxFree (
-  IN   VOID                  *TlsCtx
+  IN   VOID  *TlsCtx
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return;
 }
 
@@ -60,11 +60,11 @@ TlsCtxFree (
 VOID *
 EFIAPI
 TlsCtxNew (
-  IN     UINT8                    MajorVer,
-  IN     UINT8                    MinorVer
+  IN     UINT8  MajorVer,
+  IN     UINT8  MinorVer
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return NULL;
 }
 
@@ -80,10 +80,10 @@ TlsCtxNew (
 VOID
 EFIAPI
 TlsFree (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
 }
 
 /**
@@ -102,10 +102,9 @@ TlsFree (
 VOID *
 EFIAPI
 TlsNew (
-  IN     VOID                     *TlsCtx
+  IN     VOID  *TlsCtx
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return NULL;
 }
-

CryptoPkg/Library/TlsLibNull/TlsProcessNull.c

@@ -24,10 +24,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 BOOLEAN
 EFIAPI
 TlsInHandshake (
-  IN     VOID                     *Tls
+  IN     VOID  *Tls
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return FALSE;
 }
 
@@ -60,14 +60,14 @@ TlsInHandshake (
 EFI_STATUS
 EFIAPI
 TlsDoHandshake (
-  IN     VOID                     *Tls,
-  IN     UINT8                    *BufferIn  OPTIONAL,
-  IN     UINTN                    BufferInSize  OPTIONAL,
-     OUT UINT8                    *BufferOut  OPTIONAL,
-  IN OUT UINTN                    *BufferOutSize
+  IN     VOID   *Tls,
+  IN     UINT8  *BufferIn  OPTIONAL,
+  IN     UINTN  BufferInSize  OPTIONAL,
+  OUT UINT8     *BufferOut  OPTIONAL,
+  IN OUT UINTN  *BufferOutSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -99,14 +99,14 @@ TlsDoHandshake (
 EFI_STATUS
 EFIAPI
 TlsHandleAlert (
-  IN     VOID                     *Tls,
-  IN     UINT8                    *BufferIn  OPTIONAL,
-  IN     UINTN                    BufferInSize  OPTIONAL,
-     OUT UINT8                    *BufferOut  OPTIONAL,
-  IN OUT UINTN                    *BufferOutSize
+  IN     VOID   *Tls,
+  IN     UINT8  *BufferIn  OPTIONAL,
+  IN     UINTN  BufferInSize  OPTIONAL,
+  OUT UINT8     *BufferOut  OPTIONAL,
+  IN OUT UINTN  *BufferOutSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -131,12 +131,12 @@ TlsHandleAlert (
 EFI_STATUS
 EFIAPI
 TlsCloseNotify (
-  IN     VOID                     *Tls,
-  IN OUT UINT8                    *Buffer,
-  IN OUT UINTN                    *BufferSize
+  IN     VOID   *Tls,
+  IN OUT UINT8  *Buffer,
+  IN OUT UINTN  *BufferSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return EFI_UNSUPPORTED;
 }
 
@@ -157,12 +157,12 @@ TlsCloseNotify (
 INTN
 EFIAPI
 TlsCtrlTrafficOut (
-  IN     VOID                     *Tls,
-  IN OUT VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN OUT VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return 0;
 }
 
@@ -183,14 +183,15 @@ TlsCtrlTrafficOut (
 INTN
 EFIAPI
 TlsCtrlTrafficIn (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN     VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return 0;
 }
+
 /**
   Attempts to read bytes from the specified TLS connection into the buffer.
 
@@ -209,12 +210,12 @@ TlsCtrlTrafficIn (
 INTN
 EFIAPI
 TlsRead (
-  IN     VOID                     *Tls,
-  IN OUT VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN OUT VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return 0;
 }
 
@@ -236,11 +237,11 @@ TlsRead (
 INTN
 EFIAPI
 TlsWrite (
-  IN     VOID                     *Tls,
-  IN     VOID                     *Buffer,
-  IN     UINTN                    BufferSize
+  IN     VOID   *Tls,
+  IN     VOID   *Buffer,
+  IN     UINTN  BufferSize
   )
 {
-  ASSERT(FALSE);
+  ASSERT (FALSE);
   return 0;
 }