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>

diff --git a/CryptoPkg/Driver/Crypto.c b/CryptoPkg/Driver/Crypto.c
index de9c5e9a015c663b0637a1ccecab093fb86420fa..d5d6aa8e582020add019d6e4de357f5761e365c4 100644 (file)
--- a/CryptoPkg/Driver/Crypto.c
+++ b/CryptoPkg/Driver/Crypto.c
@@ -18,7 +18,7 @@
   A macro used to retrieve the FixedAtBuild PcdCryptoServiceFamilyEnable with a\r
   typecast to its associcted structure type PCD_CRYPTO_SERVICE_FAMILY_ENABLE.\r
 **/\r
   A macro used to retrieve the FixedAtBuild PcdCryptoServiceFamilyEnable with a\r
   typecast to its associcted structure type PCD_CRYPTO_SERVICE_FAMILY_ENABLE.\r
 **/\r

-#define EDKII_CRYPTO_PCD ((const PCD_CRYPTO_SERVICE_FAMILY_ENABLE *) \\r
+#define EDKII_CRYPTO_PCD  ((const PCD_CRYPTO_SERVICE_FAMILY_ENABLE *)\\r

   (FixedPcdGetPtr (PcdCryptoServiceFamilyEnable)))\r
 \r
 /**\r
   (FixedPcdGetPtr (PcdCryptoServiceFamilyEnable)))\r
 \r
 /**\r


@@ -119,9 +119,9 @@ CryptoServiceGetCryptoVersion (
   return EDKII_CRYPTO_VERSION;\r
 }\r
 \r
   return EDKII_CRYPTO_VERSION;\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    One-Way Cryptographic Hash Primitives\r
 //    One-Way Cryptographic Hash Primitives\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   MD4 is deprecated and unsupported any longer.\r
 \r
 /**\r
   MD4 is deprecated and unsupported any longer.\r


@@ -244,6 +244,7 @@ DeprecatedCryptoServiceMd4HashAll (
 }\r
 \r
 #ifndef ENABLE_MD5_DEPRECATED_INTERFACES\r
 }\r
 \r
 #ifndef ENABLE_MD5_DEPRECATED_INTERFACES\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r


@@ -390,7 +391,9 @@ DeprecatedCryptoServiceMd5HashAll (
 {\r
   return BaseCryptLibServiceDeprecated ("Md5HashAll"), FALSE;\r
 }\r
 {\r
   return BaseCryptLibServiceDeprecated ("Md5HashAll"), FALSE;\r
 }\r

+\r

 #else\r
 #else\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r


@@ -548,9 +551,11 @@ CryptoServiceMd5HashAll (
 {\r
   return CALL_BASECRYPTLIB (Md5.Services.HashAll, Md5HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r
 {\r
   return CALL_BASECRYPTLIB (Md5.Services.HashAll, Md5HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r

+\r

 #endif\r
 \r
 #ifdef DISABLE_SHA1_DEPRECATED_INTERFACES\r
 #endif\r
 \r
 #ifdef DISABLE_SHA1_DEPRECATED_INTERFACES\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r


@@ -699,7 +704,9 @@ DeprecatedCryptoServiceSha1HashAll (
 {\r
   return BaseCryptLibServiceDeprecated ("Sha1HashAll"), FALSE;\r
 }\r
 {\r
   return BaseCryptLibServiceDeprecated ("Sha1HashAll"), FALSE;\r
 }\r

+\r

 #else\r
 #else\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r


@@ -857,6 +864,7 @@ CryptoServiceSha1HashAll (
 {\r
   return CALL_BASECRYPTLIB (Sha1.Services.HashAll, Sha1HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r
 {\r
   return CALL_BASECRYPTLIB (Sha1.Services.HashAll, Sha1HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r

+\r

 #endif\r
 \r
 /**\r
 #endif\r
 \r
 /**\r


@@ -1455,9 +1463,9 @@ CryptoServiceSm3HashAll (
   return CALL_BASECRYPTLIB (Sm3.Services.HashAll, Sm3HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r
 \r
   return CALL_BASECRYPTLIB (Sm3.Services.HashAll, Sm3HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    MAC (Message Authentication Code) Primitive\r
 //    MAC (Message Authentication Code) Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   HMAC MD5 is deprecated and unsupported any longer.\r
 \r
 /**\r
   HMAC MD5 is deprecated and unsupported any longer.\r


@@ -1839,9 +1847,9 @@ CryptoServiceHmacSha256Final (
   return CALL_BASECRYPTLIB (HmacSha256.Services.Final, HmacSha256Final, (HmacSha256Context, HmacValue), FALSE);\r
 }\r
 \r
   return CALL_BASECRYPTLIB (HmacSha256.Services.Final, HmacSha256Final, (HmacSha256Context, HmacValue), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Symmetric Cryptography Primitive\r
 //    Symmetric Cryptography Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   TDES is deprecated and unsupported any longer.\r
 \r
 /**\r
   TDES is deprecated and unsupported any longer.\r


@@ -2268,9 +2276,9 @@ DeprecatedCryptoServiceArc4Reset (
   return BaseCryptLibServiceDeprecated ("Arc4Reset"), FALSE;\r
 }\r
 \r
   return BaseCryptLibServiceDeprecated ("Arc4Reset"), FALSE;\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Asymmetric Cryptography Primitive\r
 //    Asymmetric Cryptography Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Allocates and initializes one RSA context for subsequent use.\r
 \r
 /**\r
   Allocates and initializes one RSA context for subsequent use.\r


@@ -2674,10 +2682,10 @@ CryptoServiceX509GetCommonName (
 RETURN_STATUS\r
 EFIAPI\r
 CryptoServiceX509GetOrganizationName (\r
 RETURN_STATUS\r
 EFIAPI\r
 CryptoServiceX509GetOrganizationName (\r

-  IN      CONST UINT8   *Cert,\r
-  IN      UINTN         CertSize,\r
-  OUT     CHAR8         *NameBuffer   OPTIONAL,\r
-  IN OUT  UINTN         *NameBufferSize\r
+  IN      CONST UINT8  *Cert,\r
+  IN      UINTN        CertSize,\r
+  OUT     CHAR8        *NameBuffer   OPTIONAL,\r
+  IN OUT  UINTN        *NameBufferSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (X509.Services.GetOrganizationName, X509GetOrganizationName, (Cert, CertSize, NameBuffer, NameBufferSize), RETURN_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (X509.Services.GetOrganizationName, X509GetOrganizationName, (Cert, CertSize, NameBuffer, NameBufferSize), RETURN_UNSUPPORTED);\r


@@ -3005,7 +3013,7 @@ CryptoServicePkcs7GetSigners (
 VOID\r
 EFIAPI\r
 CryptoServicePkcs7FreeSigners (\r
 VOID\r
 EFIAPI\r
 CryptoServicePkcs7FreeSigners (\r

-  IN  UINT8        *Certs\r
+  IN  UINT8  *Certs\r

   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (Pkcs.Services.Pkcs7FreeSigners, Pkcs7FreeSigners, (Certs));\r
   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (Pkcs.Services.Pkcs7FreeSigners, Pkcs7FreeSigners, (Certs));\r


@@ -3172,7 +3180,6 @@ CryptoServiceVerifyEKUsInPkcs7Signature (
   return CALL_BASECRYPTLIB (Pkcs.Services.VerifyEKUsInPkcs7Signature, VerifyEKUsInPkcs7Signature, (Pkcs7Signature, SignatureSize, RequiredEKUs, RequiredEKUsSize, RequireAllPresent), FALSE);\r
 }\r
 \r
   return CALL_BASECRYPTLIB (Pkcs.Services.VerifyEKUsInPkcs7Signature, VerifyEKUsInPkcs7Signature, (Pkcs7Signature, SignatureSize, RequiredEKUs, RequiredEKUsSize, RequireAllPresent), FALSE);\r
 }\r
 \r

-\r

 /**\r
   Extracts the attached content from a PKCS#7 signed data if existed. The input signed\r
   data could be wrapped in a ContentInfo structure.\r
 /**\r
   Extracts the attached content from a PKCS#7 signed data if existed. The input signed\r
   data could be wrapped in a ContentInfo structure.\r


@@ -3276,9 +3283,9 @@ CryptoServiceImageTimestampVerify (
   return CALL_BASECRYPTLIB (Pkcs.Services.ImageTimestampVerify, ImageTimestampVerify, (AuthData, DataSize, TsaCert, CertSize, SigningTime), FALSE);\r
 }\r
 \r
   return CALL_BASECRYPTLIB (Pkcs.Services.ImageTimestampVerify, ImageTimestampVerify, (AuthData, DataSize, TsaCert, CertSize, SigningTime), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    DH Key Exchange Primitive\r
 //    DH Key Exchange Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Allocates and Initializes one Diffie-Hellman Context for subsequent use.\r
 \r
 /**\r
   Allocates and Initializes one Diffie-Hellman Context for subsequent use.\r


@@ -3459,9 +3466,9 @@ CryptoServiceDhComputeKey (
   return CALL_BASECRYPTLIB (Dh.Services.ComputeKey, DhComputeKey, (DhContext, PeerPublicKey, PeerPublicKeySize, Key, KeySize), FALSE);\r
 }\r
 \r
   return CALL_BASECRYPTLIB (Dh.Services.ComputeKey, DhComputeKey, (DhContext, PeerPublicKey, PeerPublicKeySize, Key, KeySize), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Pseudo-Random Generation Primitive\r
 //    Pseudo-Random Generation Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r
 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r


@@ -3515,9 +3522,9 @@ CryptoServiceRandomBytes (
   return CALL_BASECRYPTLIB (Random.Services.Bytes, RandomBytes, (Output, Size), FALSE);\r
 }\r
 \r
   return CALL_BASECRYPTLIB (Random.Services.Bytes, RandomBytes, (Output, Size), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Key Derivation Function Primitive\r
 //    Key Derivation Function Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Derive key data using HMAC-SHA256 based KDF.\r
 \r
 /**\r
   Derive key data using HMAC-SHA256 based KDF.\r


@@ -3580,7 +3587,7 @@ CryptoServiceTlsInitialize (
 VOID\r
 EFIAPI\r
 CryptoServiceTlsCtxFree (\r
 VOID\r
 EFIAPI\r
 CryptoServiceTlsCtxFree (\r

-  IN   VOID                  *TlsCtx\r
+  IN   VOID  *TlsCtx\r

   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (Tls.Services.CtxFree, TlsCtxFree, (TlsCtx));\r
   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (Tls.Services.CtxFree, TlsCtxFree, (TlsCtx));\r


@@ -3600,8 +3607,8 @@ CryptoServiceTlsCtxFree (
 VOID *\r
 EFIAPI\r
 CryptoServiceTlsCtxNew (\r
 VOID *\r
 EFIAPI\r
 CryptoServiceTlsCtxNew (\r

-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.CtxNew, TlsCtxNew, (MajorVer, MinorVer), NULL);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.CtxNew, TlsCtxNew, (MajorVer, MinorVer), NULL);\r


@@ -3619,7 +3626,7 @@ CryptoServiceTlsCtxNew (
 VOID\r
 EFIAPI\r
 CryptoServiceTlsFree (\r
 VOID\r
 EFIAPI\r
 CryptoServiceTlsFree (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (Tls.Services.Free, TlsFree, (Tls));\r
   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (Tls.Services.Free, TlsFree, (Tls));\r


@@ -3641,7 +3648,7 @@ CryptoServiceTlsFree (
 VOID *\r
 EFIAPI\r
 CryptoServiceTlsNew (\r
 VOID *\r
 EFIAPI\r
 CryptoServiceTlsNew (\r

-  IN     VOID                     *TlsCtx\r
+  IN     VOID  *TlsCtx\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.New, TlsNew, (TlsCtx), NULL);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.New, TlsNew, (TlsCtx), NULL);\r


@@ -3661,7 +3668,7 @@ CryptoServiceTlsNew (
 BOOLEAN\r
 EFIAPI\r
 CryptoServiceTlsInHandshake (\r
 BOOLEAN\r
 EFIAPI\r
 CryptoServiceTlsInHandshake (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.InHandshake, TlsInHandshake, (Tls), FALSE);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.InHandshake, TlsInHandshake, (Tls), FALSE);\r


@@ -3696,11 +3703,11 @@ CryptoServiceTlsInHandshake (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsDoHandshake (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsDoHandshake (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.DoHandshake, TlsDoHandshake, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.DoHandshake, TlsDoHandshake, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);\r


@@ -3734,11 +3741,11 @@ CryptoServiceTlsDoHandshake (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsHandleAlert (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsHandleAlert (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.HandleAlert, TlsHandleAlert, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.HandleAlert, TlsHandleAlert, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);\r


@@ -3765,9 +3772,9 @@ CryptoServiceTlsHandleAlert (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsCloseNotify (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsCloseNotify (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *Buffer,\r
-  IN OUT UINTN                    *BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *Buffer,\r
+  IN OUT UINTN  *BufferSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.CloseNotify, TlsCloseNotify, (Tls, Buffer, BufferSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.CloseNotify, TlsCloseNotify, (Tls, Buffer, BufferSize), EFI_UNSUPPORTED);\r


@@ -3790,9 +3797,9 @@ CryptoServiceTlsCloseNotify (
 INTN\r
 EFIAPI\r
 CryptoServiceTlsCtrlTrafficOut (\r
 INTN\r
 EFIAPI\r
 CryptoServiceTlsCtrlTrafficOut (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.CtrlTrafficOut, TlsCtrlTrafficOut, (Tls, Buffer, BufferSize), 0);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.CtrlTrafficOut, TlsCtrlTrafficOut, (Tls, Buffer, BufferSize), 0);\r


@@ -3815,9 +3822,9 @@ CryptoServiceTlsCtrlTrafficOut (
 INTN\r
 EFIAPI\r
 CryptoServiceTlsCtrlTrafficIn (\r
 INTN\r
 EFIAPI\r
 CryptoServiceTlsCtrlTrafficIn (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.CtrlTrafficIn, TlsCtrlTrafficIn, (Tls, Buffer, BufferSize), 0);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.CtrlTrafficIn, TlsCtrlTrafficIn, (Tls, Buffer, BufferSize), 0);\r


@@ -3841,9 +3848,9 @@ CryptoServiceTlsCtrlTrafficIn (
 INTN\r
 EFIAPI\r
 CryptoServiceTlsRead (\r
 INTN\r
 EFIAPI\r
 CryptoServiceTlsRead (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.Read, TlsRead, (Tls, Buffer, BufferSize), 0);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.Read, TlsRead, (Tls, Buffer, BufferSize), 0);\r


@@ -3867,9 +3874,9 @@ CryptoServiceTlsRead (
 INTN\r
 EFIAPI\r
 CryptoServiceTlsWrite (\r
 INTN\r
 EFIAPI\r
 CryptoServiceTlsWrite (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.Write, TlsWrite, (Tls, Buffer, BufferSize), 0);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (Tls.Services.Write, TlsWrite, (Tls, Buffer, BufferSize), 0);\r


@@ -3892,9 +3899,9 @@ CryptoServiceTlsWrite (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetVersion (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetVersion (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.Version, TlsSetVersion, (Tls, MajorVer, MinorVer), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.Version, TlsSetVersion, (Tls, MajorVer, MinorVer), EFI_UNSUPPORTED);\r


@@ -3916,8 +3923,8 @@ CryptoServiceTlsSetVersion (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetConnectionEnd (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetConnectionEnd (\r

-  IN     VOID                     *Tls,\r
-  IN     BOOLEAN                  IsServer\r
+  IN     VOID     *Tls,\r
+  IN     BOOLEAN  IsServer\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.ConnectionEnd, TlsSetConnectionEnd, (Tls, IsServer), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.ConnectionEnd, TlsSetConnectionEnd, (Tls, IsServer), EFI_UNSUPPORTED);\r


@@ -3944,9 +3951,9 @@ CryptoServiceTlsSetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetCipherList (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetCipherList (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT16                   *CipherId,\r
-  IN     UINTN                    CipherNum\r
+  IN     VOID    *Tls,\r
+  IN     UINT16  *CipherId,\r
+  IN     UINTN   CipherNum\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.CipherList, TlsSetCipherList, (Tls, CipherId, CipherNum), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.CipherList, TlsSetCipherList, (Tls, CipherId, CipherNum), EFI_UNSUPPORTED);\r


@@ -3967,7 +3974,7 @@ CryptoServiceTlsSetCipherList (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetCompressionMethod (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetCompressionMethod (\r

-  IN     UINT8                    CompMethod\r
+  IN     UINT8  CompMethod\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.CompressionMethod, TlsSetCompressionMethod, (CompMethod), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.CompressionMethod, TlsSetCompressionMethod, (CompMethod), EFI_UNSUPPORTED);\r


@@ -3985,8 +3992,8 @@ CryptoServiceTlsSetCompressionMethod (
 VOID\r
 EFIAPI\r
 CryptoServiceTlsSetVerify (\r
 VOID\r
 EFIAPI\r
 CryptoServiceTlsSetVerify (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   VerifyMode\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  VerifyMode\r

   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (TlsSet.Services.Verify, TlsSetVerify, (Tls, VerifyMode));\r
   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (TlsSet.Services.Verify, TlsSetVerify, (Tls, VerifyMode));\r


@@ -4007,9 +4014,9 @@ CryptoServiceTlsSetVerify (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetVerifyHost (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetVerifyHost (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   Flags,\r
-  IN     CHAR8                    *HostName\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  Flags,\r
+  IN     CHAR8   *HostName\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.VerifyHost, TlsSetVerifyHost, (Tls, Flags, HostName), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.VerifyHost, TlsSetVerifyHost, (Tls, Flags, HostName), EFI_UNSUPPORTED);\r


@@ -4033,9 +4040,9 @@ CryptoServiceTlsSetVerifyHost (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *SessionId,\r
-  IN     UINT16                   SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN     UINT8   *SessionId,\r
+  IN     UINT16  SessionIdLen\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.SessionId, TlsSetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.SessionId, TlsSetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);\r


@@ -4061,9 +4068,9 @@ CryptoServiceTlsSetSessionId (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.CaCertificate, TlsSetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.CaCertificate, TlsSetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -4089,9 +4096,9 @@ CryptoServiceTlsSetCaCertificate (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.HostPublicCert, TlsSetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.HostPublicCert, TlsSetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -4116,9 +4123,9 @@ CryptoServiceTlsSetHostPublicCert (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.HostPrivateKey, TlsSetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.HostPrivateKey, TlsSetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -4141,8 +4148,8 @@ CryptoServiceTlsSetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsSetCertRevocationList (\r

-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.CertRevocationList, TlsSetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsSet.Services.CertRevocationList, TlsSetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);\r


@@ -4164,7 +4171,7 @@ CryptoServiceTlsSetCertRevocationList (
 UINT16\r
 EFIAPI\r
 CryptoServiceTlsGetVersion (\r
 UINT16\r
 EFIAPI\r
 CryptoServiceTlsGetVersion (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.Version, TlsGetVersion, (Tls), 0);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.Version, TlsGetVersion, (Tls), 0);\r


@@ -4186,7 +4193,7 @@ CryptoServiceTlsGetVersion (
 UINT8\r
 EFIAPI\r
 CryptoServiceTlsGetConnectionEnd (\r
 UINT8\r
 EFIAPI\r
 CryptoServiceTlsGetConnectionEnd (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.ConnectionEnd, TlsGetConnectionEnd, (Tls), 0);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.ConnectionEnd, TlsGetConnectionEnd, (Tls), 0);\r


@@ -4209,8 +4216,8 @@ CryptoServiceTlsGetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetCurrentCipher (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetCurrentCipher (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT16                   *CipherId\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT16  *CipherId\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.CurrentCipher, TlsGetCurrentCipher, (Tls, CipherId), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.CurrentCipher, TlsGetCurrentCipher, (Tls, CipherId), EFI_UNSUPPORTED);\r


@@ -4235,8 +4242,8 @@ CryptoServiceTlsGetCurrentCipher (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetCurrentCompressionId (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetCurrentCompressionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *CompressionId\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *CompressionId\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.CurrentCompressionId, TlsGetCurrentCompressionId, (Tls, CompressionId), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.CurrentCompressionId, TlsGetCurrentCompressionId, (Tls, CompressionId), EFI_UNSUPPORTED);\r


@@ -4258,7 +4265,7 @@ CryptoServiceTlsGetCurrentCompressionId (
 UINT32\r
 EFIAPI\r
 CryptoServiceTlsGetVerify (\r
 UINT32\r
 EFIAPI\r
 CryptoServiceTlsGetVerify (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.Verify, TlsGetVerify, (Tls), 0);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.Verify, TlsGetVerify, (Tls), 0);\r


@@ -4282,9 +4289,9 @@ CryptoServiceTlsGetVerify (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *SessionId,\r
-  IN OUT UINT16                   *SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT8   *SessionId,\r
+  IN OUT UINT16  *SessionIdLen\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.SessionId, TlsGetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.SessionId, TlsGetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);\r


@@ -4304,8 +4311,8 @@ CryptoServiceTlsGetSessionId (
 VOID\r
 EFIAPI\r
 CryptoServiceTlsGetClientRandom (\r
 VOID\r
 EFIAPI\r
 CryptoServiceTlsGetClientRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ClientRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ClientRandom\r

   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (TlsGet.Services.ClientRandom, TlsGetClientRandom, (Tls, ClientRandom));\r
   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (TlsGet.Services.ClientRandom, TlsGetClientRandom, (Tls, ClientRandom));\r


@@ -4325,8 +4332,8 @@ CryptoServiceTlsGetClientRandom (
 VOID\r
 EFIAPI\r
 CryptoServiceTlsGetServerRandom (\r
 VOID\r
 EFIAPI\r
 CryptoServiceTlsGetServerRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ServerRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ServerRandom\r

   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (TlsGet.Services.ServerRandom, TlsGetServerRandom, (Tls, ServerRandom));\r
   )\r
 {\r
   CALL_VOID_BASECRYPTLIB (TlsGet.Services.ServerRandom, TlsGetServerRandom, (Tls, ServerRandom));\r


@@ -4349,8 +4356,8 @@ CryptoServiceTlsGetServerRandom (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetKeyMaterial (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetKeyMaterial (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *KeyMaterial\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *KeyMaterial\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.KeyMaterial, TlsGetKeyMaterial, (Tls, KeyMaterial), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.KeyMaterial, TlsGetKeyMaterial, (Tls, KeyMaterial), EFI_UNSUPPORTED);\r


@@ -4375,9 +4382,9 @@ CryptoServiceTlsGetKeyMaterial (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.CaCertificate, TlsGetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.CaCertificate, TlsGetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -4403,9 +4410,9 @@ CryptoServiceTlsGetCaCertificate (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.HostPublicCert, TlsGetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.HostPublicCert, TlsGetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -4430,9 +4437,9 @@ CryptoServiceTlsGetHostPublicCert (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.HostPrivateKey, TlsGetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.HostPrivateKey, TlsGetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -4456,14 +4463,14 @@ CryptoServiceTlsGetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 CryptoServiceTlsGetCertRevocationList (\r

-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.CertRevocationList, TlsGetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);\r
 }\r
 \r
   )\r
 {\r
   return CALL_BASECRYPTLIB (TlsGet.Services.CertRevocationList, TlsGetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);\r
 }\r
 \r

-const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto = {\r
+const EDKII_CRYPTO_PROTOCOL  mEdkiiCrypto = {\r

   /// Version\r
   CryptoServiceGetCryptoVersion,\r
   /// HMAC MD5 - deprecated and unsupported\r
   /// Version\r
   CryptoServiceGetCryptoVersion,\r
   /// HMAC MD5 - deprecated and unsupported\r


@@ -4494,7 +4501,7 @@ const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto = {
   DeprecatedCryptoServiceMd4Update,\r
   DeprecatedCryptoServiceMd4Final,\r
   DeprecatedCryptoServiceMd4HashAll,\r
   DeprecatedCryptoServiceMd4Update,\r
   DeprecatedCryptoServiceMd4Final,\r
   DeprecatedCryptoServiceMd4HashAll,\r

-#ifndef ENABLE_MD5_DEPRECATED_INTERFACES\r
+ #ifndef ENABLE_MD5_DEPRECATED_INTERFACES\r

   /// Md5 - deprecated and unsupported\r
   DeprecatedCryptoServiceMd5GetContextSize,\r
   DeprecatedCryptoServiceMd5Init,\r
   /// Md5 - deprecated and unsupported\r
   DeprecatedCryptoServiceMd5GetContextSize,\r
   DeprecatedCryptoServiceMd5Init,\r


@@ -4502,7 +4509,7 @@ const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto = {
   DeprecatedCryptoServiceMd5Update,\r
   DeprecatedCryptoServiceMd5Final,\r
   DeprecatedCryptoServiceMd5HashAll,\r
   DeprecatedCryptoServiceMd5Update,\r
   DeprecatedCryptoServiceMd5Final,\r
   DeprecatedCryptoServiceMd5HashAll,\r

-#else\r
+ #else\r

   /// Md5\r
   CryptoServiceMd5GetContextSize,\r
   CryptoServiceMd5Init,\r
   /// Md5\r
   CryptoServiceMd5GetContextSize,\r
   CryptoServiceMd5Init,\r


@@ -4510,7 +4517,7 @@ const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto = {
   CryptoServiceMd5Update,\r
   CryptoServiceMd5Final,\r
   CryptoServiceMd5HashAll,\r
   CryptoServiceMd5Update,\r
   CryptoServiceMd5Final,\r
   CryptoServiceMd5HashAll,\r

-#endif\r
+ #endif\r

   /// Pkcs\r
   CryptoServicePkcs1v2Encrypt,\r
   CryptoServicePkcs5HashPassword,\r
   /// Pkcs\r
   CryptoServicePkcs1v2Encrypt,\r
   CryptoServicePkcs5HashPassword,\r


@@ -4545,7 +4552,7 @@ const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto = {
   CryptoServiceRsaPkcs1Verify,\r
   CryptoServiceRsaGetPrivateKeyFromPem,\r
   CryptoServiceRsaGetPublicKeyFromX509,\r
   CryptoServiceRsaPkcs1Verify,\r
   CryptoServiceRsaGetPrivateKeyFromPem,\r
   CryptoServiceRsaGetPublicKeyFromX509,\r

-#ifdef DISABLE_SHA1_DEPRECATED_INTERFACES\r
+ #ifdef DISABLE_SHA1_DEPRECATED_INTERFACES\r

   /// Sha1 - deprecated and unsupported\r
   DeprecatedCryptoServiceSha1GetContextSize,\r
   DeprecatedCryptoServiceSha1Init,\r
   /// Sha1 - deprecated and unsupported\r
   DeprecatedCryptoServiceSha1GetContextSize,\r
   DeprecatedCryptoServiceSha1Init,\r


@@ -4553,7 +4560,7 @@ const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto = {
   DeprecatedCryptoServiceSha1Update,\r
   DeprecatedCryptoServiceSha1Final,\r
   DeprecatedCryptoServiceSha1HashAll,\r
   DeprecatedCryptoServiceSha1Update,\r
   DeprecatedCryptoServiceSha1Final,\r
   DeprecatedCryptoServiceSha1HashAll,\r

-#else\r
+ #else\r

   /// Sha1\r
   CryptoServiceSha1GetContextSize,\r
   CryptoServiceSha1Init,\r
   /// Sha1\r
   CryptoServiceSha1GetContextSize,\r
   CryptoServiceSha1Init,\r


@@ -4561,7 +4568,7 @@ const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto = {
   CryptoServiceSha1Update,\r
   CryptoServiceSha1Final,\r
   CryptoServiceSha1HashAll,\r
   CryptoServiceSha1Update,\r
   CryptoServiceSha1Final,\r
   CryptoServiceSha1HashAll,\r

-#endif\r
+ #endif\r

   /// Sha256\r
   CryptoServiceSha256GetContextSize,\r
   CryptoServiceSha256Init,\r
   /// Sha256\r
   CryptoServiceSha256GetContextSize,\r
   CryptoServiceSha256Init,\r

diff --git a/CryptoPkg/Driver/CryptoDxe.c b/CryptoPkg/Driver/CryptoDxe.c
index ee44c03cc44c555d0fbdd19961ce7a92cc0530df..cb3ca11d0204452837825ffff06a25c9191591a8 100644 (file)
--- a/CryptoPkg/Driver/CryptoDxe.c
+++ b/CryptoPkg/Driver/CryptoDxe.c
@@ -29,10 +29,10 @@ CryptoDxeEntry (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r

-  return gBS->InstallMultipleProtocolInterfaces(\r
+  return gBS->InstallMultipleProtocolInterfaces (\r

                 &ImageHandle,\r
                 &gEdkiiCryptoProtocolGuid,\r
                 &ImageHandle,\r
                 &gEdkiiCryptoProtocolGuid,\r

-                (EDKII_CRYPTO_PROTOCOL *) &mEdkiiCrypto,\r
+                (EDKII_CRYPTO_PROTOCOL *)&mEdkiiCrypto,\r

                 NULL\r
                 );\r
 }\r
                 NULL\r
                 );\r
 }\r

diff --git a/CryptoPkg/Driver/CryptoPei.c b/CryptoPkg/Driver/CryptoPei.c
index 8b2771802c543e28985758d4cc975dda227b54b8..e538aa42184bae77f8dca85c1fa8a9a196d9d8e3 100644 (file)
--- a/CryptoPkg/Driver/CryptoPei.c
+++ b/CryptoPkg/Driver/CryptoPei.c
@@ -18,7 +18,7 @@ extern CONST EDKII_CRYPTO_PROTOCOL  mEdkiiCrypto;
 CONST EFI_PEI_PPI_DESCRIPTOR  mEdkiiCryptoPpiList = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEdkiiCryptoPpiGuid,\r
 CONST EFI_PEI_PPI_DESCRIPTOR  mEdkiiCryptoPpiList = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEdkiiCryptoPpiGuid,\r

-  (EDKII_CRYPTO_PPI *) &mEdkiiCrypto\r
+  (EDKII_CRYPTO_PPI *)&mEdkiiCrypto\r

 };\r
 \r
 /**\r
 };\r
 \r
 /**\r


@@ -47,11 +47,11 @@ CryptoPeiEntry (
   // always shadow this module in memory in Post-Mem.\r
   //\r
   Status = PeiServicesLocatePpi (\r
   // always shadow this module in memory in Post-Mem.\r
   //\r
   Status = PeiServicesLocatePpi (\r

-              &gEfiPeiMemoryDiscoveredPpiGuid,\r
-              0,\r
-              NULL,\r
-              (VOID **)&MemoryDiscoveredPpi\r
-              );\r
+             &gEfiPeiMemoryDiscoveredPpiGuid,\r
+             0,\r
+             NULL,\r
+             (VOID **)&MemoryDiscoveredPpi\r
+             );\r

   if (Status == EFI_NOT_FOUND) {\r
     //\r
     // CryptoPei is dispatched before gEfiPeiMemoryDiscoveredPpiGuid\r
   if (Status == EFI_NOT_FOUND) {\r
     //\r
     // CryptoPei is dispatched before gEfiPeiMemoryDiscoveredPpiGuid\r


@@ -81,7 +81,7 @@ CryptoPeiEntry (
       //\r
       // CryptoPei was also dispatched before gEfiPeiMemoryDiscoveredPpiGuid\r
       //\r
       //\r
       // CryptoPei was also dispatched before gEfiPeiMemoryDiscoveredPpiGuid\r
       //\r

-      DEBUG((DEBUG_INFO, "CryptoPeiEntry: ReInstall Post-Memmory Crypto PPI\n"));\r
+      DEBUG ((DEBUG_INFO, "CryptoPeiEntry: ReInstall Post-Memmory Crypto PPI\n"));\r

       Status = PeiServicesReInstallPpi (\r
                  EdkiiCryptoPpiDescriptor,\r
                  &mEdkiiCryptoPpiList\r
       Status = PeiServicesReInstallPpi (\r
                  EdkiiCryptoPpiDescriptor,\r
                  &mEdkiiCryptoPpiList\r

diff --git a/CryptoPkg/Driver/CryptoSmm.c b/CryptoPkg/Driver/CryptoSmm.c
index 83b9bcf8b031995ef8735ed8a04b7a1aeed6a08f..32182bb0944788195f833e291d2c876e22c40ddc 100644 (file)
--- a/CryptoPkg/Driver/CryptoSmm.c
+++ b/CryptoPkg/Driver/CryptoSmm.c
@@ -36,6 +36,6 @@ CryptoSmmEntry (
                   &Handle,\r
                   &gEdkiiSmmCryptoProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r
                   &Handle,\r
                   &gEdkiiSmmCryptoProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r

-                  (EDKII_CRYPTO_PROTOCOL *) &mEdkiiCrypto\r
+                  (EDKII_CRYPTO_PROTOCOL *)&mEdkiiCrypto\r

                   );\r
 }\r
                   );\r
 }\r

diff --git a/CryptoPkg/Include/Library/BaseCryptLib.h b/CryptoPkg/Include/Library/BaseCryptLib.h
index 3755cfab4051d005a7a3a24402f8c902bc19d8bd..f4bc7c0d73d9d570f6be408bf0aaee1f27d0b5af 100644 (file)
--- a/CryptoPkg/Include/Library/BaseCryptLib.h
+++ b/CryptoPkg/Include/Library/BaseCryptLib.h
@@ -17,12 +17,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 /// MD5 digest size in bytes\r
 ///\r
 ///\r
 /// MD5 digest size in bytes\r
 ///\r

-#define MD5_DIGEST_SIZE     16\r
+#define MD5_DIGEST_SIZE  16\r

 \r
 ///\r
 /// SHA-1 digest size in bytes.\r
 ///\r
 \r
 ///\r
 /// SHA-1 digest size in bytes.\r
 ///\r

-#define SHA1_DIGEST_SIZE    20\r
+#define SHA1_DIGEST_SIZE  20\r

 \r
 ///\r
 /// SHA-256 digest size in bytes\r
 \r
 ///\r
 /// SHA-256 digest size in bytes\r


@@ -42,17 +42,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 /// SM3 digest size in bytes\r
 ///\r
 ///\r
 /// SM3 digest size in bytes\r
 ///\r

-#define SM3_256_DIGEST_SIZE 32\r
+#define SM3_256_DIGEST_SIZE  32\r

 \r
 ///\r
 /// TDES block size in bytes\r
 ///\r
 \r
 ///\r
 /// TDES block size in bytes\r
 ///\r

-#define TDES_BLOCK_SIZE     8\r
+#define TDES_BLOCK_SIZE  8\r

 \r
 ///\r
 /// AES block size in bytes\r
 ///\r
 \r
 ///\r
 /// AES block size in bytes\r
 ///\r

-#define AES_BLOCK_SIZE      16\r
+#define AES_BLOCK_SIZE  16\r

 \r
 ///\r
 /// RSA Key Tags Definition used in RsaSetKey() function for key component identification.\r
 \r
 ///\r
 /// RSA Key Tags Definition used in RsaSetKey() function for key component identification.\r


@@ -68,11 +68,12 @@ typedef enum {
   RsaKeyQInv    ///< The CRT coefficient (== 1/q mod p)\r
 } RSA_KEY_TAG;\r
 \r
   RsaKeyQInv    ///< The CRT coefficient (== 1/q mod p)\r
 } RSA_KEY_TAG;\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    One-Way Cryptographic Hash Primitives\r
 //    One-Way Cryptographic Hash Primitives\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r
 \r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r


@@ -212,9 +213,11 @@ Md5HashAll (
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   );\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   );\r

+\r

 #endif\r
 \r
 #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES\r
 #endif\r
 \r
 #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r


@@ -354,6 +357,7 @@ Sha1HashAll (
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   );\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   );\r

+\r

 #endif\r
 \r
 /**\r
 #endif\r
 \r
 /**\r


@@ -880,9 +884,9 @@ Sm3HashAll (
   OUT  UINT8       *HashValue\r
   );\r
 \r
   OUT  UINT8       *HashValue\r
   );\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    MAC (Message Authentication Code) Primitive\r
 //    MAC (Message Authentication Code) Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Allocates and initializes one HMAC_CTX context for subsequent HMAC-SHA256 use.\r
 \r
 /**\r
   Allocates and initializes one HMAC_CTX context for subsequent HMAC-SHA256 use.\r


@@ -1012,9 +1016,9 @@ HmacSha256Final (
   OUT     UINT8  *HmacValue\r
   );\r
 \r
   OUT     UINT8  *HmacValue\r
   );\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Symmetric Cryptography Primitive\r
 //    Symmetric Cryptography Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for AES operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for AES operations.\r


@@ -1139,9 +1143,9 @@ AesCbcDecrypt (
   OUT  UINT8        *Output\r
   );\r
 \r
   OUT  UINT8        *Output\r
   );\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Asymmetric Cryptography Primitive\r
 //    Asymmetric Cryptography Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Allocates and initializes one RSA context for subsequent use.\r
 \r
 /**\r
   Allocates and initializes one RSA context for subsequent use.\r


@@ -1583,10 +1587,10 @@ X509GetCommonName (
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r

-  IN      CONST UINT8   *Cert,\r
-  IN      UINTN         CertSize,\r
-  OUT     CHAR8         *NameBuffer   OPTIONAL,\r
-  IN OUT  UINTN         *NameBufferSize\r
+  IN      CONST UINT8  *Cert,\r
+  IN      UINTN        CertSize,\r
+  OUT     CHAR8        *NameBuffer   OPTIONAL,\r
+  IN OUT  UINTN        *NameBufferSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1851,8 +1855,8 @@ typedef struct {
 } EFI_CERT_DATA;\r
 \r
 typedef struct {\r
 } EFI_CERT_DATA;\r
 \r
 typedef struct {\r

-  UINT8             CertNumber;   // Number of X.509 certificate.\r
-  //EFI_CERT_DATA   CertArray[];  // An array of X.509 certificate.\r
+  UINT8    CertNumber;            // Number of X.509 certificate.\r
+  // EFI_CERT_DATA   CertArray[];  // An array of X.509 certificate.\r

 } EFI_CERT_STACK;\r
 \r
 #pragma pack()\r
 } EFI_CERT_STACK;\r
 \r
 #pragma pack()\r


@@ -1905,7 +1909,7 @@ Pkcs7GetSigners (
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r

-  IN  UINT8        *Certs\r
+  IN  UINT8  *Certs\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -2151,9 +2155,9 @@ ImageTimestampVerify (
   OUT EFI_TIME     *SigningTime\r
   );\r
 \r
   OUT EFI_TIME     *SigningTime\r
   );\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    DH Key Exchange Primitive\r
 //    DH Key Exchange Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Allocates and Initializes one Diffie-Hellman Context for subsequent use.\r
 \r
 /**\r
   Allocates and Initializes one Diffie-Hellman Context for subsequent use.\r


@@ -2316,9 +2320,9 @@ DhComputeKey (
   IN OUT  UINTN        *KeySize\r
   );\r
 \r
   IN OUT  UINTN        *KeySize\r
   );\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Pseudo-Random Generation Primitive\r
 //    Pseudo-Random Generation Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r
 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r


@@ -2366,9 +2370,9 @@ RandomBytes (
   IN   UINTN  Size\r
   );\r
 \r
   IN   UINTN  Size\r
   );\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Key Derivation Function Primitive\r
 //    Key Derivation Function Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Derive key data using HMAC-SHA256 based KDF.\r
 \r
 /**\r
   Derive key data using HMAC-SHA256 based KDF.\r

diff --git a/CryptoPkg/Include/Library/HashApiLib.h b/CryptoPkg/Include/Library/HashApiLib.h
index 17250505fda16f7d82a9997c0a7058af159be568..c2b88bd7859cf1adce5decfee3c2e08f6bc82c80 100644 (file)
--- a/CryptoPkg/Include/Library/HashApiLib.h
+++ b/CryptoPkg/Include/Library/HashApiLib.h
@@ -12,7 +12,7 @@
 #ifndef __HASH_API_LIB_H_\r
 #define __HASH_API_LIB_H_\r
 \r
 #ifndef __HASH_API_LIB_H_\r
 #define __HASH_API_LIB_H_\r
 \r

-typedef VOID  *HASH_API_CONTEXT;\r
+typedef VOID *HASH_API_CONTEXT;\r

 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for hash operations.\r

diff --git a/CryptoPkg/Include/Library/TlsLib.h b/CryptoPkg/Include/Library/TlsLib.h
index df529bc1382a22319be454baa315659020bac7fc..3b75fde0aaba952af87646865eac6e80c453feea 100644 (file)
--- a/CryptoPkg/Include/Library/TlsLib.h
+++ b/CryptoPkg/Include/Library/TlsLib.h
@@ -35,7 +35,7 @@ TlsInitialize (
 VOID\r
 EFIAPI\r
 TlsCtxFree (\r
 VOID\r
 EFIAPI\r
 TlsCtxFree (\r

-  IN   VOID                  *TlsCtx\r
+  IN   VOID  *TlsCtx\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -52,8 +52,8 @@ TlsCtxFree (
 VOID *\r
 EFIAPI\r
 TlsCtxNew (\r
 VOID *\r
 EFIAPI\r
 TlsCtxNew (\r

-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -68,7 +68,7 @@ TlsCtxNew (
 VOID\r
 EFIAPI\r
 TlsFree (\r
 VOID\r
 EFIAPI\r
 TlsFree (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -87,7 +87,7 @@ TlsFree (
 VOID *\r
 EFIAPI\r
 TlsNew (\r
 VOID *\r
 EFIAPI\r
 TlsNew (\r

-  IN     VOID                     *TlsCtx\r
+  IN     VOID  *TlsCtx\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -104,7 +104,7 @@ TlsNew (
 BOOLEAN\r
 EFIAPI\r
 TlsInHandshake (\r
 BOOLEAN\r
 EFIAPI\r
 TlsInHandshake (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -136,11 +136,11 @@ TlsInHandshake (
 EFI_STATUS\r
 EFIAPI\r
 TlsDoHandshake (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsDoHandshake (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -171,11 +171,11 @@ TlsDoHandshake (
 EFI_STATUS\r
 EFIAPI\r
 TlsHandleAlert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsHandleAlert (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -199,9 +199,9 @@ TlsHandleAlert (
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseNotify (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseNotify (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *Buffer,\r
-  IN OUT UINTN                    *BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *Buffer,\r
+  IN OUT UINTN  *BufferSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -221,9 +221,9 @@ TlsCloseNotify (
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficOut (\r
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficOut (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -243,9 +243,9 @@ TlsCtrlTrafficOut (
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficIn (\r
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficIn (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -266,9 +266,9 @@ TlsCtrlTrafficIn (
 INTN\r
 EFIAPI\r
 TlsRead (\r
 INTN\r
 EFIAPI\r
 TlsRead (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -289,9 +289,9 @@ TlsRead (
 INTN\r
 EFIAPI\r
 TlsWrite (\r
 INTN\r
 EFIAPI\r
 TlsWrite (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -311,9 +311,9 @@ TlsWrite (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVersion (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVersion (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -332,8 +332,8 @@ TlsSetVersion (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetConnectionEnd (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetConnectionEnd (\r

-  IN     VOID                     *Tls,\r
-  IN     BOOLEAN                  IsServer\r
+  IN     VOID     *Tls,\r
+  IN     BOOLEAN  IsServer\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -357,9 +357,9 @@ TlsSetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCipherList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCipherList (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT16                   *CipherId,\r
-  IN     UINTN                    CipherNum\r
+  IN     VOID    *Tls,\r
+  IN     UINT16  *CipherId,\r
+  IN     UINTN   CipherNum\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -377,7 +377,7 @@ TlsSetCipherList (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCompressionMethod (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCompressionMethod (\r

-  IN     UINT8                    CompMethod\r
+  IN     UINT8  CompMethod\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -392,8 +392,8 @@ TlsSetCompressionMethod (
 VOID\r
 EFIAPI\r
 TlsSetVerify (\r
 VOID\r
 EFIAPI\r
 TlsSetVerify (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   VerifyMode\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  VerifyMode\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -411,9 +411,9 @@ TlsSetVerify (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVerifyHost (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVerifyHost (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   Flags,\r
-  IN     CHAR8                    *HostName\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  Flags,\r
+  IN     CHAR8   *HostName\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -434,9 +434,9 @@ TlsSetVerifyHost (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *SessionId,\r
-  IN     UINT16                   SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN     UINT8   *SessionId,\r
+  IN     UINT16  SessionIdLen\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -459,9 +459,9 @@ TlsSetSessionId (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -484,9 +484,9 @@ TlsSetCaCertificate (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -508,9 +508,9 @@ TlsSetHostPublicCert (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -530,8 +530,8 @@ TlsSetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCertRevocationList (\r

-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -550,7 +550,7 @@ TlsSetCertRevocationList (
 UINT16\r
 EFIAPI\r
 TlsGetVersion (\r
 UINT16\r
 EFIAPI\r
 TlsGetVersion (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -569,7 +569,7 @@ TlsGetVersion (
 UINT8\r
 EFIAPI\r
 TlsGetConnectionEnd (\r
 UINT8\r
 EFIAPI\r
 TlsGetConnectionEnd (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -589,8 +589,8 @@ TlsGetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCipher (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCipher (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT16                   *CipherId\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT16  *CipherId\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -612,8 +612,8 @@ TlsGetCurrentCipher (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCompressionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCompressionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *CompressionId\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *CompressionId\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -632,7 +632,7 @@ TlsGetCurrentCompressionId (
 UINT32\r
 EFIAPI\r
 TlsGetVerify (\r
 UINT32\r
 EFIAPI\r
 TlsGetVerify (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -653,9 +653,9 @@ TlsGetVerify (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *SessionId,\r
-  IN OUT UINT16                   *SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT8   *SessionId,\r
+  IN OUT UINT16  *SessionIdLen\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -672,8 +672,8 @@ TlsGetSessionId (
 VOID\r
 EFIAPI\r
 TlsGetClientRandom (\r
 VOID\r
 EFIAPI\r
 TlsGetClientRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ClientRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ClientRandom\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -690,8 +690,8 @@ TlsGetClientRandom (
 VOID\r
 EFIAPI\r
 TlsGetServerRandom (\r
 VOID\r
 EFIAPI\r
 TlsGetServerRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ServerRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ServerRandom\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -711,8 +711,8 @@ TlsGetServerRandom (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetKeyMaterial (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetKeyMaterial (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *KeyMaterial\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *KeyMaterial\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -734,9 +734,9 @@ TlsGetKeyMaterial (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -759,9 +759,9 @@ TlsGetCaCertificate (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -783,9 +783,9 @@ TlsGetHostPublicCert (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -806,8 +806,8 @@ TlsGetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCertRevocationList (\r

-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   );\r
 \r
 #endif // __TLS_LIB_H__\r
   );\r
 \r
 #endif // __TLS_LIB_H__\r

diff --git a/CryptoPkg/Include/Pcd/PcdCryptoServiceFamilyEnable.h b/CryptoPkg/Include/Pcd/PcdCryptoServiceFamilyEnable.h
index 44fb0262f413ecefa5cb55bc28135e7ec443f0e2..5186a54759aec8a8c3ced9c5a8cd2c45ccc8360b 100644 (file)
--- a/CryptoPkg/Include/Pcd/PcdCryptoServiceFamilyEnable.h
+++ b/CryptoPkg/Include/Pcd/PcdCryptoServiceFamilyEnable.h
@@ -25,266 +25,266 @@
 typedef struct {\r
   union {\r
     struct {\r
 typedef struct {\r
   union {\r
     struct {\r

-      UINT8  New:1;\r
-      UINT8  Free:1;\r
-      UINT8  SetKey:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
+      UINT8    New       : 1;\r
+      UINT8    Free      : 1;\r
+      UINT8    SetKey    : 1;\r
+      UINT8    Duplicate : 1;\r
+      UINT8    Update    : 1;\r
+      UINT8    Final     : 1;\r

     } Services;\r
     UINT32    Family;\r
   } HmacMd5;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } HmacMd5;\r
   union {\r
     struct {\r

-      UINT8  New:1;\r
-      UINT8  Free:1;\r
-      UINT8  SetKey:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
+      UINT8    New       : 1;\r
+      UINT8    Free      : 1;\r
+      UINT8    SetKey    : 1;\r
+      UINT8    Duplicate : 1;\r
+      UINT8    Update    : 1;\r
+      UINT8    Final     : 1;\r

     } Services;\r
     UINT32    Family;\r
   } HmacSha1;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } HmacSha1;\r
   union {\r
     struct {\r

-      UINT8  New:1;\r
-      UINT8  Free:1;\r
-      UINT8  SetKey:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
+      UINT8    New       : 1;\r
+      UINT8    Free      : 1;\r
+      UINT8    SetKey    : 1;\r
+      UINT8    Duplicate : 1;\r
+      UINT8    Update    : 1;\r
+      UINT8    Final     : 1;\r

     } Services;\r
     UINT32    Family;\r
   } HmacSha256;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } HmacSha256;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
-      UINT8  HashAll:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    Duplicate      : 1;\r
+      UINT8    Update         : 1;\r
+      UINT8    Final          : 1;\r
+      UINT8    HashAll        : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Md4;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Md4;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
-      UINT8  HashAll:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    Duplicate      : 1;\r
+      UINT8    Update         : 1;\r
+      UINT8    Final          : 1;\r
+      UINT8    HashAll        : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Md5;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Md5;\r
   union {\r
     struct {\r

-      UINT8  Pkcs1v2Encrypt:1;\r
-      UINT8  Pkcs5HashPassword:1;\r
-      UINT8  Pkcs7Verify:1;\r
-      UINT8  VerifyEKUsInPkcs7Signature:1;\r
-      UINT8  Pkcs7GetSigners:1;\r
-      UINT8  Pkcs7FreeSigners:1;\r
-      UINT8  Pkcs7Sign:1;\r
-      UINT8  Pkcs7GetAttachedContent:1;\r
-      UINT8  Pkcs7GetCertificatesList:1;\r
-      UINT8  AuthenticodeVerify:1;\r
-      UINT8  ImageTimestampVerify:1;\r
+      UINT8    Pkcs1v2Encrypt             : 1;\r
+      UINT8    Pkcs5HashPassword          : 1;\r
+      UINT8    Pkcs7Verify                : 1;\r
+      UINT8    VerifyEKUsInPkcs7Signature : 1;\r
+      UINT8    Pkcs7GetSigners            : 1;\r
+      UINT8    Pkcs7FreeSigners           : 1;\r
+      UINT8    Pkcs7Sign                  : 1;\r
+      UINT8    Pkcs7GetAttachedContent    : 1;\r
+      UINT8    Pkcs7GetCertificatesList   : 1;\r
+      UINT8    AuthenticodeVerify         : 1;\r
+      UINT8    ImageTimestampVerify       : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Pkcs;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Pkcs;\r
   union {\r
     struct {\r

-      UINT8  New:1;\r
-      UINT8  Free:1;\r
-      UINT8  GenerateParameter:1;\r
-      UINT8  SetParameter:1;\r
-      UINT8  GenerateKey:1;\r
-      UINT8  ComputeKey:1;\r
+      UINT8    New               : 1;\r
+      UINT8    Free              : 1;\r
+      UINT8    GenerateParameter : 1;\r
+      UINT8    SetParameter      : 1;\r
+      UINT8    GenerateKey       : 1;\r
+      UINT8    ComputeKey        : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Dh;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Dh;\r
   union {\r
     struct {\r

-      UINT8  Seed:1;\r
-      UINT8  Bytes:1;\r
+      UINT8    Seed  : 1;\r
+      UINT8    Bytes : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Random;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Random;\r
   union {\r
     struct {\r

-      UINT8  VerifyPkcs1:1;\r
-      UINT8  New:1;\r
-      UINT8  Free:1;\r
-      UINT8  SetKey:1;\r
-      UINT8  GetKey:1;\r
-      UINT8  GenerateKey:1;\r
-      UINT8  CheckKey:1;\r
-      UINT8  Pkcs1Sign:1;\r
-      UINT8  Pkcs1Verify:1;\r
-      UINT8  GetPrivateKeyFromPem:1;\r
-      UINT8  GetPublicKeyFromX509:1;\r
+      UINT8    VerifyPkcs1          : 1;\r
+      UINT8    New                  : 1;\r
+      UINT8    Free                 : 1;\r
+      UINT8    SetKey               : 1;\r
+      UINT8    GetKey               : 1;\r
+      UINT8    GenerateKey          : 1;\r
+      UINT8    CheckKey             : 1;\r
+      UINT8    Pkcs1Sign            : 1;\r
+      UINT8    Pkcs1Verify          : 1;\r
+      UINT8    GetPrivateKeyFromPem : 1;\r
+      UINT8    GetPublicKeyFromX509 : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Rsa;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Rsa;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
-      UINT8  HashAll:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    Duplicate      : 1;\r
+      UINT8    Update         : 1;\r
+      UINT8    Final          : 1;\r
+      UINT8    HashAll        : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Sha1;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Sha1;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
-      UINT8  HashAll:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    Duplicate      : 1;\r
+      UINT8    Update         : 1;\r
+      UINT8    Final          : 1;\r
+      UINT8    HashAll        : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Sha256;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Sha256;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
-      UINT8  HashAll:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    Duplicate      : 1;\r
+      UINT8    Update         : 1;\r
+      UINT8    Final          : 1;\r
+      UINT8    HashAll        : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Sha384;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Sha384;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
-      UINT8  HashAll:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    Duplicate      : 1;\r
+      UINT8    Update         : 1;\r
+      UINT8    Final          : 1;\r
+      UINT8    HashAll        : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Sha512;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Sha512;\r
   union {\r
     struct {\r

-      UINT8  GetSubjectName:1;\r
-      UINT8  GetCommonName:1;\r
-      UINT8  GetOrganizationName:1;\r
-      UINT8  VerifyCert:1;\r
-      UINT8  ConstructCertificate:1;\r
-      UINT8  ConstructCertificateStack:1;\r
-      UINT8  ConstructCertificateStackV:1;\r
-      UINT8  Free:1;\r
-      UINT8  StackFree:1;\r
-      UINT8  GetTBSCert:1;\r
+      UINT8    GetSubjectName             : 1;\r
+      UINT8    GetCommonName              : 1;\r
+      UINT8    GetOrganizationName        : 1;\r
+      UINT8    VerifyCert                 : 1;\r
+      UINT8    ConstructCertificate       : 1;\r
+      UINT8    ConstructCertificateStack  : 1;\r
+      UINT8    ConstructCertificateStackV : 1;\r
+      UINT8    Free                       : 1;\r
+      UINT8    StackFree                  : 1;\r
+      UINT8    GetTBSCert                 : 1;\r

     } Services;\r
     UINT32    Family;\r
   } X509;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } X509;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  EcbEncrypt:1;\r
-      UINT8  EcbDecrypt:1;\r
-      UINT8  CbcEncrypt:1;\r
-      UINT8  CbcDecrypt:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    EcbEncrypt     : 1;\r
+      UINT8    EcbDecrypt     : 1;\r
+      UINT8    CbcEncrypt     : 1;\r
+      UINT8    CbcDecrypt     : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Tdes;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Tdes;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  EcbEncrypt:1;\r
-      UINT8  EcbDecrypt:1;\r
-      UINT8  CbcEncrypt:1;\r
-      UINT8  CbcDecrypt:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    EcbEncrypt     : 1;\r
+      UINT8    EcbDecrypt     : 1;\r
+      UINT8    CbcEncrypt     : 1;\r
+      UINT8    CbcDecrypt     : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Aes;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Aes;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  Encrypt:1;\r
-      UINT8  Decrypt:1;\r
-      UINT8  Reset:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    Encrypt        : 1;\r
+      UINT8    Decrypt        : 1;\r
+      UINT8    Reset          : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Arc4;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Arc4;\r
   union {\r
     struct {\r

-      UINT8  GetContextSize:1;\r
-      UINT8  Init:1;\r
-      UINT8  Duplicate:1;\r
-      UINT8  Update:1;\r
-      UINT8  Final:1;\r
-      UINT8  HashAll:1;\r
+      UINT8    GetContextSize : 1;\r
+      UINT8    Init           : 1;\r
+      UINT8    Duplicate      : 1;\r
+      UINT8    Update         : 1;\r
+      UINT8    Final          : 1;\r
+      UINT8    HashAll        : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Sm3;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Sm3;\r
   union {\r
     struct {\r

-      UINT8  Sha256ExtractAndExpand;\r
+      UINT8    Sha256ExtractAndExpand;\r

     } Services;\r
     UINT32    Family;\r
   } Hkdf;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Hkdf;\r
   union {\r
     struct {\r

-      UINT8  Initialize:1;\r
-      UINT8  CtxFree:1;\r
-      UINT8  CtxNew:1;\r
-      UINT8  Free:1;\r
-      UINT8  New:1;\r
-      UINT8  InHandshake:1;\r
-      UINT8  DoHandshake:1;\r
-      UINT8  HandleAlert:1;\r
-      UINT8  CloseNotify:1;\r
-      UINT8  CtrlTrafficOut:1;\r
-      UINT8  CtrlTrafficIn:1;\r
-      UINT8  Read:1;\r
-      UINT8  Write:1;\r
+      UINT8    Initialize     : 1;\r
+      UINT8    CtxFree        : 1;\r
+      UINT8    CtxNew         : 1;\r
+      UINT8    Free           : 1;\r
+      UINT8    New            : 1;\r
+      UINT8    InHandshake    : 1;\r
+      UINT8    DoHandshake    : 1;\r
+      UINT8    HandleAlert    : 1;\r
+      UINT8    CloseNotify    : 1;\r
+      UINT8    CtrlTrafficOut : 1;\r
+      UINT8    CtrlTrafficIn  : 1;\r
+      UINT8    Read           : 1;\r
+      UINT8    Write          : 1;\r

     } Services;\r
     UINT32    Family;\r
   } Tls;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } Tls;\r
   union {\r
     struct {\r

-      UINT8  Version:1;\r
-      UINT8  ConnectionEnd:1;\r
-      UINT8  CipherList:1;\r
-      UINT8  CompressionMethod:1;\r
-      UINT8  Verify:1;\r
-      UINT8  VerifyHost:1;\r
-      UINT8  SessionId:1;\r
-      UINT8  CaCertificate:1;\r
-      UINT8  HostPublicCert:1;\r
-      UINT8  HostPrivateKey:1;\r
-      UINT8  CertRevocationList:1;\r
+      UINT8    Version            : 1;\r
+      UINT8    ConnectionEnd      : 1;\r
+      UINT8    CipherList         : 1;\r
+      UINT8    CompressionMethod  : 1;\r
+      UINT8    Verify             : 1;\r
+      UINT8    VerifyHost         : 1;\r
+      UINT8    SessionId          : 1;\r
+      UINT8    CaCertificate      : 1;\r
+      UINT8    HostPublicCert     : 1;\r
+      UINT8    HostPrivateKey     : 1;\r
+      UINT8    CertRevocationList : 1;\r

     } Services;\r
     UINT32    Family;\r
   } TlsSet;\r
   union {\r
     struct {\r
     } Services;\r
     UINT32    Family;\r
   } TlsSet;\r
   union {\r
     struct {\r

-      UINT8  Version:1;\r
-      UINT8  ConnectionEnd:1;\r
-      UINT8  CurrentCipher:1;\r
-      UINT8  CurrentCompressionId:1;\r
-      UINT8  Verify:1;\r
-      UINT8  SessionId:1;\r
-      UINT8  ClientRandom:1;\r
-      UINT8  ServerRandom:1;\r
-      UINT8  KeyMaterial:1;\r
-      UINT8  CaCertificate:1;\r
-      UINT8  HostPublicCert:1;\r
-      UINT8  HostPrivateKey:1;\r
-      UINT8  CertRevocationList:1;\r
+      UINT8    Version              : 1;\r
+      UINT8    ConnectionEnd        : 1;\r
+      UINT8    CurrentCipher        : 1;\r
+      UINT8    CurrentCompressionId : 1;\r
+      UINT8    Verify               : 1;\r
+      UINT8    SessionId            : 1;\r
+      UINT8    ClientRandom         : 1;\r
+      UINT8    ServerRandom         : 1;\r
+      UINT8    KeyMaterial          : 1;\r
+      UINT8    CaCertificate        : 1;\r
+      UINT8    HostPublicCert       : 1;\r
+      UINT8    HostPrivateKey       : 1;\r
+      UINT8    CertRevocationList   : 1;\r

     } Services;\r
     UINT32    Family;\r
   } TlsGet;\r
     } Services;\r
     UINT32    Family;\r
   } TlsGet;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c
index 914cffb2111511a03c749d0ae1556915f7cffab8..587885e33d0d46e9b0c7ad70d101d66a811d8589 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c
+++ b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c
@@ -25,7 +25,7 @@ AesGetContextSize (
   // AES uses different key contexts for encryption and decryption, so here memory\r
   // for 2 copies of AES_KEY is allocated.\r
   //\r
   // AES uses different key contexts for encryption and decryption, so here memory\r
   // for 2 copies of AES_KEY is allocated.\r
   //\r

-  return (UINTN) (2 * sizeof (AES_KEY));\r
+  return (UINTN)(2 * sizeof (AES_KEY));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -61,20 +61,22 @@ AesInit (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (AesContext == NULL || Key == NULL || (KeyLength != 128 && KeyLength != 192 && KeyLength != 256)) {\r
+  if ((AesContext == NULL) || (Key == NULL) || ((KeyLength != 128) && (KeyLength != 192) && (KeyLength != 256))) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // Initialize AES encryption & decryption key schedule.\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // Initialize AES encryption & decryption key schedule.\r
   //\r

-  AesKey = (AES_KEY *) AesContext;\r
-  if (AES_set_encrypt_key (Key, (UINT32) KeyLength, AesKey) != 0) {\r
+  AesKey = (AES_KEY *)AesContext;\r
+  if (AES_set_encrypt_key (Key, (UINT32)KeyLength, AesKey) != 0) {\r

     return FALSE;\r
   }\r
     return FALSE;\r
   }\r

-  if (AES_set_decrypt_key (Key, (UINT32) KeyLength, AesKey + 1) != 0) {\r
+\r
+  if (AES_set_decrypt_key (Key, (UINT32)KeyLength, AesKey + 1) != 0) {\r

     return FALSE;\r
   }\r
     return FALSE;\r
   }\r

+\r

   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r
 \r


@@ -121,21 +123,21 @@ AesCbcEncrypt (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (AesContext == NULL || Input == NULL || (InputSize % AES_BLOCK_SIZE) != 0) {\r
+  if ((AesContext == NULL) || (Input == NULL) || ((InputSize % AES_BLOCK_SIZE) != 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (Ivec == NULL || Output == NULL || InputSize > INT_MAX) {\r
+  if ((Ivec == NULL) || (Output == NULL) || (InputSize > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  AesKey = (AES_KEY *) AesContext;\r
+  AesKey = (AES_KEY *)AesContext;\r

   CopyMem (IvecBuffer, Ivec, AES_BLOCK_SIZE);\r
 \r
   //\r
   // Perform AES data encryption with CBC mode\r
   //\r
   CopyMem (IvecBuffer, Ivec, AES_BLOCK_SIZE);\r
 \r
   //\r
   // Perform AES data encryption with CBC mode\r
   //\r

-  AES_cbc_encrypt (Input, Output, (UINT32) InputSize, AesKey, IvecBuffer, AES_ENCRYPT);\r
+  AES_cbc_encrypt (Input, Output, (UINT32)InputSize, AesKey, IvecBuffer, AES_ENCRYPT);\r

 \r
   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r


@@ -183,21 +185,21 @@ AesCbcDecrypt (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (AesContext == NULL || Input == NULL || (InputSize % AES_BLOCK_SIZE) != 0) {\r
+  if ((AesContext == NULL) || (Input == NULL) || ((InputSize % AES_BLOCK_SIZE) != 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (Ivec == NULL || Output == NULL || InputSize > INT_MAX) {\r
+  if ((Ivec == NULL) || (Output == NULL) || (InputSize > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  AesKey = (AES_KEY *) AesContext;\r
+  AesKey = (AES_KEY *)AesContext;\r

   CopyMem (IvecBuffer, Ivec, AES_BLOCK_SIZE);\r
 \r
   //\r
   // Perform AES data decryption with CBC mode\r
   //\r
   CopyMem (IvecBuffer, Ivec, AES_BLOCK_SIZE);\r
 \r
   //\r
   // Perform AES data decryption with CBC mode\r
   //\r

-  AES_cbc_encrypt (Input, Output, (UINT32) InputSize, AesKey + 1, IvecBuffer, AES_DECRYPT);\r
+  AES_cbc_encrypt (Input, Output, (UINT32)InputSize, AesKey + 1, IvecBuffer, AES_DECRYPT);\r

 \r
   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
index d670f17424f775cdc683da6965abec03a13adb45..f749c7f6e3ade97eda49202a573db0c5d65f0a07 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
@@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/md5.h>\r
 \r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r
 #include <openssl/md5.h>\r
 \r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r


@@ -25,10 +26,9 @@ Md5GetContextSize (
   //\r
   // Retrieves the OpenSSL MD5 Context Size\r
   //\r
   //\r
   // Retrieves the OpenSSL MD5 Context Size\r
   //\r

-  return (UINTN) (sizeof (MD5_CTX));\r
+  return (UINTN)(sizeof (MD5_CTX));\r

 }\r
 \r
 }\r
 \r

-\r

 /**\r
   Initializes user-supplied memory pointed by Md5Context as MD5 hash context for\r
   subsequent use.\r
 /**\r
   Initializes user-supplied memory pointed by Md5Context as MD5 hash context for\r
   subsequent use.\r


@@ -57,7 +57,7 @@ Md5Init (
   //\r
   // OpenSSL MD5 Context Initialization\r
   //\r
   //\r
   // OpenSSL MD5 Context Initialization\r
   //\r

-  return (BOOLEAN) (MD5_Init ((MD5_CTX *) Md5Context));\r
+  return (BOOLEAN)(MD5_Init ((MD5_CTX *)Md5Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -83,7 +83,7 @@ Md5Duplicate (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Md5Context == NULL || NewMd5Context == NULL) {\r
+  if ((Md5Context == NULL) || (NewMd5Context == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -128,14 +128,14 @@ Md5Update (
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r

-  if (Data == NULL && (DataSize != 0)) {\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL MD5 Hash Update\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL MD5 Hash Update\r
   //\r

-  return (BOOLEAN) (MD5_Update ((MD5_CTX *) Md5Context, Data, DataSize));\r
+  return (BOOLEAN)(MD5_Update ((MD5_CTX *)Md5Context, Data, DataSize));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -168,14 +168,14 @@ Md5Final (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Md5Context == NULL || HashValue == NULL) {\r
+  if ((Md5Context == NULL) || (HashValue == NULL)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL MD5 Hash Finalization\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL MD5 Hash Finalization\r
   //\r

-  return (BOOLEAN) (MD5_Final (HashValue, (MD5_CTX *) Md5Context));\r
+  return (BOOLEAN)(MD5_Final (HashValue, (MD5_CTX *)Md5Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -210,7 +210,8 @@ Md5HashAll (
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r

-  if (Data == NULL && (DataSize != 0)) {\r
+\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -223,4 +224,5 @@ Md5HashAll (
     return TRUE;\r
   }\r
 }\r
     return TRUE;\r
   }\r
 }\r

+\r

 #endif\r
 #endif\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
index 52e767524f7b6995a227ffa7974638be664244cd..1e071ce2b325edd1d3a3e706bb741c471a669335 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
@@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/sha.h>\r
 \r
 #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES\r
 #include <openssl/sha.h>\r
 \r
 #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r


@@ -25,7 +26,7 @@ Sha1GetContextSize (
   //\r
   // Retrieves OpenSSL SHA Context Size\r
   //\r
   //\r
   // Retrieves OpenSSL SHA Context Size\r
   //\r

-  return (UINTN) (sizeof (SHA_CTX));\r
+  return (UINTN)(sizeof (SHA_CTX));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -56,7 +57,7 @@ Sha1Init (
   //\r
   // OpenSSL SHA-1 Context Initialization\r
   //\r
   //\r
   // OpenSSL SHA-1 Context Initialization\r
   //\r

-  return (BOOLEAN) (SHA1_Init ((SHA_CTX *) Sha1Context));\r
+  return (BOOLEAN)(SHA1_Init ((SHA_CTX *)Sha1Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -82,7 +83,7 @@ Sha1Duplicate (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sha1Context == NULL || NewSha1Context == NULL) {\r
+  if ((Sha1Context == NULL) || (NewSha1Context == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -127,14 +128,14 @@ Sha1Update (
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r

-  if (Data == NULL && DataSize != 0) {\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-1 Hash Update\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-1 Hash Update\r
   //\r

-  return (BOOLEAN) (SHA1_Update ((SHA_CTX *) Sha1Context, Data, DataSize));\r
+  return (BOOLEAN)(SHA1_Update ((SHA_CTX *)Sha1Context, Data, DataSize));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -167,14 +168,14 @@ Sha1Final (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sha1Context == NULL || HashValue == NULL) {\r
+  if ((Sha1Context == NULL) || (HashValue == NULL)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-1 Hash Finalization\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-1 Hash Finalization\r
   //\r

-  return (BOOLEAN) (SHA1_Final (HashValue, (SHA_CTX *) Sha1Context));\r
+  return (BOOLEAN)(SHA1_Final (HashValue, (SHA_CTX *)Sha1Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -209,7 +210,8 @@ Sha1HashAll (
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r

-  if (Data == NULL && DataSize != 0) {\r
+\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -222,4 +224,5 @@ Sha1HashAll (
     return TRUE;\r
   }\r
 }\r
     return TRUE;\r
   }\r
 }\r

+\r

 #endif\r
 #endif\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c
index 38b9b4d84858d1c06c61f7c4cd5e7ed1963bec54..f105e6e5770810b0b3e935b65abba5321707871f 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c
@@ -24,7 +24,7 @@ Sha256GetContextSize (
   //\r
   // Retrieves OpenSSL SHA-256 Context Size\r
   //\r
   //\r
   // Retrieves OpenSSL SHA-256 Context Size\r
   //\r

-  return (UINTN) (sizeof (SHA256_CTX));\r
+  return (UINTN)(sizeof (SHA256_CTX));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -55,7 +55,7 @@ Sha256Init (
   //\r
   // OpenSSL SHA-256 Context Initialization\r
   //\r
   //\r
   // OpenSSL SHA-256 Context Initialization\r
   //\r

-  return (BOOLEAN) (SHA256_Init ((SHA256_CTX *) Sha256Context));\r
+  return (BOOLEAN)(SHA256_Init ((SHA256_CTX *)Sha256Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -81,7 +81,7 @@ Sha256Duplicate (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sha256Context == NULL || NewSha256Context == NULL) {\r
+  if ((Sha256Context == NULL) || (NewSha256Context == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -126,14 +126,14 @@ Sha256Update (
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r

-  if (Data == NULL && DataSize != 0) {\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-256 Hash Update\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-256 Hash Update\r
   //\r

-  return (BOOLEAN) (SHA256_Update ((SHA256_CTX *) Sha256Context, Data, DataSize));\r
+  return (BOOLEAN)(SHA256_Update ((SHA256_CTX *)Sha256Context, Data, DataSize));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -166,14 +166,14 @@ Sha256Final (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sha256Context == NULL || HashValue == NULL) {\r
+  if ((Sha256Context == NULL) || (HashValue == NULL)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-256 Hash Finalization\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-256 Hash Finalization\r
   //\r

-  return (BOOLEAN) (SHA256_Final (HashValue, (SHA256_CTX *) Sha256Context));\r
+  return (BOOLEAN)(SHA256_Final (HashValue, (SHA256_CTX *)Sha256Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -208,7 +208,8 @@ Sha256HashAll (
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r

-  if (Data == NULL && DataSize != 0) {\r
+\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c
index 719a5acfe0b90e81db6ec52f0ed78f4a9146c237..59e5708465880969dff81cf2670eee277e1f9194 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c
@@ -24,7 +24,7 @@ Sha384GetContextSize (
   //\r
   // Retrieves OpenSSL SHA-384 Context Size\r
   //\r
   //\r
   // Retrieves OpenSSL SHA-384 Context Size\r
   //\r

-  return (UINTN) (sizeof (SHA512_CTX));\r
+  return (UINTN)(sizeof (SHA512_CTX));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -55,7 +55,7 @@ Sha384Init (
   //\r
   // OpenSSL SHA-384 Context Initialization\r
   //\r
   //\r
   // OpenSSL SHA-384 Context Initialization\r
   //\r

-  return (BOOLEAN) (SHA384_Init ((SHA512_CTX *) Sha384Context));\r
+  return (BOOLEAN)(SHA384_Init ((SHA512_CTX *)Sha384Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -83,7 +83,7 @@ Sha384Duplicate (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sha384Context == NULL || NewSha384Context == NULL) {\r
+  if ((Sha384Context == NULL) || (NewSha384Context == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -128,14 +128,14 @@ Sha384Update (
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r

-  if (Data == NULL && DataSize != 0) {\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-384 Hash Update\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-384 Hash Update\r
   //\r

-  return (BOOLEAN) (SHA384_Update ((SHA512_CTX *) Sha384Context, Data, DataSize));\r
+  return (BOOLEAN)(SHA384_Update ((SHA512_CTX *)Sha384Context, Data, DataSize));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -168,14 +168,14 @@ Sha384Final (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sha384Context == NULL || HashValue == NULL) {\r
+  if ((Sha384Context == NULL) || (HashValue == NULL)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-384 Hash Finalization\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-384 Hash Finalization\r
   //\r

-  return (BOOLEAN) (SHA384_Final (HashValue, (SHA512_CTX *) Sha384Context));\r
+  return (BOOLEAN)(SHA384_Final (HashValue, (SHA512_CTX *)Sha384Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -210,7 +210,8 @@ Sha384HashAll (
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r

-  if (Data == NULL && DataSize != 0) {\r
+\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -239,7 +240,7 @@ Sha512GetContextSize (
   //\r
   // Retrieves OpenSSL SHA-512 Context Size\r
   //\r
   //\r
   // Retrieves OpenSSL SHA-512 Context Size\r
   //\r

-  return (UINTN) (sizeof (SHA512_CTX));\r
+  return (UINTN)(sizeof (SHA512_CTX));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -270,7 +271,7 @@ Sha512Init (
   //\r
   // OpenSSL SHA-512 Context Initialization\r
   //\r
   //\r
   // OpenSSL SHA-512 Context Initialization\r
   //\r

-  return (BOOLEAN) (SHA512_Init ((SHA512_CTX *) Sha512Context));\r
+  return (BOOLEAN)(SHA512_Init ((SHA512_CTX *)Sha512Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -298,7 +299,7 @@ Sha512Duplicate (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sha512Context == NULL || NewSha512Context == NULL) {\r
+  if ((Sha512Context == NULL) || (NewSha512Context == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -343,14 +344,14 @@ Sha512Update (
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r

-  if (Data == NULL && DataSize != 0) {\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-512 Hash Update\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-512 Hash Update\r
   //\r

-  return (BOOLEAN) (SHA512_Update ((SHA512_CTX *) Sha512Context, Data, DataSize));\r
+  return (BOOLEAN)(SHA512_Update ((SHA512_CTX *)Sha512Context, Data, DataSize));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -383,14 +384,14 @@ Sha512Final (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sha512Context == NULL || HashValue == NULL) {\r
+  if ((Sha512Context == NULL) || (HashValue == NULL)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-512 Hash Finalization\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // OpenSSL SHA-512 Hash Finalization\r
   //\r

-  return (BOOLEAN) (SHA384_Final (HashValue, (SHA512_CTX *) Sha512Context));\r
+  return (BOOLEAN)(SHA384_Final (HashValue, (SHA512_CTX *)Sha512Context));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -425,7 +426,8 @@ Sha512HashAll (
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r

-  if (Data == NULL && DataSize != 0) {\r
+\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c
index 235331c2a0382008c7f49081c02c5be8b821137b..bbbc1e56f2469199b8898f1c8a9385b77d840661 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c
@@ -24,7 +24,7 @@ Sm3GetContextSize (
   //\r
   // Retrieves Openssl SM3 Context Size\r
   //\r
   //\r
   // Retrieves Openssl SM3 Context Size\r
   //\r

-  return (UINTN) (sizeof (SM3_CTX));\r
+  return (UINTN)(sizeof (SM3_CTX));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -55,7 +55,7 @@ Sm3Init (
   //\r
   // Openssl SM3 Context Initialization\r
   //\r
   //\r
   // Openssl SM3 Context Initialization\r
   //\r

-  sm3_init ((SM3_CTX *) Sm3Context);\r
+  sm3_init ((SM3_CTX *)Sm3Context);\r

   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r
 \r


@@ -84,7 +84,7 @@ Sm3Duplicate (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sm3Context == NULL || NewSm3Context == NULL) {\r
+  if ((Sm3Context == NULL) || (NewSm3Context == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -129,14 +129,14 @@ Sm3Update (
   //\r
   // Check invalid parameters, in case that only DataLength was checked in Openssl\r
   //\r
   //\r
   // Check invalid parameters, in case that only DataLength was checked in Openssl\r
   //\r

-  if (Data == NULL && DataSize != 0) {\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // Openssl SM3 Hash Update\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // Openssl SM3 Hash Update\r
   //\r

-  sm3_update ((SM3_CTX *) Sm3Context, Data, DataSize);\r
+  sm3_update ((SM3_CTX *)Sm3Context, Data, DataSize);\r

 \r
   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r


@@ -171,14 +171,14 @@ Sm3Final (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Sm3Context == NULL || HashValue == NULL) {\r
+  if ((Sm3Context == NULL) || (HashValue == NULL)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // Openssl SM3 Hash Finalization\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // Openssl SM3 Hash Finalization\r
   //\r

-  sm3_final (HashValue, (SM3_CTX *) Sm3Context);\r
+  sm3_final (HashValue, (SM3_CTX *)Sm3Context);\r

 \r
   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r


@@ -209,7 +209,7 @@ Sm3HashAll (
   OUT  UINT8       *HashValue\r
   )\r
 {\r
   OUT  UINT8       *HashValue\r
   )\r
 {\r

-  SM3_CTX Ctx;\r
+  SM3_CTX  Ctx;\r

 \r
   //\r
   // Check input parameters.\r
 \r
   //\r
   // Check input parameters.\r


@@ -217,18 +217,19 @@ Sm3HashAll (
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r
   if (HashValue == NULL) {\r
     return FALSE;\r
   }\r

-  if (Data == NULL && DataSize != 0) {\r
+\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // SM3 Hash Computation.\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // SM3 Hash Computation.\r
   //\r

-  sm3_init(&Ctx);\r
+  sm3_init (&Ctx);\r

 \r
 \r

-  sm3_update(&Ctx, Data, DataSize);\r
+  sm3_update (&Ctx, Data, DataSize);\r

 \r
 \r

-  sm3_final(HashValue, &Ctx);\r
+  sm3_final (HashValue, &Ctx);\r

 \r
   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c
index 3fdef064f93a4e80ffcfc79674b685aaa1962c6b..7e83551c1b22fc51fbc45610fe10bec64b03b161 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c
@@ -25,7 +25,7 @@ HmacSha256New (
   //\r
   // Allocates & Initializes HMAC_CTX Context by OpenSSL HMAC_CTX_new()\r
   //\r
   //\r
   // Allocates & Initializes HMAC_CTX Context by OpenSSL HMAC_CTX_new()\r
   //\r

-  return (VOID *) HMAC_CTX_new ();\r
+  return (VOID *)HMAC_CTX_new ();\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -71,11 +71,11 @@ HmacSha256SetKey (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (HmacSha256Context == NULL || KeySize > INT_MAX) {\r
+  if ((HmacSha256Context == NULL) || (KeySize > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (HMAC_Init_ex ((HMAC_CTX *)HmacSha256Context, Key, (UINT32) KeySize, EVP_sha256(), NULL) != 1) {\r
+  if (HMAC_Init_ex ((HMAC_CTX *)HmacSha256Context, Key, (UINT32)KeySize, EVP_sha256 (), NULL) != 1) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -105,7 +105,7 @@ HmacSha256Duplicate (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (HmacSha256Context == NULL || NewHmacSha256Context == NULL) {\r
+  if ((HmacSha256Context == NULL) || (NewHmacSha256Context == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -152,7 +152,7 @@ HmacSha256Update (
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r
   //\r
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r

-  if (Data == NULL && DataSize != 0) {\r
+  if ((Data == NULL) && (DataSize != 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -198,7 +198,7 @@ HmacSha256Final (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (HmacSha256Context == NULL || HmacValue == NULL) {\r
+  if ((HmacSha256Context == NULL) || (HmacValue == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -208,6 +208,7 @@ HmacSha256Final (
   if (HMAC_Final ((HMAC_CTX *)HmacSha256Context, HmacValue, &Length) != 1) {\r
     return FALSE;\r
   }\r
   if (HMAC_Final ((HMAC_CTX *)HmacSha256Context, HmacValue, &Length) != 1) {\r
     return FALSE;\r
   }\r

+\r

   if (HMAC_CTX_reset ((HMAC_CTX *)HmacSha256Context) != 1) {\r
     return FALSE;\r
   }\r
   if (HMAC_CTX_reset ((HMAC_CTX *)HmacSha256Context) != 1) {\r
     return FALSE;\r
   }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h b/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
index ff6d33835b2a3fa2e0c0ebab511df6f0b9dbd3a7..3412acc676920be11738f09ce86d682d7e46d911 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
+++ b/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
@@ -23,8 +23,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/opensslv.h>\r
 \r
 #if OPENSSL_VERSION_NUMBER < 0x10100000L\r
 #include <openssl/opensslv.h>\r
 \r
 #if OPENSSL_VERSION_NUMBER < 0x10100000L\r

-#define OBJ_get0_data(o) ((o)->data)\r
-#define OBJ_length(o) ((o)->length)\r
+#define OBJ_get0_data(o)  ((o)->data)\r
+#define OBJ_length(o)     ((o)->length)\r

 #endif\r
 \r
 /**\r
 #endif\r
 \r
 /**\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Kdf/CryptHkdf.c b/CryptoPkg/Library/BaseCryptLib/Kdf/CryptHkdf.c
index 3a827dadfcbde605264a9d6895ad4ec8b10b80e4..9457b04f723738848a2d55ace9b62b412f008864 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Kdf/CryptHkdf.c
+++ b/CryptoPkg/Library/BaseCryptLib/Kdf/CryptHkdf.c
@@ -39,37 +39,42 @@ HkdfSha256ExtractAndExpand (
   IN   UINTN        OutSize\r
   )\r
 {\r
   IN   UINTN        OutSize\r
   )\r
 {\r

-  EVP_PKEY_CTX *pHkdfCtx;\r
-  BOOLEAN Result;\r
+  EVP_PKEY_CTX  *pHkdfCtx;\r
+  BOOLEAN       Result;\r

 \r
 \r

-  if (Key == NULL || Salt == NULL || Info == NULL || Out == NULL ||\r
-    KeySize > INT_MAX || SaltSize > INT_MAX || InfoSize > INT_MAX || OutSize > INT_MAX ) {\r
+  if ((Key == NULL) || (Salt == NULL) || (Info == NULL) || (Out == NULL) ||\r
+      (KeySize > INT_MAX) || (SaltSize > INT_MAX) || (InfoSize > INT_MAX) || (OutSize > INT_MAX))\r
+  {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  pHkdfCtx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);\r
+  pHkdfCtx = EVP_PKEY_CTX_new_id (EVP_PKEY_HKDF, NULL);\r

   if (pHkdfCtx == NULL) {\r
     return FALSE;\r
   }\r
 \r
   if (pHkdfCtx == NULL) {\r
     return FALSE;\r
   }\r
 \r

-  Result = EVP_PKEY_derive_init(pHkdfCtx) > 0;\r
+  Result = EVP_PKEY_derive_init (pHkdfCtx) > 0;\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_set_hkdf_md(pHkdfCtx, EVP_sha256()) > 0;\r
+    Result = EVP_PKEY_CTX_set_hkdf_md (pHkdfCtx, EVP_sha256 ()) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_set1_hkdf_salt(pHkdfCtx, Salt, (UINT32)SaltSize) > 0;\r
+    Result = EVP_PKEY_CTX_set1_hkdf_salt (pHkdfCtx, Salt, (UINT32)SaltSize) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_set1_hkdf_key(pHkdfCtx, Key, (UINT32)KeySize) > 0;\r
+    Result = EVP_PKEY_CTX_set1_hkdf_key (pHkdfCtx, Key, (UINT32)KeySize) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_add1_hkdf_info(pHkdfCtx, Info, (UINT32)InfoSize) > 0;\r
+    Result = EVP_PKEY_CTX_add1_hkdf_info (pHkdfCtx, Info, (UINT32)InfoSize) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_PKEY_derive(pHkdfCtx, Out, &OutSize) > 0;\r
+    Result = EVP_PKEY_derive (pHkdfCtx, Out, &OutSize) > 0;\r

   }\r
 \r
   }\r
 \r

-  EVP_PKEY_CTX_free(pHkdfCtx);\r
+  EVP_PKEY_CTX_free (pHkdfCtx);\r

   pHkdfCtx = NULL;\r
   return Result;\r
 }\r
   pHkdfCtx = NULL;\r
   return Result;\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
index 6f7e1971f8e196ab3e99d387dfced2454cad3842..7733d772f40ab023119257511f940993192a4a8a 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
@@ -30,14 +30,14 @@ PasswordCallback (
 {\r
   INTN  KeyLength;\r
 \r
 {\r
   INTN  KeyLength;\r
 \r

-  ZeroMem ((VOID *) Buf, (UINTN) Size);\r
+  ZeroMem ((VOID *)Buf, (UINTN)Size);\r

   if (Key != NULL) {\r
     //\r
     // Duplicate key phrase directly.\r
     //\r
   if (Key != NULL) {\r
     //\r
     // Duplicate key phrase directly.\r
     //\r

-    KeyLength = (INTN) AsciiStrLen ((CHAR8 *)Key);\r
-    KeyLength = (KeyLength > Size ) ? Size : KeyLength;\r
-    CopyMem (Buf, Key, (UINTN) KeyLength);\r
+    KeyLength = (INTN)AsciiStrLen ((CHAR8 *)Key);\r
+    KeyLength = (KeyLength > Size) ? Size : KeyLength;\r
+    CopyMem (Buf, Key, (UINTN)KeyLength);\r

     return KeyLength;\r
   } else {\r
     return 0;\r
     return KeyLength;\r
   } else {\r
     return 0;\r


@@ -76,7 +76,7 @@ RsaGetPrivateKeyFromPem (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (PemData == NULL || RsaContext == NULL || PemSize > INT_MAX) {\r
+  if ((PemData == NULL) || (RsaContext == NULL) || (PemSize > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -87,9 +87,11 @@ RsaGetPrivateKeyFromPem (
   if (EVP_add_cipher (EVP_aes_128_cbc ()) == 0) {\r
     return FALSE;\r
   }\r
   if (EVP_add_cipher (EVP_aes_128_cbc ()) == 0) {\r
     return FALSE;\r
   }\r

+\r

   if (EVP_add_cipher (EVP_aes_192_cbc ()) == 0) {\r
     return FALSE;\r
   }\r
   if (EVP_add_cipher (EVP_aes_192_cbc ()) == 0) {\r
     return FALSE;\r
   }\r

+\r

   if (EVP_add_cipher (EVP_aes_256_cbc ()) == 0) {\r
     return FALSE;\r
   }\r
   if (EVP_add_cipher (EVP_aes_256_cbc ()) == 0) {\r
     return FALSE;\r
   }\r


@@ -104,14 +106,14 @@ RsaGetPrivateKeyFromPem (
     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r

-  if (BIO_write (PemBio, PemData, (int) PemSize) <= 0) {\r
+  if (BIO_write (PemBio, PemData, (int)PemSize) <= 0) {\r

     goto _Exit;\r
   }\r
 \r
   //\r
   // Retrieve RSA Private Key from encrypted PEM data.\r
   //\r
     goto _Exit;\r
   }\r
 \r
   //\r
   // Retrieve RSA Private Key from encrypted PEM data.\r
   //\r

-  *RsaContext = PEM_read_bio_RSAPrivateKey (PemBio, NULL, (pem_password_cb *) &PasswordCallback, (void *) Password);\r
+  *RsaContext = PEM_read_bio_RSAPrivateKey (PemBio, NULL, (pem_password_cb *)&PasswordCallback, (void *)Password);\r

   if (*RsaContext != NULL) {\r
     Status = TRUE;\r
   }\r
   if (*RsaContext != NULL) {\r
     Status = TRUE;\r
   }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
index 3c2d14a88bce2a3ac5cddf147c8b101c16b40eb4..aa4a33364d9240fc2b245af4942e4577f209282e 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
@@ -23,9 +23,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // OID ASN.1 Value for SPC_INDIRECT_DATA_OBJID\r
 //\r
 //\r
 // OID ASN.1 Value for SPC_INDIRECT_DATA_OBJID\r
 //\r

-UINT8 mSpcIndirectOidValue[] = {\r
+UINT8  mSpcIndirectOidValue[] = {\r

   0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x04\r
   0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x04\r

-  };\r
+};\r

 \r
 /**\r
   Verifies the validity of a PE/COFF Authenticode Signature as described in "Windows\r
 \r
 /**\r
   Verifies the validity of a PE/COFF Authenticode Signature as described in "Windows\r


@@ -109,20 +109,20 @@ AuthenticodeVerify (
   //       some authenticode-specific structure. Use opaque ASN.1 string to retrieve\r
   //       PKCS#7 ContentInfo here.\r
   //\r
   //       some authenticode-specific structure. Use opaque ASN.1 string to retrieve\r
   //       PKCS#7 ContentInfo here.\r
   //\r

-  SpcIndirectDataOid = OBJ_get0_data(Pkcs7->d.sign->contents->type);\r
-  if (OBJ_length(Pkcs7->d.sign->contents->type) != sizeof(mSpcIndirectOidValue) ||\r
-      CompareMem (\r
-        SpcIndirectDataOid,\r
-        mSpcIndirectOidValue,\r
-        sizeof (mSpcIndirectOidValue)\r
-        ) != 0) {\r
+  SpcIndirectDataOid = OBJ_get0_data (Pkcs7->d.sign->contents->type);\r
+  if ((OBJ_length (Pkcs7->d.sign->contents->type) != sizeof (mSpcIndirectOidValue)) ||\r
+      (CompareMem (\r
+         SpcIndirectDataOid,\r
+         mSpcIndirectOidValue,\r
+         sizeof (mSpcIndirectOidValue)\r
+         ) != 0))\r
+  {\r

     //\r
     // Un-matched SPC_INDIRECT_DATA_OBJID.\r
     //\r
     goto _Exit;\r
   }\r
 \r
     //\r
     // Un-matched SPC_INDIRECT_DATA_OBJID.\r
     //\r
     goto _Exit;\r
   }\r
 \r

-\r

   SpcIndirectDataContent = (UINT8 *)(Pkcs7->d.sign->contents->d.other->value.asn1_string->data);\r
 \r
   //\r
   SpcIndirectDataContent = (UINT8 *)(Pkcs7->d.sign->contents->d.other->value.asn1_string->data);\r
 \r
   //\r


@@ -134,33 +134,30 @@ AuthenticodeVerify (
     //\r
     // Short Form of Length Encoding (Length < 128)\r
     //\r
     //\r
     // Short Form of Length Encoding (Length < 128)\r
     //\r

-    ContentSize = (UINTN) (Asn1Byte & 0x7F);\r
+    ContentSize = (UINTN)(Asn1Byte & 0x7F);\r

     //\r
     // Skip the SEQUENCE Tag;\r
     //\r
     SpcIndirectDataContent += 2;\r
     //\r
     // Skip the SEQUENCE Tag;\r
     //\r
     SpcIndirectDataContent += 2;\r

-\r

   } else if ((Asn1Byte & 0x81) == 0x81) {\r
     //\r
     // Long Form of Length Encoding (128 <= Length < 255, Single Octet)\r
     //\r
   } else if ((Asn1Byte & 0x81) == 0x81) {\r
     //\r
     // Long Form of Length Encoding (128 <= Length < 255, Single Octet)\r
     //\r

-    ContentSize = (UINTN) (*(UINT8 *)(SpcIndirectDataContent + 2));\r
+    ContentSize = (UINTN)(*(UINT8 *)(SpcIndirectDataContent + 2));\r

     //\r
     // Skip the SEQUENCE Tag;\r
     //\r
     SpcIndirectDataContent += 3;\r
     //\r
     // Skip the SEQUENCE Tag;\r
     //\r
     SpcIndirectDataContent += 3;\r

-\r

   } else if ((Asn1Byte & 0x82) == 0x82) {\r
     //\r
     // Long Form of Length Encoding (Length > 255, Two Octet)\r
     //\r
   } else if ((Asn1Byte & 0x82) == 0x82) {\r
     //\r
     // Long Form of Length Encoding (Length > 255, Two Octet)\r
     //\r

-    ContentSize = (UINTN) (*(UINT8 *)(SpcIndirectDataContent + 2));\r
+    ContentSize = (UINTN)(*(UINT8 *)(SpcIndirectDataContent + 2));\r

     ContentSize = (ContentSize << 8) + (UINTN)(*(UINT8 *)(SpcIndirectDataContent + 3));\r
     //\r
     // Skip the SEQUENCE Tag;\r
     //\r
     SpcIndirectDataContent += 4;\r
     ContentSize = (ContentSize << 8) + (UINTN)(*(UINT8 *)(SpcIndirectDataContent + 3));\r
     //\r
     // Skip the SEQUENCE Tag;\r
     //\r
     SpcIndirectDataContent += 4;\r

-\r

   } else {\r
     goto _Exit;\r
   }\r
   } else {\r
     goto _Exit;\r
   }\r


@@ -180,7 +177,7 @@ AuthenticodeVerify (
   //\r
   // Verifies the PKCS#7 Signed Data in PE/COFF Authenticode Signature\r
   //\r
   //\r
   // Verifies the PKCS#7 Signed Data in PE/COFF Authenticode Signature\r
   //\r

-  Status = (BOOLEAN) Pkcs7Verify (OrigAuthData, DataSize, TrustedCert, CertSize, SpcIndirectDataContent, ContentSize);\r
+  Status = (BOOLEAN)Pkcs7Verify (OrigAuthData, DataSize, TrustedCert, CertSize, SpcIndirectDataContent, ContentSize);\r

 \r
 _Exit:\r
   //\r
 \r
 _Exit:\r
   //\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
index abe4601d111f3e8d54de153ef7d5443d74e824cb..27322888934d03ded82504a26bff2b8e0a4d389b 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
@@ -26,7 +26,7 @@ DhNew (
   //\r
   // Allocates & Initializes DH Context by OpenSSL DH_new()\r
   //\r
   //\r
   // Allocates & Initializes DH Context by OpenSSL DH_new()\r
   //\r

-  return (VOID *) DH_new ();\r
+  return (VOID *)DH_new ();\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -46,7 +46,7 @@ DhFree (
   //\r
   // Free OpenSSL DH Context\r
   //\r
   //\r
   // Free OpenSSL DH Context\r
   //\r

-  DH_free ((DH *) DhContext);\r
+  DH_free ((DH *)DhContext);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -80,21 +80,21 @@ DhGenerateParameter (
   OUT     UINT8  *Prime\r
   )\r
 {\r
   OUT     UINT8  *Prime\r
   )\r
 {\r

-  BOOLEAN RetVal;\r
-  BIGNUM  *BnP;\r
+  BOOLEAN  RetVal;\r
+  BIGNUM   *BnP;\r

 \r
   //\r
   // Check input parameters.\r
   //\r
 \r
   //\r
   // Check input parameters.\r
   //\r

-  if (DhContext == NULL || Prime == NULL || PrimeLength > INT_MAX) {\r
+  if ((DhContext == NULL) || (Prime == NULL) || (PrimeLength > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (Generator != DH_GENERATOR_2 && Generator != DH_GENERATOR_5) {\r
+  if ((Generator != DH_GENERATOR_2) && (Generator != DH_GENERATOR_5)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  RetVal = (BOOLEAN) DH_generate_parameters_ex (DhContext, (UINT32) PrimeLength, (UINT32) Generator, NULL);\r
+  RetVal = (BOOLEAN)DH_generate_parameters_ex (DhContext, (UINT32)PrimeLength, (UINT32)Generator, NULL);\r

   if (!RetVal) {\r
     return FALSE;\r
   }\r
   if (!RetVal) {\r
     return FALSE;\r
   }\r


@@ -142,11 +142,11 @@ DhSetParameter (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (DhContext == NULL || Prime == NULL || PrimeLength > INT_MAX) {\r
+  if ((DhContext == NULL) || (Prime == NULL) || (PrimeLength > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (Generator != DH_GENERATOR_2 && Generator != DH_GENERATOR_5) {\r
+  if ((Generator != DH_GENERATOR_2) && (Generator != DH_GENERATOR_5)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -199,29 +199,29 @@ DhGenerateKey (
   IN OUT  UINTN  *PublicKeySize\r
   )\r
 {\r
   IN OUT  UINTN  *PublicKeySize\r
   )\r
 {\r

-  BOOLEAN RetVal;\r
-  DH      *Dh;\r
-  BIGNUM  *DhPubKey;\r
-  INTN    Size;\r
+  BOOLEAN  RetVal;\r
+  DH       *Dh;\r
+  BIGNUM   *DhPubKey;\r
+  INTN     Size;\r

 \r
   //\r
   // Check input parameters.\r
   //\r
 \r
   //\r
   // Check input parameters.\r
   //\r

-  if (DhContext == NULL || PublicKeySize == NULL) {\r
+  if ((DhContext == NULL) || (PublicKeySize == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (PublicKey == NULL && *PublicKeySize != 0) {\r
+  if ((PublicKey == NULL) && (*PublicKeySize != 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  Dh = (DH *) DhContext;\r
+  Dh = (DH *)DhContext;\r

 \r
 \r

-  RetVal = (BOOLEAN) DH_generate_key (DhContext);\r
+  RetVal = (BOOLEAN)DH_generate_key (DhContext);\r

   if (RetVal) {\r
     DH_get0_key (Dh, (const BIGNUM **)&DhPubKey, NULL);\r
     Size = BN_num_bytes (DhPubKey);\r
   if (RetVal) {\r
     DH_get0_key (Dh, (const BIGNUM **)&DhPubKey, NULL);\r
     Size = BN_num_bytes (DhPubKey);\r

-    if ((Size > 0) && (*PublicKeySize < (UINTN) Size)) {\r
+    if ((Size > 0) && (*PublicKeySize < (UINTN)Size)) {\r

       *PublicKeySize = Size;\r
       return FALSE;\r
     }\r
       *PublicKeySize = Size;\r
       return FALSE;\r
     }\r


@@ -229,6 +229,7 @@ DhGenerateKey (
     if (PublicKey != NULL) {\r
       BN_bn2bin (DhPubKey, PublicKey);\r
     }\r
     if (PublicKey != NULL) {\r
       BN_bn2bin (DhPubKey, PublicKey);\r
     }\r

+\r

     *PublicKeySize = Size;\r
   }\r
 \r
     *PublicKeySize = Size;\r
   }\r
 \r


@@ -275,7 +276,7 @@ DhComputeKey (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (DhContext == NULL || PeerPublicKey == NULL || KeySize == NULL || Key == NULL) {\r
+  if ((DhContext == NULL) || (PeerPublicKey == NULL) || (KeySize == NULL) || (Key == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -283,7 +284,7 @@ DhComputeKey (
     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  Bn = BN_bin2bn (PeerPublicKey, (UINT32) PeerPublicKeySize, NULL);\r
+  Bn = BN_bin2bn (PeerPublicKey, (UINT32)PeerPublicKeySize, NULL);\r

   if (Bn == NULL) {\r
     return FALSE;\r
   }\r
   if (Bn == NULL) {\r
     return FALSE;\r
   }\r


@@ -294,7 +295,7 @@ DhComputeKey (
     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (*KeySize < (UINTN) Size) {\r
+  if (*KeySize < (UINTN)Size) {\r

     *KeySize = Size;\r
     BN_free (Bn);\r
     return FALSE;\r
     *KeySize = Size;\r
     BN_free (Bn);\r
     return FALSE;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1Oaep.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1Oaep.c
index 970fa2a36e87955bca1e434df7407501075ebe22..ea43c1381c198362f2f1fa2a08c459dca18f5c4c 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1Oaep.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1Oaep.c
@@ -67,8 +67,9 @@ Pkcs1v2Encrypt (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (PublicKey == NULL || InData == NULL ||\r
-      EncryptedData == NULL || EncryptedDataSize == NULL) {\r
+  if ((PublicKey == NULL) || (InData == NULL) ||\r
+      (EncryptedData == NULL) || (EncryptedDataSize == NULL))\r
+  {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -82,15 +83,15 @@ Pkcs1v2Encrypt (
     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  *EncryptedData        = NULL;\r
-  *EncryptedDataSize    = 0;\r
-  Result                = FALSE;\r
-  TempPointer           = NULL;\r
-  CertData              = NULL;\r
-  InternalPublicKey     = NULL;\r
-  PkeyCtx               = NULL;\r
-  OutData               = NULL;\r
-  OutDataSize           = 0;\r
+  *EncryptedData     = NULL;\r
+  *EncryptedDataSize = 0;\r
+  Result             = FALSE;\r
+  TempPointer        = NULL;\r
+  CertData           = NULL;\r
+  InternalPublicKey  = NULL;\r
+  PkeyCtx            = NULL;\r
+  OutData            = NULL;\r
+  OutDataSize        = 0;\r

 \r
   //\r
   // If it provides a seed then use it.\r
 \r
   //\r
   // If it provides a seed then use it.\r


@@ -107,7 +108,7 @@ Pkcs1v2Encrypt (
   // Parse the X509 cert and extract the public key.\r
   //\r
   TempPointer = PublicKey;\r
   // Parse the X509 cert and extract the public key.\r
   //\r
   TempPointer = PublicKey;\r

-  CertData = d2i_X509 (&CertData, &TempPointer, (UINT32)PublicKeySize);\r
+  CertData    = d2i_X509 (&CertData, &TempPointer, (UINT32)PublicKeySize);\r

   if (CertData == NULL) {\r
     //\r
     // Fail to parse X509 cert.\r
   if (CertData == NULL) {\r
     //\r
     // Fail to parse X509 cert.\r


@@ -137,11 +138,13 @@ Pkcs1v2Encrypt (
     //\r
     goto _Exit;\r
   }\r
     //\r
     goto _Exit;\r
   }\r

+\r

   //\r
   // Initialize the context and set the desired padding.\r
   //\r
   //\r
   // Initialize the context and set the desired padding.\r
   //\r

-  if (EVP_PKEY_encrypt_init (PkeyCtx) <= 0 ||\r
-      EVP_PKEY_CTX_set_rsa_padding (PkeyCtx, RSA_PKCS1_OAEP_PADDING) <= 0) {\r
+  if ((EVP_PKEY_encrypt_init (PkeyCtx) <= 0) ||\r
+      (EVP_PKEY_CTX_set_rsa_padding (PkeyCtx, RSA_PKCS1_OAEP_PADDING) <= 0))\r
+  {\r

     //\r
     // Fail to initialize the context.\r
     //\r
     //\r
     // Fail to initialize the context.\r
     //\r


@@ -177,7 +180,7 @@ Pkcs1v2Encrypt (
     // Fail to encrypt data, need to free the output buffer.\r
     //\r
     FreePool (OutData);\r
     // Fail to encrypt data, need to free the output buffer.\r
     //\r
     FreePool (OutData);\r

-    OutData = NULL;\r
+    OutData     = NULL;\r

     OutDataSize = 0;\r
     goto _Exit;\r
   }\r
     OutDataSize = 0;\r
     goto _Exit;\r
   }\r


@@ -185,20 +188,22 @@ Pkcs1v2Encrypt (
   //\r
   // Encrypt done.\r
   //\r
   //\r
   // Encrypt done.\r
   //\r

-  *EncryptedData = OutData;\r
+  *EncryptedData     = OutData;\r

   *EncryptedDataSize = OutDataSize;\r
   *EncryptedDataSize = OutDataSize;\r

-  Result = TRUE;\r
+  Result             = TRUE;\r

 \r
 _Exit:\r
   //\r
   // Release Resources\r
   //\r
   if (CertData != NULL) {\r
 \r
 _Exit:\r
   //\r
   // Release Resources\r
   //\r
   if (CertData != NULL) {\r

-    X509_free (CertData );\r
+    X509_free (CertData);\r

   }\r
   }\r

+\r

   if (InternalPublicKey != NULL) {\r
     EVP_PKEY_free (InternalPublicKey);\r
   }\r
   if (InternalPublicKey != NULL) {\r
     EVP_PKEY_free (InternalPublicKey);\r
   }\r

+\r

   if (PkeyCtx != NULL) {\r
     EVP_PKEY_CTX_free (PkeyCtx);\r
   }\r
   if (PkeyCtx != NULL) {\r
     EVP_PKEY_CTX_free (PkeyCtx);\r
   }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2.c
index a89c1525c111912878104de982a240e35b9c0f74..92e8b8c20b035a84c1d110bfd3e91d234d0fb55d 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2.c
@@ -58,25 +58,28 @@ Pkcs5HashPassword (
   if ((Password == NULL) || (Salt == NULL) || (OutKey == NULL)) {\r
     return FALSE;\r
   }\r
   if ((Password == NULL) || (Salt == NULL) || (OutKey == NULL)) {\r
     return FALSE;\r
   }\r

+\r

   if ((PasswordLength == 0) || (PasswordLength > INT_MAX) ||\r
       (SaltLength == 0) || (SaltLength > INT_MAX) ||\r
       (KeyLength == 0) || (KeyLength > INT_MAX) ||\r
   if ((PasswordLength == 0) || (PasswordLength > INT_MAX) ||\r
       (SaltLength == 0) || (SaltLength > INT_MAX) ||\r
       (KeyLength == 0) || (KeyLength > INT_MAX) ||\r

-      (IterationCount < 1) || (IterationCount > INT_MAX)) {\r
+      (IterationCount < 1) || (IterationCount > INT_MAX))\r
+  {\r

     return FALSE;\r
   }\r
     return FALSE;\r
   }\r

+\r

   //\r
   // Make sure the digest algorithm is supported.\r
   //\r
   switch (DigestSize) {\r
   //\r
   // Make sure the digest algorithm is supported.\r
   //\r
   switch (DigestSize) {\r

-  case SHA1_DIGEST_SIZE:\r
-    HashAlg = EVP_sha1();\r
-    break;\r
-  case SHA256_DIGEST_SIZE:\r
-    HashAlg = EVP_sha256();\r
-    break;\r
-  default:\r
-    return FALSE;\r
-    break;\r
+    case SHA1_DIGEST_SIZE:\r
+      HashAlg = EVP_sha1 ();\r
+      break;\r
+    case SHA256_DIGEST_SIZE:\r
+      HashAlg = EVP_sha256 ();\r
+      break;\r
+    default:\r
+      return FALSE;\r
+      break;\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c
index 442f573f8bddb108bd0859f69c8fef59f903006b..3f8b4642442d79f623cff73a5a978f66056be5db 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c
@@ -62,8 +62,9 @@ Pkcs7Sign (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (PrivateKey == NULL || KeyPassword == NULL || InData == NULL ||\r
-    SignCert == NULL || SignedData == NULL || SignedDataSize == NULL || InDataSize > INT_MAX) {\r
+  if ((PrivateKey == NULL) || (KeyPassword == NULL) || (InData == NULL) ||\r
+      (SignCert == NULL) || (SignedData == NULL) || (SignedDataSize == NULL) || (InDataSize > INT_MAX))\r
+  {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -79,8 +80,8 @@ Pkcs7Sign (
   Status = RsaGetPrivateKeyFromPem (\r
              PrivateKey,\r
              PrivateKeySize,\r
   Status = RsaGetPrivateKeyFromPem (\r
              PrivateKey,\r
              PrivateKeySize,\r

-             (CONST CHAR8 *) KeyPassword,\r
-             (VOID **) &RsaContext\r
+             (CONST CHAR8 *)KeyPassword,\r
+             (VOID **)&RsaContext\r

              );\r
   if (!Status) {\r
     return Status;\r
              );\r
   if (!Status) {\r
     return Status;\r


@@ -94,9 +95,11 @@ Pkcs7Sign (
   if (EVP_add_digest (EVP_md5 ()) == 0) {\r
     goto _Exit;\r
   }\r
   if (EVP_add_digest (EVP_md5 ()) == 0) {\r
     goto _Exit;\r
   }\r

+\r

   if (EVP_add_digest (EVP_sha1 ()) == 0) {\r
     goto _Exit;\r
   }\r
   if (EVP_add_digest (EVP_sha1 ()) == 0) {\r
     goto _Exit;\r
   }\r

+\r

   if (EVP_add_digest (EVP_sha256 ()) == 0) {\r
     goto _Exit;\r
   }\r
   if (EVP_add_digest (EVP_sha256 ()) == 0) {\r
     goto _Exit;\r
   }\r


@@ -110,7 +113,8 @@ Pkcs7Sign (
   if (Key == NULL) {\r
     goto _Exit;\r
   }\r
   if (Key == NULL) {\r
     goto _Exit;\r
   }\r

-  if (EVP_PKEY_assign_RSA (Key, (RSA *) RsaContext) == 0) {\r
+\r
+  if (EVP_PKEY_assign_RSA (Key, (RSA *)RsaContext) == 0) {\r

     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r


@@ -122,7 +126,7 @@ Pkcs7Sign (
     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r

-  if (BIO_write (DataBio, InData, (int) InDataSize) <= 0) {\r
+  if (BIO_write (DataBio, InData, (int)InDataSize) <= 0) {\r

     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r


@@ -130,9 +134,9 @@ Pkcs7Sign (
   // Create the PKCS#7 signedData structure.\r
   //\r
   Pkcs7 = PKCS7_sign (\r
   // Create the PKCS#7 signedData structure.\r
   //\r
   Pkcs7 = PKCS7_sign (\r

-            (X509 *) SignCert,\r
+            (X509 *)SignCert,\r

             Key,\r
             Key,\r

-            (STACK_OF(X509) *) OtherCerts,\r
+            (STACK_OF (X509) *) OtherCerts,\r

             DataBio,\r
             PKCS7_BINARY | PKCS7_NOATTR | PKCS7_DETACHED\r
             );\r
             DataBio,\r
             PKCS7_BINARY | PKCS7_NOATTR | PKCS7_DETACHED\r
             );\r


@@ -148,13 +152,13 @@ Pkcs7Sign (
     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r

-  P7Data     = malloc (P7DataSize);\r
+  P7Data = malloc (P7DataSize);\r

   if (P7Data == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   Tmp        = P7Data;\r
   if (P7Data == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   Tmp        = P7Data;\r

-  P7DataSize = i2d_PKCS7 (Pkcs7, (unsigned char **) &Tmp);\r
+  P7DataSize = i2d_PKCS7 (Pkcs7, (unsigned char **)&Tmp);\r

   ASSERT (P7DataSize > 19);\r
 \r
   //\r
   ASSERT (P7DataSize > 19);\r
 \r
   //\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7SignNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7SignNull.c
index d7ff8ba947c45353b93725c694c234e145e30d2c..07c33c6ae6089d96095f91da0c35ca424dd9eeb3 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7SignNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7SignNull.c
@@ -51,4 +51,3 @@ Pkcs7Sign (
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
index 112c13c226f023355cbb7b28af420ef4ba29033f..aac98ae4f9701084c51e170e4e35ca7fedf816b5 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
@@ -26,11 +26,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 STATIC\r
 BOOLEAN\r
 Pkcs7TypeIsOther (\r
 STATIC\r
 BOOLEAN\r
 Pkcs7TypeIsOther (\r

-  IN PKCS7 *P7\r
+  IN PKCS7  *P7\r

   )\r
 {\r
   )\r
 {\r

-  BOOLEAN Others;\r
-  INTN    Nid = OBJ_obj2nid (P7->type);\r
+  BOOLEAN  Others;\r
+  INTN     Nid = OBJ_obj2nid (P7->type);\r

 \r
   switch (Nid) {\r
     case NID_pkcs7_data:\r
 \r
   switch (Nid) {\r
     case NID_pkcs7_data:\r


@@ -57,17 +57,18 @@ Pkcs7TypeIsOther (
   @return ASN1_OCTET_STRING ASN.1 string.\r
 **/\r
 STATIC\r
   @return ASN1_OCTET_STRING ASN.1 string.\r
 **/\r
 STATIC\r

-ASN1_OCTET_STRING*\r
+ASN1_OCTET_STRING *\r

 Pkcs7GetOctetString (\r
 Pkcs7GetOctetString (\r

-  IN PKCS7 *P7\r
+  IN PKCS7  *P7\r

   )\r
 {\r
   if (PKCS7_type_is_data (P7)) {\r
     return P7->d.data;\r
   }\r
 \r
   )\r
 {\r
   if (PKCS7_type_is_data (P7)) {\r
     return P7->d.data;\r
   }\r
 \r

-  if (Pkcs7TypeIsOther(P7) && (P7->d.other != NULL) &&\r
-      (P7->d.other->type == V_ASN1_OCTET_STRING)) {\r
+  if (Pkcs7TypeIsOther (P7) && (P7->d.other != NULL) &&\r
+      (P7->d.other->type == V_ASN1_OCTET_STRING))\r
+  {\r

     return P7->d.other->value.octet_string;\r
   }\r
 \r
     return P7->d.other->value.octet_string;\r
   }\r
 \r


@@ -171,9 +172,11 @@ Pkcs7GetAttachedContent (
         *ContentSize = 0;\r
         goto _Exit;\r
       }\r
         *ContentSize = 0;\r
         goto _Exit;\r
       }\r

+\r

       CopyMem (*Content, OctStr->data, *ContentSize);\r
     }\r
   }\r
       CopyMem (*Content, OctStr->data, *ContentSize);\r
     }\r
   }\r

+\r

   Status = TRUE;\r
 \r
 _Exit:\r
   Status = TRUE;\r
 \r
 _Exit:\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
index 8eda98f7b289f9c35329a698defc2db0f31a70a7..3336d2f60a6a1724637202c95adac0669e6baf87 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
@@ -22,7 +22,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/x509v3.h>\r
 #include <openssl/pkcs7.h>\r
 \r
 #include <openssl/x509v3.h>\r
 #include <openssl/pkcs7.h>\r
 \r

-UINT8 mOidValue[9] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x02 };\r
+UINT8  mOidValue[9] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x02 };\r

 \r
 /**\r
   Check input P7Data is a wrapped ContentInfo structure or not. If not construct\r
 \r
 /**\r
   Check input P7Data is a wrapped ContentInfo structure or not. If not construct\r


@@ -56,8 +56,8 @@ WrapPkcs7Data (
   OUT UINTN        *WrapDataSize\r
   )\r
 {\r
   OUT UINTN        *WrapDataSize\r
   )\r
 {\r

-  BOOLEAN          Wrapped;\r
-  UINT8            *SignedData;\r
+  BOOLEAN  Wrapped;\r
+  UINT8    *SignedData;\r

 \r
   //\r
   // Check whether input P7Data is a wrapped ContentInfo structure or not.\r
 \r
   //\r
   // Check whether input P7Data is a wrapped ContentInfo structure or not.\r


@@ -72,7 +72,7 @@ WrapPkcs7Data (
   }\r
 \r
   if (Wrapped) {\r
   }\r
 \r
   if (Wrapped) {\r

-    *WrapData     = (UINT8 *) P7Data;\r
+    *WrapData     = (UINT8 *)P7Data;\r

     *WrapDataSize = P7Length;\r
   } else {\r
     //\r
     *WrapDataSize = P7Length;\r
   } else {\r
     //\r


@@ -96,8 +96,8 @@ WrapPkcs7Data (
     //\r
     // Part2: Length1 = P7Length + 19 - 4, in big endian.\r
     //\r
     //\r
     // Part2: Length1 = P7Length + 19 - 4, in big endian.\r
     //\r

-    SignedData[2] = (UINT8) (((UINT16) (*WrapDataSize - 4)) >> 8);\r
-    SignedData[3] = (UINT8) (((UINT16) (*WrapDataSize - 4)) & 0xff);\r
+    SignedData[2] = (UINT8)(((UINT16)(*WrapDataSize - 4)) >> 8);\r
+    SignedData[3] = (UINT8)(((UINT16)(*WrapDataSize - 4)) & 0xff);\r

 \r
     //\r
     // Part3: 0x06, 0x09.\r
 \r
     //\r
     // Part3: 0x06, 0x09.\r


@@ -119,8 +119,8 @@ WrapPkcs7Data (
     //\r
     // Part6: Length2 = P7Length, in big endian.\r
     //\r
     //\r
     // Part6: Length2 = P7Length, in big endian.\r
     //\r

-    SignedData[17] = (UINT8) (((UINT16) P7Length) >> 8);\r
-    SignedData[18] = (UINT8) (((UINT16) P7Length) & 0xff);\r
+    SignedData[17] = (UINT8)(((UINT16)P7Length) >> 8);\r
+    SignedData[18] = (UINT8)(((UINT16)P7Length) & 0xff);\r

 \r
     //\r
     // Part7: P7Data.\r
 \r
     //\r
     // Part7: P7Data.\r


@@ -147,19 +147,20 @@ WrapPkcs7Data (
 **/\r
 BOOLEAN\r
 X509PopCertificate (\r
 **/\r
 BOOLEAN\r
 X509PopCertificate (\r

-  IN  VOID  *X509Stack,\r
-  OUT UINT8 **Cert,\r
-  OUT UINTN *CertSize\r
+  IN  VOID   *X509Stack,\r
+  OUT UINT8  **Cert,\r
+  OUT UINTN  *CertSize\r

   )\r
 {\r
   )\r
 {\r

-  BIO             *CertBio;\r
-  X509            *X509Cert;\r
-  STACK_OF(X509)  *CertStack;\r
-  BOOLEAN         Status;\r
-  INT32           Result;\r
-  BUF_MEM         *Ptr;\r
-  INT32           Length;\r
-  VOID            *Buffer;\r
+  BIO   *CertBio;\r
+  X509  *X509Cert;\r
+\r
+  STACK_OF (X509)  *CertStack;\r
+  BOOLEAN  Status;\r
+  INT32    Result;\r
+  BUF_MEM  *Ptr;\r
+  INT32    Length;\r
+  VOID     *Buffer;\r

 \r
   Status = FALSE;\r
 \r
 \r
   Status = FALSE;\r
 \r


@@ -167,7 +168,7 @@ X509PopCertificate (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  CertStack = (STACK_OF(X509) *) X509Stack;\r
+  CertStack = (STACK_OF (X509) *) X509Stack;\r

 \r
   X509Cert = sk_X509_pop (CertStack);\r
 \r
 \r
   X509Cert = sk_X509_pop (CertStack);\r
 \r


@@ -258,23 +259,25 @@ Pkcs7GetSigners (
   OUT UINTN        *CertLength\r
   )\r
 {\r
   OUT UINTN        *CertLength\r
   )\r
 {\r

-  PKCS7            *Pkcs7;\r
-  BOOLEAN          Status;\r
-  UINT8            *SignedData;\r
-  CONST UINT8      *Temp;\r
-  UINTN            SignedDataSize;\r
-  BOOLEAN          Wrapped;\r
-  STACK_OF(X509)   *Stack;\r
-  UINT8            Index;\r
-  UINT8            *CertBuf;\r
-  UINT8            *OldBuf;\r
-  UINTN            BufferSize;\r
-  UINTN            OldSize;\r
-  UINT8            *SingleCert;\r
-  UINTN            SingleCertSize;\r
+  PKCS7        *Pkcs7;\r
+  BOOLEAN      Status;\r
+  UINT8        *SignedData;\r
+  CONST UINT8  *Temp;\r
+  UINTN        SignedDataSize;\r
+  BOOLEAN      Wrapped;\r
+\r
+  STACK_OF (X509)   *Stack;\r
+  UINT8  Index;\r
+  UINT8  *CertBuf;\r
+  UINT8  *OldBuf;\r
+  UINTN  BufferSize;\r
+  UINTN  OldSize;\r
+  UINT8  *SingleCert;\r
+  UINTN  SingleCertSize;\r

 \r
   if ((P7Data == NULL) || (CertStack == NULL) || (StackLength == NULL) ||\r
 \r
   if ((P7Data == NULL) || (CertStack == NULL) || (StackLength == NULL) ||\r

-      (TrustedCert == NULL) || (CertLength == NULL) || (P7Length > INT_MAX)) {\r
+      (TrustedCert == NULL) || (CertLength == NULL) || (P7Length > INT_MAX))\r
+  {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -297,8 +300,8 @@ Pkcs7GetSigners (
     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r

-  Temp = SignedData;\r
-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &Temp, (int) SignedDataSize);\r
+  Temp  = SignedData;\r
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&Temp, (int)SignedDataSize);\r

   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r
   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r


@@ -310,7 +313,7 @@ Pkcs7GetSigners (
     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r

-  Stack = PKCS7_get0_signers(Pkcs7, NULL, PKCS7_BINARY);\r
+  Stack = PKCS7_get0_signers (Pkcs7, NULL, PKCS7_BINARY);\r

   if (Stack == NULL) {\r
     goto _Exit;\r
   }\r
   if (Stack == NULL) {\r
     goto _Exit;\r
   }\r


@@ -350,7 +353,7 @@ Pkcs7GetSigners (
       OldBuf = NULL;\r
     }\r
 \r
       OldBuf = NULL;\r
     }\r
 \r

-    WriteUnaligned32 ((UINT32 *) (CertBuf + OldSize), (UINT32) SingleCertSize);\r
+    WriteUnaligned32 ((UINT32 *)(CertBuf + OldSize), (UINT32)SingleCertSize);\r

     CopyMem (CertBuf + OldSize + sizeof (UINT32), SingleCert, SingleCertSize);\r
 \r
     free (SingleCert);\r
     CopyMem (CertBuf + OldSize + sizeof (UINT32), SingleCert, SingleCertSize);\r
 \r
     free (SingleCert);\r


@@ -363,7 +366,7 @@ Pkcs7GetSigners (
     //\r
     CertBuf[0] = Index;\r
 \r
     //\r
     CertBuf[0] = Index;\r
 \r

-    *CertLength = BufferSize - OldSize - sizeof (UINT32);\r
+    *CertLength  = BufferSize - OldSize - sizeof (UINT32);\r

     *TrustedCert = malloc (*CertLength);\r
     if (*TrustedCert == NULL) {\r
       goto _Exit;\r
     *TrustedCert = malloc (*CertLength);\r
     if (*TrustedCert == NULL) {\r
       goto _Exit;\r


@@ -372,7 +375,7 @@ Pkcs7GetSigners (
     CopyMem (*TrustedCert, CertBuf + OldSize + sizeof (UINT32), *CertLength);\r
     *CertStack   = CertBuf;\r
     *StackLength = BufferSize;\r
     CopyMem (*TrustedCert, CertBuf + OldSize + sizeof (UINT32), *CertLength);\r
     *CertStack   = CertBuf;\r
     *StackLength = BufferSize;\r

-    Status = TRUE;\r
+    Status       = TRUE;\r

   }\r
 \r
 _Exit:\r
   }\r
 \r
 _Exit:\r


@@ -388,7 +391,7 @@ _Exit:
   }\r
 \r
   if (Stack != NULL) {\r
   }\r
 \r
   if (Stack != NULL) {\r

-    sk_X509_pop_free(Stack, X509_free);\r
+    sk_X509_pop_free (Stack, X509_free);\r

   }\r
 \r
   if (SingleCert !=  NULL) {\r
   }\r
 \r
   if (SingleCert !=  NULL) {\r


@@ -416,7 +419,7 @@ _Exit:
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r

-  IN  UINT8        *Certs\r
+  IN  UINT8  *Certs\r

   )\r
 {\r
   if (Certs == NULL) {\r
   )\r
 {\r
   if (Certs == NULL) {\r


@@ -459,43 +462,45 @@ Pkcs7GetCertificatesList (
   OUT UINTN        *UnchainLength\r
   )\r
 {\r
   OUT UINTN        *UnchainLength\r
   )\r
 {\r

-  BOOLEAN          Status;\r
-  UINT8            *NewP7Data;\r
-  UINTN            NewP7Length;\r
-  BOOLEAN          Wrapped;\r
-  UINT8            Index;\r
-  PKCS7            *Pkcs7;\r
-  X509_STORE_CTX   *CertCtx;\r
-  STACK_OF(X509)   *CtxChain;\r
-  STACK_OF(X509)   *CtxUntrusted;\r
-  X509             *CtxCert;\r
-  STACK_OF(X509)   *Signers;\r
-  X509             *Signer;\r
-  X509             *Cert;\r
-  X509             *Issuer;\r
-  X509_NAME        *IssuerName;\r
-  UINT8            *CertBuf;\r
-  UINT8            *OldBuf;\r
-  UINTN            BufferSize;\r
-  UINTN            OldSize;\r
-  UINT8            *SingleCert;\r
-  UINTN            CertSize;\r
+  BOOLEAN         Status;\r
+  UINT8           *NewP7Data;\r
+  UINTN           NewP7Length;\r
+  BOOLEAN         Wrapped;\r
+  UINT8           Index;\r
+  PKCS7           *Pkcs7;\r
+  X509_STORE_CTX  *CertCtx;\r
+\r
+  STACK_OF (X509)   *CtxChain;\r
+  STACK_OF (X509)   *CtxUntrusted;\r
+  X509  *CtxCert;\r
+\r
+  STACK_OF (X509)   *Signers;\r
+  X509       *Signer;\r
+  X509       *Cert;\r
+  X509       *Issuer;\r
+  X509_NAME  *IssuerName;\r
+  UINT8      *CertBuf;\r
+  UINT8      *OldBuf;\r
+  UINTN      BufferSize;\r
+  UINTN      OldSize;\r
+  UINT8      *SingleCert;\r
+  UINTN      CertSize;\r

 \r
   //\r
   // Initializations\r
   //\r
 \r
   //\r
   // Initializations\r
   //\r

-  Status         = FALSE;\r
-  NewP7Data      = NULL;\r
-  Pkcs7          = NULL;\r
-  CertCtx        = NULL;\r
-  CtxChain       = NULL;\r
-  CtxCert        = NULL;\r
-  CtxUntrusted   = NULL;\r
-  Cert           = NULL;\r
-  SingleCert     = NULL;\r
-  CertBuf        = NULL;\r
-  OldBuf         = NULL;\r
-  Signers        = NULL;\r
+  Status       = FALSE;\r
+  NewP7Data    = NULL;\r
+  Pkcs7        = NULL;\r
+  CertCtx      = NULL;\r
+  CtxChain     = NULL;\r
+  CtxCert      = NULL;\r
+  CtxUntrusted = NULL;\r
+  Cert         = NULL;\r
+  SingleCert   = NULL;\r
+  CertBuf      = NULL;\r
+  OldBuf       = NULL;\r
+  Signers      = NULL;\r

 \r
   ZeroMem (&CertCtx, sizeof (CertCtx));\r
 \r
 \r
   ZeroMem (&CertCtx, sizeof (CertCtx));\r
 \r


@@ -503,7 +508,8 @@ Pkcs7GetCertificatesList (
   // Parameter Checking\r
   //\r
   if ((P7Data == NULL) || (SignerChainCerts == NULL) || (ChainLength == NULL) ||\r
   // Parameter Checking\r
   //\r
   if ((P7Data == NULL) || (SignerChainCerts == NULL) || (ChainLength == NULL) ||\r

-      (UnchainCerts == NULL) || (UnchainLength == NULL) || (P7Length > INT_MAX)) {\r
+      (UnchainCerts == NULL) || (UnchainLength == NULL) || (P7Length > INT_MAX))\r
+  {\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -523,7 +529,7 @@ Pkcs7GetCertificatesList (
   //\r
   // Decodes PKCS#7 SignedData\r
   //\r
   //\r
   // Decodes PKCS#7 SignedData\r
   //\r

-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &NewP7Data, (int) NewP7Length);\r
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&NewP7Data, (int)NewP7Length);\r

   if ((Pkcs7 == NULL) || (!PKCS7_type_is_signed (Pkcs7))) {\r
     goto _Error;\r
   }\r
   if ((Pkcs7 == NULL) || (!PKCS7_type_is_signed (Pkcs7))) {\r
     goto _Error;\r
   }\r


@@ -537,15 +543,18 @@ Pkcs7GetCertificatesList (
   if ((Signers == NULL) || (sk_X509_num (Signers) != 1)) {\r
     goto _Error;\r
   }\r
   if ((Signers == NULL) || (sk_X509_num (Signers) != 1)) {\r
     goto _Error;\r
   }\r

+\r

   Signer = sk_X509_value (Signers, 0);\r
 \r
   CertCtx = X509_STORE_CTX_new ();\r
   if (CertCtx == NULL) {\r
     goto _Error;\r
   }\r
   Signer = sk_X509_value (Signers, 0);\r
 \r
   CertCtx = X509_STORE_CTX_new ();\r
   if (CertCtx == NULL) {\r
     goto _Error;\r
   }\r

+\r

   if (!X509_STORE_CTX_init (CertCtx, NULL, Signer, Pkcs7->d.sign->cert)) {\r
     goto _Error;\r
   }\r
   if (!X509_STORE_CTX_init (CertCtx, NULL, Signer, Pkcs7->d.sign->cert)) {\r
     goto _Error;\r
   }\r

+\r

   //\r
   // Initialize Chained & Untrusted stack\r
   //\r
   //\r
   // Initialize Chained & Untrusted stack\r
   //\r


@@ -553,10 +562,12 @@ Pkcs7GetCertificatesList (
   CtxCert  = X509_STORE_CTX_get0_cert (CertCtx);\r
   if (CtxChain == NULL) {\r
     if (((CtxChain = sk_X509_new_null ()) == NULL) ||\r
   CtxCert  = X509_STORE_CTX_get0_cert (CertCtx);\r
   if (CtxChain == NULL) {\r
     if (((CtxChain = sk_X509_new_null ()) == NULL) ||\r

-        (!sk_X509_push (CtxChain, CtxCert))) {\r
+        (!sk_X509_push (CtxChain, CtxCert)))\r
+    {\r

       goto _Error;\r
     }\r
   }\r
       goto _Error;\r
     }\r
   }\r

+\r

   CtxUntrusted = X509_STORE_CTX_get0_untrusted (CertCtx);\r
   if (CtxUntrusted != NULL) {\r
     (VOID)sk_X509_delete_ptr (CtxUntrusted, Signer);\r
   CtxUntrusted = X509_STORE_CTX_get0_untrusted (CertCtx);\r
   if (CtxUntrusted != NULL) {\r
     (VOID)sk_X509_delete_ptr (CtxUntrusted, Signer);\r


@@ -566,7 +577,7 @@ Pkcs7GetCertificatesList (
   // Build certificates stack chained from Signer's certificate.\r
   //\r
   Cert = Signer;\r
   // Build certificates stack chained from Signer's certificate.\r
   //\r
   Cert = Signer;\r

-  for (; ;) {\r
+  for ( ; ;) {\r

     //\r
     // Self-Issue checking\r
     //\r
     //\r
     // Self-Issue checking\r
     //\r


@@ -581,13 +592,14 @@ Pkcs7GetCertificatesList (
     // Found the issuer of the current certificate\r
     //\r
     if (CtxUntrusted != NULL) {\r
     // Found the issuer of the current certificate\r
     //\r
     if (CtxUntrusted != NULL) {\r

-      Issuer = NULL;\r
+      Issuer     = NULL;\r

       IssuerName = X509_get_issuer_name (Cert);\r
       Issuer     = X509_find_by_subject (CtxUntrusted, IssuerName);\r
       if (Issuer != NULL) {\r
         if (!sk_X509_push (CtxChain, Issuer)) {\r
           goto _Error;\r
         }\r
       IssuerName = X509_get_issuer_name (Cert);\r
       Issuer     = X509_find_by_subject (CtxUntrusted, IssuerName);\r
       if (Issuer != NULL) {\r
         if (!sk_X509_push (CtxChain, Issuer)) {\r
           goto _Error;\r
         }\r

+\r

         (VOID)sk_X509_delete_ptr (CtxUntrusted, Issuer);\r
 \r
         Cert = Issuer;\r
         (VOID)sk_X509_delete_ptr (CtxUntrusted, Issuer);\r
 \r
         Cert = Issuer;\r


@@ -629,13 +641,14 @@ Pkcs7GetCertificatesList (
         Status = FALSE;\r
         goto _Error;\r
       }\r
         Status = FALSE;\r
         goto _Error;\r
       }\r

+\r

       if (OldBuf != NULL) {\r
         CopyMem (CertBuf, OldBuf, OldSize);\r
         free (OldBuf);\r
         OldBuf = NULL;\r
       }\r
 \r
       if (OldBuf != NULL) {\r
         CopyMem (CertBuf, OldBuf, OldSize);\r
         free (OldBuf);\r
         OldBuf = NULL;\r
       }\r
 \r

-      WriteUnaligned32 ((UINT32 *) (CertBuf + OldSize), (UINT32) CertSize);\r
+      WriteUnaligned32 ((UINT32 *)(CertBuf + OldSize), (UINT32)CertSize);\r

       CopyMem (CertBuf + OldSize + sizeof (UINT32), SingleCert, CertSize);\r
 \r
       free (SingleCert);\r
       CopyMem (CertBuf + OldSize + sizeof (UINT32), SingleCert, CertSize);\r
 \r
       free (SingleCert);\r


@@ -672,13 +685,14 @@ Pkcs7GetCertificatesList (
         Status = FALSE;\r
         goto _Error;\r
       }\r
         Status = FALSE;\r
         goto _Error;\r
       }\r

+\r

       if (OldBuf != NULL) {\r
         CopyMem (CertBuf, OldBuf, OldSize);\r
         free (OldBuf);\r
         OldBuf = NULL;\r
       }\r
 \r
       if (OldBuf != NULL) {\r
         CopyMem (CertBuf, OldBuf, OldSize);\r
         free (OldBuf);\r
         OldBuf = NULL;\r
       }\r
 \r

-      WriteUnaligned32 ((UINT32 *) (CertBuf + OldSize), (UINT32) CertSize);\r
+      WriteUnaligned32 ((UINT32 *)(CertBuf + OldSize), (UINT32)CertSize);\r

       CopyMem (CertBuf + OldSize + sizeof (UINT32), SingleCert, CertSize);\r
 \r
       free (SingleCert);\r
       CopyMem (CertBuf + OldSize + sizeof (UINT32), SingleCert, CertSize);\r
 \r
       free (SingleCert);\r


@@ -709,6 +723,7 @@ _Error:
   if (Pkcs7 != NULL) {\r
     PKCS7_free (Pkcs7);\r
   }\r
   if (Pkcs7 != NULL) {\r
     PKCS7_free (Pkcs7);\r
   }\r

+\r

   sk_X509_free (Signers);\r
 \r
   if (CertCtx != NULL) {\r
   sk_X509_free (Signers);\r
 \r
   if (CertCtx != NULL) {\r


@@ -768,21 +783,22 @@ Pkcs7Verify (
   IN  UINTN        DataLength\r
   )\r
 {\r
   IN  UINTN        DataLength\r
   )\r
 {\r

-  PKCS7       *Pkcs7;\r
-  BIO         *DataBio;\r
-  BOOLEAN     Status;\r
-  X509        *Cert;\r
-  X509_STORE  *CertStore;\r
-  UINT8       *SignedData;\r
-  CONST UINT8 *Temp;\r
-  UINTN       SignedDataSize;\r
-  BOOLEAN     Wrapped;\r
+  PKCS7        *Pkcs7;\r
+  BIO          *DataBio;\r
+  BOOLEAN      Status;\r
+  X509         *Cert;\r
+  X509_STORE   *CertStore;\r
+  UINT8        *SignedData;\r
+  CONST UINT8  *Temp;\r
+  UINTN        SignedDataSize;\r
+  BOOLEAN      Wrapped;\r

 \r
   //\r
   // Check input parameters.\r
   //\r
 \r
   //\r
   // Check input parameters.\r
   //\r

-  if (P7Data == NULL || TrustedCert == NULL || InData == NULL ||\r
-    P7Length > INT_MAX || CertLength > INT_MAX || DataLength > INT_MAX) {\r
+  if ((P7Data == NULL) || (TrustedCert == NULL) || (InData == NULL) ||\r
+      (P7Length > INT_MAX) || (CertLength > INT_MAX) || (DataLength > INT_MAX))\r
+  {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -797,18 +813,23 @@ Pkcs7Verify (
   if (EVP_add_digest (EVP_md5 ()) == 0) {\r
     return FALSE;\r
   }\r
   if (EVP_add_digest (EVP_md5 ()) == 0) {\r
     return FALSE;\r
   }\r

+\r

   if (EVP_add_digest (EVP_sha1 ()) == 0) {\r
     return FALSE;\r
   }\r
   if (EVP_add_digest (EVP_sha1 ()) == 0) {\r
     return FALSE;\r
   }\r

+\r

   if (EVP_add_digest (EVP_sha256 ()) == 0) {\r
     return FALSE;\r
   }\r
   if (EVP_add_digest (EVP_sha256 ()) == 0) {\r
     return FALSE;\r
   }\r

+\r

   if (EVP_add_digest (EVP_sha384 ()) == 0) {\r
     return FALSE;\r
   }\r
   if (EVP_add_digest (EVP_sha384 ()) == 0) {\r
     return FALSE;\r
   }\r

+\r

   if (EVP_add_digest (EVP_sha512 ()) == 0) {\r
     return FALSE;\r
   }\r
   if (EVP_add_digest (EVP_sha512 ()) == 0) {\r
     return FALSE;\r
   }\r

+\r

   if (EVP_add_digest_alias (SN_sha1WithRSAEncryption, SN_sha1WithRSA) == 0) {\r
     return FALSE;\r
   }\r
   if (EVP_add_digest_alias (SN_sha1WithRSAEncryption, SN_sha1WithRSA) == 0) {\r
     return FALSE;\r
   }\r


@@ -827,8 +848,8 @@ Pkcs7Verify (
     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r

-  Temp = SignedData;\r
-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &Temp, (int) SignedDataSize);\r
+  Temp  = SignedData;\r
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&Temp, (int)SignedDataSize);\r

   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r
   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r


@@ -844,7 +865,7 @@ Pkcs7Verify (
   // Read DER-encoded root certificate and Construct X509 Certificate\r
   //\r
   Temp = TrustedCert;\r
   // Read DER-encoded root certificate and Construct X509 Certificate\r
   //\r
   Temp = TrustedCert;\r

-  Cert = d2i_X509 (NULL, &Temp, (long) CertLength);\r
+  Cert = d2i_X509 (NULL, &Temp, (long)CertLength);\r

   if (Cert == NULL) {\r
     goto _Exit;\r
   }\r
   if (Cert == NULL) {\r
     goto _Exit;\r
   }\r


@@ -856,6 +877,7 @@ Pkcs7Verify (
   if (CertStore == NULL) {\r
     goto _Exit;\r
   }\r
   if (CertStore == NULL) {\r
     goto _Exit;\r
   }\r

+\r

   if (!(X509_STORE_add_cert (CertStore, Cert))) {\r
     goto _Exit;\r
   }\r
   if (!(X509_STORE_add_cert (CertStore, Cert))) {\r
     goto _Exit;\r
   }\r


@@ -864,7 +886,7 @@ Pkcs7Verify (
   // For generic PKCS#7 handling, InData may be NULL if the content is present\r
   // in PKCS#7 structure. So ignore NULL checking here.\r
   //\r
   // For generic PKCS#7 handling, InData may be NULL if the content is present\r
   // in PKCS#7 structure. So ignore NULL checking here.\r
   //\r

-  DataBio = BIO_new_mem_buf (InData, (int) DataLength);\r
+  DataBio = BIO_new_mem_buf (InData, (int)DataLength);\r

   if (DataBio == NULL) {\r
     goto _Exit;\r
   }\r
   if (DataBio == NULL) {\r
     goto _Exit;\r
   }\r


@@ -873,8 +895,10 @@ Pkcs7Verify (
   // Allow partial certificate chains, terminated by a non-self-signed but\r
   // still trusted intermediate certificate. Also disable time checks.\r
   //\r
   // Allow partial certificate chains, terminated by a non-self-signed but\r
   // still trusted intermediate certificate. Also disable time checks.\r
   //\r

-  X509_STORE_set_flags (CertStore,\r
-                        X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME);\r
+  X509_STORE_set_flags (\r
+    CertStore,\r
+    X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME\r
+    );\r

 \r
   //\r
   // OpenSSL PKCS7 Verification by default checks for SMIME (email signing) and\r
 \r
   //\r
   // OpenSSL PKCS7 Verification by default checks for SMIME (email signing) and\r


@@ -886,7 +910,7 @@ Pkcs7Verify (
   //\r
   // Verifies the PKCS#7 signedData structure\r
   //\r
   //\r
   // Verifies the PKCS#7 signedData structure\r
   //\r

-  Status = (BOOLEAN) PKCS7_verify (Pkcs7, NULL, CertStore, DataBio, NULL, PKCS7_BINARY);\r
+  Status = (BOOLEAN)PKCS7_verify (Pkcs7, NULL, CertStore, DataBio, NULL, PKCS7_BINARY);\r

 \r
 _Exit:\r
   //\r
 \r
 _Exit:\r
   //\r


@@ -903,4 +927,3 @@ _Exit:
 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
index 40cc39afe7dd529d5bfd12855b053ba89905c7a4..833b29ae97551b672abb7b3482e0a48110ff7ba3 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
@@ -64,19 +64,20 @@
 **/\r
 EFI_STATUS\r
 GetSignerCertificate (\r
 **/\r
 EFI_STATUS\r
 GetSignerCertificate (\r

-  IN CONST PKCS7 *CertChain,\r
-  OUT X509       **SignerCert\r
+  IN CONST PKCS7  *CertChain,\r
+  OUT X509        **SignerCert\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS      Status;\r
-  STACK_OF(X509)  *Signers;\r
-  INT32           NumberSigners;\r
+  EFI_STATUS  Status;\r

 \r
 \r

-  Status         = EFI_SUCCESS;\r
-  Signers        = NULL;\r
-  NumberSigners  = 0;\r
+  STACK_OF (X509)  *Signers;\r
+  INT32  NumberSigners;\r

 \r
 \r

-  if (CertChain == NULL || SignerCert == NULL) {\r
+  Status        = EFI_SUCCESS;\r
+  Signers       = NULL;\r
+  NumberSigners = 0;\r
+\r
+  if ((CertChain == NULL) || (SignerCert == NULL)) {\r

     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r


@@ -84,7 +85,7 @@ GetSignerCertificate (
   //\r
   // Get the signers from the chain.\r
   //\r
   //\r
   // Get the signers from the chain.\r
   //\r

-  Signers = PKCS7_get0_signers ((PKCS7*) CertChain, NULL, PKCS7_BINARY);\r
+  Signers = PKCS7_get0_signers ((PKCS7 *)CertChain, NULL, PKCS7_BINARY);\r

   if (Signers == NULL) {\r
     //\r
     // Fail to get signers form PKCS7\r
   if (Signers == NULL) {\r
     //\r
     // Fail to get signers form PKCS7\r


@@ -118,7 +119,6 @@ Exit:
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-\r

 /**\r
   Determines if the specified EKU represented in ASN1 form is present\r
   in a given certificate.\r
 /**\r
   Determines if the specified EKU represented in ASN1 form is present\r
   in a given certificate.\r


@@ -134,8 +134,8 @@ Exit:
 **/\r
 EFI_STATUS\r
 IsEkuInCertificate (\r
 **/\r
 EFI_STATUS\r
 IsEkuInCertificate (\r

-  IN CONST X509  *Cert,\r
-  IN ASN1_OBJECT *Asn1ToFind\r
+  IN CONST X509   *Cert,\r
+  IN ASN1_OBJECT  *Asn1ToFind\r

   )\r
 {\r
   EFI_STATUS          Status;\r
   )\r
 {\r
   EFI_STATUS          Status;\r


@@ -147,15 +147,15 @@ IsEkuInCertificate (
   ASN1_OBJECT         *Asn1InCert;\r
   INTN                Index;\r
 \r
   ASN1_OBJECT         *Asn1InCert;\r
   INTN                Index;\r
 \r

-  Status            = EFI_NOT_FOUND;\r
-  ClonedCert        = NULL;\r
-  Extension         = NULL;\r
-  Eku               = NULL;\r
-  ExtensionIndex    = -1;\r
-  NumExtensions     = 0;\r
-  Asn1InCert        = NULL;\r
+  Status         = EFI_NOT_FOUND;\r
+  ClonedCert     = NULL;\r
+  Extension      = NULL;\r
+  Eku            = NULL;\r
+  ExtensionIndex = -1;\r
+  NumExtensions  = 0;\r
+  Asn1InCert     = NULL;\r

 \r
 \r

-  if (Cert == NULL || Asn1ToFind == NULL) {\r
+  if ((Cert == NULL) || (Asn1ToFind == NULL)) {\r

     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r


@@ -164,7 +164,7 @@ IsEkuInCertificate (
   // Clone the certificate.  This is required because the Extension API's\r
   // only work once per instance of an X509 object.\r
   //\r
   // Clone the certificate.  This is required because the Extension API's\r
   // only work once per instance of an X509 object.\r
   //\r

-  ClonedCert = X509_dup ((X509*)Cert);\r
+  ClonedCert = X509_dup ((X509 *)Cert);\r

   if (ClonedCert == NULL) {\r
     //\r
     // Fail to duplicate cert.\r
   if (ClonedCert == NULL) {\r
     //\r
     // Fail to duplicate cert.\r


@@ -193,7 +193,7 @@ IsEkuInCertificate (
     goto Exit;\r
   }\r
 \r
     goto Exit;\r
   }\r
 \r

-  Eku = (EXTENDED_KEY_USAGE*)X509V3_EXT_d2i (Extension);\r
+  Eku = (EXTENDED_KEY_USAGE *)X509V3_EXT_d2i (Extension);\r

   if (Eku == NULL) {\r
     //\r
     // Fail to get Eku from extension.\r
   if (Eku == NULL) {\r
     //\r
     // Fail to get Eku from extension.\r


@@ -215,8 +215,9 @@ IsEkuInCertificate (
       goto Exit;\r
     }\r
 \r
       goto Exit;\r
     }\r
 \r

-    if (Asn1InCert->length == Asn1ToFind->length &&\r
-        CompareMem (Asn1InCert->data, Asn1ToFind->data, Asn1InCert->length) == 0) {\r
+    if ((Asn1InCert->length == Asn1ToFind->length) &&\r
+        (CompareMem (Asn1InCert->data, Asn1ToFind->data, Asn1InCert->length) == 0))\r
+    {\r

       //\r
       // Found Eku in certificate.\r
       //\r
       //\r
       // Found Eku in certificate.\r
       //\r


@@ -241,7 +242,6 @@ Exit:
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-\r

 /**\r
   Determines if the specified EKUs are present in a signing certificate.\r
 \r
 /**\r
   Determines if the specified EKUs are present in a signing certificate.\r
 \r


@@ -256,23 +256,23 @@ Exit:
   @retval EFI_NOT_FOUND             One or more EKU's were not found in the signature.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_NOT_FOUND             One or more EKU's were not found in the signature.\r
 **/\r
 EFI_STATUS\r

-CheckEKUs(\r
-  IN CONST X509     *SignerCert,\r
-  IN CONST CHAR8    *RequiredEKUs[],\r
-  IN CONST UINT32   RequiredEKUsSize,\r
-  IN BOOLEAN        RequireAllPresent\r
+CheckEKUs (\r
+  IN CONST X509    *SignerCert,\r
+  IN CONST CHAR8   *RequiredEKUs[],\r
+  IN CONST UINT32  RequiredEKUsSize,\r
+  IN BOOLEAN       RequireAllPresent\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS    Status;\r
-  ASN1_OBJECT   *Asn1ToFind;\r
-  UINT32        NumEkusFound;\r
-  UINT32        Index;\r
+  EFI_STATUS   Status;\r
+  ASN1_OBJECT  *Asn1ToFind;\r
+  UINT32       NumEkusFound;\r
+  UINT32       Index;\r

 \r
   Status       = EFI_SUCCESS;\r
   Asn1ToFind   = NULL;\r
   NumEkusFound = 0;\r
 \r
 \r
   Status       = EFI_SUCCESS;\r
   Asn1ToFind   = NULL;\r
   NumEkusFound = 0;\r
 \r

-  if (SignerCert == NULL || RequiredEKUs == NULL || RequiredEKUsSize == 0) {\r
+  if ((SignerCert == NULL) || (RequiredEKUs == NULL) || (RequiredEKUsSize == 0)) {\r

     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r


@@ -282,7 +282,7 @@ CheckEKUs(
     // Finding required EKU in cert.\r
     //\r
     if (Asn1ToFind != NULL) {\r
     // Finding required EKU in cert.\r
     //\r
     if (Asn1ToFind != NULL) {\r

-      ASN1_OBJECT_free(Asn1ToFind);\r
+      ASN1_OBJECT_free (Asn1ToFind);\r

       Asn1ToFind = NULL;\r
     }\r
 \r
       Asn1ToFind = NULL;\r
     }\r
 \r


@@ -314,11 +314,12 @@ CheckEKUs(
 Exit:\r
 \r
   if (Asn1ToFind != NULL) {\r
 Exit:\r
 \r
   if (Asn1ToFind != NULL) {\r

-    ASN1_OBJECT_free(Asn1ToFind);\r
+    ASN1_OBJECT_free (Asn1ToFind);\r

   }\r
 \r
   if (RequireAllPresent &&\r
   }\r
 \r
   if (RequireAllPresent &&\r

-      NumEkusFound == RequiredEKUsSize) {\r
+      (NumEkusFound == RequiredEKUsSize))\r
+  {\r

     //\r
     // Found all required EKUs in certificate.\r
     //\r
     //\r
     // Found all required EKUs in certificate.\r
     //\r


@@ -361,43 +362,45 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 VerifyEKUsInPkcs7Signature (\r
 EFI_STATUS\r
 EFIAPI\r
 VerifyEKUsInPkcs7Signature (\r

-  IN CONST UINT8    *Pkcs7Signature,\r
-  IN CONST UINT32   SignatureSize,\r
-  IN CONST CHAR8    *RequiredEKUs[],\r
-  IN CONST UINT32   RequiredEKUsSize,\r
-  IN BOOLEAN        RequireAllPresent\r
+  IN CONST UINT8   *Pkcs7Signature,\r
+  IN CONST UINT32  SignatureSize,\r
+  IN CONST CHAR8   *RequiredEKUs[],\r
+  IN CONST UINT32  RequiredEKUsSize,\r
+  IN BOOLEAN       RequireAllPresent\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS        Status;\r
-  PKCS7             *Pkcs7;\r
-  STACK_OF(X509)    *CertChain;\r
-  INT32             SignatureType;\r
-  INT32             NumberCertsInSignature;\r
-  X509              *SignerCert;\r
-  UINT8             *SignedData;\r
-  UINT8             *Temp;\r
-  UINTN             SignedDataSize;\r
-  BOOLEAN           IsWrapped;\r
-  BOOLEAN           Ok;\r
-\r
-  Status                    = EFI_SUCCESS;\r
-  Pkcs7                     = NULL;\r
-  CertChain                 = NULL;\r
-  SignatureType             = 0;\r
-  NumberCertsInSignature    = 0;\r
-  SignerCert                = NULL;\r
-  SignedData                = NULL;\r
-  SignedDataSize            = 0;\r
-  IsWrapped                 = FALSE;\r
-  Ok                        = FALSE;\r
+  EFI_STATUS  Status;\r
+  PKCS7       *Pkcs7;\r
+\r
+  STACK_OF (X509)    *CertChain;\r
+  INT32    SignatureType;\r
+  INT32    NumberCertsInSignature;\r
+  X509     *SignerCert;\r
+  UINT8    *SignedData;\r
+  UINT8    *Temp;\r
+  UINTN    SignedDataSize;\r
+  BOOLEAN  IsWrapped;\r
+  BOOLEAN  Ok;\r
+\r
+  Status                 = EFI_SUCCESS;\r
+  Pkcs7                  = NULL;\r
+  CertChain              = NULL;\r
+  SignatureType          = 0;\r
+  NumberCertsInSignature = 0;\r
+  SignerCert             = NULL;\r
+  SignedData             = NULL;\r
+  SignedDataSize         = 0;\r
+  IsWrapped              = FALSE;\r
+  Ok                     = FALSE;\r

 \r
   //\r
 \r
   //\r

-  //Validate the input parameters.\r
+  // Validate the input parameters.\r

   //\r
   //\r

-  if (Pkcs7Signature   == NULL ||\r
-      SignatureSize    == 0    ||\r
-      RequiredEKUs     == NULL ||\r
-      RequiredEKUsSize == 0) {\r
+  if ((Pkcs7Signature   == NULL) ||\r
+      (SignatureSize    == 0) ||\r
+      (RequiredEKUs     == NULL) ||\r
+      (RequiredEKUsSize == 0))\r
+  {\r

     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r


@@ -409,11 +412,13 @@ VerifyEKUsInPkcs7Signature (
   //\r
   // Wrap the PKCS7 data if needed.\r
   //\r
   //\r
   // Wrap the PKCS7 data if needed.\r
   //\r

-  Ok = WrapPkcs7Data (Pkcs7Signature,\r
-                      SignatureSize,\r
-                      &IsWrapped,\r
-                      &SignedData,\r
-                      &SignedDataSize);\r
+  Ok = WrapPkcs7Data (\r
+         Pkcs7Signature,\r
+         SignatureSize,\r
+         &IsWrapped,\r
+         &SignedData,\r
+         &SignedDataSize\r
+         );\r

   if (!Ok) {\r
     //\r
     // Fail to Wrap the PKCS7 data.\r
   if (!Ok) {\r
     //\r
     // Fail to Wrap the PKCS7 data.\r


@@ -441,18 +446,20 @@ VerifyEKUsInPkcs7Signature (
   //\r
   SignatureType = OBJ_obj2nid (Pkcs7->type);\r
   switch (SignatureType) {\r
   //\r
   SignatureType = OBJ_obj2nid (Pkcs7->type);\r
   switch (SignatureType) {\r

-  case NID_pkcs7_signed:\r
-    if (Pkcs7->d.sign != NULL) {\r
-      CertChain = Pkcs7->d.sign->cert;\r
-    }\r
-    break;\r
-  case NID_pkcs7_signedAndEnveloped:\r
-    if (Pkcs7->d.signed_and_enveloped != NULL) {\r
-      CertChain = Pkcs7->d.signed_and_enveloped->cert;\r
-    }\r
-    break;\r
-  default:\r
-    break;\r
+    case NID_pkcs7_signed:\r
+      if (Pkcs7->d.sign != NULL) {\r
+        CertChain = Pkcs7->d.sign->cert;\r
+      }\r
+\r
+      break;\r
+    case NID_pkcs7_signedAndEnveloped:\r
+      if (Pkcs7->d.signed_and_enveloped != NULL) {\r
+        CertChain = Pkcs7->d.signed_and_enveloped->cert;\r
+      }\r
+\r
+      break;\r
+    default:\r
+      break;\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -483,7 +490,7 @@ VerifyEKUsInPkcs7Signature (
   // Get the leaf signer.\r
   //\r
   Status = GetSignerCertificate (Pkcs7, &SignerCert);\r
   // Get the leaf signer.\r
   //\r
   Status = GetSignerCertificate (Pkcs7, &SignerCert);\r

-  if (Status != EFI_SUCCESS || SignerCert == NULL) {\r
+  if ((Status != EFI_SUCCESS) || (SignerCert == NULL)) {\r

     //\r
     // Fail to get the end-entity leaf signer certificate.\r
     //\r
     //\r
     // Fail to get the end-entity leaf signer certificate.\r
     //\r


@@ -514,4 +521,3 @@ Exit:
 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEkuRuntime.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEkuRuntime.c
index aea5d30a6fda5392eeca8e4b018a7e1e2d18de84..9ac122ac072e77636fe7516b94cef5d75734ea10 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEkuRuntime.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEkuRuntime.c
@@ -44,14 +44,13 @@
 EFI_STATUS\r
 EFIAPI\r
 VerifyEKUsInPkcs7Signature (\r
 EFI_STATUS\r
 EFIAPI\r
 VerifyEKUsInPkcs7Signature (\r

-  IN CONST UINT8    *Pkcs7Signature,\r
-  IN CONST UINT32   SignatureSize,\r
-  IN CONST CHAR8    *RequiredEKUs[],\r
-  IN CONST UINT32   RequiredEKUsSize,\r
-  IN BOOLEAN        RequireAllPresent\r
+  IN CONST UINT8   *Pkcs7Signature,\r
+  IN CONST UINT32  SignatureSize,\r
+  IN CONST CHAR8   *RequiredEKUs[],\r
+  IN CONST UINT32  RequiredEKUsSize,\r
+  IN BOOLEAN       RequireAllPresent\r

   )\r
 {\r
   ASSERT (FALSE);\r
   return RETURN_UNSUPPORTED;\r
 }\r
   )\r
 {\r
   ASSERT (FALSE);\r
   return RETURN_UNSUPPORTED;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyNull.c
index 0ddf16a61b31587795051ef6a0a6620179a0baf2..b9b7960126dea6cf49a36c889c859ddbb85df0fa 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyNull.c
@@ -57,7 +57,7 @@ Pkcs7GetSigners (
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r

-  IN  UINT8        *Certs\r
+  IN  UINT8  *Certs\r

   )\r
 {\r
   ASSERT (FALSE);\r
   )\r
 {\r
   ASSERT (FALSE);\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyRuntime.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyRuntime.c
index 1b0cda18219cef8fe04ef4783d77f87a42985ae8..3c17b203aa6d038a0e319d39e05d4795d578204b 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyRuntime.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyRuntime.c
@@ -36,4 +36,3 @@ Pkcs7GetAttachedContent (
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
index d24e1fdf68019d0ab2ab57474164d08d4844903d..5bd740bf7594da48941af3d178963c3715dd3167 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
@@ -34,7 +34,7 @@ RsaNew (
   //\r
   // Allocates & Initializes RSA Context by OpenSSL RSA_new()\r
   //\r
   //\r
   // Allocates & Initializes RSA Context by OpenSSL RSA_new()\r
   //\r

-  return (VOID *) RSA_new ();\r
+  return (VOID *)RSA_new ();\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -52,7 +52,7 @@ RsaFree (
   //\r
   // Free OpenSSL RSA Context\r
   //\r
   //\r
   // Free OpenSSL RSA Context\r
   //\r

-  RSA_free ((RSA *) RsaContext);\r
+  RSA_free ((RSA *)RsaContext);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -99,7 +99,7 @@ RsaSetKey (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (RsaContext == NULL || BnSize > INT_MAX) {\r
+  if ((RsaContext == NULL) || (BnSize > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -115,7 +115,7 @@ RsaSetKey (
   //\r
   // Retrieve the components from RSA object.\r
   //\r
   //\r
   // Retrieve the components from RSA object.\r
   //\r

-  RsaKey = (RSA *) RsaContext;\r
+  RsaKey = (RSA *)RsaContext;\r

   RSA_get0_key (RsaKey, (const BIGNUM **)&BnN, (const BIGNUM **)&BnE, (const BIGNUM **)&BnD);\r
   RSA_get0_factors (RsaKey, (const BIGNUM **)&BnP, (const BIGNUM **)&BnQ);\r
   RSA_get0_crt_params (RsaKey, (const BIGNUM **)&BnDp, (const BIGNUM **)&BnDq, (const BIGNUM **)&BnQInv);\r
   RSA_get0_key (RsaKey, (const BIGNUM **)&BnN, (const BIGNUM **)&BnE, (const BIGNUM **)&BnD);\r
   RSA_get0_factors (RsaKey, (const BIGNUM **)&BnP, (const BIGNUM **)&BnQ);\r
   RSA_get0_crt_params (RsaKey, (const BIGNUM **)&BnDp, (const BIGNUM **)&BnDq, (const BIGNUM **)&BnQInv);\r


@@ -126,118 +126,127 @@ RsaSetKey (
   //       (N, e) are needed.\r
   //\r
   switch (KeyTag) {\r
   //       (N, e) are needed.\r
   //\r
   switch (KeyTag) {\r

-\r
-  //\r
-  // RSA Public Modulus (N), Public Exponent (e) and Private Exponent (d)\r
-  //\r
-  case RsaKeyN:\r
-  case RsaKeyE:\r
-  case RsaKeyD:\r
-    if (BnN == NULL) {\r
-      BnN = BN_new ();\r
-    }\r
-    if (BnE == NULL) {\r
-      BnE = BN_new ();\r
-    }\r
-    if (BnD == NULL) {\r
-      BnD = BN_new ();\r
-    }\r
-\r
-    if ((BnN == NULL) || (BnE == NULL) || (BnD == NULL)) {\r
-      return FALSE;\r
-    }\r
-\r
-    switch (KeyTag) {\r
+    //\r
+    // RSA Public Modulus (N), Public Exponent (e) and Private Exponent (d)\r
+    //\r

     case RsaKeyN:\r
     case RsaKeyN:\r

-      BnN = BN_bin2bn (BigNumber, (UINT32)BnSize, BnN);\r
-      break;\r

     case RsaKeyE:\r
     case RsaKeyE:\r

-      BnE = BN_bin2bn (BigNumber, (UINT32)BnSize, BnE);\r
-      break;\r

     case RsaKeyD:\r
     case RsaKeyD:\r

-      BnD = BN_bin2bn (BigNumber, (UINT32)BnSize, BnD);\r
-      break;\r
-    default:\r
-      return FALSE;\r
-    }\r
-    if (RSA_set0_key (RsaKey, BN_dup(BnN), BN_dup(BnE), BN_dup(BnD)) == 0) {\r
-      return FALSE;\r
-    }\r
+      if (BnN == NULL) {\r
+        BnN = BN_new ();\r
+      }\r
+\r
+      if (BnE == NULL) {\r
+        BnE = BN_new ();\r
+      }\r
+\r
+      if (BnD == NULL) {\r
+        BnD = BN_new ();\r
+      }\r
+\r
+      if ((BnN == NULL) || (BnE == NULL) || (BnD == NULL)) {\r
+        return FALSE;\r
+      }\r
+\r
+      switch (KeyTag) {\r
+        case RsaKeyN:\r
+          BnN = BN_bin2bn (BigNumber, (UINT32)BnSize, BnN);\r
+          break;\r
+        case RsaKeyE:\r
+          BnE = BN_bin2bn (BigNumber, (UINT32)BnSize, BnE);\r
+          break;\r
+        case RsaKeyD:\r
+          BnD = BN_bin2bn (BigNumber, (UINT32)BnSize, BnD);\r
+          break;\r
+        default:\r
+          return FALSE;\r
+      }\r
+\r
+      if (RSA_set0_key (RsaKey, BN_dup (BnN), BN_dup (BnE), BN_dup (BnD)) == 0) {\r
+        return FALSE;\r
+      }\r

 \r
 \r

-    break;\r
-\r
-  //\r
-  // RSA Secret Prime Factor of Modulus (p and q)\r
-  //\r
-  case RsaKeyP:\r
-  case RsaKeyQ:\r
-    if (BnP == NULL) {\r
-      BnP = BN_new ();\r
-    }\r
-    if (BnQ == NULL) {\r
-      BnQ = BN_new ();\r
-    }\r
-    if ((BnP == NULL) || (BnQ == NULL)) {\r
-      return FALSE;\r
-    }\r
+      break;\r

 \r
 \r

-    switch (KeyTag) {\r
+    //\r
+    // RSA Secret Prime Factor of Modulus (p and q)\r
+    //\r

     case RsaKeyP:\r
     case RsaKeyP:\r

-      BnP = BN_bin2bn (BigNumber, (UINT32)BnSize, BnP);\r
-      break;\r

     case RsaKeyQ:\r
     case RsaKeyQ:\r

-      BnQ = BN_bin2bn (BigNumber, (UINT32)BnSize, BnQ);\r
-      break;\r
-    default:\r
-      return FALSE;\r
-    }\r
-    if (RSA_set0_factors (RsaKey, BN_dup(BnP), BN_dup(BnQ)) == 0) {\r
-      return FALSE;\r
-    }\r
+      if (BnP == NULL) {\r
+        BnP = BN_new ();\r
+      }\r
+\r
+      if (BnQ == NULL) {\r
+        BnQ = BN_new ();\r
+      }\r
+\r
+      if ((BnP == NULL) || (BnQ == NULL)) {\r
+        return FALSE;\r
+      }\r
+\r
+      switch (KeyTag) {\r
+        case RsaKeyP:\r
+          BnP = BN_bin2bn (BigNumber, (UINT32)BnSize, BnP);\r
+          break;\r
+        case RsaKeyQ:\r
+          BnQ = BN_bin2bn (BigNumber, (UINT32)BnSize, BnQ);\r
+          break;\r
+        default:\r
+          return FALSE;\r
+      }\r
+\r
+      if (RSA_set0_factors (RsaKey, BN_dup (BnP), BN_dup (BnQ)) == 0) {\r
+        return FALSE;\r
+      }\r

 \r
 \r

-    break;\r
-\r
-  //\r
-  // p's CRT Exponent (== d mod (p - 1)),  q's CRT Exponent (== d mod (q - 1)),\r
-  // and CRT Coefficient (== 1/q mod p)\r
-  //\r
-  case RsaKeyDp:\r
-  case RsaKeyDq:\r
-  case RsaKeyQInv:\r
-    if (BnDp == NULL) {\r
-      BnDp = BN_new ();\r
-    }\r
-    if (BnDq == NULL) {\r
-      BnDq = BN_new ();\r
-    }\r
-    if (BnQInv == NULL) {\r
-      BnQInv = BN_new ();\r
-    }\r
-    if ((BnDp == NULL) || (BnDq == NULL) || (BnQInv == NULL)) {\r
-      return FALSE;\r
-    }\r
+      break;\r

 \r
 \r

-    switch (KeyTag) {\r
+    //\r
+    // p's CRT Exponent (== d mod (p - 1)),  q's CRT Exponent (== d mod (q - 1)),\r
+    // and CRT Coefficient (== 1/q mod p)\r
+    //\r

     case RsaKeyDp:\r
     case RsaKeyDp:\r

-      BnDp = BN_bin2bn (BigNumber, (UINT32)BnSize, BnDp);\r
-      break;\r

     case RsaKeyDq:\r
     case RsaKeyDq:\r

-      BnDq = BN_bin2bn (BigNumber, (UINT32)BnSize, BnDq);\r
-      break;\r

     case RsaKeyQInv:\r
     case RsaKeyQInv:\r

-      BnQInv = BN_bin2bn (BigNumber, (UINT32)BnSize, BnQInv);\r
+      if (BnDp == NULL) {\r
+        BnDp = BN_new ();\r
+      }\r
+\r
+      if (BnDq == NULL) {\r
+        BnDq = BN_new ();\r
+      }\r
+\r
+      if (BnQInv == NULL) {\r
+        BnQInv = BN_new ();\r
+      }\r
+\r
+      if ((BnDp == NULL) || (BnDq == NULL) || (BnQInv == NULL)) {\r
+        return FALSE;\r
+      }\r
+\r
+      switch (KeyTag) {\r
+        case RsaKeyDp:\r
+          BnDp = BN_bin2bn (BigNumber, (UINT32)BnSize, BnDp);\r
+          break;\r
+        case RsaKeyDq:\r
+          BnDq = BN_bin2bn (BigNumber, (UINT32)BnSize, BnDq);\r
+          break;\r
+        case RsaKeyQInv:\r
+          BnQInv = BN_bin2bn (BigNumber, (UINT32)BnSize, BnQInv);\r
+          break;\r
+        default:\r
+          return FALSE;\r
+      }\r
+\r
+      if (RSA_set0_crt_params (RsaKey, BN_dup (BnDp), BN_dup (BnDq), BN_dup (BnQInv)) == 0) {\r
+        return FALSE;\r
+      }\r
+\r

       break;\r
       break;\r

+\r

     default:\r
       return FALSE;\r
     default:\r
       return FALSE;\r

-    }\r
-    if (RSA_set0_crt_params (RsaKey, BN_dup(BnDp), BN_dup(BnDq), BN_dup(BnQInv)) == 0) {\r
-      return FALSE;\r
-    }\r
-\r
-    break;\r
-\r
-  default:\r
-    return FALSE;\r

   }\r
 \r
   return TRUE;\r
   }\r
 \r
   return TRUE;\r


@@ -272,17 +281,17 @@ RsaPkcs1Verify (
   IN  UINTN        SigSize\r
   )\r
 {\r
   IN  UINTN        SigSize\r
   )\r
 {\r

-  INT32    DigestType;\r
-  UINT8    *SigBuf;\r
+  INT32  DigestType;\r
+  UINT8  *SigBuf;\r

 \r
   //\r
   // Check input parameters.\r
   //\r
 \r
   //\r
   // Check input parameters.\r
   //\r

-  if (RsaContext == NULL || MessageHash == NULL || Signature == NULL) {\r
+  if ((RsaContext == NULL) || (MessageHash == NULL) || (Signature == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (SigSize > INT_MAX || SigSize == 0) {\r
+  if ((SigSize > INT_MAX) || (SigSize == 0)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -291,37 +300,37 @@ RsaPkcs1Verify (
   //   Only MD5, SHA-1, SHA-256, SHA-384 or SHA-512 algorithm is supported.\r
   //\r
   switch (HashSize) {\r
   //   Only MD5, SHA-1, SHA-256, SHA-384 or SHA-512 algorithm is supported.\r
   //\r
   switch (HashSize) {\r

-  case MD5_DIGEST_SIZE:\r
-    DigestType = NID_md5;\r
-    break;\r
+    case MD5_DIGEST_SIZE:\r
+      DigestType = NID_md5;\r
+      break;\r

 \r
 \r

-  case SHA1_DIGEST_SIZE:\r
-    DigestType = NID_sha1;\r
-    break;\r
+    case SHA1_DIGEST_SIZE:\r
+      DigestType = NID_sha1;\r
+      break;\r

 \r
 \r

-  case SHA256_DIGEST_SIZE:\r
-    DigestType = NID_sha256;\r
-    break;\r
+    case SHA256_DIGEST_SIZE:\r
+      DigestType = NID_sha256;\r
+      break;\r

 \r
 \r

-  case SHA384_DIGEST_SIZE:\r
-    DigestType = NID_sha384;\r
-    break;\r
+    case SHA384_DIGEST_SIZE:\r
+      DigestType = NID_sha384;\r
+      break;\r

 \r
 \r

-  case SHA512_DIGEST_SIZE:\r
-    DigestType = NID_sha512;\r
-    break;\r
+    case SHA512_DIGEST_SIZE:\r
+      DigestType = NID_sha512;\r
+      break;\r

 \r
 \r

-  default:\r
-    return FALSE;\r
+    default:\r
+      return FALSE;\r

   }\r
 \r
   }\r
 \r

-  SigBuf = (UINT8 *) Signature;\r
-  return (BOOLEAN) RSA_verify (\r
-                     DigestType,\r
-                     MessageHash,\r
-                     (UINT32) HashSize,\r
-                     SigBuf,\r
-                     (UINT32) SigSize,\r
-                     (RSA *) RsaContext\r
-                     );\r
+  SigBuf = (UINT8 *)Signature;\r
+  return (BOOLEAN)RSA_verify (\r
+                    DigestType,\r
+                    MessageHash,\r
+                    (UINT32)HashSize,\r
+                    SigBuf,\r
+                    (UINT32)SigSize,\r
+                    (RSA *)RsaContext\r
+                    );\r

 }\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
index 7cd5fecf04cb139bde01c85abb43eae2ef323540..d414ce83f95f11156d8b02136dab4848b542d2ee 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
@@ -54,82 +54,81 @@ RsaGetKey (
   IN OUT  UINTN        *BnSize\r
   )\r
 {\r
   IN OUT  UINTN        *BnSize\r
   )\r
 {\r

-  RSA    *RsaKey;\r
-  BIGNUM *BnKey;\r
-  UINTN  Size;\r
+  RSA     *RsaKey;\r
+  BIGNUM  *BnKey;\r
+  UINTN   Size;\r

 \r
   //\r
   // Check input parameters.\r
   //\r
 \r
   //\r
   // Check input parameters.\r
   //\r

-  if (RsaContext == NULL || BnSize == NULL) {\r
+  if ((RsaContext == NULL) || (BnSize == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  RsaKey  = (RSA *) RsaContext;\r
+  RsaKey  = (RSA *)RsaContext;\r

   Size    = *BnSize;\r
   *BnSize = 0;\r
   BnKey   = NULL;\r
 \r
   switch (KeyTag) {\r
   Size    = *BnSize;\r
   *BnSize = 0;\r
   BnKey   = NULL;\r
 \r
   switch (KeyTag) {\r

-\r
-  //\r
-  // RSA Public Modulus (N)\r
-  //\r
-  case RsaKeyN:\r
-    RSA_get0_key (RsaKey, (const BIGNUM **)&BnKey, NULL, NULL);\r
-    break;\r
-\r
-  //\r
-  // RSA Public Exponent (e)\r
-  //\r
-  case RsaKeyE:\r
-    RSA_get0_key (RsaKey, NULL, (const BIGNUM **)&BnKey, NULL);\r
-    break;\r
-\r
-  //\r
-  // RSA Private Exponent (d)\r
-  //\r
-  case RsaKeyD:\r
-    RSA_get0_key (RsaKey, NULL, NULL, (const BIGNUM **)&BnKey);\r
-    break;\r
-\r
-  //\r
-  // RSA Secret Prime Factor of Modulus (p)\r
-  //\r
-  case RsaKeyP:\r
-    RSA_get0_factors (RsaKey, (const BIGNUM **)&BnKey, NULL);\r
-    break;\r
-\r
-  //\r
-  // RSA Secret Prime Factor of Modules (q)\r
-  //\r
-  case RsaKeyQ:\r
-    RSA_get0_factors (RsaKey, NULL, (const BIGNUM **)&BnKey);\r
-    break;\r
-\r
-  //\r
-  // p's CRT Exponent (== d mod (p - 1))\r
-  //\r
-  case RsaKeyDp:\r
-    RSA_get0_crt_params (RsaKey, (const BIGNUM **)&BnKey, NULL, NULL);\r
-    break;\r
-\r
-  //\r
-  // q's CRT Exponent (== d mod (q - 1))\r
-  //\r
-  case RsaKeyDq:\r
-    RSA_get0_crt_params (RsaKey, NULL, (const BIGNUM **)&BnKey, NULL);\r
-    break;\r
-\r
-  //\r
-  // The CRT Coefficient (== 1/q mod p)\r
-  //\r
-  case RsaKeyQInv:\r
-    RSA_get0_crt_params (RsaKey, NULL, NULL, (const BIGNUM **)&BnKey);\r
-    break;\r
-\r
-  default:\r
-    return FALSE;\r
+    //\r
+    // RSA Public Modulus (N)\r
+    //\r
+    case RsaKeyN:\r
+      RSA_get0_key (RsaKey, (const BIGNUM **)&BnKey, NULL, NULL);\r
+      break;\r
+\r
+    //\r
+    // RSA Public Exponent (e)\r
+    //\r
+    case RsaKeyE:\r
+      RSA_get0_key (RsaKey, NULL, (const BIGNUM **)&BnKey, NULL);\r
+      break;\r
+\r
+    //\r
+    // RSA Private Exponent (d)\r
+    //\r
+    case RsaKeyD:\r
+      RSA_get0_key (RsaKey, NULL, NULL, (const BIGNUM **)&BnKey);\r
+      break;\r
+\r
+    //\r
+    // RSA Secret Prime Factor of Modulus (p)\r
+    //\r
+    case RsaKeyP:\r
+      RSA_get0_factors (RsaKey, (const BIGNUM **)&BnKey, NULL);\r
+      break;\r
+\r
+    //\r
+    // RSA Secret Prime Factor of Modules (q)\r
+    //\r
+    case RsaKeyQ:\r
+      RSA_get0_factors (RsaKey, NULL, (const BIGNUM **)&BnKey);\r
+      break;\r
+\r
+    //\r
+    // p's CRT Exponent (== d mod (p - 1))\r
+    //\r
+    case RsaKeyDp:\r
+      RSA_get0_crt_params (RsaKey, (const BIGNUM **)&BnKey, NULL, NULL);\r
+      break;\r
+\r
+    //\r
+    // q's CRT Exponent (== d mod (q - 1))\r
+    //\r
+    case RsaKeyDq:\r
+      RSA_get0_crt_params (RsaKey, NULL, (const BIGNUM **)&BnKey, NULL);\r
+      break;\r
+\r
+    //\r
+    // The CRT Coefficient (== 1/q mod p)\r
+    //\r
+    case RsaKeyQInv:\r
+      RSA_get0_crt_params (RsaKey, NULL, NULL, (const BIGNUM **)&BnKey);\r
+      break;\r
+\r
+    default:\r
+      return FALSE;\r

   }\r
 \r
   if (BnKey == NULL) {\r
   }\r
 \r
   if (BnKey == NULL) {\r


@@ -148,7 +147,8 @@ RsaGetKey (
     *BnSize = Size;\r
     return TRUE;\r
   }\r
     *BnSize = Size;\r
     return TRUE;\r
   }\r

-  *BnSize = BN_bn2bin (BnKey, BigNumber) ;\r
+\r
+  *BnSize = BN_bn2bin (BnKey, BigNumber);\r

 \r
   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r


@@ -189,7 +189,7 @@ RsaGenerateKey (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (RsaContext == NULL || ModulusLength > INT_MAX || PublicExponentSize > INT_MAX) {\r
+  if ((RsaContext == NULL) || (ModulusLength > INT_MAX) || (PublicExponentSize > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -205,13 +205,13 @@ RsaGenerateKey (
       goto _Exit;\r
     }\r
   } else {\r
       goto _Exit;\r
     }\r
   } else {\r

-    if (BN_bin2bn (PublicExponent, (UINT32) PublicExponentSize, KeyE) == NULL) {\r
+    if (BN_bin2bn (PublicExponent, (UINT32)PublicExponentSize, KeyE) == NULL) {\r

       goto _Exit;\r
     }\r
   }\r
 \r
       goto _Exit;\r
     }\r
   }\r
 \r

-  if (RSA_generate_key_ex ((RSA *) RsaContext, (UINT32) ModulusLength, KeyE, NULL) == 1) {\r
-   RetVal = TRUE;\r
+  if (RSA_generate_key_ex ((RSA *)RsaContext, (UINT32)ModulusLength, KeyE, NULL) == 1) {\r
+    RetVal = TRUE;\r

   }\r
 \r
 _Exit:\r
   }\r
 \r
 _Exit:\r


@@ -253,12 +253,13 @@ RsaCheckKey (
     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if  (RSA_check_key ((RSA *) RsaContext) != 1) {\r
+  if (RSA_check_key ((RSA *)RsaContext) != 1) {\r

     Reason = ERR_GET_REASON (ERR_peek_last_error ());\r
     Reason = ERR_GET_REASON (ERR_peek_last_error ());\r

-    if (Reason == RSA_R_P_NOT_PRIME ||\r
-        Reason == RSA_R_Q_NOT_PRIME ||\r
-        Reason == RSA_R_N_DOES_NOT_EQUAL_P_Q ||\r
-        Reason == RSA_R_D_E_NOT_CONGRUENT_TO_1) {\r
+    if ((Reason == RSA_R_P_NOT_PRIME) ||\r
+        (Reason == RSA_R_Q_NOT_PRIME) ||\r
+        (Reason == RSA_R_N_DOES_NOT_EQUAL_P_Q) ||\r
+        (Reason == RSA_R_D_E_NOT_CONGRUENT_TO_1))\r
+    {\r

       return FALSE;\r
     }\r
   }\r
       return FALSE;\r
     }\r
   }\r


@@ -301,18 +302,18 @@ RsaPkcs1Sign (
   IN OUT  UINTN        *SigSize\r
   )\r
 {\r
   IN OUT  UINTN        *SigSize\r
   )\r
 {\r

-  RSA      *Rsa;\r
-  UINTN    Size;\r
-  INT32    DigestType;\r
+  RSA    *Rsa;\r
+  UINTN  Size;\r
+  INT32  DigestType;\r

 \r
   //\r
   // Check input parameters.\r
   //\r
 \r
   //\r
   // Check input parameters.\r
   //\r

-  if (RsaContext == NULL || MessageHash == NULL) {\r
+  if ((RsaContext == NULL) || (MessageHash == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  Rsa = (RSA *) RsaContext;\r
+  Rsa  = (RSA *)RsaContext;\r

   Size = RSA_size (Rsa);\r
 \r
   if (*SigSize < Size) {\r
   Size = RSA_size (Rsa);\r
 \r
   if (*SigSize < Size) {\r


@@ -329,36 +330,36 @@ RsaPkcs1Sign (
   //   Only MD5, SHA-1, SHA-256, SHA-384 or SHA-512 algorithm is supported.\r
   //\r
   switch (HashSize) {\r
   //   Only MD5, SHA-1, SHA-256, SHA-384 or SHA-512 algorithm is supported.\r
   //\r
   switch (HashSize) {\r

-  case MD5_DIGEST_SIZE:\r
-    DigestType = NID_md5;\r
-    break;\r
+    case MD5_DIGEST_SIZE:\r
+      DigestType = NID_md5;\r
+      break;\r

 \r
 \r

-  case SHA1_DIGEST_SIZE:\r
-    DigestType = NID_sha1;\r
-    break;\r
+    case SHA1_DIGEST_SIZE:\r
+      DigestType = NID_sha1;\r
+      break;\r

 \r
 \r

-  case SHA256_DIGEST_SIZE:\r
-    DigestType = NID_sha256;\r
-    break;\r
+    case SHA256_DIGEST_SIZE:\r
+      DigestType = NID_sha256;\r
+      break;\r

 \r
 \r

-  case SHA384_DIGEST_SIZE:\r
-    DigestType = NID_sha384;\r
-    break;\r
+    case SHA384_DIGEST_SIZE:\r
+      DigestType = NID_sha384;\r
+      break;\r

 \r
 \r

-  case SHA512_DIGEST_SIZE:\r
-    DigestType = NID_sha512;\r
-    break;\r
+    case SHA512_DIGEST_SIZE:\r
+      DigestType = NID_sha512;\r
+      break;\r

 \r
 \r

-  default:\r
-    return FALSE;\r
+    default:\r
+      return FALSE;\r

   }\r
 \r
   }\r
 \r

-  return (BOOLEAN) RSA_sign (\r
-                     DigestType,\r
-                     MessageHash,\r
-                     (UINT32) HashSize,\r
-                     Signature,\r
-                     (UINT32 *) SigSize,\r
-                     (RSA *) RsaContext\r
-                     );\r
+  return (BOOLEAN)RSA_sign (\r
+                    DigestType,\r
+                    MessageHash,\r
+                    (UINT32)HashSize,\r
+                    Signature,\r
+                    (UINT32 *)SigSize,\r
+                    (RSA *)RsaContext\r
+                    );\r

 }\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExtNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExtNull.c
index 260cb00e658fedd3aa0d3621db3543f4fb286f3b..9aeadcf96b154590635282e2634b8e89023c88e2 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExtNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExtNull.c
@@ -115,5 +115,3 @@ RsaPkcs1Sign (
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r

-\r
-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPss.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPss.c
index 37075ea65a0dc7cf388b3453fd4337af2b8045a1..bdc9155e1f4090fa58d0ec43fe2035904fb6aa53 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPss.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPss.c
@@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/objects.h>\r
 #include <openssl/evp.h>\r
 \r
 #include <openssl/objects.h>\r
 #include <openssl/evp.h>\r
 \r

-\r

 /**\r
   Retrieve a pointer to EVP message digest object.\r
 \r
 /**\r
   Retrieve a pointer to EVP message digest object.\r
 \r


@@ -25,27 +24,26 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 STATIC\r
 const\r
 **/\r
 STATIC\r
 const\r

-EVP_MD*\r
+EVP_MD *\r

 GetEvpMD (\r
 GetEvpMD (\r

-  IN UINT16 DigestLen\r
+  IN UINT16  DigestLen\r

   )\r
 {\r
   )\r
 {\r

-  switch (DigestLen){\r
+  switch (DigestLen) {\r

     case SHA256_DIGEST_SIZE:\r
     case SHA256_DIGEST_SIZE:\r

-      return EVP_sha256();\r
+      return EVP_sha256 ();\r

       break;\r
     case SHA384_DIGEST_SIZE:\r
       break;\r
     case SHA384_DIGEST_SIZE:\r

-      return EVP_sha384();\r
+      return EVP_sha384 ();\r

       break;\r
     case SHA512_DIGEST_SIZE:\r
       break;\r
     case SHA512_DIGEST_SIZE:\r

-      return EVP_sha512();\r
+      return EVP_sha512 ();\r

       break;\r
     default:\r
       return NULL;\r
   }\r
 }\r
 \r
       break;\r
     default:\r
       return NULL;\r
   }\r
 }\r
 \r

-\r

 /**\r
   Verifies the RSA signature with RSASSA-PSS signature scheme defined in RFC 8017.\r
   Implementation determines salt length automatically from the signature encoding.\r
 /**\r
   Verifies the RSA signature with RSASSA-PSS signature scheme defined in RFC 8017.\r
   Implementation determines salt length automatically from the signature encoding.\r


@@ -76,76 +74,84 @@ RsaPssVerify (
   IN  UINT16       SaltLen\r
   )\r
 {\r
   IN  UINT16       SaltLen\r
   )\r
 {\r

-  BOOLEAN Result;\r
-  EVP_PKEY *EvpRsaKey;\r
-  EVP_MD_CTX *EvpVerifyCtx;\r
-  EVP_PKEY_CTX *KeyCtx;\r
+  BOOLEAN       Result;\r
+  EVP_PKEY      *EvpRsaKey;\r
+  EVP_MD_CTX    *EvpVerifyCtx;\r
+  EVP_PKEY_CTX  *KeyCtx;\r

   CONST EVP_MD  *HashAlg;\r
 \r
   CONST EVP_MD  *HashAlg;\r
 \r

-  Result = FALSE;\r
-  EvpRsaKey = NULL;\r
+  Result       = FALSE;\r
+  EvpRsaKey    = NULL;\r

   EvpVerifyCtx = NULL;\r
   EvpVerifyCtx = NULL;\r

-  KeyCtx = NULL;\r
-  HashAlg = NULL;\r
+  KeyCtx       = NULL;\r
+  HashAlg      = NULL;\r

 \r
   if (RsaContext == NULL) {\r
     return FALSE;\r
   }\r
 \r
   if (RsaContext == NULL) {\r
     return FALSE;\r
   }\r

-  if (Message == NULL || MsgSize == 0 || MsgSize > INT_MAX) {\r
+\r
+  if ((Message == NULL) || (MsgSize == 0) || (MsgSize > INT_MAX)) {\r

     return FALSE;\r
   }\r
     return FALSE;\r
   }\r

-  if (Signature == NULL || SigSize == 0 || SigSize > INT_MAX) {\r
+\r
+  if ((Signature == NULL) || (SigSize == 0) || (SigSize > INT_MAX)) {\r

     return FALSE;\r
   }\r
     return FALSE;\r
   }\r

+\r

   if (SaltLen != DigestLen) {\r
     return FALSE;\r
   }\r
 \r
   if (SaltLen != DigestLen) {\r
     return FALSE;\r
   }\r
 \r

-  HashAlg = GetEvpMD(DigestLen);\r
+  HashAlg = GetEvpMD (DigestLen);\r

 \r
   if (HashAlg == NULL) {\r
     return FALSE;\r
   }\r
 \r
 \r
   if (HashAlg == NULL) {\r
     return FALSE;\r
   }\r
 \r

-  EvpRsaKey = EVP_PKEY_new();\r
+  EvpRsaKey = EVP_PKEY_new ();\r

   if (EvpRsaKey == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   if (EvpRsaKey == NULL) {\r
     goto _Exit;\r
   }\r
 \r

-  EVP_PKEY_set1_RSA(EvpRsaKey, RsaContext);\r
+  EVP_PKEY_set1_RSA (EvpRsaKey, RsaContext);\r

 \r
 \r

-  EvpVerifyCtx = EVP_MD_CTX_create();\r
+  EvpVerifyCtx = EVP_MD_CTX_create ();\r

   if (EvpVerifyCtx == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   if (EvpVerifyCtx == NULL) {\r
     goto _Exit;\r
   }\r
 \r

-  Result = EVP_DigestVerifyInit(EvpVerifyCtx, &KeyCtx, HashAlg, NULL, EvpRsaKey) > 0;\r
+  Result = EVP_DigestVerifyInit (EvpVerifyCtx, &KeyCtx, HashAlg, NULL, EvpRsaKey) > 0;\r

   if (KeyCtx == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   if (Result) {\r
   if (KeyCtx == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_set_rsa_padding(KeyCtx, RSA_PKCS1_PSS_PADDING) > 0;\r
+    Result = EVP_PKEY_CTX_set_rsa_padding (KeyCtx, RSA_PKCS1_PSS_PADDING) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_set_rsa_pss_saltlen(KeyCtx, SaltLen) > 0;\r
+    Result = EVP_PKEY_CTX_set_rsa_pss_saltlen (KeyCtx, SaltLen) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_set_rsa_mgf1_md(KeyCtx, HashAlg) > 0;\r
+    Result = EVP_PKEY_CTX_set_rsa_mgf1_md (KeyCtx, HashAlg) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_DigestVerifyUpdate(EvpVerifyCtx, Message, (UINT32)MsgSize) > 0;\r
+    Result = EVP_DigestVerifyUpdate (EvpVerifyCtx, Message, (UINT32)MsgSize) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_DigestVerifyFinal(EvpVerifyCtx, Signature, (UINT32)SigSize) > 0;\r
+    Result = EVP_DigestVerifyFinal (EvpVerifyCtx, Signature, (UINT32)SigSize) > 0;\r

   }\r
 \r
   }\r
 \r

-_Exit :\r
+_Exit:\r

   if (EvpRsaKey != NULL) {\r
   if (EvpRsaKey != NULL) {\r

-    EVP_PKEY_free(EvpRsaKey);\r
+    EVP_PKEY_free (EvpRsaKey);\r

   }\r
   }\r

+\r

   if (EvpVerifyCtx != NULL) {\r
   if (EvpVerifyCtx != NULL) {\r

-    EVP_MD_CTX_destroy(EvpVerifyCtx);\r
+    EVP_MD_CTX_destroy (EvpVerifyCtx);\r

   }\r
 \r
   return Result;\r
   }\r
 \r
   return Result;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPssSign.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPssSign.c
index 06187ff4baa72788629901a4d215acd215fbaa38..07c24f6e8decedcffefb8e2ea1ebeed9715506a3 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPssSign.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaPssSign.c
@@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <openssl/objects.h>\r
 #include <openssl/evp.h>\r
 \r
 #include <openssl/objects.h>\r
 #include <openssl/evp.h>\r
 \r

-\r

 /**\r
   Retrieve a pointer to EVP message digest object.\r
 \r
 /**\r
   Retrieve a pointer to EVP message digest object.\r
 \r


@@ -25,27 +24,26 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 STATIC\r
 const\r
 **/\r
 STATIC\r
 const\r

-EVP_MD*\r
+EVP_MD *\r

 GetEvpMD (\r
 GetEvpMD (\r

-  IN UINT16 DigestLen\r
+  IN UINT16  DigestLen\r

   )\r
 {\r
   )\r
 {\r

-  switch (DigestLen){\r
+  switch (DigestLen) {\r

     case SHA256_DIGEST_SIZE:\r
     case SHA256_DIGEST_SIZE:\r

-      return EVP_sha256();\r
+      return EVP_sha256 ();\r

       break;\r
     case SHA384_DIGEST_SIZE:\r
       break;\r
     case SHA384_DIGEST_SIZE:\r

-      return EVP_sha384();\r
+      return EVP_sha384 ();\r

       break;\r
     case SHA512_DIGEST_SIZE:\r
       break;\r
     case SHA512_DIGEST_SIZE:\r

-      return EVP_sha512();\r
+      return EVP_sha512 ();\r

       break;\r
     default:\r
       return NULL;\r
   }\r
 }\r
 \r
       break;\r
     default:\r
       return NULL;\r
   }\r
 }\r
 \r

-\r

 /**\r
   Carries out the RSA-SSA signature generation with EMSA-PSS encoding scheme.\r
 \r
 /**\r
   Carries out the RSA-SSA signature generation with EMSA-PSS encoding scheme.\r
 \r


@@ -90,23 +88,24 @@ RsaPssSign (
   IN OUT  UINTN        *SigSize\r
   )\r
 {\r
   IN OUT  UINTN        *SigSize\r
   )\r
 {\r

-  BOOLEAN               Result;\r
-  UINTN                 RsaSigSize;\r
-  EVP_PKEY              *EvpRsaKey;\r
-  EVP_MD_CTX            *EvpVerifyCtx;\r
-  EVP_PKEY_CTX          *KeyCtx;\r
-  CONST EVP_MD          *HashAlg;\r
-\r
-  Result = FALSE;\r
-  EvpRsaKey = NULL;\r
+  BOOLEAN       Result;\r
+  UINTN         RsaSigSize;\r
+  EVP_PKEY      *EvpRsaKey;\r
+  EVP_MD_CTX    *EvpVerifyCtx;\r
+  EVP_PKEY_CTX  *KeyCtx;\r
+  CONST EVP_MD  *HashAlg;\r
+\r
+  Result       = FALSE;\r
+  EvpRsaKey    = NULL;\r

   EvpVerifyCtx = NULL;\r
   EvpVerifyCtx = NULL;\r

-  KeyCtx = NULL;\r
-  HashAlg = NULL;\r
+  KeyCtx       = NULL;\r
+  HashAlg      = NULL;\r

 \r
   if (RsaContext == NULL) {\r
     return FALSE;\r
   }\r
 \r
   if (RsaContext == NULL) {\r
     return FALSE;\r
   }\r

-  if (Message == NULL || MsgSize == 0 || MsgSize > INT_MAX) {\r
+\r
+  if ((Message == NULL) || (MsgSize == 0) || (MsgSize > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -124,51 +123,56 @@ RsaPssSign (
     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  HashAlg = GetEvpMD(DigestLen);\r
+  HashAlg = GetEvpMD (DigestLen);\r

 \r
   if (HashAlg == NULL) {\r
     return FALSE;\r
   }\r
 \r
 \r
   if (HashAlg == NULL) {\r
     return FALSE;\r
   }\r
 \r

-  EvpRsaKey = EVP_PKEY_new();\r
+  EvpRsaKey = EVP_PKEY_new ();\r

   if (EvpRsaKey == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   if (EvpRsaKey == NULL) {\r
     goto _Exit;\r
   }\r
 \r

-  EVP_PKEY_set1_RSA(EvpRsaKey, RsaContext);\r
+  EVP_PKEY_set1_RSA (EvpRsaKey, RsaContext);\r

 \r
 \r

-  EvpVerifyCtx = EVP_MD_CTX_create();\r
+  EvpVerifyCtx = EVP_MD_CTX_create ();\r

   if (EvpVerifyCtx == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   if (EvpVerifyCtx == NULL) {\r
     goto _Exit;\r
   }\r
 \r

-  Result = EVP_DigestSignInit(EvpVerifyCtx, &KeyCtx, HashAlg, NULL, EvpRsaKey) > 0;\r
+  Result = EVP_DigestSignInit (EvpVerifyCtx, &KeyCtx, HashAlg, NULL, EvpRsaKey) > 0;\r

   if (KeyCtx == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   if (Result) {\r
   if (KeyCtx == NULL) {\r
     goto _Exit;\r
   }\r
 \r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_set_rsa_padding(KeyCtx, RSA_PKCS1_PSS_PADDING) > 0;\r
+    Result = EVP_PKEY_CTX_set_rsa_padding (KeyCtx, RSA_PKCS1_PSS_PADDING) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_set_rsa_pss_saltlen(KeyCtx, SaltLen) > 0;\r
+    Result = EVP_PKEY_CTX_set_rsa_pss_saltlen (KeyCtx, SaltLen) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_PKEY_CTX_set_rsa_mgf1_md(KeyCtx, HashAlg) > 0;\r
+    Result = EVP_PKEY_CTX_set_rsa_mgf1_md (KeyCtx, HashAlg) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_DigestSignUpdate(EvpVerifyCtx, Message, (UINT32)MsgSize) > 0;\r
+    Result = EVP_DigestSignUpdate (EvpVerifyCtx, Message, (UINT32)MsgSize) > 0;\r

   }\r
   }\r

+\r

   if (Result) {\r
   if (Result) {\r

-    Result = EVP_DigestSignFinal(EvpVerifyCtx, Signature, SigSize) > 0;\r
+    Result = EVP_DigestSignFinal (EvpVerifyCtx, Signature, SigSize) > 0;\r

   }\r
 \r
   }\r
 \r

-_Exit :\r
+_Exit:\r

   if (EvpRsaKey != NULL) {\r
   if (EvpRsaKey != NULL) {\r

-    EVP_PKEY_free(EvpRsaKey);\r
+    EVP_PKEY_free (EvpRsaKey);\r

   }\r
   }\r

+\r

   if (EvpVerifyCtx != NULL) {\r
   if (EvpVerifyCtx != NULL) {\r

-    EVP_MD_CTX_destroy(EvpVerifyCtx);\r
+    EVP_MD_CTX_destroy (EvpVerifyCtx);\r

   }\r
 \r
   return Result;\r
   }\r
 \r
   return Result;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
index 970e9b94a0714e8002ba75d650444745b69b394f..f118f2e9d6aa913e5a906f1ff066b07ae6f12eb1 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
@@ -21,9 +21,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // OID ASN.1 Value for SPC_RFC3161_OBJID ("1.3.6.1.4.1.311.3.3.1")\r
 //\r
 //\r
 // OID ASN.1 Value for SPC_RFC3161_OBJID ("1.3.6.1.4.1.311.3.3.1")\r
 //\r

-UINT8 mSpcRFC3161OidValue[] = {\r
+UINT8  mSpcRFC3161OidValue[] = {\r

   0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x03, 0x03, 0x01\r
   0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x03, 0x03, 0x01\r

-  };\r
+};\r

 \r
 ///\r
 /// The messageImprint field SHOULD contain the hash of the datum to be\r
 \r
 ///\r
 /// The messageImprint field SHOULD contain the hash of the datum to be\r


@@ -36,8 +36,8 @@ UINT8 mSpcRFC3161OidValue[] = {
 ///   hashedMessage                OCTET STRING  }\r
 ///\r
 typedef struct {\r
 ///   hashedMessage                OCTET STRING  }\r
 ///\r
 typedef struct {\r

-  X509_ALGOR         *HashAlgorithm;\r
-  ASN1_OCTET_STRING  *HashedMessage;\r
+  X509_ALGOR           *HashAlgorithm;\r
+  ASN1_OCTET_STRING    *HashedMessage;\r

 } TS_MESSAGE_IMPRINT;\r
 \r
 //\r
 } TS_MESSAGE_IMPRINT;\r
 \r
 //\r


@@ -60,9 +60,9 @@ IMPLEMENT_ASN1_FUNCTIONS (TS_MESSAGE_IMPRINT)
 ///       micros     [1] INTEGER  (1..999)    OPTIONAL  }\r
 ///\r
 typedef struct {\r
 ///       micros     [1] INTEGER  (1..999)    OPTIONAL  }\r
 ///\r
 typedef struct {\r

-  ASN1_INTEGER  *Seconds;\r
-  ASN1_INTEGER  *Millis;\r
-  ASN1_INTEGER  *Micros;\r
+  ASN1_INTEGER    *Seconds;\r
+  ASN1_INTEGER    *Millis;\r
+  ASN1_INTEGER    *Micros;\r

 } TS_ACCURACY;\r
 \r
 //\r
 } TS_ACCURACY;\r
 \r
 //\r


@@ -70,7 +70,7 @@ typedef struct {
 //\r
 DECLARE_ASN1_FUNCTIONS (TS_ACCURACY)\r
 ASN1_SEQUENCE (TS_ACCURACY) = {\r
 //\r
 DECLARE_ASN1_FUNCTIONS (TS_ACCURACY)\r
 ASN1_SEQUENCE (TS_ACCURACY) = {\r

-  ASN1_OPT     (TS_ACCURACY, Seconds, ASN1_INTEGER),\r
+  ASN1_OPT (TS_ACCURACY,     Seconds, ASN1_INTEGER),\r

   ASN1_IMP_OPT (TS_ACCURACY, Millis,  ASN1_INTEGER, 0),\r
   ASN1_IMP_OPT (TS_ACCURACY, Micros,  ASN1_INTEGER, 1)\r
 } ASN1_SEQUENCE_END (TS_ACCURACY)\r
   ASN1_IMP_OPT (TS_ACCURACY, Millis,  ASN1_INTEGER, 0),\r
   ASN1_IMP_OPT (TS_ACCURACY, Micros,  ASN1_INTEGER, 1)\r
 } ASN1_SEQUENCE_END (TS_ACCURACY)\r


@@ -99,16 +99,16 @@ IMPLEMENT_ASN1_FUNCTIONS (TS_ACCURACY)
 ///     extensions                   [1] IMPLICIT Extensions   OPTIONAL  }\r
 ///\r
 typedef struct {\r
 ///     extensions                   [1] IMPLICIT Extensions   OPTIONAL  }\r
 ///\r
 typedef struct {\r

-  ASN1_INTEGER              *Version;\r
-  ASN1_OBJECT               *Policy;\r
-  TS_MESSAGE_IMPRINT        *MessageImprint;\r
-  ASN1_INTEGER              *SerialNumber;\r
-  ASN1_GENERALIZEDTIME      *GenTime;\r
-  TS_ACCURACY               *Accuracy;\r
-  ASN1_BOOLEAN              Ordering;\r
-  ASN1_INTEGER              *Nonce;\r
-  GENERAL_NAME              *Tsa;\r
-  STACK_OF(X509_EXTENSION)  *Extensions;\r
+  ASN1_INTEGER            *Version;\r
+  ASN1_OBJECT             *Policy;\r
+  TS_MESSAGE_IMPRINT      *MessageImprint;\r
+  ASN1_INTEGER            *SerialNumber;\r
+  ASN1_GENERALIZEDTIME    *GenTime;\r
+  TS_ACCURACY             *Accuracy;\r
+  ASN1_BOOLEAN            Ordering;\r
+  ASN1_INTEGER            *Nonce;\r
+  GENERAL_NAME            *Tsa;\r
+  STACK_OF (X509_EXTENSION)  *Extensions;\r

 } TS_TST_INFO;\r
 \r
 //\r
 } TS_TST_INFO;\r
 \r
 //\r


@@ -116,20 +116,19 @@ typedef struct {
 //\r
 DECLARE_ASN1_FUNCTIONS (TS_TST_INFO)\r
 ASN1_SEQUENCE (TS_TST_INFO) = {\r
 //\r
 DECLARE_ASN1_FUNCTIONS (TS_TST_INFO)\r
 ASN1_SEQUENCE (TS_TST_INFO) = {\r

-  ASN1_SIMPLE (TS_TST_INFO, Version, ASN1_INTEGER),\r
-  ASN1_SIMPLE (TS_TST_INFO, Policy, ASN1_OBJECT),\r
-  ASN1_SIMPLE (TS_TST_INFO, MessageImprint, TS_MESSAGE_IMPRINT),\r
-  ASN1_SIMPLE (TS_TST_INFO, SerialNumber, ASN1_INTEGER),\r
-  ASN1_SIMPLE (TS_TST_INFO, GenTime, ASN1_GENERALIZEDTIME),\r
-  ASN1_OPT    (TS_TST_INFO, Accuracy, TS_ACCURACY),\r
-  ASN1_OPT    (TS_TST_INFO, Ordering, ASN1_FBOOLEAN),\r
-  ASN1_OPT    (TS_TST_INFO, Nonce, ASN1_INTEGER),\r
-  ASN1_EXP_OPT(TS_TST_INFO, Tsa, GENERAL_NAME, 0),\r
-  ASN1_IMP_SEQUENCE_OF_OPT (TS_TST_INFO, Extensions, X509_EXTENSION, 1)\r
+  ASN1_SIMPLE (TS_TST_INFO,              Version,        ASN1_INTEGER),\r
+  ASN1_SIMPLE (TS_TST_INFO,              Policy,         ASN1_OBJECT),\r
+  ASN1_SIMPLE (TS_TST_INFO,              MessageImprint, TS_MESSAGE_IMPRINT),\r
+  ASN1_SIMPLE (TS_TST_INFO,              SerialNumber,   ASN1_INTEGER),\r
+  ASN1_SIMPLE (TS_TST_INFO,              GenTime,        ASN1_GENERALIZEDTIME),\r
+  ASN1_OPT (TS_TST_INFO,                 Accuracy,       TS_ACCURACY),\r
+  ASN1_OPT (TS_TST_INFO,                 Ordering,       ASN1_FBOOLEAN),\r
+  ASN1_OPT (TS_TST_INFO,                 Nonce,          ASN1_INTEGER),\r
+  ASN1_EXP_OPT (TS_TST_INFO,             Tsa,            GENERAL_NAME,         0),\r
+  ASN1_IMP_SEQUENCE_OF_OPT (TS_TST_INFO, Extensions,     X509_EXTENSION,       1)\r

 } ASN1_SEQUENCE_END (TS_TST_INFO)\r
 IMPLEMENT_ASN1_FUNCTIONS (TS_TST_INFO)\r
 \r
 } ASN1_SEQUENCE_END (TS_TST_INFO)\r
 IMPLEMENT_ASN1_FUNCTIONS (TS_TST_INFO)\r
 \r

-\r

 /**\r
   Convert ASN.1 GeneralizedTime to EFI Time.\r
 \r
 /**\r
   Convert ASN.1 GeneralizedTime to EFI Time.\r
 \r


@@ -154,17 +153,19 @@ ConvertAsn1TimeToEfiTime (
     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  Str = (CONST CHAR8*)Asn1Time->data;\r
+  Str = (CONST CHAR8 *)Asn1Time->data;\r

   SetMem (EfiTime, sizeof (EFI_TIME), 0);\r
 \r
   Index = 0;\r
   SetMem (EfiTime, sizeof (EFI_TIME), 0);\r
 \r
   Index = 0;\r

-  if (Asn1Time->type == V_ASN1_UTCTIME) {               /* two digit year */\r
+  if (Asn1Time->type == V_ASN1_UTCTIME) {\r
+    /* two digit year */\r

     EfiTime->Year  = (Str[Index++] - '0') * 10;\r
     EfiTime->Year += (Str[Index++] - '0');\r
     if (EfiTime->Year < 70) {\r
       EfiTime->Year += 100;\r
     }\r
     EfiTime->Year  = (Str[Index++] - '0') * 10;\r
     EfiTime->Year += (Str[Index++] - '0');\r
     if (EfiTime->Year < 70) {\r
       EfiTime->Year += 100;\r
     }\r

-  } else if (Asn1Time->type == V_ASN1_GENERALIZEDTIME) { /* four digit year */\r
+  } else if (Asn1Time->type == V_ASN1_GENERALIZEDTIME) {\r
+    /* four digit year */\r

     EfiTime->Year  = (Str[Index++] - '0') * 1000;\r
     EfiTime->Year += (Str[Index++] - '0') * 100;\r
     EfiTime->Year += (Str[Index++] - '0') * 10;\r
     EfiTime->Year  = (Str[Index++] - '0') * 1000;\r
     EfiTime->Year += (Str[Index++] - '0') * 100;\r
     EfiTime->Year += (Str[Index++] - '0') * 10;\r


@@ -174,20 +175,20 @@ ConvertAsn1TimeToEfiTime (
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  EfiTime->Month   = (Str[Index++] - '0') * 10;\r
-  EfiTime->Month  += (Str[Index++] - '0');\r
+  EfiTime->Month  = (Str[Index++] - '0') * 10;\r
+  EfiTime->Month += (Str[Index++] - '0');\r

   if ((EfiTime->Month < 1) || (EfiTime->Month > 12)) {\r
     return FALSE;\r
   }\r
 \r
   if ((EfiTime->Month < 1) || (EfiTime->Month > 12)) {\r
     return FALSE;\r
   }\r
 \r

-  EfiTime->Day     = (Str[Index++] - '0') * 10;\r
-  EfiTime->Day    += (Str[Index++] - '0');\r
+  EfiTime->Day  = (Str[Index++] - '0') * 10;\r
+  EfiTime->Day += (Str[Index++] - '0');\r

   if ((EfiTime->Day < 1) || (EfiTime->Day > 31)) {\r
     return FALSE;\r
   }\r
 \r
   if ((EfiTime->Day < 1) || (EfiTime->Day > 31)) {\r
     return FALSE;\r
   }\r
 \r

-  EfiTime->Hour    = (Str[Index++] - '0') * 10;\r
-  EfiTime->Hour   += (Str[Index++] - '0');\r
+  EfiTime->Hour  = (Str[Index++] - '0') * 10;\r
+  EfiTime->Hour += (Str[Index++] - '0');\r

   if (EfiTime->Hour > 23) {\r
     return FALSE;\r
   }\r
   if (EfiTime->Hour > 23) {\r
     return FALSE;\r
   }\r


@@ -275,22 +276,27 @@ CheckTSTInfo (
     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r

-  MdSize = EVP_MD_size (Md);\r
+  MdSize    = EVP_MD_size (Md);\r

   HashedMsg = AllocateZeroPool (MdSize);\r
   if (HashedMsg == NULL) {\r
     goto _Exit;\r
   }\r
   HashedMsg = AllocateZeroPool (MdSize);\r
   if (HashedMsg == NULL) {\r
     goto _Exit;\r
   }\r

+\r

   MdCtx = EVP_MD_CTX_new ();\r
   if (MdCtx == NULL) {\r
     goto _Exit;\r
   }\r
   MdCtx = EVP_MD_CTX_new ();\r
   if (MdCtx == NULL) {\r
     goto _Exit;\r
   }\r

+\r

   if ((EVP_DigestInit_ex (MdCtx, Md, NULL) != 1) ||\r
       (EVP_DigestUpdate (MdCtx, TimestampedData, DataSize) != 1) ||\r
   if ((EVP_DigestInit_ex (MdCtx, Md, NULL) != 1) ||\r
       (EVP_DigestUpdate (MdCtx, TimestampedData, DataSize) != 1) ||\r

-      (EVP_DigestFinal (MdCtx, HashedMsg, NULL) != 1)) {\r
+      (EVP_DigestFinal (MdCtx, HashedMsg, NULL) != 1))\r
+  {\r

     goto _Exit;\r
   }\r
     goto _Exit;\r
   }\r

+\r

   if ((MdSize == (UINTN)ASN1_STRING_length (Imprint->HashedMessage)) &&\r
   if ((MdSize == (UINTN)ASN1_STRING_length (Imprint->HashedMessage)) &&\r

-      (CompareMem (HashedMsg, ASN1_STRING_get0_data (Imprint->HashedMessage), MdSize) != 0)) {\r
+      (CompareMem (HashedMsg, ASN1_STRING_get0_data (Imprint->HashedMessage), MdSize) != 0))\r
+  {\r

     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r


@@ -376,7 +382,8 @@ TimestampTokenVerify (
   // Check input parameters\r
   //\r
   if ((TSToken == NULL) || (TsaCert == NULL) || (TimestampedData == NULL) ||\r
   // Check input parameters\r
   //\r
   if ((TSToken == NULL) || (TsaCert == NULL) || (TimestampedData == NULL) ||\r

-      (TokenSize > INT_MAX) || (CertSize > INT_MAX) || (DataSize > INT_MAX)) {\r
+      (TokenSize > INT_MAX) || (CertSize > INT_MAX) || (DataSize > INT_MAX))\r
+  {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -386,6 +393,7 @@ TimestampTokenVerify (
   if (SigningTime != NULL) {\r
     SetMem (SigningTime, sizeof (EFI_TIME), 0);\r
   }\r
   if (SigningTime != NULL) {\r
     SetMem (SigningTime, sizeof (EFI_TIME), 0);\r
   }\r

+\r

   Pkcs7     = NULL;\r
   Cert      = NULL;\r
   CertStore = NULL;\r
   Pkcs7     = NULL;\r
   Cert      = NULL;\r
   CertStore = NULL;\r


@@ -397,7 +405,7 @@ TimestampTokenVerify (
   // TimeStamp Token should contain one valid DER-encoded ASN.1 PKCS#7 structure.\r
   //\r
   TokenTemp = TSToken;\r
   // TimeStamp Token should contain one valid DER-encoded ASN.1 PKCS#7 structure.\r
   //\r
   TokenTemp = TSToken;\r

-  Pkcs7     = d2i_PKCS7 (NULL, (const unsigned char **) &TokenTemp, (int) TokenSize);\r
+  Pkcs7     = d2i_PKCS7 (NULL, (const unsigned char **)&TokenTemp, (int)TokenSize);\r

   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r
   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r


@@ -413,7 +421,7 @@ TimestampTokenVerify (
   // Read the trusted TSA certificate (DER-encoded), and Construct X509 Certificate.\r
   //\r
   CertTemp = TsaCert;\r
   // Read the trusted TSA certificate (DER-encoded), and Construct X509 Certificate.\r
   //\r
   CertTemp = TsaCert;\r

-  Cert = d2i_X509 (NULL, &CertTemp, (long) CertSize);\r
+  Cert     = d2i_X509 (NULL, &CertTemp, (long)CertSize);\r

   if (Cert == NULL) {\r
     goto _Exit;\r
   }\r
   if (Cert == NULL) {\r
     goto _Exit;\r
   }\r


@@ -430,8 +438,10 @@ TimestampTokenVerify (
   // Allow partial certificate chains, terminated by a non-self-signed but\r
   // still trusted intermediate certificate. Also disable time checks.\r
   //\r
   // Allow partial certificate chains, terminated by a non-self-signed but\r
   // still trusted intermediate certificate. Also disable time checks.\r
   //\r

-  X509_STORE_set_flags (CertStore,\r
-                        X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME);\r
+  X509_STORE_set_flags (\r
+    CertStore,\r
+    X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME\r
+    );\r

 \r
   X509_STORE_set_purpose (CertStore, X509_PURPOSE_ANY);\r
 \r
 \r
   X509_STORE_set_purpose (CertStore, X509_PURPOSE_ANY);\r
 \r


@@ -442,6 +452,7 @@ TimestampTokenVerify (
   if (OutBio == NULL) {\r
     goto _Exit;\r
   }\r
   if (OutBio == NULL) {\r
     goto _Exit;\r
   }\r

+\r

   if (!PKCS7_verify (Pkcs7, NULL, CertStore, NULL, OutBio, PKCS7_BINARY)) {\r
     goto _Exit;\r
   }\r
   if (!PKCS7_verify (Pkcs7, NULL, CertStore, NULL, OutBio, PKCS7_BINARY)) {\r
     goto _Exit;\r
   }\r


@@ -453,14 +464,18 @@ TimestampTokenVerify (
   if (TstData == NULL) {\r
     goto _Exit;\r
   }\r
   if (TstData == NULL) {\r
     goto _Exit;\r
   }\r

-  TstSize = BIO_read (OutBio, (void *) TstData, 2048);\r
+\r
+  TstSize = BIO_read (OutBio, (void *)TstData, 2048);\r

 \r
   //\r
   // Construct TS_TST_INFO structure from the signed contents.\r
   //\r
   TstTemp = TstData;\r
 \r
   //\r
   // Construct TS_TST_INFO structure from the signed contents.\r
   //\r
   TstTemp = TstData;\r

-  TstInfo = d2i_TS_TST_INFO (NULL, (const unsigned char **) &TstTemp,\r
-              (int)TstSize);\r
+  TstInfo = d2i_TS_TST_INFO (\r
+              NULL,\r
+              (const unsigned char **)&TstTemp,\r
+              (int)TstSize\r
+              );\r

   if (TstInfo == NULL) {\r
     goto _Exit;\r
   }\r
   if (TstInfo == NULL) {\r
     goto _Exit;\r
   }\r


@@ -527,19 +542,21 @@ ImageTimestampVerify (
   OUT EFI_TIME     *SigningTime\r
   )\r
 {\r
   OUT EFI_TIME     *SigningTime\r
   )\r
 {\r

-  BOOLEAN                      Status;\r
-  PKCS7                        *Pkcs7;\r
-  CONST UINT8                  *Temp;\r
-  STACK_OF(PKCS7_SIGNER_INFO)  *SignerInfos;\r
-  PKCS7_SIGNER_INFO            *SignInfo;\r
-  UINTN                        Index;\r
-  STACK_OF(X509_ATTRIBUTE)     *Sk;\r
-  X509_ATTRIBUTE               *Xa;\r
-  ASN1_OBJECT                  *XaObj;\r
-  ASN1_TYPE                    *Asn1Type;\r
-  ASN1_OCTET_STRING            *EncDigest;\r
-  UINT8                        *TSToken;\r
-  UINTN                        TokenSize;\r
+  BOOLEAN      Status;\r
+  PKCS7        *Pkcs7;\r
+  CONST UINT8  *Temp;\r
+\r
+  STACK_OF (PKCS7_SIGNER_INFO)  *SignerInfos;\r
+  PKCS7_SIGNER_INFO  *SignInfo;\r
+  UINTN              Index;\r
+\r
+  STACK_OF (X509_ATTRIBUTE)     *Sk;\r
+  X509_ATTRIBUTE     *Xa;\r
+  ASN1_OBJECT        *XaObj;\r
+  ASN1_TYPE          *Asn1Type;\r
+  ASN1_OCTET_STRING  *EncDigest;\r
+  UINT8              *TSToken;\r
+  UINTN              TokenSize;\r

 \r
   //\r
   // Input Parameters Checking.\r
 \r
   //\r
   // Input Parameters Checking.\r


@@ -556,22 +573,23 @@ ImageTimestampVerify (
   // Register & Initialize necessary digest algorithms for PKCS#7 Handling.\r
   //\r
   if ((EVP_add_digest (EVP_md5 ()) == 0) || (EVP_add_digest (EVP_sha1 ()) == 0) ||\r
   // Register & Initialize necessary digest algorithms for PKCS#7 Handling.\r
   //\r
   if ((EVP_add_digest (EVP_md5 ()) == 0) || (EVP_add_digest (EVP_sha1 ()) == 0) ||\r

-      (EVP_add_digest (EVP_sha256 ()) == 0) || (EVP_add_digest_alias (SN_sha1WithRSAEncryption, SN_sha1WithRSA)) == 0) {\r
+      (EVP_add_digest (EVP_sha256 ()) == 0) || ((EVP_add_digest_alias (SN_sha1WithRSAEncryption, SN_sha1WithRSA)) == 0))\r
+  {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // Initialization.\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // Initialization.\r
   //\r

-  Status    = FALSE;\r
-  Pkcs7     = NULL;\r
-  SignInfo  = NULL;\r
+  Status   = FALSE;\r
+  Pkcs7    = NULL;\r
+  SignInfo = NULL;\r

 \r
   //\r
   // Decode ASN.1-encoded Authenticode data into PKCS7 structure.\r
   //\r
   Temp  = AuthData;\r
 \r
   //\r
   // Decode ASN.1-encoded Authenticode data into PKCS7 structure.\r
   //\r
   Temp  = AuthData;\r

-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &Temp, (int) DataSize);\r
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&Temp, (int)DataSize);\r

   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r
   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r


@@ -605,12 +623,13 @@ ImageTimestampVerify (
   // of SignerInfo.\r
   //\r
   Sk = SignInfo->unauth_attr;\r
   // of SignerInfo.\r
   //\r
   Sk = SignInfo->unauth_attr;\r

-  if (Sk == NULL) {             // No timestamp counterSignature.\r
+  if (Sk == NULL) {\r
+    // No timestamp counterSignature.\r

     goto _Exit;\r
   }\r
 \r
   Asn1Type = NULL;\r
     goto _Exit;\r
   }\r
 \r
   Asn1Type = NULL;\r

-  for (Index = 0; Index < (UINTN) sk_X509_ATTRIBUTE_num (Sk); Index++) {\r
+  for (Index = 0; Index < (UINTN)sk_X509_ATTRIBUTE_num (Sk); Index++) {\r

     //\r
     // Search valid RFC3161 timestamp counterSignature based on OBJID.\r
     //\r
     //\r
     // Search valid RFC3161 timestamp counterSignature based on OBJID.\r
     //\r


@@ -618,21 +637,26 @@ ImageTimestampVerify (
     if (Xa == NULL) {\r
       continue;\r
     }\r
     if (Xa == NULL) {\r
       continue;\r
     }\r

-    XaObj = X509_ATTRIBUTE_get0_object(Xa);\r
+\r
+    XaObj = X509_ATTRIBUTE_get0_object (Xa);\r

     if (XaObj == NULL) {\r
       continue;\r
     }\r
     if (XaObj == NULL) {\r
       continue;\r
     }\r

-    if ((OBJ_length(XaObj) != sizeof (mSpcRFC3161OidValue)) ||\r
-        (CompareMem (OBJ_get0_data(XaObj), mSpcRFC3161OidValue, sizeof (mSpcRFC3161OidValue)) != 0)) {\r
+\r
+    if ((OBJ_length (XaObj) != sizeof (mSpcRFC3161OidValue)) ||\r
+        (CompareMem (OBJ_get0_data (XaObj), mSpcRFC3161OidValue, sizeof (mSpcRFC3161OidValue)) != 0))\r
+    {\r

       continue;\r
     }\r
       continue;\r
     }\r

-    Asn1Type = X509_ATTRIBUTE_get0_type(Xa, 0);\r
+\r
+    Asn1Type = X509_ATTRIBUTE_get0_type (Xa, 0);\r

   }\r
 \r
   if (Asn1Type == NULL) {\r
     Status = FALSE;\r
     goto _Exit;\r
   }\r
   }\r
 \r
   if (Asn1Type == NULL) {\r
     Status = FALSE;\r
     goto _Exit;\r
   }\r

+\r

   TSToken   = Asn1Type->value.octet_string->data;\r
   TokenSize = Asn1Type->value.octet_string->length;\r
 \r
   TSToken   = Asn1Type->value.octet_string->data;\r
   TokenSize = Asn1Type->value.octet_string->length;\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
index ff96d30b57148fe268f9bb0b5ed0941a99d20b70..e6bb45e64135e37a5d331f828d12dcf4f6a27292 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
@@ -38,7 +38,7 @@ X509ConstructCertificate (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Cert == NULL || SingleX509Cert == NULL || CertSize > INT_MAX) {\r
+  if ((Cert == NULL) || (SingleX509Cert == NULL) || (CertSize > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -46,12 +46,12 @@ X509ConstructCertificate (
   // Read DER-encoded X509 Certificate and Construct X509 object.\r
   //\r
   Temp     = Cert;\r
   // Read DER-encoded X509 Certificate and Construct X509 object.\r
   //\r
   Temp     = Cert;\r

-  X509Cert = d2i_X509 (NULL, &Temp, (long) CertSize);\r
+  X509Cert = d2i_X509 (NULL, &Temp, (long)CertSize);\r

   if (X509Cert == NULL) {\r
     return FALSE;\r
   }\r
 \r
   if (X509Cert == NULL) {\r
     return FALSE;\r
   }\r
 \r

-  *SingleX509Cert = (UINT8 *) X509Cert;\r
+  *SingleX509Cert = (UINT8 *)X509Cert;\r

 \r
   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r


@@ -82,12 +82,13 @@ X509ConstructCertificateStackV (
   IN      VA_LIST  Args\r
   )\r
 {\r
   IN      VA_LIST  Args\r
   )\r
 {\r

-  UINT8           *Cert;\r
-  UINTN           CertSize;\r
-  X509            *X509Cert;\r
-  STACK_OF(X509)  *CertStack;\r
-  BOOLEAN         Status;\r
-  UINTN           Index;\r
+  UINT8  *Cert;\r
+  UINTN  CertSize;\r
+  X509   *X509Cert;\r
+\r
+  STACK_OF (X509)  *CertStack;\r
+  BOOLEAN  Status;\r
+  UINTN    Index;\r

 \r
   //\r
   // Check input parameters.\r
 \r
   //\r
   // Check input parameters.\r


@@ -101,7 +102,7 @@ X509ConstructCertificateStackV (
   //\r
   // Initialize X509 stack object.\r
   //\r
   //\r
   // Initialize X509 stack object.\r
   //\r

-  CertStack = (STACK_OF(X509) *) (*X509Stack);\r
+  CertStack = (STACK_OF (X509) *)(*X509Stack);\r

   if (CertStack == NULL) {\r
     CertStack = sk_X509_new_null ();\r
     if (CertStack == NULL) {\r
   if (CertStack == NULL) {\r
     CertStack = sk_X509_new_null ();\r
     if (CertStack == NULL) {\r


@@ -127,15 +128,16 @@ X509ConstructCertificateStackV (
     // Construct X509 Object from the given DER-encoded certificate data.\r
     //\r
     X509Cert = NULL;\r
     // Construct X509 Object from the given DER-encoded certificate data.\r
     //\r
     X509Cert = NULL;\r

-    Status = X509ConstructCertificate (\r
-               (CONST UINT8 *) Cert,\r
-               CertSize,\r
-               (UINT8 **) &X509Cert\r
-               );\r
+    Status   = X509ConstructCertificate (\r
+                 (CONST UINT8 *)Cert,\r
+                 CertSize,\r
+                 (UINT8 **)&X509Cert\r
+                 );\r

     if (!Status) {\r
       if (X509Cert != NULL) {\r
         X509_free (X509Cert);\r
       }\r
     if (!Status) {\r
       if (X509Cert != NULL) {\r
         X509_free (X509Cert);\r
       }\r

+\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r


@@ -148,7 +150,7 @@ X509ConstructCertificateStackV (
   if (!Status) {\r
     sk_X509_pop_free (CertStack, X509_free);\r
   } else {\r
   if (!Status) {\r
     sk_X509_pop_free (CertStack, X509_free);\r
   } else {\r

-    *X509Stack = (UINT8 *) CertStack;\r
+    *X509Stack = (UINT8 *)CertStack;\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -210,7 +212,7 @@ X509Free (
   //\r
   // Free OpenSSL X509 object.\r
   //\r
   //\r
   // Free OpenSSL X509 object.\r
   //\r

-  X509_free ((X509 *) X509Cert);\r
+  X509_free ((X509 *)X509Cert);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -237,7 +239,7 @@ X509StackFree (
   //\r
   // Free OpenSSL X509 stack object.\r
   //\r
   //\r
   // Free OpenSSL X509 stack object.\r
   //\r

-  sk_X509_pop_free ((STACK_OF(X509) *) X509Stack, X509_free);\r
+  sk_X509_pop_free ((STACK_OF (X509) *) X509Stack, X509_free);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -274,7 +276,7 @@ X509GetSubjectName (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Cert == NULL || SubjectSize == NULL) {\r
+  if ((Cert == NULL) || (SubjectSize == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -283,7 +285,7 @@ X509GetSubjectName (
   //\r
   // Read DER-encoded X509 Certificate and Construct X509 object.\r
   //\r
   //\r
   // Read DER-encoded X509 Certificate and Construct X509 object.\r
   //\r

-  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);\r
+  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **)&X509Cert);\r

   if ((X509Cert == NULL) || (!Status)) {\r
     Status = FALSE;\r
     goto _Exit;\r
   if ((X509Cert == NULL) || (!Status)) {\r
     Status = FALSE;\r
     goto _Exit;\r


@@ -299,14 +301,15 @@ X509GetSubjectName (
     goto _Exit;\r
   }\r
 \r
     goto _Exit;\r
   }\r
 \r

-  X509NameSize = i2d_X509_NAME(X509Name, NULL);\r
+  X509NameSize = i2d_X509_NAME (X509Name, NULL);\r

   if (*SubjectSize < X509NameSize) {\r
     *SubjectSize = X509NameSize;\r
     goto _Exit;\r
   }\r
   if (*SubjectSize < X509NameSize) {\r
     *SubjectSize = X509NameSize;\r
     goto _Exit;\r
   }\r

+\r

   *SubjectSize = X509NameSize;\r
   if (CertSubject != NULL) {\r
   *SubjectSize = X509NameSize;\r
   if (CertSubject != NULL) {\r

-    i2d_X509_NAME(X509Name, &CertSubject);\r
+    i2d_X509_NAME (X509Name, &CertSubject);\r

     Status = TRUE;\r
   }\r
 \r
     Status = TRUE;\r
   }\r
 \r


@@ -351,11 +354,11 @@ _Exit:
 STATIC\r
 RETURN_STATUS\r
 InternalX509GetNIDName (\r
 STATIC\r
 RETURN_STATUS\r
 InternalX509GetNIDName (\r

-  IN      CONST UINT8   *Cert,\r
-  IN      UINTN         CertSize,\r
-  IN      INT32         Request_NID,\r
-  OUT     CHAR8         *CommonName   OPTIONAL,\r
-  IN OUT  UINTN         *CommonNameSize\r
+  IN      CONST UINT8  *Cert,\r
+  IN      UINTN        CertSize,\r
+  IN      INT32        Request_NID,\r
+  OUT     CHAR8        *CommonName   OPTIONAL,\r
+  IN OUT  UINTN        *CommonNameSize\r

   )\r
 {\r
   RETURN_STATUS    ReturnStatus;\r
   )\r
 {\r
   RETURN_STATUS    ReturnStatus;\r


@@ -377,6 +380,7 @@ InternalX509GetNIDName (
   if ((Cert == NULL) || (CertSize > INT_MAX) || (CommonNameSize == NULL)) {\r
     return ReturnStatus;\r
   }\r
   if ((Cert == NULL) || (CertSize > INT_MAX) || (CommonNameSize == NULL)) {\r
     return ReturnStatus;\r
   }\r

+\r

   if ((CommonName != NULL) && (*CommonNameSize == 0)) {\r
     return ReturnStatus;\r
   }\r
   if ((CommonName != NULL) && (*CommonNameSize == 0)) {\r
     return ReturnStatus;\r
   }\r


@@ -385,7 +389,7 @@ InternalX509GetNIDName (
   //\r
   // Read DER-encoded X509 Certificate and Construct X509 object.\r
   //\r
   //\r
   // Read DER-encoded X509 Certificate and Construct X509 object.\r
   //\r

-  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);\r
+  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **)&X509Cert);\r

   if ((X509Cert == NULL) || (!Status)) {\r
     //\r
     // Invalid X.509 Certificate\r
   if ((X509Cert == NULL) || (!Status)) {\r
     //\r
     // Invalid X.509 Certificate\r


@@ -443,12 +447,12 @@ InternalX509GetNIDName (
 \r
   if (CommonName == NULL) {\r
     *CommonNameSize = Length + 1;\r
 \r
   if (CommonName == NULL) {\r
     *CommonNameSize = Length + 1;\r

-    ReturnStatus = RETURN_BUFFER_TOO_SMALL;\r
+    ReturnStatus    = RETURN_BUFFER_TOO_SMALL;\r

   } else {\r
     *CommonNameSize = MIN ((UINTN)Length, *CommonNameSize - 1) + 1;\r
     CopyMem (CommonName, UTF8Name, *CommonNameSize - 1);\r
     CommonName[*CommonNameSize - 1] = '\0';\r
   } else {\r
     *CommonNameSize = MIN ((UINTN)Length, *CommonNameSize - 1) + 1;\r
     CopyMem (CommonName, UTF8Name, *CommonNameSize - 1);\r
     CommonName[*CommonNameSize - 1] = '\0';\r

-    ReturnStatus = RETURN_SUCCESS;\r
+    ReturnStatus                    = RETURN_SUCCESS;\r

   }\r
 \r
 _Exit:\r
   }\r
 \r
 _Exit:\r


@@ -458,6 +462,7 @@ _Exit:
   if (X509Cert != NULL) {\r
     X509_free (X509Cert);\r
   }\r
   if (X509Cert != NULL) {\r
     X509_free (X509Cert);\r
   }\r

+\r

   if (UTF8Name != NULL) {\r
     OPENSSL_free (UTF8Name);\r
   }\r
   if (UTF8Name != NULL) {\r
     OPENSSL_free (UTF8Name);\r
   }\r


@@ -532,10 +537,10 @@ X509GetCommonName (
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r

-  IN      CONST UINT8   *Cert,\r
-  IN      UINTN         CertSize,\r
-  OUT     CHAR8         *NameBuffer   OPTIONAL,\r
-  IN OUT  UINTN         *NameBufferSize\r
+  IN      CONST UINT8  *Cert,\r
+  IN      UINTN        CertSize,\r
+  OUT     CHAR8        *NameBuffer   OPTIONAL,\r
+  IN OUT  UINTN        *NameBufferSize\r

   )\r
 {\r
   return InternalX509GetNIDName (Cert, CertSize, NID_organizationName, NameBuffer, NameBufferSize);\r
   )\r
 {\r
   return InternalX509GetNIDName (Cert, CertSize, NID_organizationName, NameBuffer, NameBufferSize);\r


@@ -572,7 +577,7 @@ RsaGetPublicKeyFromX509 (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Cert == NULL || RsaContext == NULL) {\r
+  if ((Cert == NULL) || (RsaContext == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -582,7 +587,7 @@ RsaGetPublicKeyFromX509 (
   //\r
   // Read DER-encoded X509 Certificate and Construct X509 object.\r
   //\r
   //\r
   // Read DER-encoded X509 Certificate and Construct X509 object.\r
   //\r

-  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);\r
+  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **)&X509Cert);\r

   if ((X509Cert == NULL) || (!Status)) {\r
     Status = FALSE;\r
     goto _Exit;\r
   if ((X509Cert == NULL) || (!Status)) {\r
     Status = FALSE;\r
     goto _Exit;\r


@@ -654,7 +659,7 @@ X509VerifyCert (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Cert == NULL || CACert == NULL) {\r
+  if ((Cert == NULL) || (CACert == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -670,9 +675,11 @@ X509VerifyCert (
   if (EVP_add_digest (EVP_md5 ()) == 0) {\r
     goto _Exit;\r
   }\r
   if (EVP_add_digest (EVP_md5 ()) == 0) {\r
     goto _Exit;\r
   }\r

+\r

   if (EVP_add_digest (EVP_sha1 ()) == 0) {\r
     goto _Exit;\r
   }\r
   if (EVP_add_digest (EVP_sha1 ()) == 0) {\r
     goto _Exit;\r
   }\r

+\r

   if (EVP_add_digest (EVP_sha256 ()) == 0) {\r
     goto _Exit;\r
   }\r
   if (EVP_add_digest (EVP_sha256 ()) == 0) {\r
     goto _Exit;\r
   }\r


@@ -680,7 +687,7 @@ X509VerifyCert (
   //\r
   // Read DER-encoded certificate to be verified and Construct X509 object.\r
   //\r
   //\r
   // Read DER-encoded certificate to be verified and Construct X509 object.\r
   //\r

-  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);\r
+  Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **)&X509Cert);\r

   if ((X509Cert == NULL) || (!Status)) {\r
     Status = FALSE;\r
     goto _Exit;\r
   if ((X509Cert == NULL) || (!Status)) {\r
     Status = FALSE;\r
     goto _Exit;\r


@@ -689,7 +696,7 @@ X509VerifyCert (
   //\r
   // Read DER-encoded root certificate and Construct X509 object.\r
   //\r
   //\r
   // Read DER-encoded root certificate and Construct X509 object.\r
   //\r

-  Status = X509ConstructCertificate (CACert, CACertSize, (UINT8 **) &X509CACert);\r
+  Status = X509ConstructCertificate (CACert, CACertSize, (UINT8 **)&X509CACert);\r

   if ((X509CACert == NULL) || (!Status)) {\r
     Status = FALSE;\r
     goto _Exit;\r
   if ((X509CACert == NULL) || (!Status)) {\r
     Status = FALSE;\r
     goto _Exit;\r


@@ -704,6 +711,7 @@ X509VerifyCert (
   if (CertStore == NULL) {\r
     goto _Exit;\r
   }\r
   if (CertStore == NULL) {\r
     goto _Exit;\r
   }\r

+\r

   if (!(X509_STORE_add_cert (CertStore, X509CACert))) {\r
     goto _Exit;\r
   }\r
   if (!(X509_STORE_add_cert (CertStore, X509CACert))) {\r
     goto _Exit;\r
   }\r


@@ -712,8 +720,10 @@ X509VerifyCert (
   // Allow partial certificate chains, terminated by a non-self-signed but\r
   // still trusted intermediate certificate. Also disable time checks.\r
   //\r
   // Allow partial certificate chains, terminated by a non-self-signed but\r
   // still trusted intermediate certificate. Also disable time checks.\r
   //\r

-  X509_STORE_set_flags (CertStore,\r
-                        X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME);\r
+  X509_STORE_set_flags (\r
+    CertStore,\r
+    X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME\r
+    );\r

 \r
   //\r
   // Set up X509_STORE_CTX for the subsequent verification operation.\r
 \r
   //\r
   // Set up X509_STORE_CTX for the subsequent verification operation.\r


@@ -722,6 +732,7 @@ X509VerifyCert (
   if (CertCtx == NULL) {\r
     goto _Exit;\r
   }\r
   if (CertCtx == NULL) {\r
     goto _Exit;\r
   }\r

+\r

   if (!X509_STORE_CTX_init (CertCtx, CertStore, X509Cert, NULL)) {\r
     goto _Exit;\r
   }\r
   if (!X509_STORE_CTX_init (CertCtx, CertStore, X509Cert, NULL)) {\r
     goto _Exit;\r
   }\r


@@ -729,7 +740,7 @@ X509VerifyCert (
   //\r
   // X509 Certificate Verification.\r
   //\r
   //\r
   // X509 Certificate Verification.\r
   //\r

-  Status = (BOOLEAN) X509_verify_cert (CertCtx);\r
+  Status = (BOOLEAN)X509_verify_cert (CertCtx);\r

   X509_STORE_CTX_cleanup (CertCtx);\r
 \r
 _Exit:\r
   X509_STORE_CTX_cleanup (CertCtx);\r
 \r
 _Exit:\r


@@ -787,7 +798,8 @@ X509GetTBSCert (
   // Check input parameters.\r
   //\r
   if ((Cert == NULL) || (TBSCert == NULL) ||\r
   // Check input parameters.\r
   //\r
   if ((Cert == NULL) || (TBSCert == NULL) ||\r

-      (TBSCertSize == NULL) || (CertSize > INT_MAX)) {\r
+      (TBSCertSize == NULL) || (CertSize > INT_MAX))\r
+  {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
index 2835f20a1de02a6befdd71a9f424032f2a6f72b2..38819723c791e8845f0cb442cafdda379f496f91 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
@@ -205,10 +205,10 @@ X509GetCommonName (
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r

-  IN      CONST UINT8   *Cert,\r
-  IN      UINTN         CertSize,\r
-  OUT     CHAR8         *NameBuffer   OPTIONAL,\r
-  IN OUT  UINTN         *NameBufferSize\r
+  IN      CONST UINT8  *Cert,\r
+  IN      UINTN        CertSize,\r
+  OUT     CHAR8        *NameBuffer   OPTIONAL,\r
+  IN OUT  UINTN        *NameBufferSize\r

   )\r
 {\r
   ASSERT (FALSE);\r
   )\r
 {\r
   ASSERT (FALSE);\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c
index 9c37a3a296ba5178dafd9bbfdf71ebb224ae9b7d..9e2fcefe084ee3b97739b381a78b014920723933 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c
+++ b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c
@@ -55,7 +55,7 @@ RandomSeed (
   // NOTE: A cryptographic PRNG must be seeded with unpredictable data.\r
   //\r
   if (Seed != NULL) {\r
   // NOTE: A cryptographic PRNG must be seeded with unpredictable data.\r
   //\r
   if (Seed != NULL) {\r

-    RAND_seed (Seed, (UINT32) SeedSize);\r
+    RAND_seed (Seed, (UINT32)SeedSize);\r

   } else {\r
     RAND_seed (DefaultSeed, sizeof (DefaultSeed));\r
   }\r
   } else {\r
     RAND_seed (DefaultSeed, sizeof (DefaultSeed));\r
   }\r


@@ -89,14 +89,14 @@ RandomBytes (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Output == NULL || Size > INT_MAX) {\r
+  if ((Output == NULL) || (Size > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // Generate random data.\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // Generate random data.\r
   //\r

-  if (RAND_bytes (Output, (UINT32) Size) != 1) {\r
+  if (RAND_bytes (Output, (UINT32)Size) != 1) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandNull.c b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandNull.c
index d2914f8758a3417399863876f2d5345c15a6a13f..254fa31899b0310b8da597261369edd92ed1aabc 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandNull.c
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "InternalCryptLib.h"\r
 \r
 \r
 #include "InternalCryptLib.h"\r
 \r

-\r

 /**\r
   Sets up the seed value for the pseudorandom number generator.\r
 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandTsc.c b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandTsc.c
index b0bfd5fb4f96253cdb28a441429d1f15d00ba395..30454bf10f9ba633e4d53cca94315e89ac51d71c 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandTsc.c
+++ b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandTsc.c
@@ -53,7 +53,7 @@ RandomSeed (
   // NOTE: A cryptographic PRNG must be seeded with unpredictable data.\r
   //\r
   if (Seed != NULL) {\r
   // NOTE: A cryptographic PRNG must be seeded with unpredictable data.\r
   //\r
   if (Seed != NULL) {\r

-    RAND_seed (Seed, (UINT32) SeedSize);\r
+    RAND_seed (Seed, (UINT32)SeedSize);\r

   } else {\r
     //\r
     // Retrieve current time.\r
   } else {\r
     //\r
     // Retrieve current time.\r


@@ -97,14 +97,14 @@ RandomBytes (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (Output == NULL || Size > INT_MAX) {\r
+  if ((Output == NULL) || (Size > INT_MAX)) {\r

     return FALSE;\r
   }\r
 \r
   //\r
   // Generate random data.\r
   //\r
     return FALSE;\r
   }\r
 \r
   //\r
   // Generate random data.\r
   //\r

-  if (RAND_bytes (Output, (UINT32) Size) != 1) {\r
+  if (RAND_bytes (Output, (UINT32)Size) != 1) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c b/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c
index d14644d13597f8f06f3fdc01e4576433880a811a..b7bed15c18df66cd7f8819ea01e119c263fb8f99 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c
@@ -13,21 +13,24 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Extra header to record the memory buffer size from malloc routine.\r
 //\r
 //\r
 // Extra header to record the memory buffer size from malloc routine.\r
 //\r

-#define CRYPTMEM_HEAD_SIGNATURE    SIGNATURE_32('c','m','h','d')\r
+#define CRYPTMEM_HEAD_SIGNATURE  SIGNATURE_32('c','m','h','d')\r

 typedef struct {\r
   UINT32    Signature;\r
   UINT32    Reserved;\r
   UINTN     Size;\r
 } CRYPTMEM_HEAD;\r
 \r
 typedef struct {\r
   UINT32    Signature;\r
   UINT32    Reserved;\r
   UINTN     Size;\r
 } CRYPTMEM_HEAD;\r
 \r

-#define CRYPTMEM_OVERHEAD      sizeof(CRYPTMEM_HEAD)\r
+#define CRYPTMEM_OVERHEAD  sizeof(CRYPTMEM_HEAD)\r

 \r
 //\r
 // -- Memory-Allocation Routines --\r
 //\r
 \r
 /* Allocates memory blocks */\r
 \r
 //\r
 // -- Memory-Allocation Routines --\r
 //\r
 \r
 /* Allocates memory blocks */\r

-void *malloc (size_t size)\r
+void *\r
+malloc (\r
+  size_t  size\r
+  )\r

 {\r
   CRYPTMEM_HEAD  *PoolHdr;\r
   UINTN          NewSize;\r
 {\r
   CRYPTMEM_HEAD  *PoolHdr;\r
   UINTN          NewSize;\r


@@ -38,7 +41,7 @@ void *malloc (size_t size)
   //\r
   NewSize = (UINTN)(size) + CRYPTMEM_OVERHEAD;\r
 \r
   //\r
   NewSize = (UINTN)(size) + CRYPTMEM_OVERHEAD;\r
 \r

-  Data  = AllocatePool (NewSize);\r
+  Data = AllocatePool (NewSize);\r

   if (Data != NULL) {\r
     PoolHdr = (CRYPTMEM_HEAD *)Data;\r
     //\r
   if (Data != NULL) {\r
     PoolHdr = (CRYPTMEM_HEAD *)Data;\r
     //\r


@@ -57,7 +60,11 @@ void *malloc (size_t size)
 }\r
 \r
 /* Reallocate memory blocks */\r
 }\r
 \r
 /* Reallocate memory blocks */\r

-void *realloc (void *ptr, size_t size)\r
+void *\r
+realloc (\r
+  void    *ptr,\r
+  size_t  size\r
+  )\r

 {\r
   CRYPTMEM_HEAD  *OldPoolHdr;\r
   CRYPTMEM_HEAD  *NewPoolHdr;\r
 {\r
   CRYPTMEM_HEAD  *OldPoolHdr;\r
   CRYPTMEM_HEAD  *NewPoolHdr;\r


@@ -66,9 +73,9 @@ void *realloc (void *ptr, size_t size)
   VOID           *Data;\r
 \r
   NewSize = (UINTN)size + CRYPTMEM_OVERHEAD;\r
   VOID           *Data;\r
 \r
   NewSize = (UINTN)size + CRYPTMEM_OVERHEAD;\r

-  Data = AllocatePool (NewSize);\r
+  Data    = AllocatePool (NewSize);\r

   if (Data != NULL) {\r
   if (Data != NULL) {\r

-    NewPoolHdr = (CRYPTMEM_HEAD *)Data;\r
+    NewPoolHdr            = (CRYPTMEM_HEAD *)Data;\r

     NewPoolHdr->Signature = CRYPTMEM_HEAD_SIGNATURE;\r
     NewPoolHdr->Size      = size;\r
     if (ptr != NULL) {\r
     NewPoolHdr->Signature = CRYPTMEM_HEAD_SIGNATURE;\r
     NewPoolHdr->Size      = size;\r
     if (ptr != NULL) {\r


@@ -96,7 +103,10 @@ void *realloc (void *ptr, size_t size)
 }\r
 \r
 /* De-allocates or frees a memory block */\r
 }\r
 \r
 /* De-allocates or frees a memory block */\r

-void free (void *ptr)\r
+void\r
+free (\r
+  void  *ptr\r
+  )\r

 {\r
   CRYPTMEM_HEAD  *PoolHdr;\r
 \r
 {\r
   CRYPTMEM_HEAD  *PoolHdr;\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c b/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c
index 18b04f2afd54e5daa099cb5fc2970b0798f01c40..2956b92d08277cf5972226e57cf353eb360f0ff0 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c
@@ -23,15 +23,22 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // -- Time Management Routines --\r
 //\r
 \r
 // -- Time Management Routines --\r
 //\r
 \r

-time_t time (time_t *timer)\r
+time_t\r
+time (\r
+  time_t  *timer\r
+  )\r

 {\r
   if (timer != NULL) {\r
     *timer = 0;\r
   }\r
 {\r
   if (timer != NULL) {\r
     *timer = 0;\r
   }\r

+\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r

-struct tm * gmtime (const time_t *timer)\r
+struct tm *\r
+gmtime (\r
+  const time_t  *timer\r
+  )\r

 {\r
   return NULL;\r
 }\r
 {\r
   return NULL;\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
index 42235ab96ac3e6e4fab85dac1d8fba43829e366a..bac477da070b04be4a93b209bc0bbcf8e6e3fc69 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include <CrtLibSupport.h>\r
 \r
 \r
 #include <CrtLibSupport.h>\r
 \r

-int errno = 0;\r
+int  errno = 0;\r

 \r
 FILE  *stderr = NULL;\r
 FILE  *stdin  = NULL;\r
 \r
 FILE  *stderr = NULL;\r
 FILE  *stdin  = NULL;\r


@@ -35,15 +35,15 @@ QuickSortWorker (
   IN        VOID          *Buffer\r
   )\r
 {\r
   IN        VOID          *Buffer\r
   )\r
 {\r

-  VOID        *Pivot;\r
-  UINTN       LoopCount;\r
-  UINTN       NextSwapLocation;\r
+  VOID   *Pivot;\r
+  UINTN  LoopCount;\r
+  UINTN  NextSwapLocation;\r

 \r
 \r

-  ASSERT(BufferToSort    != NULL);\r
-  ASSERT(CompareFunction != NULL);\r
-  ASSERT(Buffer          != NULL);\r
+  ASSERT (BufferToSort    != NULL);\r
+  ASSERT (CompareFunction != NULL);\r
+  ASSERT (Buffer          != NULL);\r

 \r
 \r

-  if (Count < 2 || ElementSize  < 1) {\r
+  if ((Count < 2) || (ElementSize  < 1)) {\r

     return;\r
   }\r
 \r
     return;\r
   }\r
 \r


@@ -58,8 +58,7 @@ QuickSortWorker (
   // Now get the pivot such that all on "left" are below it\r
   // and everything "right" are above it\r
   //\r
   // Now get the pivot such that all on "left" are below it\r
   // and everything "right" are above it\r
   //\r

-  for (LoopCount = 0; LoopCount < Count - 1;  LoopCount++)\r
-  {\r
+  for (LoopCount = 0; LoopCount < Count - 1; LoopCount++) {\r

     //\r
     // If the element is less than the pivot\r
     //\r
     //\r
     // If the element is less than the pivot\r
     //\r


@@ -77,6 +76,7 @@ QuickSortWorker (
       NextSwapLocation++;\r
     }\r
   }\r
       NextSwapLocation++;\r
     }\r
   }\r

+\r

   //\r
   // Swap pivot to its final position (NextSwapLocation)\r
   //\r
   //\r
   // Swap pivot to its final position (NextSwapLocation)\r
   //\r


@@ -107,28 +107,37 @@ QuickSortWorker (
   return;\r
 }\r
 \r
   return;\r
 }\r
 \r

-//---------------------------------------------------------\r
+// ---------------------------------------------------------\r

 // Standard C Run-time Library Interface Wrapper\r
 // Standard C Run-time Library Interface Wrapper\r

-//---------------------------------------------------------\r
+// ---------------------------------------------------------\r

 \r
 //\r
 // -- String Manipulation Routines --\r
 //\r
 \r
 \r
 //\r
 // -- String Manipulation Routines --\r
 //\r
 \r

-char *strchr(const char *str, int ch)\r
+char *\r
+strchr (\r
+  const char  *str,\r
+  int         ch\r
+  )\r

 {\r
   return ScanMem8 (str, AsciiStrSize (str), (UINT8)ch);\r
 }\r
 \r
 /* Scan a string for the last occurrence of a character */\r
 {\r
   return ScanMem8 (str, AsciiStrSize (str), (UINT8)ch);\r
 }\r
 \r
 /* Scan a string for the last occurrence of a character */\r

-char *strrchr (const char *str, int c)\r
+char *\r
+strrchr (\r
+  const char  *str,\r
+  int         c\r
+  )\r

 {\r
 {\r

-  char * save;\r
+  char  *save;\r

 \r
   for (save = NULL; ; ++str) {\r
     if (*str == c) {\r
       save = (char *)str;\r
     }\r
 \r
   for (save = NULL; ; ++str) {\r
     if (*str == c) {\r
       save = (char *)str;\r
     }\r

+\r

     if (*str == 0) {\r
       return (save);\r
     }\r
     if (*str == 0) {\r
       return (save);\r
     }\r


@@ -136,19 +145,25 @@ char *strrchr (const char *str, int c)
 }\r
 \r
 /* Compare first n bytes of string s1 with string s2, ignoring case */\r
 }\r
 \r
 /* Compare first n bytes of string s1 with string s2, ignoring case */\r

-int strncasecmp (const char *s1, const char *s2, size_t n)\r
+int\r
+strncasecmp (\r
+  const char  *s1,\r
+  const char  *s2,\r
+  size_t      n\r
+  )\r

 {\r
 {\r

-  int Val;\r
+  int  Val;\r

 \r
 \r

-  ASSERT(s1 != NULL);\r
-  ASSERT(s2 != NULL);\r
+  ASSERT (s1 != NULL);\r
+  ASSERT (s2 != NULL);\r

 \r
   if (n != 0) {\r
     do {\r
 \r
   if (n != 0) {\r
     do {\r

-      Val = tolower(*s1) - tolower(*s2);\r
+      Val = tolower (*s1) - tolower (*s2);\r

       if (Val != 0) {\r
         return Val;\r
       }\r
       if (Val != 0) {\r
         return Val;\r
       }\r

+\r

       ++s1;\r
       ++s2;\r
       if (*s1 == '\0') {\r
       ++s1;\r
       ++s2;\r
       if (*s1 == '\0') {\r


@@ -156,11 +171,17 @@ int strncasecmp (const char *s1, const char *s2, size_t n)
       }\r
     } while (--n != 0);\r
   }\r
       }\r
     } while (--n != 0);\r
   }\r

+\r

   return 0;\r
 }\r
 \r
 /* Read formatted data from a string */\r
   return 0;\r
 }\r
 \r
 /* Read formatted data from a string */\r

-int sscanf (const char *buffer, const char *format, ...)\r
+int\r
+sscanf (\r
+  const char  *buffer,\r
+  const char  *format,\r
+  ...\r
+  )\r

 {\r
   //\r
   // Null sscanf() function implementation to satisfy the linker, since\r
 {\r
   //\r
   // Null sscanf() function implementation to satisfy the linker, since\r


@@ -170,14 +191,21 @@ int sscanf (const char *buffer, const char *format, ...)
 }\r
 \r
 /* Maps errnum to an error-message string */\r
 }\r
 \r
 /* Maps errnum to an error-message string */\r

-char * strerror (int errnum)\r
+char *\r
+strerror (\r
+  int  errnum\r
+  )\r

 {\r
   return NULL;\r
 }\r
 \r
 /* Computes the length of the maximum initial segment of the string pointed to by s1\r
    which consists entirely of characters from the string pointed to by s2. */\r
 {\r
   return NULL;\r
 }\r
 \r
 /* Computes the length of the maximum initial segment of the string pointed to by s1\r
    which consists entirely of characters from the string pointed to by s2. */\r

-size_t strspn (const char *s1 , const char *s2)\r
+size_t\r
+strspn (\r
+  const char  *s1,\r
+  const char  *s2\r
+  )\r

 {\r
   UINT8   Map[32];\r
   UINT32  Index;\r
 {\r
   UINT8   Map[32];\r
   UINT32  Index;\r


@@ -207,11 +235,15 @@ size_t strspn (const char *s1 , const char *s2)
 \r
 /* Computes the length of the maximum initial segment of the string pointed to by s1\r
    which consists entirely of characters not from the string pointed to by s2. */\r
 \r
 /* Computes the length of the maximum initial segment of the string pointed to by s1\r
    which consists entirely of characters not from the string pointed to by s2. */\r

-size_t strcspn (const char *s1, const char *s2)\r
+size_t\r
+strcspn (\r
+  const char  *s1,\r
+  const char  *s2\r
+  )\r

 {\r
 {\r

-  UINT8  Map[32];\r
-  UINT32 Index;\r
-  size_t Count;\r
+  UINT8   Map[32];\r
+  UINT32  Index;\r
+  size_t  Count;\r

 \r
   for (Index = 0; Index < 32; Index++) {\r
     Map[Index] = 0;\r
 \r
   for (Index = 0; Index < 32; Index++) {\r
     Map[Index] = 0;\r


@@ -224,9 +256,9 @@ size_t strcspn (const char *s1, const char *s2)
 \r
   Map[0] |= 1;\r
 \r
 \r
   Map[0] |= 1;\r
 \r

-  Count   = 0;\r
+  Count = 0;\r

   while (!(Map[*s1 >> 3] & (1 << (*s1 & 7)))) {\r
   while (!(Map[*s1 >> 3] & (1 << (*s1 & 7)))) {\r

-    Count ++;\r
+    Count++;\r

     s1++;\r
   }\r
 \r
     s1++;\r
   }\r
 \r


@@ -238,7 +270,10 @@ size_t strcspn (const char *s1, const char *s2)
 //\r
 \r
 /* Determines if a particular character is a decimal-digit character */\r
 //\r
 \r
 /* Determines if a particular character is a decimal-digit character */\r

-int isdigit (int c)\r
+int\r
+isdigit (\r
+  int  c\r
+  )\r

 {\r
   //\r
   // <digit> ::= [0-9]\r
 {\r
   //\r
   // <digit> ::= [0-9]\r


@@ -247,7 +282,10 @@ int isdigit (int c)
 }\r
 \r
 /* Determine if an integer represents character that is a hex digit */\r
 }\r
 \r
 /* Determine if an integer represents character that is a hex digit */\r

-int isxdigit (int c)\r
+int\r
+isxdigit (\r
+  int  c\r
+  )\r

 {\r
   //\r
   // <hexdigit> ::= [0-9] | [a-f] | [A-F]\r
 {\r
   //\r
   // <hexdigit> ::= [0-9] | [a-f] | [A-F]\r


@@ -258,7 +296,10 @@ int isxdigit (int c)
 }\r
 \r
 /* Determines if a particular character represents a space character */\r
 }\r
 \r
 /* Determines if a particular character represents a space character */\r

-int isspace (int c)\r
+int\r
+isspace (\r
+  int  c\r
+  )\r

 {\r
   //\r
   // <space> ::= [ ]\r
 {\r
   //\r
   // <space> ::= [ ]\r


@@ -267,7 +308,10 @@ int isspace (int c)
 }\r
 \r
 /* Determine if a particular character is an alphanumeric character */\r
 }\r
 \r
 /* Determine if a particular character is an alphanumeric character */\r

-int isalnum (int c)\r
+int\r
+isalnum (\r
+  int  c\r
+  )\r

 {\r
   //\r
   // <alnum> ::= [0-9] | [a-z] | [A-Z]\r
 {\r
   //\r
   // <alnum> ::= [0-9] | [a-z] | [A-Z]\r


@@ -278,7 +322,10 @@ int isalnum (int c)
 }\r
 \r
 /* Determines if a particular character is in upper case */\r
 }\r
 \r
 /* Determines if a particular character is in upper case */\r

-int isupper (int c)\r
+int\r
+isupper (\r
+  int  c\r
+  )\r

 {\r
   //\r
   // <uppercase letter> := [A-Z]\r
 {\r
   //\r
   // <uppercase letter> := [A-Z]\r


@@ -291,7 +338,12 @@ int isupper (int c)
 //\r
 \r
 /* Convert strings to a long-integer value */\r
 //\r
 \r
 /* Convert strings to a long-integer value */\r

-long strtol (const char *nptr, char **endptr, int base)\r
+long\r
+strtol (\r
+  const char  *nptr,\r
+  char        **endptr,\r
+  int         base\r
+  )\r

 {\r
   //\r
   // Null strtol() function implementation to satisfy the linker, since there is\r
 {\r
   //\r
   // Null strtol() function implementation to satisfy the linker, since there is\r


@@ -301,7 +353,12 @@ long strtol (const char *nptr, char **endptr, int base)
 }\r
 \r
 /* Convert strings to an unsigned long-integer value */\r
 }\r
 \r
 /* Convert strings to an unsigned long-integer value */\r

-unsigned long strtoul (const char *nptr, char **endptr, int base)\r
+unsigned long\r
+strtoul (\r
+  const char  *nptr,\r
+  char        **endptr,\r
+  int         base\r
+  )\r

 {\r
   //\r
   // Null strtoul() function implementation to satisfy the linker, since there is\r
 {\r
   //\r
   // Null strtoul() function implementation to satisfy the linker, since there is\r


@@ -311,11 +368,15 @@ unsigned long strtoul (const char *nptr, char **endptr, int base)
 }\r
 \r
 /* Convert character to lowercase */\r
 }\r
 \r
 /* Convert character to lowercase */\r

-int tolower (int c)\r
+int\r
+tolower (\r
+  int  c\r
+  )\r

 {\r
   if (('A' <= (c)) && ((c) <= 'Z')) {\r
     return (c - ('A' - 'a'));\r
   }\r
 {\r
   if (('A' <= (c)) && ((c) <= 'Z')) {\r
     return (c - ('A' - 'a'));\r
   }\r

+\r

   return (c);\r
 }\r
 \r
   return (c);\r
 }\r
 \r


@@ -324,7 +385,13 @@ int tolower (int c)
 //\r
 \r
 /* Performs a quick sort */\r
 //\r
 \r
 /* Performs a quick sort */\r

-void qsort (void *base, size_t num, size_t width, int (*compare)(const void *, const void *))\r
+void\r
+qsort (\r
+  void *base,\r
+  size_t num,\r
+  size_t width,\r
+  int ( *compare )(const void *, const void *)\r
+  )\r

 {\r
   VOID  *Buffer;\r
 \r
 {\r
   VOID  *Buffer;\r
 \r


@@ -351,7 +418,10 @@ void qsort (void *base, size_t num, size_t width, int (*compare)(const void *, c
 //\r
 \r
 /* Get a value from the current environment */\r
 //\r
 \r
 /* Get a value from the current environment */\r

-char *getenv (const char *varname)\r
+char *\r
+getenv (\r
+  const char  *varname\r
+  )\r

 {\r
   //\r
   // Null getenv() function implementation to satisfy the linker, since there is\r
 {\r
   //\r
   // Null getenv() function implementation to satisfy the linker, since there is\r


@@ -361,7 +431,10 @@ char *getenv (const char *varname)
 }\r
 \r
 /* Get a value from the current environment */\r
 }\r
 \r
 /* Get a value from the current environment */\r

-char *secure_getenv (const char *varname)\r
+char *\r
+secure_getenv (\r
+  const char  *varname\r
+  )\r

 {\r
   //\r
   // Null secure_getenv() function implementation to satisfy the linker, since\r
 {\r
   //\r
   // Null secure_getenv() function implementation to satisfy the linker, since\r


@@ -378,7 +451,13 @@ char *secure_getenv (const char *varname)
 //\r
 \r
 /* Write data to a stream */\r
 //\r
 \r
 /* Write data to a stream */\r

-size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)\r
+size_t\r
+fwrite (\r
+  const void  *buffer,\r
+  size_t      size,\r
+  size_t      count,\r
+  FILE        *stream\r
+  )\r

 {\r
   return 0;\r
 }\r
 {\r
   return 0;\r
 }\r


@@ -387,12 +466,23 @@ size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)
 //  -- Dummy OpenSSL Support Routines --\r
 //\r
 \r
 //  -- Dummy OpenSSL Support Routines --\r
 //\r
 \r

-int BIO_printf (void *bio, const char *format, ...)\r
+int\r
+BIO_printf (\r
+  void        *bio,\r
+  const char  *format,\r
+  ...\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-int BIO_snprintf(char *buf, size_t n, const char *format, ...)\r
+int\r
+BIO_snprintf (\r
+  char        *buf,\r
+  size_t      n,\r
+  const char  *format,\r
+  ...\r
+  )\r

 {\r
   return 0;\r
 }\r
 {\r
   return 0;\r
 }\r


@@ -403,7 +493,7 @@ typedef
 VOID\r
 (EFIAPI *NoReturnFuncPtr)(\r
   VOID\r
 VOID\r
 (EFIAPI *NoReturnFuncPtr)(\r
   VOID\r

-  ) __attribute__((__noreturn__));\r
+  ) __attribute__ ((__noreturn__));\r

 \r
 STATIC\r
 VOID\r
 \r
 STATIC\r
 VOID\r


@@ -414,60 +504,95 @@ NopFunction (
 {\r
 }\r
 \r
 {\r
 }\r
 \r

-void abort (void)\r
+void\r
+abort (\r
+  void\r
+  )\r

 {\r
 {\r

-  NoReturnFuncPtr NoReturnFunc;\r
+  NoReturnFuncPtr  NoReturnFunc;\r

 \r
 \r

-  NoReturnFunc = (NoReturnFuncPtr) NopFunction;\r
+  NoReturnFunc = (NoReturnFuncPtr)NopFunction;\r

 \r
   NoReturnFunc ();\r
 }\r
 \r
 #else\r
 \r
 \r
   NoReturnFunc ();\r
 }\r
 \r
 #else\r
 \r

-void abort (void)\r
+void\r
+abort (\r
+  void\r
+  )\r

 {\r
   // Do nothing\r
 }\r
 \r
 #endif\r
 \r
 {\r
   // Do nothing\r
 }\r
 \r
 #endif\r
 \r

-int fclose (FILE *f)\r
+int\r
+fclose (\r
+  FILE  *f\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-FILE *fopen (const char *c, const char *m)\r
+FILE *\r
+fopen (\r
+  const char  *c,\r
+  const char  *m\r
+  )\r

 {\r
   return NULL;\r
 }\r
 \r
 {\r
   return NULL;\r
 }\r
 \r

-size_t fread (void *b, size_t c, size_t i, FILE *f)\r
+size_t\r
+fread (\r
+  void    *b,\r
+  size_t  c,\r
+  size_t  i,\r
+  FILE    *f\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-uid_t getuid (void)\r
+uid_t\r
+getuid (\r
+  void\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-uid_t geteuid (void)\r
+uid_t\r
+geteuid (\r
+  void\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-gid_t getgid (void)\r
+gid_t\r
+getgid (\r
+  void\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-gid_t getegid (void)\r
+gid_t\r
+getegid (\r
+  void\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-int printf (char const *fmt, ...)\r
+int\r
+printf (\r
+  char const  *fmt,\r
+  ...\r
+  )\r

 {\r
   return 0;\r
 }\r
 {\r
   return 0;\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
index 3e12a0500afea8a9ceeee3e914a0b9ae858419b2..0d2ca604ea3e69cc59349d808801a838482707dd 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
@@ -13,42 +13,42 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MemoryAllocationLib.h>\r
 #include <Guid/EventGroup.h>\r
 \r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Guid/EventGroup.h>\r
 \r

-//----------------------------------------------------------------\r
+// ----------------------------------------------------------------\r

 // Initial version. Needs further optimizations.\r
 // Initial version. Needs further optimizations.\r

-//----------------------------------------------------------------\r
+// ----------------------------------------------------------------\r

 \r
 //\r
 // Definitions for Runtime Memory Operations\r
 //\r
 \r
 //\r
 // Definitions for Runtime Memory Operations\r
 //\r

-#define RT_PAGE_SIZE                0x200\r
-#define RT_PAGE_MASK                0x1FF\r
-#define RT_PAGE_SHIFT               9\r
+#define RT_PAGE_SIZE   0x200\r
+#define RT_PAGE_MASK   0x1FF\r
+#define RT_PAGE_SHIFT  9\r

 \r
 \r

-#define RT_SIZE_TO_PAGES(a)         (((a) >> RT_PAGE_SHIFT) + (((a) & RT_PAGE_MASK) ? 1 : 0))\r
-#define RT_PAGES_TO_SIZE(a)         ((a) << RT_PAGE_SHIFT)\r
+#define RT_SIZE_TO_PAGES(a)  (((a) >> RT_PAGE_SHIFT) + (((a) & RT_PAGE_MASK) ? 1 : 0))\r
+#define RT_PAGES_TO_SIZE(a)  ((a) << RT_PAGE_SHIFT)\r

 \r
 //\r
 // Page Flag Definitions\r
 //\r
 \r
 //\r
 // Page Flag Definitions\r
 //\r

-#define RT_PAGE_FREE                0x00000000\r
-#define RT_PAGE_USED                0x00000001\r
+#define RT_PAGE_FREE  0x00000000\r
+#define RT_PAGE_USED  0x00000001\r

 \r
 \r

-#define MIN_REQUIRED_BLOCKS         600\r
+#define MIN_REQUIRED_BLOCKS  600\r

 \r
 //\r
 // Memory Page Table\r
 //\r
 typedef struct {\r
 \r
 //\r
 // Memory Page Table\r
 //\r
 typedef struct {\r

-  UINTN   StartPageOffset;      // Offset of the starting page allocated.\r
+  UINTN     StartPageOffset;    // Offset of the starting page allocated.\r

                                 // Only available for USED pages.\r
                                 // Only available for USED pages.\r

-  UINT32  PageFlag;             // Page Attributes.\r
+  UINT32    PageFlag;           // Page Attributes.\r

 } RT_MEMORY_PAGE_ENTRY;\r
 \r
 typedef struct {\r
 } RT_MEMORY_PAGE_ENTRY;\r
 \r
 typedef struct {\r

-  UINTN                 PageCount;\r
-  UINTN                 LastEmptyPageOffset;\r
-  UINT8                 *DataAreaBase;         // Pointer to data Area.\r
-  RT_MEMORY_PAGE_ENTRY  Pages[1];              // Page Table Entries.\r
+  UINTN                   PageCount;\r
+  UINTN                   LastEmptyPageOffset;\r
+  UINT8                   *DataAreaBase;       // Pointer to data Area.\r
+  RT_MEMORY_PAGE_ENTRY    Pages[1];            // Page Table Entries.\r

 } RT_MEMORY_PAGE_TABLE;\r
 \r
 //\r
 } RT_MEMORY_PAGE_TABLE;\r
 \r
 //\r


@@ -59,8 +59,7 @@ RT_MEMORY_PAGE_TABLE  *mRTPageTable = NULL;
 //\r
 // Event for Runtime Address Conversion.\r
 //\r
 //\r
 // Event for Runtime Address Conversion.\r
 //\r

-STATIC EFI_EVENT      mVirtualAddressChangeEvent;\r
-\r
+STATIC EFI_EVENT  mVirtualAddressChangeEvent;\r

 \r
 /**\r
   Initializes pre-allocated memory pointed by ScratchBuffer for subsequent\r
 \r
 /**\r
   Initializes pre-allocated memory pointed by ScratchBuffer for subsequent\r


@@ -114,7 +113,6 @@ InitializeScratchMemory (
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-\r

 /**\r
   Look-up Free memory Region for object allocation.\r
 \r
 /**\r
   Look-up Free memory Region for object allocation.\r
 \r


@@ -182,6 +180,7 @@ LookupFreeMemRegion (
     //\r
     return (UINTN)(-1);\r
   }\r
     //\r
     return (UINTN)(-1);\r
   }\r

+\r

   for (Index = 0; Index < (StartPageIndex - ReqPages); ) {\r
     //\r
     // Check Consecutive ReqPages Pages.\r
   for (Index = 0; Index < (StartPageIndex - ReqPages); ) {\r
     //\r
     // Check Consecutive ReqPages Pages.\r


@@ -203,7 +202,8 @@ LookupFreeMemRegion (
     // Failed! Skip current adjacent Used pages\r
     //\r
     while ((SubIndex < (StartPageIndex - ReqPages)) &&\r
     // Failed! Skip current adjacent Used pages\r
     //\r
     while ((SubIndex < (StartPageIndex - ReqPages)) &&\r

-           ((mRTPageTable->Pages[SubIndex + Index].PageFlag & RT_PAGE_USED) != 0)) {\r
+           ((mRTPageTable->Pages[SubIndex + Index].PageFlag & RT_PAGE_USED) != 0))\r
+    {\r

       SubIndex++;\r
     }\r
 \r
       SubIndex++;\r
     }\r
 \r


@@ -216,7 +216,6 @@ LookupFreeMemRegion (
   return (UINTN)(-1);\r
 }\r
 \r
   return (UINTN)(-1);\r
 }\r
 \r

-\r

 /**\r
   Allocates a buffer at runtime phase.\r
 \r
 /**\r
   Allocates a buffer at runtime phase.\r
 \r


@@ -274,7 +273,6 @@ RuntimeAllocateMem (
   return AllocPtr;\r
 }\r
 \r
   return AllocPtr;\r
 }\r
 \r

-\r

 /**\r
   Frees a buffer that was previously allocated at runtime phase.\r
 \r
 /**\r
   Frees a buffer that was previously allocated at runtime phase.\r
 \r


@@ -290,19 +288,20 @@ RuntimeFreeMem (
   UINTN  StartPageIndex;\r
 \r
   StartOffset    = (UINTN)Buffer - (UINTN)mRTPageTable->DataAreaBase;\r
   UINTN  StartPageIndex;\r
 \r
   StartOffset    = (UINTN)Buffer - (UINTN)mRTPageTable->DataAreaBase;\r

-  StartPageIndex = RT_SIZE_TO_PAGES (mRTPageTable->Pages[RT_SIZE_TO_PAGES(StartOffset)].StartPageOffset);\r
+  StartPageIndex = RT_SIZE_TO_PAGES (mRTPageTable->Pages[RT_SIZE_TO_PAGES (StartOffset)].StartPageOffset);\r

 \r
   while (StartPageIndex < mRTPageTable->PageCount) {\r
     if (((mRTPageTable->Pages[StartPageIndex].PageFlag & RT_PAGE_USED) != 0) &&\r
 \r
   while (StartPageIndex < mRTPageTable->PageCount) {\r
     if (((mRTPageTable->Pages[StartPageIndex].PageFlag & RT_PAGE_USED) != 0) &&\r

-        (mRTPageTable->Pages[StartPageIndex].StartPageOffset == StartOffset)) {\r
-        //\r
-        // Free this page\r
-        //\r
-        mRTPageTable->Pages[StartPageIndex].PageFlag       &= ~RT_PAGE_USED;\r
-        mRTPageTable->Pages[StartPageIndex].PageFlag       |= RT_PAGE_FREE;\r
-        mRTPageTable->Pages[StartPageIndex].StartPageOffset = 0;\r
-\r
-        StartPageIndex++;\r
+        (mRTPageTable->Pages[StartPageIndex].StartPageOffset == StartOffset))\r
+    {\r
+      //\r
+      // Free this page\r
+      //\r
+      mRTPageTable->Pages[StartPageIndex].PageFlag       &= ~RT_PAGE_USED;\r
+      mRTPageTable->Pages[StartPageIndex].PageFlag       |= RT_PAGE_FREE;\r
+      mRTPageTable->Pages[StartPageIndex].StartPageOffset = 0;\r
+\r
+      StartPageIndex++;\r

     } else {\r
       break;\r
     }\r
     } else {\r
       break;\r
     }\r


@@ -311,7 +310,6 @@ RuntimeFreeMem (
   return;\r
 }\r
 \r
   return;\r
 }\r
 \r

-\r

 /**\r
   Notification function of EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE.\r
 \r
 /**\r
   Notification function of EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE.\r
 \r


@@ -325,18 +323,17 @@ RuntimeFreeMem (
 VOID\r
 EFIAPI\r
 RuntimeCryptLibAddressChangeEvent (\r
 VOID\r
 EFIAPI\r
 RuntimeCryptLibAddressChangeEvent (\r

-  IN  EFI_EVENT        Event,\r
-  IN  VOID             *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r

   )\r
 {\r
   //\r
   // Converts a pointer for runtime memory management to a new virtual address.\r
   //\r
   )\r
 {\r
   //\r
   // Converts a pointer for runtime memory management to a new virtual address.\r
   //\r

-  EfiConvertPointer (0x0, (VOID **) &mRTPageTable->DataAreaBase);\r
-  EfiConvertPointer (0x0, (VOID **) &mRTPageTable);\r
+  EfiConvertPointer (0x0, (VOID **)&mRTPageTable->DataAreaBase);\r
+  EfiConvertPointer (0x0, (VOID **)&mRTPageTable);\r

 }\r
 \r
 }\r
 \r

-\r

 /**\r
   Constructor routine for runtime crypt library instance.\r
 \r
 /**\r
   Constructor routine for runtime crypt library instance.\r
 \r


@@ -384,19 +381,25 @@ RuntimeCryptLibConstructor (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-\r

 //\r
 // -- Memory-Allocation Routines Wrapper for UEFI-OpenSSL Library --\r
 //\r
 \r
 /* Allocates memory blocks */\r
 //\r
 // -- Memory-Allocation Routines Wrapper for UEFI-OpenSSL Library --\r
 //\r
 \r
 /* Allocates memory blocks */\r

-void *malloc (size_t size)\r
+void *\r
+malloc (\r
+  size_t  size\r
+  )\r

 {\r
 {\r

-  return RuntimeAllocateMem ((UINTN) size);\r
+  return RuntimeAllocateMem ((UINTN)size);\r

 }\r
 \r
 /* Reallocate memory blocks */\r
 }\r
 \r
 /* Reallocate memory blocks */\r

-void *realloc (void *ptr, size_t size)\r
+void *\r
+realloc (\r
+  void    *ptr,\r
+  size_t  size\r
+  )\r

 {\r
   VOID   *NewPtr;\r
   UINTN  StartOffset;\r
 {\r
   VOID   *NewPtr;\r
   UINTN  StartOffset;\r


@@ -415,9 +418,10 @@ void *realloc (void *ptr, size_t size)
   PageCount      = 0;\r
   while (StartPageIndex < mRTPageTable->PageCount) {\r
     if (((mRTPageTable->Pages[StartPageIndex].PageFlag & RT_PAGE_USED) != 0) &&\r
   PageCount      = 0;\r
   while (StartPageIndex < mRTPageTable->PageCount) {\r
     if (((mRTPageTable->Pages[StartPageIndex].PageFlag & RT_PAGE_USED) != 0) &&\r

-        (mRTPageTable->Pages[StartPageIndex].StartPageOffset == StartOffset)) {\r
-        StartPageIndex++;\r
-        PageCount++;\r
+        (mRTPageTable->Pages[StartPageIndex].StartPageOffset == StartOffset))\r
+    {\r
+      StartPageIndex++;\r
+      PageCount++;\r

     } else {\r
       break;\r
     }\r
     } else {\r
       break;\r
     }\r


@@ -430,7 +434,7 @@ void *realloc (void *ptr, size_t size)
     return ptr;\r
   }\r
 \r
     return ptr;\r
   }\r
 \r

-  NewPtr = RuntimeAllocateMem ((UINTN) size);\r
+  NewPtr = RuntimeAllocateMem ((UINTN)size);\r

   if (NewPtr == NULL) {\r
     return NULL;\r
   }\r
   if (NewPtr == NULL) {\r
     return NULL;\r
   }\r


@@ -443,7 +447,10 @@ void *realloc (void *ptr, size_t size)
 }\r
 \r
 /* Deallocates or frees a memory block */\r
 }\r
 \r
 /* Deallocates or frees a memory block */\r

-void free (void *ptr)\r
+void\r
+free (\r
+  void  *ptr\r
+  )\r

 {\r
   //\r
   // In Standard C, free() handles a null pointer argument transparently. This\r
 {\r
   //\r
   // In Standard C, free() handles a null pointer argument transparently. This\r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
index 027e5a942ee1555496eaa7325598f9f0ced5aa29..7d28446d4b5c6673b35fee3282612843431502fc 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
@@ -15,17 +15,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // -- Time Management Routines --\r
 //\r
 \r
 // -- Time Management Routines --\r
 //\r
 \r

-#define IsLeap(y)   (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))\r
-#define SECSPERMIN  (60)\r
-#define SECSPERHOUR (60 * 60)\r
-#define SECSPERDAY  (24 * SECSPERHOUR)\r
+#define IsLeap(y)  (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))\r
+#define SECSPERMIN   (60)\r
+#define SECSPERHOUR  (60 * 60)\r
+#define SECSPERDAY   (24 * SECSPERHOUR)\r

 \r
 //\r
 //  The arrays give the cumulative number of days up to the first of the\r
 //  month number used as the index (1 -> 12) for regular and leap years.\r
 //  The value at index 13 is for the whole year.\r
 //\r
 \r
 //\r
 //  The arrays give the cumulative number of days up to the first of the\r
 //  month number used as the index (1 -> 12) for regular and leap years.\r
 //  The value at index 13 is for the whole year.\r
 //\r

-UINTN CumulativeDays[2][14] = {\r
+UINTN  CumulativeDays[2][14] = {\r

   {\r
     0,\r
     0,\r
   {\r
     0,\r
     0,\r


@@ -61,10 +61,13 @@ UINTN CumulativeDays[2][14] = {
 };\r
 \r
 /* Get the system time as seconds elapsed since midnight, January 1, 1970. */\r
 };\r
 \r
 /* Get the system time as seconds elapsed since midnight, January 1, 1970. */\r

-//INTN time(\r
+// INTN time(\r

 //  INTN *timer\r
 //  )\r
 //  INTN *timer\r
 //  )\r

-time_t time (time_t *timer)\r
+time_t\r
+time (\r
+  time_t  *timer\r
+  )\r

 {\r
   EFI_STATUS  Status;\r
   EFI_TIME    Time;\r
 {\r
   EFI_STATUS  Status;\r
   EFI_TIME    Time;\r


@@ -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.\r
   //\r
   for (Year = 1970, CalTime = 0; Year != Time.Year; Year++) {\r
   // UTime should now be set to 00:00:00 on Jan 1 of the current year.\r
   //\r
   for (Year = 1970, CalTime = 0; Year != Time.Year; Year++) {\r

-    CalTime = CalTime + (time_t)(CumulativeDays[IsLeap(Year)][13] * SECSPERDAY);\r
+    CalTime = CalTime + (time_t)(CumulativeDays[IsLeap (Year)][13] * SECSPERDAY);\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -92,7 +95,7 @@ time_t time (time_t *timer)
   //\r
   CalTime = CalTime +\r
             (time_t)((Time.TimeZone != EFI_UNSPECIFIED_TIMEZONE) ? (Time.TimeZone * 60) : 0) +\r
   //\r
   CalTime = CalTime +\r
             (time_t)((Time.TimeZone != EFI_UNSPECIFIED_TIMEZONE) ? (Time.TimeZone * 60) : 0) +\r

-            (time_t)(CumulativeDays[IsLeap(Time.Year)][Time.Month] * SECSPERDAY) +\r
+            (time_t)(CumulativeDays[IsLeap (Time.Year)][Time.Month] * SECSPERDAY) +\r

             (time_t)(((Time.Day > 0) ? Time.Day - 1 : 0) * SECSPERDAY) +\r
             (time_t)(Time.Hour * SECSPERHOUR) +\r
             (time_t)(Time.Minute * 60) +\r
             (time_t)(((Time.Day > 0) ? Time.Day - 1 : 0) * SECSPERDAY) +\r
             (time_t)(Time.Hour * SECSPERHOUR) +\r
             (time_t)(Time.Minute * 60) +\r


@@ -108,7 +111,10 @@ time_t time (time_t *timer)
 //\r
 // Convert a time value from type time_t to struct tm.\r
 //\r
 //\r
 // Convert a time value from type time_t to struct tm.\r
 //\r

-struct tm * gmtime (const time_t *timer)\r
+struct tm *\r
+gmtime (\r
+  const time_t  *timer\r
+  )\r

 {\r
   struct tm  *GmTime;\r
   UINT16     DayNo;\r
 {\r
   struct tm  *GmTime;\r
   UINT16     DayNo;\r


@@ -127,38 +133,38 @@ struct tm * gmtime (const time_t *timer)
     return NULL;\r
   }\r
 \r
     return NULL;\r
   }\r
 \r

-  ZeroMem ((VOID *) GmTime, (UINTN) sizeof (struct tm));\r
+  ZeroMem ((VOID *)GmTime, (UINTN)sizeof (struct tm));\r

 \r
 \r

-  DayNo        = (UINT16) (*timer / SECSPERDAY);\r
-  DayRemainder = (UINT16) (*timer % SECSPERDAY);\r
+  DayNo        = (UINT16)(*timer / SECSPERDAY);\r
+  DayRemainder = (UINT16)(*timer % SECSPERDAY);\r

 \r
 \r

-  GmTime->tm_sec  = (int) (DayRemainder % SECSPERMIN);\r
-  GmTime->tm_min  = (int) ((DayRemainder % SECSPERHOUR) / SECSPERMIN);\r
-  GmTime->tm_hour = (int) (DayRemainder / SECSPERHOUR);\r
-  GmTime->tm_wday = (int) ((DayNo + 4) % 7);\r
+  GmTime->tm_sec  = (int)(DayRemainder % SECSPERMIN);\r
+  GmTime->tm_min  = (int)((DayRemainder % SECSPERHOUR) / SECSPERMIN);\r
+  GmTime->tm_hour = (int)(DayRemainder / SECSPERHOUR);\r
+  GmTime->tm_wday = (int)((DayNo + 4) % 7);\r

 \r
   for (Year = 1970, YearNo = 0; DayNo > 0; Year++) {\r
 \r
   for (Year = 1970, YearNo = 0; DayNo > 0; Year++) {\r

-    TotalDays = (UINT16) (IsLeap (Year) ? 366 : 365);\r
+    TotalDays = (UINT16)(IsLeap (Year) ? 366 : 365);\r

     if (DayNo >= TotalDays) {\r
     if (DayNo >= TotalDays) {\r

-      DayNo = (UINT16) (DayNo - TotalDays);\r
+      DayNo = (UINT16)(DayNo - TotalDays);\r

       YearNo++;\r
     } else {\r
       break;\r
     }\r
   }\r
 \r
       YearNo++;\r
     } else {\r
       break;\r
     }\r
   }\r
 \r

-  GmTime->tm_year = (int) (YearNo + (1970 - 1900));\r
-  GmTime->tm_yday = (int) DayNo;\r
+  GmTime->tm_year = (int)(YearNo + (1970 - 1900));\r
+  GmTime->tm_yday = (int)DayNo;\r

 \r
   for (MonthNo = 12; MonthNo > 1; MonthNo--) {\r
 \r
   for (MonthNo = 12; MonthNo > 1; MonthNo--) {\r

-    if (DayNo >= CumulativeDays[IsLeap(Year)][MonthNo]) {\r
-      DayNo = (UINT16) (DayNo - (UINT16) (CumulativeDays[IsLeap(Year)][MonthNo]));\r
+    if (DayNo >= CumulativeDays[IsLeap (Year)][MonthNo]) {\r
+      DayNo = (UINT16)(DayNo - (UINT16)(CumulativeDays[IsLeap (Year)][MonthNo]));\r

       break;\r
     }\r
   }\r
 \r
       break;\r
     }\r
   }\r
 \r

-  GmTime->tm_mon  = (int) MonthNo - 1;\r
-  GmTime->tm_mday = (int) DayNo + 1;\r
+  GmTime->tm_mon  = (int)MonthNo - 1;\r
+  GmTime->tm_mday = (int)DayNo + 1;\r

 \r
   GmTime->tm_isdst  = 0;\r
   GmTime->tm_gmtoff = 0;\r
 \r
   GmTime->tm_isdst  = 0;\r
   GmTime->tm_gmtoff = 0;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/UnitTestHostCrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/UnitTestHostCrtWrapper.c
index a9c288e8f2be1044e17d4b432da566338a374f97..066d53e4faf8f67d53d3a97172b87a4dcd15da36 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/UnitTestHostCrtWrapper.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/UnitTestHostCrtWrapper.c
@@ -14,28 +14,38 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/DebugLib.h>\r
 \r
 /* Convert character to lowercase */\r
 #include <Library/DebugLib.h>\r
 \r
 /* Convert character to lowercase */\r

-int tolower (int c)\r
+int\r
+tolower (\r
+  int  c\r
+  )\r

 {\r
   if (('A' <= (c)) && ((c) <= 'Z')) {\r
     return (c - ('A' - 'a'));\r
   }\r
 {\r
   if (('A' <= (c)) && ((c) <= 'Z')) {\r
     return (c - ('A' - 'a'));\r
   }\r

+\r

   return (c);\r
 }\r
 \r
 /* Compare first n bytes of string s1 with string s2, ignoring case */\r
   return (c);\r
 }\r
 \r
 /* Compare first n bytes of string s1 with string s2, ignoring case */\r

-int strncasecmp (const char *s1, const char *s2, size_t n)\r
+int\r
+strncasecmp (\r
+  const char  *s1,\r
+  const char  *s2,\r
+  size_t      n\r
+  )\r

 {\r
 {\r

-  int Val;\r
+  int  Val;\r

 \r
 \r

-  ASSERT(s1 != NULL);\r
-  ASSERT(s2 != NULL);\r
+  ASSERT (s1 != NULL);\r
+  ASSERT (s2 != NULL);\r

 \r
   if (n != 0) {\r
     do {\r
 \r
   if (n != 0) {\r
     do {\r

-      Val = tolower(*s1) - tolower(*s2);\r
+      Val = tolower (*s1) - tolower (*s2);\r

       if (Val != 0) {\r
         return Val;\r
       }\r
       if (Val != 0) {\r
         return Val;\r
       }\r

+\r

       ++s1;\r
       ++s2;\r
       if (*s1 == '\0') {\r
       ++s1;\r
       ++s2;\r
       if (*s1 == '\0') {\r


@@ -43,11 +53,17 @@ int strncasecmp (const char *s1, const char *s2, size_t n)
       }\r
     } while (--n != 0);\r
   }\r
       }\r
     } while (--n != 0);\r
   }\r

+\r

   return 0;\r
 }\r
 \r
 /* Read formatted data from a string */\r
   return 0;\r
 }\r
 \r
 /* Read formatted data from a string */\r

-int sscanf (const char *buffer, const char *format, ...)\r
+int\r
+sscanf (\r
+  const char  *buffer,\r
+  const char  *format,\r
+  ...\r
+  )\r

 {\r
   //\r
   // Null sscanf() function implementation to satisfy the linker, since\r
 {\r
   //\r
   // Null sscanf() function implementation to satisfy the linker, since\r


@@ -60,34 +76,57 @@ int sscanf (const char *buffer, const char *format, ...)
 //  -- Dummy OpenSSL Support Routines --\r
 //\r
 \r
 //  -- Dummy OpenSSL Support Routines --\r
 //\r
 \r

-int BIO_printf (void *bio, const char *format, ...)\r
+int\r
+BIO_printf (\r
+  void        *bio,\r
+  const char  *format,\r
+  ...\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-int BIO_snprintf(char *buf, size_t n, const char *format, ...)\r
+int\r
+BIO_snprintf (\r
+  char        *buf,\r
+  size_t      n,\r
+  const char  *format,\r
+  ...\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-uid_t getuid (void)\r
+uid_t\r
+getuid (\r
+  void\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-uid_t geteuid (void)\r
+uid_t\r
+geteuid (\r
+  void\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-gid_t getgid (void)\r
+gid_t\r
+getgid (\r
+  void\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-gid_t getegid (void)\r
+gid_t\r
+getegid (\r
+  void\r
+  )\r

 {\r
   return 0;\r
 }\r
 \r
 {\r
   return 0;\r
 }\r
 \r

-int errno = 0;\r
+int  errno = 0;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/inet_pton.c b/CryptoPkg/Library/BaseCryptLib/SysCall/inet_pton.c
index 32e1ab8690e6e2a82b5070c702aa85104293eb86..c61f34e734f3aa517f077b2286feeef5ff18dab0 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/inet_pton.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/inet_pton.c
@@ -18,28 +18,28 @@
  * Portions copyright (c) 1999, 2000\r
  * Intel Corporation.\r
  * All rights reserved.\r
  * Portions copyright (c) 1999, 2000\r
  * Intel Corporation.\r
  * All rights reserved.\r

- * \r
+ *\r

  * Redistribution and use in source and binary forms, with or without\r
  * modification, are permitted provided that the following conditions\r
  * are met:\r
  * Redistribution and use in source and binary forms, with or without\r
  * modification, are permitted provided that the following conditions\r
  * are met:\r

- * \r
+ *\r

  * 1. Redistributions of source code must retain the above copyright\r
  *    notice, this list of conditions and the following disclaimer.\r
  * 1. Redistributions of source code must retain the above copyright\r
  *    notice, this list of conditions and the following disclaimer.\r

- * \r
+ *\r

  * 2. Redistributions in binary form must reproduce the above copyright\r
  *    notice, this list of conditions and the following disclaimer in the\r
  *    documentation and/or other materials provided with the distribution.\r
  * 2. Redistributions in binary form must reproduce the above copyright\r
  *    notice, this list of conditions and the following disclaimer in the\r
  *    documentation and/or other materials provided with the distribution.\r

- * \r
+ *\r

  * 3. All advertising materials mentioning features or use of this software\r
  *    must display the following acknowledgement:\r
  * 3. All advertising materials mentioning features or use of this software\r
  *    must display the following acknowledgement:\r

- * \r
+ *\r

  *    This product includes software developed by Intel Corporation and\r
  *    its contributors.\r
  *    This product includes software developed by Intel Corporation and\r
  *    its contributors.\r

- * \r
+ *\r

  * 4. Neither the name of Intel Corporation or its contributors may be\r
  *    used to endorse or promote products derived from this software\r
  *    without specific prior written permission.\r
  * 4. Neither the name of Intel Corporation or its contributors may be\r
  *    used to endorse or promote products derived from this software\r
  *    without specific prior written permission.\r

- * \r
+ *\r

  * THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION AND CONTRIBUTORS ``AS IS''\r
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r
  * THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION AND CONTRIBUTORS ``AS IS''\r
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r


@@ -51,11 +51,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\r
  * THE POSSIBILITY OF SUCH DAMAGE.\r
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\r
  * THE POSSIBILITY OF SUCH DAMAGE.\r

- * \r
+ *\r

  */\r
 \r
  */\r
 \r

-#if defined(LIBC_SCCS) && !defined(lint)\r
-static char rcsid[] = "$Id: inet_pton.c,v 1.1.1.1 2003/11/19 01:51:30 kyu3 Exp $";\r
+#if defined (LIBC_SCCS) && !defined (lint)\r
+static char  rcsid[] = "$Id: inet_pton.c,v 1.1.1.1 2003/11/19 01:51:30 kyu3 Exp $";\r

 #endif /* LIBC_SCCS and not lint */\r
 \r
 #include <sys/param.h>\r
 #endif /* LIBC_SCCS and not lint */\r
 \r
 #include <sys/param.h>\r


@@ -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.\r
  */\r
 \r
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.\r
  */\r
 \r

-static int     inet_pton4 (const char *src, u_char *dst);\r
-static int     inet_pton6 (const char *src, u_char *dst);\r
+static int\r
+inet_pton4 (\r
+  const char  *src,\r
+  u_char      *dst\r
+  );\r
+\r
+static int\r
+inet_pton6 (\r
+  const char  *src,\r
+  u_char      *dst\r
+  );\r

 \r
 /* int\r
  * inet_pton(af, src, dst)\r
 \r
 /* int\r
  * inet_pton(af, src, dst)\r

- *     convert from presentation format (which usually means ASCII printable)\r
- *     to network format (which is usually some kind of binary format).\r
+ *      convert from presentation format (which usually means ASCII printable)\r
+ *      to network format (which is usually some kind of binary format).\r

  * return:\r
  * return:\r

- *     1 if the address was valid for the specified address family\r
- *     0 if the address wasn't valid (`dst' is untouched in this case)\r
- *     -1 if some other error occurred (`dst' is untouched in this case, too)\r
+ *      1 if the address was valid for the specified address family\r
+ *      0 if the address wasn't valid (`dst' is untouched in this case)\r
+ *      -1 if some other error occurred (`dst' is untouched in this case, too)\r

  * author:\r
  * author:\r

- *     Paul Vixie, 1996.\r
+ *      Paul Vixie, 1996.\r

  */\r
 int\r
  */\r
 int\r

-inet_pton(\r
-       int af,\r
-       const char *src,\r
-       void *dst\r
-       )\r
+inet_pton (\r
+  int         af,\r
+  const char  *src,\r
+  void        *dst\r
+  )\r

 {\r
 {\r

-       switch (af) {\r
-       case AF_INET:\r
-               return (inet_pton4(src, dst));\r
-       case AF_INET6:\r
-               return (inet_pton6(src, dst));\r
-       default:\r
-               errno = EAFNOSUPPORT;\r
-               return (-1);\r
-       }\r
-       /* NOTREACHED */\r
+  switch (af) {\r
+    case AF_INET:\r
+      return (inet_pton4 (src, dst));\r
+    case AF_INET6:\r
+      return (inet_pton6 (src, dst));\r
+    default:\r
+      errno = EAFNOSUPPORT;\r
+      return (-1);\r
+  }\r
+\r
+  /* NOTREACHED */\r

 }\r
 \r
 /* int\r
  * inet_pton4(src, dst)\r
 }\r
 \r
 /* int\r
  * inet_pton4(src, dst)\r

- *     like inet_aton() but without all the hexadecimal and shorthand.\r
+ *      like inet_aton() but without all the hexadecimal and shorthand.\r

  * return:\r
  * return:\r

- *     1 if `src' is a valid dotted quad, else 0.\r
+ *      1 if `src' is a valid dotted quad, else 0.\r

  * notice:\r
  * notice:\r

- *     does not touch `dst' unless it's returning 1.\r
+ *      does not touch `dst' unless it's returning 1.\r

  * author:\r
  * author:\r

- *     Paul Vixie, 1996.\r
+ *      Paul Vixie, 1996.\r

  */\r
 static int\r
  */\r
 static int\r

-inet_pton4(\r
-       const char *src,\r
-       u_char *dst\r
-       )\r
+inet_pton4 (\r
+  const char  *src,\r
+  u_char      *dst\r
+  )\r

 {\r
 {\r

-       static const char digits[] = "0123456789";\r
-       int saw_digit, octets, ch;\r
-       u_char tmp[NS_INADDRSZ], *tp;\r
-\r
-       saw_digit = 0;\r
-       octets = 0;\r
-       *(tp = tmp) = 0;\r
-       while ((ch = *src++) != '\0') {\r
-               const char *pch;\r
-\r
-               if ((pch = strchr(digits, ch)) != NULL) {\r
-                       u_int new = *tp * 10 + (u_int)(pch - digits);\r
-\r
-                       if (new > 255)\r
-                               return (0);\r
-                       *tp = (u_char)new;\r
-                       if (! saw_digit) {\r
-                               if (++octets > 4)\r
-                                       return (0);\r
-                               saw_digit = 1;\r
-                       }\r
-               } else if (ch == '.' && saw_digit) {\r
-                       if (octets == 4)\r
-                               return (0);\r
-                       *++tp = 0;\r
-                       saw_digit = 0;\r
-               } else\r
-                       return (0);\r
-       }\r
-       if (octets < 4)\r
-               return (0);\r
-\r
-       memcpy(dst, tmp, NS_INADDRSZ);\r
-       return (1);\r
+  static const char  digits[] = "0123456789";\r
+  int                saw_digit, octets, ch;\r
+  u_char             tmp[NS_INADDRSZ], *tp;\r
+\r
+  saw_digit   = 0;\r
+  octets      = 0;\r
+  *(tp = tmp) = 0;\r
+  while ((ch = *src++) != '\0') {\r
+    const char  *pch;\r
+\r
+    if ((pch = strchr (digits, ch)) != NULL) {\r
+      u_int  new = *tp * 10 + (u_int)(pch - digits);\r
+\r
+      if (new > 255) {\r
+        return (0);\r
+      }\r
+\r
+      *tp = (u_char)new;\r
+      if (!saw_digit) {\r
+        if (++octets > 4) {\r
+          return (0);\r
+        }\r
+\r
+        saw_digit = 1;\r
+      }\r
+    } else if ((ch == '.') && saw_digit) {\r
+      if (octets == 4) {\r
+        return (0);\r
+      }\r
+\r
+      *++tp     = 0;\r
+      saw_digit = 0;\r
+    } else {\r
+      return (0);\r
+    }\r
+  }\r
+\r
+  if (octets < 4) {\r
+    return (0);\r
+  }\r
+\r
+  memcpy (dst, tmp, NS_INADDRSZ);\r
+  return (1);\r

 }\r
 \r
 /* int\r
  * inet_pton6(src, dst)\r
 }\r
 \r
 /* int\r
  * inet_pton6(src, dst)\r

- *     convert presentation level address to network order binary form.\r
+ *      convert presentation level address to network order binary form.\r

  * return:\r
  * return:\r

- *     1 if `src' is a valid [RFC1884 2.2] address, else 0.\r
+ *      1 if `src' is a valid [RFC1884 2.2] address, else 0.\r

  * notice:\r
  * notice:\r

- *     (1) does not touch `dst' unless it's returning 1.\r
- *     (2) :: in a full address is silently ignored.\r
+ *      (1) does not touch `dst' unless it's returning 1.\r
+ *      (2) :: in a full address is silently ignored.\r

  * credit:\r
  * credit:\r

- *     inspired by Mark Andrews.\r
+ *      inspired by Mark Andrews.\r

  * author:\r
  * author:\r

- *     Paul Vixie, 1996.\r
+ *      Paul Vixie, 1996.\r

  */\r
 static int\r
  */\r
 static int\r

-inet_pton6(\r
-       const char *src,\r
-       u_char *dst\r
-       )\r
+inet_pton6 (\r
+  const char  *src,\r
+  u_char      *dst\r
+  )\r

 {\r
 {\r

-       static const char xdigits_l[] = "0123456789abcdef",\r
-                         xdigits_u[] = "0123456789ABCDEF";\r
-       u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;\r
-       const char *xdigits, *curtok;\r
-       int ch, saw_xdigit;\r
-       u_int val;\r
-\r
-       memset((tp = tmp), '\0', NS_IN6ADDRSZ);\r
-       endp = tp + NS_IN6ADDRSZ;\r
-       colonp = NULL;\r
-       /* Leading :: requires some special handling. */\r
-       if (*src == ':')\r
-               if (*++src != ':')\r
-                       return (0);\r
-       curtok = src;\r
-       saw_xdigit = 0;\r
-       val = 0;\r
-       while ((ch = *src++) != '\0') {\r
-               const char *pch;\r
-\r
-               if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)\r
-                       pch = strchr((xdigits = xdigits_u), ch);\r
-               if (pch != NULL) {\r
-                       val <<= 4;\r
-                       val |= (pch - xdigits);\r
-                       if (val > 0xffff)\r
-                               return (0);\r
-                       saw_xdigit = 1;\r
-                       continue;\r
-               }\r
-               if (ch == ':') {\r
-                       curtok = src;\r
-                       if (!saw_xdigit) {\r
-                               if (colonp)\r
-                                       return (0);\r
-                               colonp = tp;\r
-                               continue;\r
-                       }\r
-                       if (tp + NS_INT16SZ > endp)\r
-                               return (0);\r
-                       *tp++ = (u_char) (val >> 8) & 0xff;\r
-                       *tp++ = (u_char) val & 0xff;\r
-                       saw_xdigit = 0;\r
-                       val = 0;\r
-                       continue;\r
-               }\r
-               if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&\r
-                   inet_pton4(curtok, tp) > 0) {\r
-                       tp += NS_INADDRSZ;\r
-                       saw_xdigit = 0;\r
-                       break;  /* '\0' was seen by inet_pton4(). */\r
-               }\r
-               return (0);\r
-       }\r
-       if (saw_xdigit) {\r
-               if (tp + NS_INT16SZ > endp)\r
-                       return (0);\r
-               *tp++ = (u_char) (val >> 8) & 0xff;\r
-               *tp++ = (u_char) val & 0xff;\r
-       }\r
-       if (colonp != NULL) {\r
-               /*\r
-                * Since some memmove()'s erroneously fail to handle\r
-                * overlapping regions, we'll do the shift by hand.\r
-                */\r
-               const int n = (int)(tp - colonp);\r
-               int i;\r
-\r
-               for (i = 1; i <= n; i++) {\r
-                       endp[- i] = colonp[n - i];\r
-                       colonp[n - i] = 0;\r
-               }\r
-               tp = endp;\r
-       }\r
-       if (tp != endp)\r
-               return (0);\r
-       memcpy(dst, tmp, NS_IN6ADDRSZ);\r
-       return (1);\r
+  static const char  xdigits_l[] = "0123456789abcdef",\r
+                     xdigits_u[] = "0123456789ABCDEF";\r
+  u_char      tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;\r
+  const char  *xdigits, *curtok;\r
+  int         ch, saw_xdigit;\r
+  u_int       val;\r
+\r
+  memset ((tp = tmp), '\0', NS_IN6ADDRSZ);\r
+  endp   = tp + NS_IN6ADDRSZ;\r
+  colonp = NULL;\r
+  /* Leading :: requires some special handling. */\r
+  if (*src == ':') {\r
+    if (*++src != ':') {\r
+      return (0);\r
+    }\r
+  }\r
+\r
+  curtok     = src;\r
+  saw_xdigit = 0;\r
+  val        = 0;\r
+  while ((ch = *src++) != '\0') {\r
+    const char  *pch;\r
+\r
+    if ((pch = strchr ((xdigits = xdigits_l), ch)) == NULL) {\r
+      pch = strchr ((xdigits = xdigits_u), ch);\r
+    }\r
+\r
+    if (pch != NULL) {\r
+      val <<= 4;\r
+      val  |= (pch - xdigits);\r
+      if (val > 0xffff) {\r
+        return (0);\r
+      }\r
+\r
+      saw_xdigit = 1;\r
+      continue;\r
+    }\r
+\r
+    if (ch == ':') {\r
+      curtok = src;\r
+      if (!saw_xdigit) {\r
+        if (colonp) {\r
+          return (0);\r
+        }\r
+\r
+        colonp = tp;\r
+        continue;\r
+      }\r
+\r
+      if (tp + NS_INT16SZ > endp) {\r
+        return (0);\r
+      }\r
+\r
+      *tp++      = (u_char)(val >> 8) & 0xff;\r
+      *tp++      = (u_char)val & 0xff;\r
+      saw_xdigit = 0;\r
+      val        = 0;\r
+      continue;\r
+    }\r
+\r
+    if ((ch == '.') && ((tp + NS_INADDRSZ) <= endp) &&\r
+        (inet_pton4 (curtok, tp) > 0))\r
+    {\r
+      tp        += NS_INADDRSZ;\r
+      saw_xdigit = 0;\r
+      break;                    /* '\0' was seen by inet_pton4(). */\r
+    }\r
+\r
+    return (0);\r
+  }\r
+\r
+  if (saw_xdigit) {\r
+    if (tp + NS_INT16SZ > endp) {\r
+      return (0);\r
+    }\r
+\r
+    *tp++ = (u_char)(val >> 8) & 0xff;\r
+    *tp++ = (u_char)val & 0xff;\r
+  }\r
+\r
+  if (colonp != NULL) {\r
+    /*\r
+     * Since some memmove()'s erroneously fail to handle\r
+     * overlapping regions, we'll do the shift by hand.\r
+     */\r
+    const int  n = (int)(tp - colonp);\r
+    int        i;\r
+\r
+    for (i = 1; i <= n; i++) {\r
+      endp[-i]      = colonp[n - i];\r
+      colonp[n - i] = 0;\r
+    }\r
+\r
+    tp = endp;\r
+  }\r
+\r
+  if (tp != endp) {\r
+    return (0);\r
+  }\r
+\r
+  memcpy (dst, tmp, NS_IN6ADDRSZ);\r
+  return (1);\r

 }\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Hash/CryptMd5Null.c b/CryptoPkg/Library/BaseCryptLibNull/Hash/CryptMd5Null.c
index 34c539fe3a2333f7c8ab85b38c07c7fea331bec4..893a2302a6de43962a5d396d14771fe8bd81cd90 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Hash/CryptMd5Null.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Hash/CryptMd5Null.c
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "InternalCryptLib.h"\r
 \r
 \r
 #include "InternalCryptLib.h"\r
 \r

-\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r


@@ -26,7 +25,6 @@ Md5GetContextSize (
   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r

-\r

 /**\r
   Initializes user-supplied memory pointed by Md5Context as MD5 hash context for\r
   subsequent use.\r
 /**\r
   Initializes user-supplied memory pointed by Md5Context as MD5 hash context for\r
   subsequent use.\r


@@ -154,12 +152,12 @@ value (16 bytes).
 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r

-Md5HashAll(\r
+Md5HashAll (\r

   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r

-)\r
+  )\r

 {\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return FALSE;\r
 }\r
   return FALSE;\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Hash/CryptSha1Null.c b/CryptoPkg/Library/BaseCryptLibNull/Hash/CryptSha1Null.c
index c2f4d30f83a0ae0541a1b118cc05e61bc6ea449f..d9b4610af0e0e7fb493d7753c942461431cca7ce 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Hash/CryptSha1Null.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Hash/CryptSha1Null.c
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "InternalCryptLib.h"\r
 \r
 \r
 #include "InternalCryptLib.h"\r
 \r

-\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7SignNull.c b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7SignNull.c
index d7ff8ba947c45353b93725c694c234e145e30d2c..07c33c6ae6089d96095f91da0c35ca424dd9eeb3 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7SignNull.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7SignNull.c
@@ -51,4 +51,3 @@ Pkcs7Sign (
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyEkuNull.c b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyEkuNull.c
index cbeea935c9ad08b5a1c48032c18355813c42aff0..c1d9837c5129bb3f75fcc39ed9b46cfcb36b5edf 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyEkuNull.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyEkuNull.c
@@ -51,16 +51,14 @@
 **/\r
 EFI_STATUS\r
 GetSignerCertificate (\r
 **/\r
 EFI_STATUS\r
 GetSignerCertificate (\r

-  IN CONST VOID *CertChain,\r
+  IN CONST VOID  *CertChain,\r

   OUT VOID       **SignerCert\r
   )\r
 {\r
   OUT VOID       **SignerCert\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_NOT_READY;\r
   return EFI_NOT_READY;\r

-\r

 }\r
 \r
 }\r
 \r

-\r

 /**\r
   Determines if the specified EKU represented in ASN1 form is present\r
   in a given certificate.\r
 /**\r
   Determines if the specified EKU represented in ASN1 form is present\r
   in a given certificate.\r


@@ -77,14 +75,13 @@ GetSignerCertificate (
 EFI_STATUS\r
 IsEkuInCertificate (\r
   IN CONST VOID  *Cert,\r
 EFI_STATUS\r
 IsEkuInCertificate (\r
   IN CONST VOID  *Cert,\r

-  IN VOID *Asn1ToFind\r
+  IN VOID        *Asn1ToFind\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_NOT_READY;\r
 }\r
 \r
   return EFI_NOT_READY;\r
 }\r
 \r

-\r

 /**\r
   Determines if the specified EKUs are present in a signing certificate.\r
 \r
 /**\r
   Determines if the specified EKUs are present in a signing certificate.\r
 \r


@@ -99,14 +96,14 @@ IsEkuInCertificate (
   @retval EFI_NOT_FOUND             One or more EKU's were not found in the signature.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_NOT_FOUND             One or more EKU's were not found in the signature.\r
 **/\r
 EFI_STATUS\r

-CheckEKUs(\r
-  IN CONST VOID     *SignerCert,\r
-  IN CONST CHAR8    *RequiredEKUs[],\r
-  IN CONST UINT32   RequiredEKUsSize,\r
-  IN BOOLEAN        RequireAllPresent\r
+CheckEKUs (\r
+  IN CONST VOID    *SignerCert,\r
+  IN CONST CHAR8   *RequiredEKUs[],\r
+  IN CONST UINT32  RequiredEKUsSize,\r
+  IN BOOLEAN       RequireAllPresent\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_NOT_READY;\r
 }\r
 \r
   return EFI_NOT_READY;\r
 }\r
 \r


@@ -143,14 +140,13 @@ CheckEKUs(
 EFI_STATUS\r
 EFIAPI\r
 VerifyEKUsInPkcs7Signature (\r
 EFI_STATUS\r
 EFIAPI\r
 VerifyEKUsInPkcs7Signature (\r

-  IN CONST UINT8    *Pkcs7Signature,\r
-  IN CONST UINT32   SignatureSize,\r
-  IN CONST CHAR8    *RequiredEKUs[],\r
-  IN CONST UINT32   RequiredEKUsSize,\r
-  IN BOOLEAN        RequireAllPresent\r
+  IN CONST UINT8   *Pkcs7Signature,\r
+  IN CONST UINT32  SignatureSize,\r
+  IN CONST CHAR8   *RequiredEKUs[],\r
+  IN CONST UINT32  RequiredEKUsSize,\r
+  IN BOOLEAN       RequireAllPresent\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_NOT_READY;\r
 }\r
   return EFI_NOT_READY;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyNull.c b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyNull.c
index 0ddf16a61b31587795051ef6a0a6620179a0baf2..b9b7960126dea6cf49a36c889c859ddbb85df0fa 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyNull.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs7VerifyNull.c
@@ -57,7 +57,7 @@ Pkcs7GetSigners (
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r

-  IN  UINT8        *Certs\r
+  IN  UINT8  *Certs\r

   )\r
 {\r
   ASSERT (FALSE);\r
   )\r
 {\r
   ASSERT (FALSE);\r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptRsaExtNull.c b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptRsaExtNull.c
index 2e74494c525d811d75941ff232a6ff66706dbf09..9fef64086da72292bd38b81a5f731ad63e341365 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptRsaExtNull.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptRsaExtNull.c
@@ -115,5 +115,3 @@ RsaPkcs1Sign (
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r

-\r
-\r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c
index 2835f20a1de02a6befdd71a9f424032f2a6f72b2..38819723c791e8845f0cb442cafdda379f496f91 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c
@@ -205,10 +205,10 @@ X509GetCommonName (
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r

-  IN      CONST UINT8   *Cert,\r
-  IN      UINTN         CertSize,\r
-  OUT     CHAR8         *NameBuffer   OPTIONAL,\r
-  IN OUT  UINTN         *NameBufferSize\r
+  IN      CONST UINT8  *Cert,\r
+  IN      UINTN        CertSize,\r
+  OUT     CHAR8        *NameBuffer   OPTIONAL,\r
+  IN OUT  UINTN        *NameBufferSize\r

   )\r
 {\r
   ASSERT (FALSE);\r
   )\r
 {\r
   ASSERT (FALSE);\r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Rand/CryptRandNull.c b/CryptoPkg/Library/BaseCryptLibNull/Rand/CryptRandNull.c
index d2914f8758a3417399863876f2d5345c15a6a13f..254fa31899b0310b8da597261369edd92ed1aabc 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Rand/CryptRandNull.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Rand/CryptRandNull.c
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "InternalCryptLib.h"\r
 \r
 \r
 #include "InternalCryptLib.h"\r
 \r

-\r

 /**\r
   Sets up the seed value for the pseudorandom number generator.\r
 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
index 6b2a5b11b5bcc581b2ebe67176f92a40da01d226..c8df259ea963e7ed6768bb59a10dcd8f5c9a45eb 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
+++ b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
@@ -95,11 +95,12 @@ CryptoServiceNotAvailable (
   ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 }\r
 \r
   ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    One-Way Cryptographic Hash Primitives\r
 //    One-Way Cryptographic Hash Primitives\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r
 \r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.\r
 \r


@@ -257,9 +258,11 @@ Md5HashAll (
 {\r
   CALL_CRYPTO_SERVICE (Md5HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r
 {\r
   CALL_CRYPTO_SERVICE (Md5HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r

+\r

 #endif\r
 \r
 #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES\r
 #endif\r
 \r
 #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES\r

+\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r


@@ -417,6 +420,7 @@ Sha1HashAll (
 {\r
   CALL_CRYPTO_SERVICE (Sha1HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r
 {\r
   CALL_CRYPTO_SERVICE (Sha1HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r

+\r

 #endif\r
 \r
 /**\r
 #endif\r
 \r
 /**\r


@@ -1015,9 +1019,9 @@ Sm3HashAll (
   CALL_CRYPTO_SERVICE (Sm3HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r
 \r
   CALL_CRYPTO_SERVICE (Sm3HashAll, (Data, DataSize, HashValue), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    MAC (Message Authentication Code) Primitive\r
 //    MAC (Message Authentication Code) Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Allocates and initializes one HMAC_CTX context for subsequent HMAC-SHA256 use.\r
 \r
 /**\r
   Allocates and initializes one HMAC_CTX context for subsequent HMAC-SHA256 use.\r


@@ -1165,9 +1169,9 @@ HmacSha256Final (
   CALL_CRYPTO_SERVICE (HmacSha256Final, (HmacSha256Context, HmacValue), FALSE);\r
 }\r
 \r
   CALL_CRYPTO_SERVICE (HmacSha256Final, (HmacSha256Context, HmacValue), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Symmetric Cryptography Primitive\r
 //    Symmetric Cryptography Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for AES operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for AES operations.\r


@@ -1304,9 +1308,9 @@ AesCbcDecrypt (
   CALL_CRYPTO_SERVICE (AesCbcDecrypt, (AesContext, Input, InputSize, Ivec, Output), FALSE);\r
 }\r
 \r
   CALL_CRYPTO_SERVICE (AesCbcDecrypt, (AesContext, Input, InputSize, Ivec, Output), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Asymmetric Cryptography Primitive\r
 //    Asymmetric Cryptography Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Allocates and initializes one RSA context for subsequent use.\r
 \r
 /**\r
   Allocates and initializes one RSA context for subsequent use.\r


@@ -1788,10 +1792,10 @@ X509GetCommonName (
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r
 RETURN_STATUS\r
 EFIAPI\r
 X509GetOrganizationName (\r

-  IN      CONST UINT8   *Cert,\r
-  IN      UINTN         CertSize,\r
-  OUT     CHAR8         *NameBuffer   OPTIONAL,\r
-  IN OUT  UINTN         *NameBufferSize\r
+  IN      CONST UINT8  *Cert,\r
+  IN      UINTN        CertSize,\r
+  OUT     CHAR8        *NameBuffer   OPTIONAL,\r
+  IN OUT  UINTN        *NameBufferSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (X509GetOrganizationName, (Cert, CertSize, NameBuffer, NameBufferSize), RETURN_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (X509GetOrganizationName, (Cert, CertSize, NameBuffer, NameBufferSize), RETURN_UNSUPPORTED);\r


@@ -2120,7 +2124,7 @@ Pkcs7GetSigners (
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r
 VOID\r
 EFIAPI\r
 Pkcs7FreeSigners (\r

-  IN  UINT8        *Certs\r
+  IN  UINT8  *Certs\r

   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (Pkcs7FreeSigners, (Certs));\r
   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (Pkcs7FreeSigners, (Certs));\r


@@ -2287,7 +2291,6 @@ VerifyEKUsInPkcs7Signature (
   CALL_CRYPTO_SERVICE (VerifyEKUsInPkcs7Signature, (Pkcs7Signature, SignatureSize, RequiredEKUs, RequiredEKUsSize, RequireAllPresent), FALSE);\r
 }\r
 \r
   CALL_CRYPTO_SERVICE (VerifyEKUsInPkcs7Signature, (Pkcs7Signature, SignatureSize, RequiredEKUs, RequiredEKUsSize, RequireAllPresent), FALSE);\r
 }\r
 \r

-\r

 /**\r
   Extracts the attached content from a PKCS#7 signed data if existed. The input signed\r
   data could be wrapped in a ContentInfo structure.\r
 /**\r
   Extracts the attached content from a PKCS#7 signed data if existed. The input signed\r
   data could be wrapped in a ContentInfo structure.\r


@@ -2391,9 +2394,9 @@ ImageTimestampVerify (
   CALL_CRYPTO_SERVICE (ImageTimestampVerify, (AuthData, DataSize, TsaCert, CertSize, SigningTime), FALSE);\r
 }\r
 \r
   CALL_CRYPTO_SERVICE (ImageTimestampVerify, (AuthData, DataSize, TsaCert, CertSize, SigningTime), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    DH Key Exchange Primitive\r
 //    DH Key Exchange Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Allocates and Initializes one Diffie-Hellman Context for subsequent use.\r
 \r
 /**\r
   Allocates and Initializes one Diffie-Hellman Context for subsequent use.\r


@@ -2574,9 +2577,9 @@ DhComputeKey (
   CALL_CRYPTO_SERVICE (DhComputeKey, (DhContext, PeerPublicKey, PeerPublicKeySize, Key, KeySize), FALSE);\r
 }\r
 \r
   CALL_CRYPTO_SERVICE (DhComputeKey, (DhContext, PeerPublicKey, PeerPublicKeySize, Key, KeySize), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Pseudo-Random Generation Primitive\r
 //    Pseudo-Random Generation Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r
 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r


@@ -2630,9 +2633,9 @@ RandomBytes (
   CALL_CRYPTO_SERVICE (RandomBytes, (Output, Size), FALSE);\r
 }\r
 \r
   CALL_CRYPTO_SERVICE (RandomBytes, (Output, Size), FALSE);\r
 }\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Key Derivation Function Primitive\r
 //    Key Derivation Function Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Derive key data using HMAC-SHA256 based KDF.\r
 \r
 /**\r
   Derive key data using HMAC-SHA256 based KDF.\r


@@ -2695,7 +2698,7 @@ TlsInitialize (
 VOID\r
 EFIAPI\r
 TlsCtxFree (\r
 VOID\r
 EFIAPI\r
 TlsCtxFree (\r

-  IN   VOID                  *TlsCtx\r
+  IN   VOID  *TlsCtx\r

   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsCtxFree, (TlsCtx));\r
   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsCtxFree, (TlsCtx));\r


@@ -2715,8 +2718,8 @@ TlsCtxFree (
 VOID *\r
 EFIAPI\r
 TlsCtxNew (\r
 VOID *\r
 EFIAPI\r
 TlsCtxNew (\r

-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsCtxNew, (MajorVer, MinorVer), NULL);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsCtxNew, (MajorVer, MinorVer), NULL);\r


@@ -2734,7 +2737,7 @@ TlsCtxNew (
 VOID\r
 EFIAPI\r
 TlsFree (\r
 VOID\r
 EFIAPI\r
 TlsFree (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsFree, (Tls));\r
   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsFree, (Tls));\r


@@ -2756,7 +2759,7 @@ TlsFree (
 VOID *\r
 EFIAPI\r
 TlsNew (\r
 VOID *\r
 EFIAPI\r
 TlsNew (\r

-  IN     VOID                     *TlsCtx\r
+  IN     VOID  *TlsCtx\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsNew, (TlsCtx), NULL);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsNew, (TlsCtx), NULL);\r


@@ -2776,7 +2779,7 @@ TlsNew (
 BOOLEAN\r
 EFIAPI\r
 TlsInHandshake (\r
 BOOLEAN\r
 EFIAPI\r
 TlsInHandshake (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsInHandshake, (Tls), FALSE);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsInHandshake, (Tls), FALSE);\r


@@ -2811,11 +2814,11 @@ TlsInHandshake (
 EFI_STATUS\r
 EFIAPI\r
 TlsDoHandshake (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsDoHandshake (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsDoHandshake, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsDoHandshake, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);\r


@@ -2849,11 +2852,11 @@ TlsDoHandshake (
 EFI_STATUS\r
 EFIAPI\r
 TlsHandleAlert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsHandleAlert (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsHandleAlert, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsHandleAlert, (Tls, BufferIn, BufferInSize, BufferOut, BufferOutSize), EFI_UNSUPPORTED);\r


@@ -2880,9 +2883,9 @@ TlsHandleAlert (
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseNotify (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseNotify (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *Buffer,\r
-  IN OUT UINTN                    *BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *Buffer,\r
+  IN OUT UINTN  *BufferSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsCloseNotify, (Tls, Buffer, BufferSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsCloseNotify, (Tls, Buffer, BufferSize), EFI_UNSUPPORTED);\r


@@ -2905,9 +2908,9 @@ TlsCloseNotify (
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficOut (\r
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficOut (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsCtrlTrafficOut, (Tls, Buffer, BufferSize), 0);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsCtrlTrafficOut, (Tls, Buffer, BufferSize), 0);\r


@@ -2930,9 +2933,9 @@ TlsCtrlTrafficOut (
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficIn (\r
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficIn (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsCtrlTrafficIn, (Tls, Buffer, BufferSize), 0);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsCtrlTrafficIn, (Tls, Buffer, BufferSize), 0);\r


@@ -2956,9 +2959,9 @@ TlsCtrlTrafficIn (
 INTN\r
 EFIAPI\r
 TlsRead (\r
 INTN\r
 EFIAPI\r
 TlsRead (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsRead, (Tls, Buffer, BufferSize), 0);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsRead, (Tls, Buffer, BufferSize), 0);\r


@@ -2982,9 +2985,9 @@ TlsRead (
 INTN\r
 EFIAPI\r
 TlsWrite (\r
 INTN\r
 EFIAPI\r
 TlsWrite (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsWrite, (Tls, Buffer, BufferSize), 0);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsWrite, (Tls, Buffer, BufferSize), 0);\r


@@ -3007,9 +3010,9 @@ TlsWrite (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVersion (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVersion (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetVersion, (Tls, MajorVer, MinorVer), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetVersion, (Tls, MajorVer, MinorVer), EFI_UNSUPPORTED);\r


@@ -3031,8 +3034,8 @@ TlsSetVersion (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetConnectionEnd (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetConnectionEnd (\r

-  IN     VOID                     *Tls,\r
-  IN     BOOLEAN                  IsServer\r
+  IN     VOID     *Tls,\r
+  IN     BOOLEAN  IsServer\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetConnectionEnd, (Tls, IsServer), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetConnectionEnd, (Tls, IsServer), EFI_UNSUPPORTED);\r


@@ -3059,9 +3062,9 @@ TlsSetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCipherList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCipherList (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT16                   *CipherId,\r
-  IN     UINTN                    CipherNum\r
+  IN     VOID    *Tls,\r
+  IN     UINT16  *CipherId,\r
+  IN     UINTN   CipherNum\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetCipherList, (Tls, CipherId, CipherNum), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetCipherList, (Tls, CipherId, CipherNum), EFI_UNSUPPORTED);\r


@@ -3082,7 +3085,7 @@ TlsSetCipherList (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCompressionMethod (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCompressionMethod (\r

-  IN     UINT8                    CompMethod\r
+  IN     UINT8  CompMethod\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetCompressionMethod, (CompMethod), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetCompressionMethod, (CompMethod), EFI_UNSUPPORTED);\r


@@ -3100,8 +3103,8 @@ TlsSetCompressionMethod (
 VOID\r
 EFIAPI\r
 TlsSetVerify (\r
 VOID\r
 EFIAPI\r
 TlsSetVerify (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   VerifyMode\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  VerifyMode\r

   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsSetVerify, (Tls, VerifyMode));\r
   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsSetVerify, (Tls, VerifyMode));\r


@@ -3122,9 +3125,9 @@ TlsSetVerify (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVerifyHost (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVerifyHost (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   Flags,\r
-  IN     CHAR8                    *HostName\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  Flags,\r
+  IN     CHAR8   *HostName\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetVerifyHost, (Tls, Flags, HostName), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetVerifyHost, (Tls, Flags, HostName), EFI_UNSUPPORTED);\r


@@ -3148,9 +3151,9 @@ TlsSetVerifyHost (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *SessionId,\r
-  IN     UINT16                   SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN     UINT8   *SessionId,\r
+  IN     UINT16  SessionIdLen\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);\r


@@ -3176,9 +3179,9 @@ TlsSetSessionId (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -3204,9 +3207,9 @@ TlsSetCaCertificate (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -3231,9 +3234,9 @@ TlsSetHostPublicCert (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -3256,8 +3259,8 @@ TlsSetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCertRevocationList (\r

-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsSetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);\r


@@ -3279,7 +3282,7 @@ TlsSetCertRevocationList (
 UINT16\r
 EFIAPI\r
 TlsGetVersion (\r
 UINT16\r
 EFIAPI\r
 TlsGetVersion (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetVersion, (Tls), 0);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetVersion, (Tls), 0);\r


@@ -3301,7 +3304,7 @@ TlsGetVersion (
 UINT8\r
 EFIAPI\r
 TlsGetConnectionEnd (\r
 UINT8\r
 EFIAPI\r
 TlsGetConnectionEnd (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetConnectionEnd, (Tls), 0);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetConnectionEnd, (Tls), 0);\r


@@ -3324,8 +3327,8 @@ TlsGetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCipher (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCipher (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT16                   *CipherId\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT16  *CipherId\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetCurrentCipher, (Tls, CipherId), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetCurrentCipher, (Tls, CipherId), EFI_UNSUPPORTED);\r


@@ -3350,8 +3353,8 @@ TlsGetCurrentCipher (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCompressionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCompressionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *CompressionId\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *CompressionId\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetCurrentCompressionId, (Tls, CompressionId), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetCurrentCompressionId, (Tls, CompressionId), EFI_UNSUPPORTED);\r


@@ -3373,7 +3376,7 @@ TlsGetCurrentCompressionId (
 UINT32\r
 EFIAPI\r
 TlsGetVerify (\r
 UINT32\r
 EFIAPI\r
 TlsGetVerify (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetVerify, (Tls), 0);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetVerify, (Tls), 0);\r


@@ -3397,9 +3400,9 @@ TlsGetVerify (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *SessionId,\r
-  IN OUT UINT16                   *SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT8   *SessionId,\r
+  IN OUT UINT16  *SessionIdLen\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetSessionId, (Tls, SessionId, SessionIdLen), EFI_UNSUPPORTED);\r


@@ -3419,8 +3422,8 @@ TlsGetSessionId (
 VOID\r
 EFIAPI\r
 TlsGetClientRandom (\r
 VOID\r
 EFIAPI\r
 TlsGetClientRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ClientRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ClientRandom\r

   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsGetClientRandom, (Tls, ClientRandom));\r
   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsGetClientRandom, (Tls, ClientRandom));\r


@@ -3440,8 +3443,8 @@ TlsGetClientRandom (
 VOID\r
 EFIAPI\r
 TlsGetServerRandom (\r
 VOID\r
 EFIAPI\r
 TlsGetServerRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ServerRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ServerRandom\r

   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsGetServerRandom, (Tls, ServerRandom));\r
   )\r
 {\r
   CALL_VOID_CRYPTO_SERVICE (TlsGetServerRandom, (Tls, ServerRandom));\r


@@ -3464,8 +3467,8 @@ TlsGetServerRandom (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetKeyMaterial (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetKeyMaterial (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *KeyMaterial\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *KeyMaterial\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetKeyMaterial, (Tls, KeyMaterial), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetKeyMaterial, (Tls, KeyMaterial), EFI_UNSUPPORTED);\r


@@ -3490,9 +3493,9 @@ TlsGetKeyMaterial (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetCaCertificate, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -3518,9 +3521,9 @@ TlsGetCaCertificate (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetHostPublicCert, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -3545,9 +3548,9 @@ TlsGetHostPublicCert (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetHostPrivateKey, (Tls, Data, DataSize), EFI_UNSUPPORTED);\r


@@ -3571,8 +3574,8 @@ TlsGetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCertRevocationList (\r

-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);\r
   )\r
 {\r
   CALL_CRYPTO_SERVICE (TlsGetCertRevocationList, (Data, DataSize), EFI_UNSUPPORTED);\r

diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.c b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.c
index b503a5708bdbc72fec2c1328654d2deab2174625..dc7527bb01e91eb7563a3301f78ae2274ce12223 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.c
+++ b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.c
@@ -57,8 +57,8 @@ DxeCryptLibConstructor (
                   (VOID **)&mCryptoProtocol\r
                   );\r
 \r
                   (VOID **)&mCryptoProtocol\r
                   );\r
 \r

-  if (EFI_ERROR (Status) || mCryptoProtocol == NULL) {\r
-    DEBUG((DEBUG_ERROR, "[DxeCryptLib] Failed to locate Crypto Protocol. Status = %r\n", Status));\r
+  if (EFI_ERROR (Status) || (mCryptoProtocol == NULL)) {\r
+    DEBUG ((DEBUG_ERROR, "[DxeCryptLib] Failed to locate Crypto Protocol. Status = %r\n", Status));\r

     ASSERT_EFI_ERROR (Status);\r
     ASSERT (mCryptoProtocol != NULL);\r
     mCryptoProtocol = NULL;\r
     ASSERT_EFI_ERROR (Status);\r
     ASSERT (mCryptoProtocol != NULL);\r
     mCryptoProtocol = NULL;\r


@@ -67,7 +67,7 @@ DxeCryptLibConstructor (
 \r
   Version = mCryptoProtocol->GetVersion ();\r
   if (Version < EDKII_CRYPTO_VERSION) {\r
 \r
   Version = mCryptoProtocol->GetVersion ();\r
   if (Version < EDKII_CRYPTO_VERSION) {\r

-    DEBUG((DEBUG_ERROR, "[DxeCryptLib] Crypto Protocol unsupported version %d\n", Version));\r
+    DEBUG ((DEBUG_ERROR, "[DxeCryptLib] Crypto Protocol unsupported version %d\n", Version));\r

     ASSERT (Version >= EDKII_CRYPTO_VERSION);\r
     mCryptoProtocol = NULL;\r
     return EFI_NOT_FOUND;\r
     ASSERT (Version >= EDKII_CRYPTO_VERSION);\r
     mCryptoProtocol = NULL;\r
     return EFI_NOT_FOUND;\r

diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.c b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.c
index 4fd0e4d3bbf6a2e289768fcc87841b9fe9f4293f..51f858302fc14edf184bc984e290d6e28e5e4429 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.c
+++ b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.c
@@ -33,14 +33,14 @@ GetCryptoServices (
   UINTN             Version;\r
 \r
   CryptoPpi = NULL;\r
   UINTN             Version;\r
 \r
   CryptoPpi = NULL;\r

-  Status = PeiServicesLocatePpi (\r
-             &gEdkiiCryptoPpiGuid,\r
-             0,\r
-             NULL,\r
-             (VOID **)&CryptoPpi\r
-             );\r
-  if (EFI_ERROR (Status) || CryptoPpi == NULL) {\r
-    DEBUG((DEBUG_ERROR, "[PeiCryptLib] Failed to locate Crypto PPI. Status = %r\n", Status));\r
+  Status    = PeiServicesLocatePpi (\r
+                &gEdkiiCryptoPpiGuid,\r
+                0,\r
+                NULL,\r
+                (VOID **)&CryptoPpi\r
+                );\r
+  if (EFI_ERROR (Status) || (CryptoPpi == NULL)) {\r
+    DEBUG ((DEBUG_ERROR, "[PeiCryptLib] Failed to locate Crypto PPI. Status = %r\n", Status));\r

     ASSERT_EFI_ERROR (Status);\r
     ASSERT (CryptoPpi != NULL);\r
     return NULL;\r
     ASSERT_EFI_ERROR (Status);\r
     ASSERT (CryptoPpi != NULL);\r
     return NULL;\r


@@ -48,7 +48,7 @@ GetCryptoServices (
 \r
   Version = CryptoPpi->GetVersion ();\r
   if (Version < EDKII_CRYPTO_VERSION) {\r
 \r
   Version = CryptoPpi->GetVersion ();\r
   if (Version < EDKII_CRYPTO_VERSION) {\r

-    DEBUG((DEBUG_ERROR, "[PeiCryptLib] Crypto PPI unsupported version %d\n", Version));\r
+    DEBUG ((DEBUG_ERROR, "[PeiCryptLib] Crypto PPI unsupported version %d\n", Version));\r

     ASSERT (Version >= EDKII_CRYPTO_VERSION);\r
     return NULL;\r
   }\r
     ASSERT (Version >= EDKII_CRYPTO_VERSION);\r
     return NULL;\r
   }\r

diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.c b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.c
index ef6078dfa4175a12a5717b77ef474305d877c79f..be0f44e63b3e9896f526e248049a4a790144dca1 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.c
+++ b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.c
@@ -59,8 +59,8 @@ SmmCryptLibConstructor (
                     NULL,\r
                     (VOID **)&mSmmCryptoProtocol\r
                     );\r
                     NULL,\r
                     (VOID **)&mSmmCryptoProtocol\r
                     );\r

-  if (EFI_ERROR (Status) || mSmmCryptoProtocol == NULL) {\r
-    DEBUG((DEBUG_ERROR, "[SmmCryptLib] Failed to locate Crypto SMM Protocol. Status = %r\n", Status));\r
+  if (EFI_ERROR (Status) || (mSmmCryptoProtocol == NULL)) {\r
+    DEBUG ((DEBUG_ERROR, "[SmmCryptLib] Failed to locate Crypto SMM Protocol. Status = %r\n", Status));\r

     ASSERT_EFI_ERROR (Status);\r
     ASSERT (mSmmCryptoProtocol != NULL);\r
     mSmmCryptoProtocol = NULL;\r
     ASSERT_EFI_ERROR (Status);\r
     ASSERT (mSmmCryptoProtocol != NULL);\r
     mSmmCryptoProtocol = NULL;\r


@@ -69,7 +69,7 @@ SmmCryptLibConstructor (
 \r
   Version = mSmmCryptoProtocol->GetVersion ();\r
   if (Version < EDKII_CRYPTO_VERSION) {\r
 \r
   Version = mSmmCryptoProtocol->GetVersion ();\r
   if (Version < EDKII_CRYPTO_VERSION) {\r

-    DEBUG((DEBUG_ERROR, "[SmmCryptLib] Crypto SMM Protocol unsupported version %d\n", Version));\r
+    DEBUG ((DEBUG_ERROR, "[SmmCryptLib] Crypto SMM Protocol unsupported version %d\n", Version));\r

     ASSERT (Version >= EDKII_CRYPTO_VERSION);\r
     mSmmCryptoProtocol = NULL;\r
     return EFI_NOT_FOUND;\r
     ASSERT (Version >= EDKII_CRYPTO_VERSION);\r
     mSmmCryptoProtocol = NULL;\r
     return EFI_NOT_FOUND;\r

diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h
index 17d7f29ba20e006ca0e8dbdab6d66c10481753be..d257dca8fa9b03b043f8f026fae5a2a2eff22462 100644 (file)
--- a/CryptoPkg/Library/Include/CrtLibSupport.h
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
@@ -16,8 +16,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/DebugLib.h>\r
 #include <Library/PrintLib.h>\r
 \r
 #include <Library/DebugLib.h>\r
 #include <Library/PrintLib.h>\r
 \r

-#define OPENSSLDIR ""\r
-#define ENGINESDIR ""\r
+#define OPENSSLDIR  ""\r
+#define ENGINESDIR  ""\r

 \r
 #define MAX_STRING_SIZE  0x1000\r
 \r
 \r
 #define MAX_STRING_SIZE  0x1000\r
 \r


@@ -39,50 +39,50 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // define our own here.\r
 //\r
 #ifdef CONFIG_HEADER_BN_H\r
 // define our own here.\r
 //\r
 #ifdef CONFIG_HEADER_BN_H\r

-#error CONFIG_HEADER_BN_H already defined\r
+  #error CONFIG_HEADER_BN_H already defined\r

 #endif\r
 \r
 #define CONFIG_HEADER_BN_H\r
 \r
 #endif\r
 \r
 #define CONFIG_HEADER_BN_H\r
 \r

-#if !defined(SIXTY_FOUR_BIT) && !defined (THIRTY_TWO_BIT)\r
-#if defined(MDE_CPU_X64) || defined(MDE_CPU_AARCH64) || defined(MDE_CPU_IA64) || defined(MDE_CPU_RISCV64)\r
+#if !defined (SIXTY_FOUR_BIT) && !defined (THIRTY_TWO_BIT)\r
+  #if defined (MDE_CPU_X64) || defined (MDE_CPU_AARCH64) || defined (MDE_CPU_IA64) || defined (MDE_CPU_RISCV64)\r

 //\r
 // With GCC we would normally use SIXTY_FOUR_BIT_LONG, but MSVC needs\r
 // SIXTY_FOUR_BIT, because 'long' is 32-bit and only 'long long' is\r
 // 64-bit. Since using 'long long' works fine on GCC too, just do that.\r
 //\r
 #define SIXTY_FOUR_BIT\r
 //\r
 // With GCC we would normally use SIXTY_FOUR_BIT_LONG, but MSVC needs\r
 // SIXTY_FOUR_BIT, because 'long' is 32-bit and only 'long long' is\r
 // 64-bit. Since using 'long long' works fine on GCC too, just do that.\r
 //\r
 #define SIXTY_FOUR_BIT\r

-#elif defined(MDE_CPU_IA32) || defined(MDE_CPU_ARM) || defined(MDE_CPU_EBC)\r
+  #elif defined (MDE_CPU_IA32) || defined (MDE_CPU_ARM) || defined (MDE_CPU_EBC)\r

 #define THIRTY_TWO_BIT\r
 #define THIRTY_TWO_BIT\r

-#else\r
-#error Unknown target architecture\r
-#endif\r
+  #else\r
+    #error Unknown target architecture\r
+  #endif\r

 #endif\r
 \r
 //\r
 // Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h\r
 //\r
 #endif\r
 \r
 //\r
 // Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h\r
 //\r

-#if !defined(__CC_ARM) // if va_list is not already defined\r
+#if !defined (__CC_ARM) // if va_list is not already defined\r

 #define va_list   VA_LIST\r
 #define va_arg    VA_ARG\r
 #define va_start  VA_START\r
 #define va_end    VA_END\r
 #else // __CC_ARM\r
 #define va_list   VA_LIST\r
 #define va_arg    VA_ARG\r
 #define va_start  VA_START\r
 #define va_end    VA_END\r
 #else // __CC_ARM\r

-#define va_start(Marker, Parameter)   __va_start(Marker, Parameter)\r
-#define va_arg(Marker, TYPE)          __va_arg(Marker, TYPE)\r
-#define va_end(Marker)                ((void)0)\r
+#define va_start(Marker, Parameter)  __va_start(Marker, Parameter)\r
+#define va_arg(Marker, TYPE)         __va_arg(Marker, TYPE)\r
+#define va_end(Marker)               ((void)0)\r

 #endif\r
 \r
 //\r
 // Definitions for global constants used by CRT library routines\r
 //\r
 #endif\r
 \r
 //\r
 // Definitions for global constants used by CRT library routines\r
 //\r

-#define EINVAL       22               /* Invalid argument */\r
-#define EAFNOSUPPORT 47               /* Address family not supported by protocol family */\r
-#define INT_MAX      0x7FFFFFFF       /* Maximum (signed) int value */\r
-#define LONG_MAX     0X7FFFFFFFL      /* max value for a long */\r
-#define LONG_MIN     (-LONG_MAX-1)    /* min value for a long */\r
-#define ULONG_MAX    0xFFFFFFFF       /* Maximum unsigned long value */\r
-#define CHAR_BIT     8                /* Number of bits in a char */\r
+#define EINVAL        22              /* Invalid argument */\r
+#define EAFNOSUPPORT  47              /* Address family not supported by protocol family */\r
+#define INT_MAX       0x7FFFFFFF      /* Maximum (signed) int value */\r
+#define LONG_MAX      0X7FFFFFFFL     /* max value for a long */\r
+#define LONG_MIN      (-LONG_MAX-1)   /* min value for a long */\r
+#define ULONG_MAX     0xFFFFFFFF      /* Maximum unsigned long value */\r
+#define CHAR_BIT      8               /* Number of bits in a char */\r

 \r
 //\r
 // Address families.\r
 \r
 //\r
 // Address families.\r


@@ -100,124 +100,316 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Basic types mapping\r
 //\r
 //\r
 // Basic types mapping\r
 //\r

-typedef UINTN          size_t;\r
-typedef UINTN          u_int;\r
-typedef INTN           ptrdiff_t;\r
-typedef INTN           ssize_t;\r
-typedef INT32          time_t;\r
-typedef UINT8          __uint8_t;\r
-typedef UINT8          sa_family_t;\r
-typedef UINT8          u_char;\r
-typedef UINT32         uid_t;\r
-typedef UINT32         gid_t;\r
-typedef CHAR16         wchar_t;\r
+typedef UINTN   size_t;\r
+typedef UINTN   u_int;\r
+typedef INTN    ptrdiff_t;\r
+typedef INTN    ssize_t;\r
+typedef INT32   time_t;\r
+typedef UINT8   __uint8_t;\r
+typedef UINT8   sa_family_t;\r
+typedef UINT8   u_char;\r
+typedef UINT32  uid_t;\r
+typedef UINT32  gid_t;\r
+typedef CHAR16  wchar_t;\r

 \r
 //\r
 // File operations are not required for EFI building,\r
 // so FILE is mapped to VOID * to pass build\r
 //\r
 \r
 //\r
 // File operations are not required for EFI building,\r
 // so FILE is mapped to VOID * to pass build\r
 //\r

-typedef VOID  *FILE;\r
+typedef VOID *FILE;\r

 \r
 //\r
 // Structures Definitions\r
 //\r
 struct tm {\r
 \r
 //\r
 // Structures Definitions\r
 //\r
 struct tm {\r

-  int   tm_sec;     /* seconds after the minute [0-60] */\r
-  int   tm_min;     /* minutes after the hour [0-59] */\r
-  int   tm_hour;    /* hours since midnight [0-23] */\r
-  int   tm_mday;    /* day of the month [1-31] */\r
-  int   tm_mon;     /* months since January [0-11] */\r
-  int   tm_year;    /* years since 1900 */\r
-  int   tm_wday;    /* days since Sunday [0-6] */\r
-  int   tm_yday;    /* days since January 1 [0-365] */\r
-  int   tm_isdst;   /* Daylight Savings Time flag */\r
-  long  tm_gmtoff;  /* offset from CUT in seconds */\r
-  char  *tm_zone;   /* timezone abbreviation */\r
+  int     tm_sec;    /* seconds after the minute [0-60] */\r
+  int     tm_min;    /* minutes after the hour [0-59] */\r
+  int     tm_hour;   /* hours since midnight [0-23] */\r
+  int     tm_mday;   /* day of the month [1-31] */\r
+  int     tm_mon;    /* months since January [0-11] */\r
+  int     tm_year;   /* years since 1900 */\r
+  int     tm_wday;   /* days since Sunday [0-6] */\r
+  int     tm_yday;   /* days since January 1 [0-365] */\r
+  int     tm_isdst;  /* Daylight Savings Time flag */\r
+  long    tm_gmtoff; /* offset from CUT in seconds */\r
+  char    *tm_zone;  /* timezone abbreviation */\r

 };\r
 \r
 struct timeval {\r
 };\r
 \r
 struct timeval {\r

-  long tv_sec;      /* time value, in seconds */\r
-  long tv_usec;     /* time value, in microseconds */\r
+  long    tv_sec;   /* time value, in seconds */\r
+  long    tv_usec;  /* time value, in microseconds */\r

 };\r
 \r
 struct sockaddr {\r
 };\r
 \r
 struct sockaddr {\r

-  __uint8_t    sa_len;       /* total length */\r
-  sa_family_t  sa_family;    /* address family */\r
-  char         sa_data[14];  /* actually longer; address value */\r
+  __uint8_t      sa_len;      /* total length */\r
+  sa_family_t    sa_family;   /* address family */\r
+  char           sa_data[14]; /* actually longer; address value */\r

 };\r
 \r
 //\r
 // Global variables\r
 //\r
 };\r
 \r
 //\r
 // Global variables\r
 //\r

-extern int  errno;\r
-extern FILE *stderr;\r
+extern int   errno;\r
+extern FILE  *stderr;\r

 \r
 //\r
 // Function prototypes of CRT Library routines\r
 //\r
 \r
 //\r
 // Function prototypes of CRT Library routines\r
 //\r

-void           *malloc     (size_t);\r
-void           *realloc    (void *, size_t);\r
-void           free        (void *);\r
-void           *memset     (void *, int, size_t);\r
-int            memcmp      (const void *, const void *, size_t);\r
-int            isdigit     (int);\r
-int            isspace     (int);\r
-int            isxdigit    (int);\r
-int            isalnum     (int);\r
-int            isupper     (int);\r
-int            tolower     (int);\r
-int            strcmp      (const char *, const char *);\r
-int            strncasecmp (const char *, const char *, size_t);\r
-char           *strchr     (const char *, int);\r
-char           *strrchr    (const char *, int);\r
-unsigned long  strtoul     (const char *, char **, int);\r
-long           strtol      (const char *, char **, int);\r
-char           *strerror   (int);\r
-size_t         strspn      (const char *, const char *);\r
-size_t         strcspn     (const char *, const char *);\r
-int            printf      (const char *, ...);\r
-int            sscanf      (const char *, const char *, ...);\r
-FILE           *fopen      (const char *, const char *);\r
-size_t         fread       (void *, size_t, size_t, FILE *);\r
-size_t         fwrite      (const void *, size_t, size_t, FILE *);\r
-int            fclose      (FILE *);\r
-int            fprintf     (FILE *, const char *, ...);\r
-time_t         time        (time_t *);\r
-struct tm      *gmtime     (const time_t *);\r
-uid_t          getuid      (void);\r
-uid_t          geteuid     (void);\r
-gid_t          getgid      (void);\r
-gid_t          getegid     (void);\r
-int            issetugid   (void);\r
-void           qsort       (void *, size_t, size_t, int (*)(const void *, const void *));\r
-char           *getenv     (const char *);\r
-char           *secure_getenv (const char *);\r
-#if defined(__GNUC__) && (__GNUC__ >= 2)\r
-void           abort       (void) __attribute__((__noreturn__));\r
+void           *\r
+malloc     (\r
+  size_t\r
+  );\r
+\r
+void           *\r
+realloc    (\r
+  void *,\r
+  size_t\r
+  );\r
+\r
+void\r
+free        (\r
+  void *\r
+  );\r
+\r
+void           *\r
+memset     (\r
+  void *,\r
+  int,\r
+  size_t\r
+  );\r
+\r
+int\r
+memcmp      (\r
+  const void *,\r
+  const void *,\r
+  size_t\r
+  );\r
+\r
+int\r
+isdigit     (\r
+  int\r
+  );\r
+\r
+int\r
+isspace     (\r
+  int\r
+  );\r
+\r
+int\r
+isxdigit    (\r
+  int\r
+  );\r
+\r
+int\r
+isalnum     (\r
+  int\r
+  );\r
+\r
+int\r
+isupper     (\r
+  int\r
+  );\r
+\r
+int\r
+tolower     (\r
+  int\r
+  );\r
+\r
+int\r
+strcmp      (\r
+  const char *,\r
+  const char *\r
+  );\r
+\r
+int\r
+strncasecmp (\r
+  const char *,\r
+  const char *,\r
+  size_t\r
+  );\r
+\r
+char           *\r
+strchr     (\r
+  const char *,\r
+  int\r
+  );\r
+\r
+char           *\r
+strrchr    (\r
+  const char *,\r
+  int\r
+  );\r
+\r
+unsigned long\r
+strtoul     (\r
+  const char *,\r
+  char **,\r
+  int\r
+  );\r
+\r
+long\r
+strtol      (\r
+  const char *,\r
+  char **,\r
+  int\r
+  );\r
+\r
+char           *\r
+strerror   (\r
+  int\r
+  );\r
+\r
+size_t\r
+strspn      (\r
+  const char *,\r
+  const char *\r
+  );\r
+\r
+size_t\r
+strcspn     (\r
+  const char *,\r
+  const char *\r
+  );\r
+\r
+int\r
+printf      (\r
+  const char *,\r
+  ...\r
+  );\r
+\r
+int\r
+sscanf      (\r
+  const char *,\r
+  const char *,\r
+  ...\r
+  );\r
+\r
+FILE           *\r
+fopen      (\r
+  const char *,\r
+  const char *\r
+  );\r
+\r
+size_t\r
+fread       (\r
+  void *,\r
+  size_t,\r
+  size_t,\r
+  FILE *\r
+  );\r
+\r
+size_t\r
+fwrite      (\r
+  const void *,\r
+  size_t,\r
+  size_t,\r
+  FILE *\r
+  );\r
+\r
+int\r
+fclose      (\r
+  FILE *\r
+  );\r
+\r
+int\r
+fprintf     (\r
+  FILE *,\r
+  const char *,\r
+  ...\r
+  );\r
+\r
+time_t\r
+time        (\r
+  time_t *\r
+  );\r
+\r
+struct tm      *\r
+gmtime     (\r
+  const time_t *\r
+  );\r
+\r
+uid_t\r
+getuid      (\r
+  void\r
+  );\r
+\r
+uid_t\r
+geteuid     (\r
+  void\r
+  );\r
+\r
+gid_t\r
+getgid      (\r
+  void\r
+  );\r
+\r
+gid_t\r
+getegid     (\r
+  void\r
+  );\r
+\r
+int\r
+issetugid   (\r
+  void\r
+  );\r
+\r
+void\r
+qsort       (\r
+  void *,\r
+  size_t,\r
+  size_t,\r
+  int (*)(const void *, const void *)\r
+  );\r
+\r
+char           *\r
+getenv     (\r
+  const char *\r
+  );\r
+\r
+char           *\r
+secure_getenv (\r
+  const char *\r
+  );\r
+\r
+#if defined (__GNUC__) && (__GNUC__ >= 2)\r
+void\r
+abort       (\r
+  void\r
+  ) __attribute__ ((__noreturn__));\r
+\r

 #else\r
 #else\r

-void           abort       (void);\r
+void\r
+abort       (\r
+  void\r
+  );\r
+\r

 #endif\r
 #endif\r

-int            inet_pton   (int, const char *, void *);\r
+int\r
+inet_pton   (\r
+  int,\r
+  const char *,\r
+  void *\r
+  );\r

 \r
 //\r
 // Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions\r
 //\r
 \r
 //\r
 // Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions\r
 //\r

-#define memcpy(dest,source,count)         CopyMem(dest,source,(UINTN)(count))\r
-#define memset(dest,ch,count)             SetMem(dest,(UINTN)(count),(UINT8)(ch))\r
-#define memchr(buf,ch,count)              ScanMem8(buf,(UINTN)(count),(UINT8)ch)\r
-#define memcmp(buf1,buf2,count)           (int)(CompareMem(buf1,buf2,(UINTN)(count)))\r
-#define memmove(dest,source,count)        CopyMem(dest,source,(UINTN)(count))\r
-#define strlen(str)                       (size_t)(AsciiStrnLenS(str,MAX_STRING_SIZE))\r
-#define strcpy(strDest,strSource)         AsciiStrCpyS(strDest,MAX_STRING_SIZE,strSource)\r
-#define strncpy(strDest,strSource,count)  AsciiStrnCpyS(strDest,MAX_STRING_SIZE,strSource,(UINTN)count)\r
-#define strcat(strDest,strSource)         AsciiStrCatS(strDest,MAX_STRING_SIZE,strSource)\r
-#define strncmp(string1,string2,count)    (int)(AsciiStrnCmp(string1,string2,(UINTN)(count)))\r
-#define strcasecmp(str1,str2)             (int)AsciiStriCmp(str1,str2)\r
-#define sprintf(buf,...)                  AsciiSPrint(buf,MAX_STRING_SIZE,__VA_ARGS__)\r
-#define localtime(timer)                  NULL\r
+#define memcpy(dest, source, count)         CopyMem(dest,source,(UINTN)(count))\r
+#define memset(dest, ch, count)             SetMem(dest,(UINTN)(count),(UINT8)(ch))\r
+#define memchr(buf, ch, count)              ScanMem8(buf,(UINTN)(count),(UINT8)ch)\r
+#define memcmp(buf1, buf2, count)           (int)(CompareMem(buf1,buf2,(UINTN)(count)))\r
+#define memmove(dest, source, count)        CopyMem(dest,source,(UINTN)(count))\r
+#define strlen(str)                         (size_t)(AsciiStrnLenS(str,MAX_STRING_SIZE))\r
+#define strcpy(strDest, strSource)          AsciiStrCpyS(strDest,MAX_STRING_SIZE,strSource)\r
+#define strncpy(strDest, strSource, count)  AsciiStrnCpyS(strDest,MAX_STRING_SIZE,strSource,(UINTN)count)\r
+#define strcat(strDest, strSource)          AsciiStrCatS(strDest,MAX_STRING_SIZE,strSource)\r
+#define strncmp(string1, string2, count)    (int)(AsciiStrnCmp(string1,string2,(UINTN)(count)))\r
+#define strcasecmp(str1, str2)              (int)AsciiStriCmp(str1,str2)\r
+#define sprintf(buf, ...)                   AsciiSPrint(buf,MAX_STRING_SIZE,__VA_ARGS__)\r
+#define localtime(timer)                    NULL\r

 #define assert(expression)\r
 #define assert(expression)\r

-#define offsetof(type,member)             OFFSET_OF(type,member)\r
-#define atoi(nptr)                        AsciiStrDecimalToUintn(nptr)\r
-#define gettimeofday(tvp,tz)              do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0)\r
+#define offsetof(type, member)  OFFSET_OF(type,member)\r
+#define atoi(nptr)              AsciiStrDecimalToUintn(nptr)\r
+#define gettimeofday(tvp, tz)   do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0)\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/CryptoPkg/Library/Include/crypto/dso_conf.h b/CryptoPkg/Library/Include/crypto/dso_conf.h
index 95f4db2b158666e2f2d0330f65510b94a3c276f1..b9c38b4166972e4f315e0c8cfebc9df9c66f3364 100644 (file)
--- a/CryptoPkg/Library/Include/crypto/dso_conf.h
+++ b/CryptoPkg/Library/Include/crypto/dso_conf.h
@@ -1,5 +1,6 @@
 /* WARNING: do not edit! */\r
 /* Generated from include/crypto/dso_conf.h.in */\r
 /* WARNING: do not edit! */\r
 /* Generated from include/crypto/dso_conf.h.in */\r

+\r

 /*\r
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.\r
  *\r
 /*\r
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.\r
  *\r


@@ -10,7 +11,7 @@
  */\r
 \r
 #ifndef OSSL_CRYPTO_DSO_CONF_H\r
  */\r
 \r
 #ifndef OSSL_CRYPTO_DSO_CONF_H\r

-# define OSSL_CRYPTO_DSO_CONF_H\r
-# define DSO_NONE\r
-# define DSO_EXTENSION ".so"\r
+#define OSSL_CRYPTO_DSO_CONF_H\r
+#define DSO_NONE\r
+#define DSO_EXTENSION  ".so"\r

 #endif\r
 #endif\r

diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h
index b8d59aebe8add543310427ecb0d1877dfc770364..b119212ed856b5b623c9dccb14600833f86b155e 100644 (file)
--- a/CryptoPkg/Library/Include/openssl/opensslconf.h
+++ b/CryptoPkg/Library/Include/openssl/opensslconf.h
@@ -17,7 +17,7 @@ extern "C" {
 #endif\r
 \r
 #ifdef OPENSSL_ALGORITHM_DEFINES\r
 #endif\r
 \r
 #ifdef OPENSSL_ALGORITHM_DEFINES\r

-# error OPENSSL_ALGORITHM_DEFINES no longer supported\r
+  #error OPENSSL_ALGORITHM_DEFINES no longer supported\r

 #endif\r
 \r
 /*\r
 #endif\r
 \r
 /*\r


@@ -25,232 +25,231 @@ extern "C" {
  */\r
 \r
 #ifndef OPENSSL_SYS_UEFI\r
  */\r
 \r
 #ifndef OPENSSL_SYS_UEFI\r

-# define OPENSSL_SYS_UEFI 1\r
+#define OPENSSL_SYS_UEFI  1\r

 #endif\r
 #endif\r

-#define OPENSSL_MIN_API 0x10100000L\r
+#define OPENSSL_MIN_API  0x10100000L\r

 #ifndef OPENSSL_NO_BF\r
 #ifndef OPENSSL_NO_BF\r

-# define OPENSSL_NO_BF\r
+#define OPENSSL_NO_BF\r

 #endif\r
 #ifndef OPENSSL_NO_BLAKE2\r
 #endif\r
 #ifndef OPENSSL_NO_BLAKE2\r

-# define OPENSSL_NO_BLAKE2\r
+#define OPENSSL_NO_BLAKE2\r

 #endif\r
 #ifndef OPENSSL_NO_CAMELLIA\r
 #endif\r
 #ifndef OPENSSL_NO_CAMELLIA\r

-# define OPENSSL_NO_CAMELLIA\r
+#define OPENSSL_NO_CAMELLIA\r

 #endif\r
 #ifndef OPENSSL_NO_CAST\r
 #endif\r
 #ifndef OPENSSL_NO_CAST\r

-# define OPENSSL_NO_CAST\r
+#define OPENSSL_NO_CAST\r

 #endif\r
 #ifndef OPENSSL_NO_CHACHA\r
 #endif\r
 #ifndef OPENSSL_NO_CHACHA\r

-# define OPENSSL_NO_CHACHA\r
+#define OPENSSL_NO_CHACHA\r

 #endif\r
 #ifndef OPENSSL_NO_CMS\r
 #endif\r
 #ifndef OPENSSL_NO_CMS\r

-# define OPENSSL_NO_CMS\r
+#define OPENSSL_NO_CMS\r

 #endif\r
 #ifndef OPENSSL_NO_CT\r
 #endif\r
 #ifndef OPENSSL_NO_CT\r

-# define OPENSSL_NO_CT\r
+#define OPENSSL_NO_CT\r

 #endif\r
 #ifndef OPENSSL_NO_DES\r
 #endif\r
 #ifndef OPENSSL_NO_DES\r

-# define OPENSSL_NO_DES\r
+#define OPENSSL_NO_DES\r

 #endif\r
 #ifndef OPENSSL_NO_DSA\r
 #endif\r
 #ifndef OPENSSL_NO_DSA\r

-# define OPENSSL_NO_DSA\r
+#define OPENSSL_NO_DSA\r

 #endif\r
 #ifndef OPENSSL_NO_EC\r
 #endif\r
 #ifndef OPENSSL_NO_EC\r

-# define OPENSSL_NO_EC\r
+#define OPENSSL_NO_EC\r

 #endif\r
 #ifndef OPENSSL_NO_IDEA\r
 #endif\r
 #ifndef OPENSSL_NO_IDEA\r

-# define OPENSSL_NO_IDEA\r
+#define OPENSSL_NO_IDEA\r

 #endif\r
 #ifndef OPENSSL_NO_MD2\r
 #endif\r
 #ifndef OPENSSL_NO_MD2\r

-# define OPENSSL_NO_MD2\r
+#define OPENSSL_NO_MD2\r

 #endif\r
 #ifndef OPENSSL_NO_MD4\r
 #endif\r
 #ifndef OPENSSL_NO_MD4\r

-# define OPENSSL_NO_MD4\r
+#define OPENSSL_NO_MD4\r

 #endif\r
 #ifndef OPENSSL_NO_MDC2\r
 #endif\r
 #ifndef OPENSSL_NO_MDC2\r

-# define OPENSSL_NO_MDC2\r
+#define OPENSSL_NO_MDC2\r

 #endif\r
 #ifndef OPENSSL_NO_POLY1305\r
 #endif\r
 #ifndef OPENSSL_NO_POLY1305\r

-# define OPENSSL_NO_POLY1305\r
+#define OPENSSL_NO_POLY1305\r

 #endif\r
 #ifndef OPENSSL_NO_RC2\r
 #endif\r
 #ifndef OPENSSL_NO_RC2\r

-# define OPENSSL_NO_RC2\r
+#define OPENSSL_NO_RC2\r

 #endif\r
 #ifndef OPENSSL_NO_RC4\r
 #endif\r
 #ifndef OPENSSL_NO_RC4\r

-# define OPENSSL_NO_RC4\r
+#define OPENSSL_NO_RC4\r

 #endif\r
 #ifndef OPENSSL_NO_RC5\r
 #endif\r
 #ifndef OPENSSL_NO_RC5\r

-# define OPENSSL_NO_RC5\r
+#define OPENSSL_NO_RC5\r

 #endif\r
 #ifndef OPENSSL_NO_RMD160\r
 #endif\r
 #ifndef OPENSSL_NO_RMD160\r

-# define OPENSSL_NO_RMD160\r
+#define OPENSSL_NO_RMD160\r

 #endif\r
 #ifndef OPENSSL_NO_SEED\r
 #endif\r
 #ifndef OPENSSL_NO_SEED\r

-# define OPENSSL_NO_SEED\r
+#define OPENSSL_NO_SEED\r

 #endif\r
 #ifndef OPENSSL_NO_SM2\r
 #endif\r
 #ifndef OPENSSL_NO_SM2\r

-# define OPENSSL_NO_SM2\r
+#define OPENSSL_NO_SM2\r

 #endif\r
 #ifndef OPENSSL_NO_SRP\r
 #endif\r
 #ifndef OPENSSL_NO_SRP\r

-# define OPENSSL_NO_SRP\r
+#define OPENSSL_NO_SRP\r

 #endif\r
 #ifndef OPENSSL_NO_TS\r
 #endif\r
 #ifndef OPENSSL_NO_TS\r

-# define OPENSSL_NO_TS\r
+#define OPENSSL_NO_TS\r

 #endif\r
 #ifndef OPENSSL_NO_WHIRLPOOL\r
 #endif\r
 #ifndef OPENSSL_NO_WHIRLPOOL\r

-# define OPENSSL_NO_WHIRLPOOL\r
+#define OPENSSL_NO_WHIRLPOOL\r

 #endif\r
 #ifndef OPENSSL_RAND_SEED_NONE\r
 #endif\r
 #ifndef OPENSSL_RAND_SEED_NONE\r

-# define OPENSSL_RAND_SEED_NONE\r
+#define OPENSSL_RAND_SEED_NONE\r

 #endif\r
 #ifndef OPENSSL_NO_AFALGENG\r
 #endif\r
 #ifndef OPENSSL_NO_AFALGENG\r

-# define OPENSSL_NO_AFALGENG\r
+#define OPENSSL_NO_AFALGENG\r

 #endif\r
 #ifndef OPENSSL_NO_APPS\r
 #endif\r
 #ifndef OPENSSL_NO_APPS\r

-# define OPENSSL_NO_APPS\r
+#define OPENSSL_NO_APPS\r

 #endif\r
 #ifndef OPENSSL_NO_ASAN\r
 #endif\r
 #ifndef OPENSSL_NO_ASAN\r

-# define OPENSSL_NO_ASAN\r
+#define OPENSSL_NO_ASAN\r

 #endif\r
 #ifndef OPENSSL_NO_ASYNC\r
 #endif\r
 #ifndef OPENSSL_NO_ASYNC\r

-# define OPENSSL_NO_ASYNC\r
+#define OPENSSL_NO_ASYNC\r

 #endif\r
 #ifndef OPENSSL_NO_AUTOERRINIT\r
 #endif\r
 #ifndef OPENSSL_NO_AUTOERRINIT\r

-# define OPENSSL_NO_AUTOERRINIT\r
+#define OPENSSL_NO_AUTOERRINIT\r

 #endif\r
 #ifndef OPENSSL_NO_AUTOLOAD_CONFIG\r
 #endif\r
 #ifndef OPENSSL_NO_AUTOLOAD_CONFIG\r

-# define OPENSSL_NO_AUTOLOAD_CONFIG\r
+#define OPENSSL_NO_AUTOLOAD_CONFIG\r

 #endif\r
 #ifndef OPENSSL_NO_CAPIENG\r
 #endif\r
 #ifndef OPENSSL_NO_CAPIENG\r

-# define OPENSSL_NO_CAPIENG\r
+#define OPENSSL_NO_CAPIENG\r

 #endif\r
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG\r
 #endif\r
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG\r

-# define OPENSSL_NO_CRYPTO_MDEBUG\r
+#define OPENSSL_NO_CRYPTO_MDEBUG\r

 #endif\r
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE\r
 #endif\r
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE\r

-# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE\r
+#define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE\r

 #endif\r
 #ifndef OPENSSL_NO_DEPRECATED\r
 #endif\r
 #ifndef OPENSSL_NO_DEPRECATED\r

-# define OPENSSL_NO_DEPRECATED\r
+#define OPENSSL_NO_DEPRECATED\r

 #endif\r
 #ifndef OPENSSL_NO_DEVCRYPTOENG\r
 #endif\r
 #ifndef OPENSSL_NO_DEVCRYPTOENG\r

-# define OPENSSL_NO_DEVCRYPTOENG\r
+#define OPENSSL_NO_DEVCRYPTOENG\r

 #endif\r
 #ifndef OPENSSL_NO_DGRAM\r
 #endif\r
 #ifndef OPENSSL_NO_DGRAM\r

-# define OPENSSL_NO_DGRAM\r
+#define OPENSSL_NO_DGRAM\r

 #endif\r
 #ifndef OPENSSL_NO_DTLS\r
 #endif\r
 #ifndef OPENSSL_NO_DTLS\r

-# define OPENSSL_NO_DTLS\r
+#define OPENSSL_NO_DTLS\r

 #endif\r
 #ifndef OPENSSL_NO_DTLS1\r
 #endif\r
 #ifndef OPENSSL_NO_DTLS1\r

-# define OPENSSL_NO_DTLS1\r
+#define OPENSSL_NO_DTLS1\r

 #endif\r
 #ifndef OPENSSL_NO_DTLS1_2\r
 #endif\r
 #ifndef OPENSSL_NO_DTLS1_2\r

-# define OPENSSL_NO_DTLS1_2\r
+#define OPENSSL_NO_DTLS1_2\r

 #endif\r
 #ifndef OPENSSL_NO_EC2M\r
 #endif\r
 #ifndef OPENSSL_NO_EC2M\r

-# define OPENSSL_NO_EC2M\r
+#define OPENSSL_NO_EC2M\r

 #endif\r
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128\r
 #endif\r
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128\r

-# define OPENSSL_NO_EC_NISTP_64_GCC_128\r
+#define OPENSSL_NO_EC_NISTP_64_GCC_128\r

 #endif\r
 #ifndef OPENSSL_NO_ECDH\r
 #endif\r
 #ifndef OPENSSL_NO_ECDH\r

-# define OPENSSL_NO_ECDH\r
+#define OPENSSL_NO_ECDH\r

 #endif\r
 #ifndef OPENSSL_NO_ECDSA\r
 #endif\r
 #ifndef OPENSSL_NO_ECDSA\r

-# define OPENSSL_NO_ECDSA\r
+#define OPENSSL_NO_ECDSA\r

 #endif\r
 #ifndef OPENSSL_NO_EGD\r
 #endif\r
 #ifndef OPENSSL_NO_EGD\r

-# define OPENSSL_NO_EGD\r
+#define OPENSSL_NO_EGD\r

 #endif\r
 #ifndef OPENSSL_NO_ENGINE\r
 #endif\r
 #ifndef OPENSSL_NO_ENGINE\r

-# define OPENSSL_NO_ENGINE\r
+#define OPENSSL_NO_ENGINE\r

 #endif\r
 #ifndef OPENSSL_NO_ERR\r
 #endif\r
 #ifndef OPENSSL_NO_ERR\r

-# define OPENSSL_NO_ERR\r
+#define OPENSSL_NO_ERR\r

 #endif\r
 #ifndef OPENSSL_NO_EXTERNAL_TESTS\r
 #endif\r
 #ifndef OPENSSL_NO_EXTERNAL_TESTS\r

-# define OPENSSL_NO_EXTERNAL_TESTS\r
+#define OPENSSL_NO_EXTERNAL_TESTS\r

 #endif\r
 #ifndef OPENSSL_NO_FILENAMES\r
 #endif\r
 #ifndef OPENSSL_NO_FILENAMES\r

-# define OPENSSL_NO_FILENAMES\r
+#define OPENSSL_NO_FILENAMES\r

 #endif\r
 #ifndef OPENSSL_NO_FUZZ_AFL\r
 #endif\r
 #ifndef OPENSSL_NO_FUZZ_AFL\r

-# define OPENSSL_NO_FUZZ_AFL\r
+#define OPENSSL_NO_FUZZ_AFL\r

 #endif\r
 #ifndef OPENSSL_NO_FUZZ_LIBFUZZER\r
 #endif\r
 #ifndef OPENSSL_NO_FUZZ_LIBFUZZER\r

-# define OPENSSL_NO_FUZZ_LIBFUZZER\r
+#define OPENSSL_NO_FUZZ_LIBFUZZER\r

 #endif\r
 #ifndef OPENSSL_NO_GOST\r
 #endif\r
 #ifndef OPENSSL_NO_GOST\r

-# define OPENSSL_NO_GOST\r
+#define OPENSSL_NO_GOST\r

 #endif\r
 #ifndef OPENSSL_NO_HEARTBEATS\r
 #endif\r
 #ifndef OPENSSL_NO_HEARTBEATS\r

-# define OPENSSL_NO_HEARTBEATS\r
+#define OPENSSL_NO_HEARTBEATS\r

 #endif\r
 #ifndef OPENSSL_NO_HW\r
 #endif\r
 #ifndef OPENSSL_NO_HW\r

-# define OPENSSL_NO_HW\r
+#define OPENSSL_NO_HW\r

 #endif\r
 #ifndef OPENSSL_NO_MSAN\r
 #endif\r
 #ifndef OPENSSL_NO_MSAN\r

-# define OPENSSL_NO_MSAN\r
+#define OPENSSL_NO_MSAN\r

 #endif\r
 #ifndef OPENSSL_NO_OCB\r
 #endif\r
 #ifndef OPENSSL_NO_OCB\r

-# define OPENSSL_NO_OCB\r
+#define OPENSSL_NO_OCB\r

 #endif\r
 #ifndef OPENSSL_NO_POSIX_IO\r
 #endif\r
 #ifndef OPENSSL_NO_POSIX_IO\r

-# define OPENSSL_NO_POSIX_IO\r
+#define OPENSSL_NO_POSIX_IO\r

 #endif\r
 #ifndef OPENSSL_NO_RFC3779\r
 #endif\r
 #ifndef OPENSSL_NO_RFC3779\r

-# define OPENSSL_NO_RFC3779\r
+#define OPENSSL_NO_RFC3779\r

 #endif\r
 #ifndef OPENSSL_NO_SCRYPT\r
 #endif\r
 #ifndef OPENSSL_NO_SCRYPT\r

-# define OPENSSL_NO_SCRYPT\r
+#define OPENSSL_NO_SCRYPT\r

 #endif\r
 #ifndef OPENSSL_NO_SCTP\r
 #endif\r
 #ifndef OPENSSL_NO_SCTP\r

-# define OPENSSL_NO_SCTP\r
+#define OPENSSL_NO_SCTP\r

 #endif\r
 #ifndef OPENSSL_NO_SOCK\r
 #endif\r
 #ifndef OPENSSL_NO_SOCK\r

-# define OPENSSL_NO_SOCK\r
+#define OPENSSL_NO_SOCK\r

 #endif\r
 #ifndef OPENSSL_NO_SSL_TRACE\r
 #endif\r
 #ifndef OPENSSL_NO_SSL_TRACE\r

-# define OPENSSL_NO_SSL_TRACE\r
+#define OPENSSL_NO_SSL_TRACE\r

 #endif\r
 #ifndef OPENSSL_NO_SSL3\r
 #endif\r
 #ifndef OPENSSL_NO_SSL3\r

-# define OPENSSL_NO_SSL3\r
+#define OPENSSL_NO_SSL3\r

 #endif\r
 #ifndef OPENSSL_NO_SSL3_METHOD\r
 #endif\r
 #ifndef OPENSSL_NO_SSL3_METHOD\r

-# define OPENSSL_NO_SSL3_METHOD\r
+#define OPENSSL_NO_SSL3_METHOD\r

 #endif\r
 #ifndef OPENSSL_NO_STDIO\r
 #endif\r
 #ifndef OPENSSL_NO_STDIO\r

-# define OPENSSL_NO_STDIO\r
+#define OPENSSL_NO_STDIO\r

 #endif\r
 #ifndef OPENSSL_NO_TESTS\r
 #endif\r
 #ifndef OPENSSL_NO_TESTS\r

-# define OPENSSL_NO_TESTS\r
+#define OPENSSL_NO_TESTS\r

 #endif\r
 #ifndef OPENSSL_NO_TLS1_3\r
 #endif\r
 #ifndef OPENSSL_NO_TLS1_3\r

-# define OPENSSL_NO_TLS1_3\r
+#define OPENSSL_NO_TLS1_3\r

 #endif\r
 #ifndef OPENSSL_NO_UBSAN\r
 #endif\r
 #ifndef OPENSSL_NO_UBSAN\r

-# define OPENSSL_NO_UBSAN\r
+#define OPENSSL_NO_UBSAN\r

 #endif\r
 #ifndef OPENSSL_NO_UI_CONSOLE\r
 #endif\r
 #ifndef OPENSSL_NO_UI_CONSOLE\r

-# define OPENSSL_NO_UI_CONSOLE\r
+#define OPENSSL_NO_UI_CONSOLE\r

 #endif\r
 #ifndef OPENSSL_NO_UNIT_TEST\r
 #endif\r
 #ifndef OPENSSL_NO_UNIT_TEST\r

-# define OPENSSL_NO_UNIT_TEST\r
+#define OPENSSL_NO_UNIT_TEST\r

 #endif\r
 #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS\r
 #endif\r
 #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS\r

-# define OPENSSL_NO_WEAK_SSL_CIPHERS\r
+#define OPENSSL_NO_WEAK_SSL_CIPHERS\r

 #endif\r
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE\r
 #endif\r
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE\r

-# define OPENSSL_NO_DYNAMIC_ENGINE\r
+#define OPENSSL_NO_DYNAMIC_ENGINE\r

 #endif\r
 \r
 #endif\r
 \r

-\r

 /*\r
  * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers\r
  * don't like that.  This will hopefully silence them.\r
  */\r
 /*\r
  * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers\r
  * don't like that.  This will hopefully silence them.\r
  */\r

-#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;\r
+#define NON_EMPTY_TRANSLATION_UNIT  static void *dummy = &dummy;\r

 \r
 /*\r
  * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the\r
 \r
 /*\r
  * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the\r


@@ -259,37 +258,37 @@ extern "C" {
  * functions.\r
  */\r
 #ifndef DECLARE_DEPRECATED\r
  * functions.\r
  */\r
 #ifndef DECLARE_DEPRECATED\r

-# define DECLARE_DEPRECATED(f)   f;\r
-# ifdef __GNUC__\r
-#  if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)\r
-#   undef DECLARE_DEPRECATED\r
-#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));\r
-#  endif\r
-#elif defined(__SUNPRO_C)\r
-#if (__SUNPRO_C >= 0x5130)\r
-#undef DECLARE_DEPRECATED\r
-#define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));\r
-#endif\r
-# endif\r
+#define DECLARE_DEPRECATED(f)  f;\r
+  #ifdef __GNUC__\r
+    #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)\r
+      #undef DECLARE_DEPRECATED\r
+#define DECLARE_DEPRECATED(f)  f __attribute__ ((deprecated));\r
+    #endif\r
+  #elif defined (__SUNPRO_C)\r
+    #if (__SUNPRO_C >= 0x5130)\r
+      #undef DECLARE_DEPRECATED\r
+#define DECLARE_DEPRECATED(f)  f __attribute__ ((deprecated));\r
+    #endif\r
+  #endif\r

 #endif\r
 \r
 #ifndef OPENSSL_FILE\r
 #endif\r
 \r
 #ifndef OPENSSL_FILE\r

-# ifdef OPENSSL_NO_FILENAMES\r
-#  define OPENSSL_FILE ""\r
-#  define OPENSSL_LINE 0\r
-# else\r
-#  define OPENSSL_FILE __FILE__\r
-#  define OPENSSL_LINE __LINE__\r
-# endif\r
+  #ifdef OPENSSL_NO_FILENAMES\r
+#define OPENSSL_FILE  ""\r
+#define OPENSSL_LINE  0\r
+  #else\r
+#define OPENSSL_FILE  __FILE__\r
+#define OPENSSL_LINE  __LINE__\r
+  #endif\r

 #endif\r
 \r
 #ifndef OPENSSL_MIN_API\r
 #endif\r
 \r
 #ifndef OPENSSL_MIN_API\r

-# define OPENSSL_MIN_API 0\r
+#define OPENSSL_MIN_API  0\r

 #endif\r
 \r
 #endif\r
 \r

-#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API\r
-# undef OPENSSL_API_COMPAT\r
-# define OPENSSL_API_COMPAT OPENSSL_MIN_API\r
+#if !defined (OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API\r
+  #undef OPENSSL_API_COMPAT\r
+#define OPENSSL_API_COMPAT  OPENSSL_MIN_API\r

 #endif\r
 \r
 /*\r
 #endif\r
 \r
 /*\r


@@ -297,51 +296,51 @@ extern "C" {
  * OpenSSL version number matches.\r
  */\r
 #if OPENSSL_VERSION_NUMBER < 0x10200000L\r
  * OpenSSL version number matches.\r
  */\r
 #if OPENSSL_VERSION_NUMBER < 0x10200000L\r

-# define DEPRECATEDIN_1_2_0(f)   f;\r
+#define DEPRECATEDIN_1_2_0(f)  f;\r

 #elif OPENSSL_API_COMPAT < 0x10200000L\r
 #elif OPENSSL_API_COMPAT < 0x10200000L\r

-# define DEPRECATEDIN_1_2_0(f)   DECLARE_DEPRECATED(f)\r
+#define DEPRECATEDIN_1_2_0(f)  DECLARE_DEPRECATED(f)\r

 #else\r
 #else\r

-# define DEPRECATEDIN_1_2_0(f)\r
+#define DEPRECATEDIN_1_2_0(f)\r

 #endif\r
 \r
 #if OPENSSL_API_COMPAT < 0x10100000L\r
 #endif\r
 \r
 #if OPENSSL_API_COMPAT < 0x10100000L\r

-# define DEPRECATEDIN_1_1_0(f)   DECLARE_DEPRECATED(f)\r
+#define DEPRECATEDIN_1_1_0(f)  DECLARE_DEPRECATED(f)\r

 #else\r
 #else\r

-# define DEPRECATEDIN_1_1_0(f)\r
+#define DEPRECATEDIN_1_1_0(f)\r

 #endif\r
 \r
 #if OPENSSL_API_COMPAT < 0x10000000L\r
 #endif\r
 \r
 #if OPENSSL_API_COMPAT < 0x10000000L\r

-# define DEPRECATEDIN_1_0_0(f)   DECLARE_DEPRECATED(f)\r
+#define DEPRECATEDIN_1_0_0(f)  DECLARE_DEPRECATED(f)\r

 #else\r
 #else\r

-# define DEPRECATEDIN_1_0_0(f)\r
+#define DEPRECATEDIN_1_0_0(f)\r

 #endif\r
 \r
 #if OPENSSL_API_COMPAT < 0x00908000L\r
 #endif\r
 \r
 #if OPENSSL_API_COMPAT < 0x00908000L\r

-# define DEPRECATEDIN_0_9_8(f)   DECLARE_DEPRECATED(f)\r
+#define DEPRECATEDIN_0_9_8(f)  DECLARE_DEPRECATED(f)\r

 #else\r
 #else\r

-# define DEPRECATEDIN_0_9_8(f)\r
+#define DEPRECATEDIN_0_9_8(f)\r

 #endif\r
 \r
 /* Generate 80386 code? */\r
 #undef I386_ONLY\r
 \r
 #undef OPENSSL_UNISTD\r
 #endif\r
 \r
 /* Generate 80386 code? */\r
 #undef I386_ONLY\r
 \r
 #undef OPENSSL_UNISTD\r

-#define OPENSSL_UNISTD <unistd.h>\r
+#define OPENSSL_UNISTD  <unistd.h>\r

 \r
 #undef OPENSSL_EXPORT_VAR_AS_FUNCTION\r
 \r
 /*\r
  * The following are cipher-specific, but are part of the public API.\r
  */\r
 \r
 #undef OPENSSL_EXPORT_VAR_AS_FUNCTION\r
 \r
 /*\r
  * The following are cipher-specific, but are part of the public API.\r
  */\r

-#if !defined(OPENSSL_SYS_UEFI)\r
-# undef BN_LLONG\r
+#if !defined (OPENSSL_SYS_UEFI)\r
+  #undef BN_LLONG\r

 /* Only one for the following should be defined */\r
 /* Only one for the following should be defined */\r

-# undef SIXTY_FOUR_BIT_LONG\r
-# undef SIXTY_FOUR_BIT\r
-# define THIRTY_TWO_BIT\r
+  #undef SIXTY_FOUR_BIT_LONG\r
+  #undef SIXTY_FOUR_BIT\r
+#define THIRTY_TWO_BIT\r

 #endif\r
 \r
 #endif\r
 \r

-#define RC4_INT unsigned int\r
+#define RC4_INT  unsigned int\r

 \r
 #ifdef  __cplusplus\r
 }\r
 \r
 #ifdef  __cplusplus\r
 }\r

diff --git a/CryptoPkg/Library/Include/sys/syscall.h b/CryptoPkg/Library/Include/sys/syscall.h
index ead0d7b9680d7b31fb2d39a14d771f597da1f4c6..bfe1c7ff1473af33cda2bde03f21c47b93f3ba6c 100644 (file)
--- a/CryptoPkg/Library/Include/sys/syscall.h
+++ b/CryptoPkg/Library/Include/sys/syscall.h
@@ -8,4 +8,3 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 \r
 #include <CrtLibSupport.h>\r
 **/\r
 \r
 #include <CrtLibSupport.h>\r

-\r

diff --git a/CryptoPkg/Library/IntrinsicLib/CopyMem.c b/CryptoPkg/Library/IntrinsicLib/CopyMem.c
index 7faf5a34d8c179f63b9121a2dd07e234a31ed59c..14a213d1dadf2300d59c5a4b3c7eebebcb709c04 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/CopyMem.c
+++ b/CryptoPkg/Library/IntrinsicLib/CopyMem.c
@@ -10,21 +10,38 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Base.h>\r
 #include <Library/BaseMemoryLib.h>\r
 \r
 #include <Base.h>\r
 #include <Library/BaseMemoryLib.h>\r
 \r

-#if defined(__clang__) && !defined(__APPLE__)\r
+#if defined (__clang__) && !defined (__APPLE__)\r

 \r
 /* Copies bytes between buffers */\r
 \r
 /* Copies bytes between buffers */\r

-static __attribute__((__used__))\r
-void * __memcpy (void *dest, const void *src, unsigned int count)\r
+static __attribute__ ((__used__))\r
+void *\r
+__memcpy (\r
+  void          *dest,\r
+  const void    *src,\r
+  unsigned int  count\r
+  )\r

 {\r
   return CopyMem (dest, src, (UINTN)count);\r
 }\r
 {\r
   return CopyMem (dest, src, (UINTN)count);\r
 }\r

-__attribute__((__alias__("__memcpy")))\r
-void * memcpy (void *dest, const void *src, unsigned int count);\r
+\r
+__attribute__ ((__alias__ ("__memcpy")))\r
+void *\r
+memcpy (\r
+  void          *dest,\r
+  const void    *src,\r
+  unsigned int  count\r
+  );\r

 \r
 #else\r
 /* Copies bytes between buffers */\r
 \r
 #else\r
 /* Copies bytes between buffers */\r

-void * memcpy (void *dest, const void *src, unsigned int count)\r
+void *\r
+memcpy (\r
+  void          *dest,\r
+  const void    *src,\r
+  unsigned int  count\r
+  )\r

 {\r
   return CopyMem (dest, src, (UINTN)count);\r
 }\r
 {\r
   return CopyMem (dest, src, (UINTN)count);\r
 }\r

+\r

 #endif\r
 #endif\r

diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c b/CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c
index 147a19a4adb0284bb07fb0d4890b90f53ec693cc..09000c6bec102d03e7b78a417101b28b6be6880a 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c
+++ b/CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c
@@ -11,7 +11,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /*\r
  * Floating point to integer conversion.\r
  */\r
 /*\r
  * Floating point to integer conversion.\r
  */\r

-__declspec(naked) void _ftol2 (void)\r
+__declspec(naked) void\r
+_ftol2 (\r
+  void\r
+  )\r

 {\r
   _asm {\r
     fistp qword ptr [esp-8]\r
 {\r
   _asm {\r
     fistp qword ptr [esp-8]\r

diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c b/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c
index fa35d9b72d6718e45b11d18ce9e8611537bbfaed..1c14b5d21c67de5684e7bda110c5e2b3256ba8cf 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c
+++ b/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c
@@ -8,16 +8,19 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-\r

 /*\r
  * Shifts a 64-bit signed value left by a particular number of bits.\r
  */\r
 /*\r
  * Shifts a 64-bit signed value left by a particular number of bits.\r
  */\r

-__declspec(naked) void __cdecl _allshl (void)\r
+__declspec(naked) void __cdecl\r
+_allshl (\r
+  void\r
+  )\r

 {\r
   _asm {\r
     ;\r
     ; Handle shifting of 64 or more bits (return 0)\r
     ;\r
 {\r
   _asm {\r
     ;\r
     ; Handle shifting of 64 or more bits (return 0)\r
     ;\r

+\r

     cmp     cl, 64\r
     jae     short ReturnZero\r
 \r
     cmp     cl, 64\r
     jae     short ReturnZero\r
 \r

diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c b/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c
index efa38983a51936772d6276e0dfd5e20d03de925b..4f5f9112d3593402f3fb965412000052479850db 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c
+++ b/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c
@@ -8,11 +8,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-\r

 /*\r
  * Shifts a 64-bit unsigned value right by a certain number of bits.\r
  */\r
 /*\r
  * Shifts a 64-bit unsigned value right by a certain number of bits.\r
  */\r

-__declspec(naked) void __cdecl _aullshr (void)\r
+__declspec(naked) void __cdecl\r
+_aullshr (\r
+  void\r
+  )\r

 {\r
   _asm {\r
     ;\r
 {\r
   _asm {\r
     ;\r


@@ -41,8 +43,9 @@ More32:
     ret\r
 \r
     ;\r
     ret\r
 \r
     ;\r

-    ; Invalid number (less then 32bits), return 0\r
+    ; Invalid number (less  then 32bits), return 0\r

     ;\r
     ;\r

+\r

 _Exit:\r
     xor     eax, eax\r
     xor     edx, edx\r
 _Exit:\r
     xor     eax, eax\r
     xor     edx, edx\r

diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
index 94fe341bec9d1dceade0fa0acb643afa67fce7df..611e9fd773b0803f3b87282516176d2926ac5265 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
+++ b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
@@ -11,20 +11,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/BaseLib.h>\r
 \r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/BaseLib.h>\r
 \r

-typedef UINTN  size_t;\r
+typedef UINTN size_t;\r

 \r
 \r

-#if defined(__GNUC__) || defined(__clang__)\r
-  #define GLOBAL_USED __attribute__((used))\r
+#if defined (__GNUC__) || defined (__clang__)\r
+#define GLOBAL_USED  __attribute__((used))\r

 #else\r
 #else\r

-  #define GLOBAL_USED\r
+#define GLOBAL_USED\r

 #endif\r
 \r
 /* OpenSSL will use floating point support, and C compiler produces the _fltused\r
    symbol by default. Simply define this symbol here to satisfy the linker. */\r
 #endif\r
 \r
 /* OpenSSL will use floating point support, and C compiler produces the _fltused\r
    symbol by default. Simply define this symbol here to satisfy the linker. */\r

-int  GLOBAL_USED _fltused = 1;\r
+int  GLOBAL_USED  _fltused = 1;\r

 \r
 /* Sets buffers to a specified character */\r
 \r
 /* Sets buffers to a specified character */\r

-void * memset (void *dest, int ch, size_t count)\r
+void *\r
+memset (\r
+  void    *dest,\r
+  int     ch,\r
+  size_t  count\r
+  )\r

 {\r
   //\r
   // NOTE: Here we use one base implementation for memset, instead of the direct\r
 {\r
   //\r
   // NOTE: Here we use one base implementation for memset, instead of the direct\r


@@ -49,12 +54,21 @@ void * memset (void *dest, int ch, size_t count)
 }\r
 \r
 /* Compare bytes in two buffers. */\r
 }\r
 \r
 /* Compare bytes in two buffers. */\r

-int memcmp (const void *buf1, const void *buf2, size_t count)\r
+int\r
+memcmp (\r
+  const void  *buf1,\r
+  const void  *buf2,\r
+  size_t      count\r
+  )\r

 {\r
 {\r

-  return (int)CompareMem(buf1, buf2, count);\r
+  return (int)CompareMem (buf1, buf2, count);\r

 }\r
 \r
 }\r
 \r

-int strcmp (const char *s1, const char *s2)\r
+int\r
+strcmp (\r
+  const char  *s1,\r
+  const char  *s2\r
+  )\r

 {\r
 {\r

-  return (int)AsciiStrCmp(s1, s2);\r
+  return (int)AsciiStrCmp (s1, s2);\r

 }\r
 }\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibConstructor.c b/CryptoPkg/Library/OpensslLib/OpensslLibConstructor.c
index 74ae1ac20c4beee8cb365f33dca922710232e4a0..18d8a5612808b9204065d45ff1b03ac32533e79c 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibConstructor.c
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibConstructor.c
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include <Uefi.h>\r
 \r
 \r
 #include <Uefi.h>\r
 \r

-\r

 /**\r
   An internal OpenSSL function which fetches a local copy of the hardware\r
   capability flags.\r
 /**\r
   An internal OpenSSL function which fetches a local copy of the hardware\r
   capability flags.\r


@@ -41,4 +40,3 @@ OpensslLibConstructor (
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/OpensslLib/X64/ApiHooks.c b/CryptoPkg/Library/OpensslLib/X64/ApiHooks.c
index 0c8043aa8e04266ede1eaa4d57d14a4605dba943..84f0d884d103a5620aad43c090a5fab7a4eebd99 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/X64/ApiHooks.c
+++ b/CryptoPkg/Library/OpensslLib/X64/ApiHooks.c
@@ -14,9 +14,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 VOID *\r
 __imp_RtlVirtualUnwind (\r
 **/\r
 VOID *\r
 __imp_RtlVirtualUnwind (\r

-  VOID *    Args\r
+  VOID  *Args\r

   )\r
 {\r
   return NULL;\r
 }\r
   )\r
 {\r
   return NULL;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/OpensslLib/buildinf.h b/CryptoPkg/Library/OpensslLib/buildinf.h
index b840c8656a28824703b07b55db86e841fc26b9c0..9042c7526fd6d9a80197382ef7234ff3922bceab 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/buildinf.h
+++ b/CryptoPkg/Library/OpensslLib/buildinf.h
@@ -1,4 +1,4 @@
 #define PLATFORM  "UEFI"\r
 #define DATE      "Fri Dec 22 01:23:45 PDT 2017"\r
 \r
 #define PLATFORM  "UEFI"\r
 #define DATE      "Fri Dec 22 01:23:45 PDT 2017"\r
 \r

-const char * compiler_flags = "compiler: information not available from edk2";\r
+const char  *compiler_flags = "compiler: information not available from edk2";\r

diff --git a/CryptoPkg/Library/OpensslLib/ossl_store.c b/CryptoPkg/Library/OpensslLib/ossl_store.c
index 29e1506048e3c9d43e3ada45bfb56ec45c93a0d9..b4297395d7aed4ebb95c32f4a5802bba1dab8a45 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/ossl_store.c
+++ b/CryptoPkg/Library/OpensslLib/ossl_store.c
@@ -11,7 +11,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
  *\r
  * Dummy Implement for UEFI\r
  */\r
  *\r
  * Dummy Implement for UEFI\r
  */\r

-void ossl_store_cleanup_int(void)\r
+void\r
+ossl_store_cleanup_int (\r
+  void\r
+  )\r

 {\r
 }\r
 {\r
 }\r

-\r

diff --git a/CryptoPkg/Library/OpensslLib/rand_pool.c b/CryptoPkg/Library/OpensslLib/rand_pool.c
index 6218ae0c1cd7f78faaeb0f188d2143b424dc5419..13e860a853d09772419b174dc82a9a6ce17630c4 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/rand_pool.c
+++ b/CryptoPkg/Library/OpensslLib/rand_pool.c
@@ -29,22 +29,21 @@ STATIC
 BOOLEAN\r
 EFIAPI\r
 RandGetBytes (\r
 BOOLEAN\r
 EFIAPI\r
 RandGetBytes (\r

-  IN UINTN         Length,\r
-  OUT UINT8       *RandBuffer\r
+  IN UINTN   Length,\r
+  OUT UINT8  *RandBuffer\r

   )\r
 {\r
   )\r
 {\r

-  BOOLEAN     Ret;\r
-  UINT64      TempRand;\r
+  BOOLEAN  Ret;\r
+  UINT64   TempRand;\r

 \r
   Ret = FALSE;\r
 \r
   if (RandBuffer == NULL) {\r
 \r
   Ret = FALSE;\r
 \r
   if (RandBuffer == NULL) {\r

-    DEBUG((DEBUG_ERROR, "[OPENSSL_RAND_POOL] NULL RandBuffer. No random numbers are generated and your system is not secure\n"));\r
+    DEBUG ((DEBUG_ERROR, "[OPENSSL_RAND_POOL] NULL RandBuffer. No random numbers are generated and your system is not secure\n"));\r

     ASSERT (RandBuffer != NULL); // Since we can't generate random numbers, we should assert. Otherwise we will just blow up later.\r
     return Ret;\r
   }\r
 \r
     ASSERT (RandBuffer != NULL); // Since we can't generate random numbers, we should assert. Otherwise we will just blow up later.\r
     return Ret;\r
   }\r
 \r

-\r

   while (Length > 0) {\r
     // Use RngLib to get random number\r
     Ret = GetRandomNumber64 (&TempRand);\r
   while (Length > 0) {\r
     // Use RngLib to get random number\r
     Ret = GetRandomNumber64 (&TempRand);\r


@@ -52,12 +51,12 @@ RandGetBytes (
     if (!Ret) {\r
       return Ret;\r
     }\r
     if (!Ret) {\r
       return Ret;\r
     }\r

+\r

     if (Length >= sizeof (TempRand)) {\r
     if (Length >= sizeof (TempRand)) {\r

-      *((UINT64*) RandBuffer) = TempRand;\r
-      RandBuffer += sizeof (UINT64);\r
-      Length -= sizeof (TempRand);\r
-    }\r
-    else {\r
+      *((UINT64 *)RandBuffer) = TempRand;\r
+      RandBuffer             += sizeof (UINT64);\r
+      Length                 -= sizeof (TempRand);\r
+    } else {\r

       CopyMem (RandBuffer, &TempRand, Length);\r
       Length = 0;\r
     }\r
       CopyMem (RandBuffer, &TempRand, Length);\r
       Length = 0;\r
     }\r


@@ -76,12 +75,12 @@ RandGetBytes (
  */\r
 size_t\r
 rand_pool_acquire_entropy (\r
  */\r
 size_t\r
 rand_pool_acquire_entropy (\r

-  RAND_POOL *pool\r
+  RAND_POOL  *pool\r

   )\r
 {\r
   BOOLEAN        Ret;\r
   size_t         Bytes_needed;\r
   )\r
 {\r
   BOOLEAN        Ret;\r
   size_t         Bytes_needed;\r

-  unsigned char *Buffer;\r
+  unsigned char  *Buffer;\r

 \r
   Bytes_needed = rand_pool_bytes_needed (pool, 1 /*entropy_factor*/);\r
   if (Bytes_needed > 0) {\r
 \r
   Bytes_needed = rand_pool_bytes_needed (pool, 1 /*entropy_factor*/);\r
   if (Bytes_needed > 0) {\r


@@ -91,8 +90,7 @@ rand_pool_acquire_entropy (
       Ret = RandGetBytes (Bytes_needed, Buffer);\r
       if (FALSE == Ret) {\r
         rand_pool_add_end (pool, 0, 0);\r
       Ret = RandGetBytes (Bytes_needed, Buffer);\r
       if (FALSE == Ret) {\r
         rand_pool_add_end (pool, 0, 0);\r

-      }\r
-      else {\r
+      } else {\r

         rand_pool_add_end (pool, Bytes_needed, 8 * Bytes_needed);\r
       }\r
     }\r
         rand_pool_add_end (pool, Bytes_needed, 8 * Bytes_needed);\r
       }\r
     }\r


@@ -108,13 +106,14 @@ rand_pool_acquire_entropy (
  */\r
 int\r
 rand_pool_add_nonce_data (\r
  */\r
 int\r
 rand_pool_add_nonce_data (\r

-  RAND_POOL *pool\r
+  RAND_POOL  *pool\r

   )\r
 {\r
   )\r
 {\r

-  UINT8 data[16];\r
-  RandGetBytes (sizeof(data), data);\r
+  UINT8  data[16];\r
+\r
+  RandGetBytes (sizeof (data), data);\r

 \r
 \r

-  return rand_pool_add (pool, (unsigned char*)&data, sizeof(data), 0);\r
+  return rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0);\r

 }\r
 \r
 /*\r
 }\r
 \r
 /*\r


@@ -124,13 +123,14 @@ rand_pool_add_nonce_data (
  */\r
 int\r
 rand_pool_add_additional_data (\r
  */\r
 int\r
 rand_pool_add_additional_data (\r

-  RAND_POOL *pool\r
+  RAND_POOL  *pool\r

   )\r
 {\r
   )\r
 {\r

-  UINT8 data[16];\r
-  RandGetBytes (sizeof(data), data);\r
+  UINT8  data[16];\r
+\r
+  RandGetBytes (sizeof (data), data);\r

 \r
 \r

-  return rand_pool_add (pool, (unsigned char*)&data, sizeof(data), 0);\r
+  return rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0);\r

 }\r
 \r
 /*\r
 }\r
 \r
 /*\r


@@ -152,7 +152,7 @@ rand_pool_init (
  * This is OpenSSL required interface.\r
  */\r
 VOID\r
  * This is OpenSSL required interface.\r
  */\r
 VOID\r

-rand_pool_cleanup(\r
+rand_pool_cleanup (\r

   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r


@@ -165,7 +165,7 @@ rand_pool_cleanup(
  */\r
 VOID\r
 rand_pool_keep_random_devices_open (\r
  */\r
 VOID\r
 rand_pool_keep_random_devices_open (\r

-  int keep\r
+  int  keep\r

   )\r
 {\r
 }\r
   )\r
 {\r
 }\r

diff --git a/CryptoPkg/Library/TlsLib/InternalTlsLib.h b/CryptoPkg/Library/TlsLib/InternalTlsLib.h
index ce7f4ced4a3078d603116f37bf055ce737eedd27..cf5ffe1b73438fd0ab0fd01503e76255e0cde079 100644 (file)
--- a/CryptoPkg/Library/TlsLib/InternalTlsLib.h
+++ b/CryptoPkg/Library/TlsLib/InternalTlsLib.h
@@ -26,16 +26,15 @@ typedef struct {
   // Main SSL Connection which is created by a server or a client\r
   // per established connection.\r
   //\r
   // Main SSL Connection which is created by a server or a client\r
   // per established connection.\r
   //\r

-  SSL                             *Ssl;\r
+  SSL    *Ssl;\r

   //\r
   // Memory BIO for the TLS/SSL Reading operations.\r
   //\r
   //\r
   // Memory BIO for the TLS/SSL Reading operations.\r
   //\r

-  BIO                             *InBio;\r
+  BIO    *InBio;\r

   //\r
   // Memory BIO for the TLS/SSL Writing operations.\r
   //\r
   //\r
   // Memory BIO for the TLS/SSL Writing operations.\r
   //\r

-  BIO                             *OutBio;\r
+  BIO    *OutBio;\r

 } TLS_CONNECTION;\r
 \r
 #endif\r
 } TLS_CONNECTION;\r
 \r
 #endif\r

-\r

diff --git a/CryptoPkg/Library/TlsLib/TlsConfig.c b/CryptoPkg/Library/TlsLib/TlsConfig.c
index 739fc44194be9d0d42c937b28ef8c025064d039f..0673c9d5322e87ce85649bf953cc98da660fd012 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsConfig.c
+++ b/CryptoPkg/Library/TlsLib/TlsConfig.c
@@ -13,15 +13,15 @@ typedef struct {
   //\r
   // IANA/IETF defined Cipher Suite ID\r
   //\r
   //\r
   // IANA/IETF defined Cipher Suite ID\r
   //\r

-  UINT16                          IanaCipher;\r
+  UINT16         IanaCipher;\r

   //\r
   // OpenSSL-used Cipher Suite String\r
   //\r
   //\r
   // OpenSSL-used Cipher Suite String\r
   //\r

-  CONST CHAR8                     *OpensslCipher;\r
+  CONST CHAR8    *OpensslCipher;\r

   //\r
   // Length of OpensslCipher\r
   //\r
   //\r
   // Length of OpensslCipher\r
   //\r

-  UINTN                           OpensslCipherLength;\r
+  UINTN          OpensslCipherLength;\r

 } TLS_CIPHER_MAPPING;\r
 \r
 //\r
 } TLS_CIPHER_MAPPING;\r
 \r
 //\r


@@ -38,30 +38,30 @@ typedef struct {
 //\r
 // Keep the table uniquely sorted by the IanaCipher field, in increasing order.\r
 //\r
 //\r
 // Keep the table uniquely sorted by the IanaCipher field, in increasing order.\r
 //\r

-STATIC CONST TLS_CIPHER_MAPPING TlsCipherMappingTable[] = {\r
-  MAP ( 0x0001, "NULL-MD5" ),                       /// TLS_RSA_WITH_NULL_MD5\r
-  MAP ( 0x0002, "NULL-SHA" ),                       /// TLS_RSA_WITH_NULL_SHA\r
-  MAP ( 0x0004, "RC4-MD5" ),                        /// TLS_RSA_WITH_RC4_128_MD5\r
-  MAP ( 0x0005, "RC4-SHA" ),                        /// TLS_RSA_WITH_RC4_128_SHA\r
-  MAP ( 0x000A, "DES-CBC3-SHA" ),                   /// TLS_RSA_WITH_3DES_EDE_CBC_SHA, mandatory TLS 1.1\r
-  MAP ( 0x0016, "DHE-RSA-DES-CBC3-SHA" ),           /// TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA\r
-  MAP ( 0x002F, "AES128-SHA" ),                     /// TLS_RSA_WITH_AES_128_CBC_SHA, mandatory TLS 1.2\r
-  MAP ( 0x0030, "DH-DSS-AES128-SHA" ),              /// TLS_DH_DSS_WITH_AES_128_CBC_SHA\r
-  MAP ( 0x0031, "DH-RSA-AES128-SHA" ),              /// TLS_DH_RSA_WITH_AES_128_CBC_SHA\r
-  MAP ( 0x0033, "DHE-RSA-AES128-SHA" ),             /// TLS_DHE_RSA_WITH_AES_128_CBC_SHA\r
-  MAP ( 0x0035, "AES256-SHA" ),                     /// TLS_RSA_WITH_AES_256_CBC_SHA\r
-  MAP ( 0x0036, "DH-DSS-AES256-SHA" ),              /// TLS_DH_DSS_WITH_AES_256_CBC_SHA\r
-  MAP ( 0x0037, "DH-RSA-AES256-SHA" ),              /// TLS_DH_RSA_WITH_AES_256_CBC_SHA\r
-  MAP ( 0x0039, "DHE-RSA-AES256-SHA" ),             /// TLS_DHE_RSA_WITH_AES_256_CBC_SHA\r
-  MAP ( 0x003B, "NULL-SHA256" ),                    /// TLS_RSA_WITH_NULL_SHA256\r
-  MAP ( 0x003C, "AES128-SHA256" ),                  /// TLS_RSA_WITH_AES_128_CBC_SHA256\r
-  MAP ( 0x003D, "AES256-SHA256" ),                  /// TLS_RSA_WITH_AES_256_CBC_SHA256\r
-  MAP ( 0x003E, "DH-DSS-AES128-SHA256" ),           /// TLS_DH_DSS_WITH_AES_128_CBC_SHA256\r
-  MAP ( 0x003F, "DH-RSA-AES128-SHA256" ),           /// TLS_DH_RSA_WITH_AES_128_CBC_SHA256\r
-  MAP ( 0x0067, "DHE-RSA-AES128-SHA256" ),          /// TLS_DHE_RSA_WITH_AES_128_CBC_SHA256\r
-  MAP ( 0x0068, "DH-DSS-AES256-SHA256" ),           /// TLS_DH_DSS_WITH_AES_256_CBC_SHA256\r
-  MAP ( 0x0069, "DH-RSA-AES256-SHA256" ),           /// TLS_DH_RSA_WITH_AES_256_CBC_SHA256\r
-  MAP ( 0x006B, "DHE-RSA-AES256-SHA256" ),          /// TLS_DHE_RSA_WITH_AES_256_CBC_SHA256\r
+STATIC CONST TLS_CIPHER_MAPPING  TlsCipherMappingTable[] = {\r
+  MAP (0x0001, "NULL-MD5"),                         /// TLS_RSA_WITH_NULL_MD5\r
+  MAP (0x0002, "NULL-SHA"),                         /// TLS_RSA_WITH_NULL_SHA\r
+  MAP (0x0004, "RC4-MD5"),                          /// TLS_RSA_WITH_RC4_128_MD5\r
+  MAP (0x0005, "RC4-SHA"),                          /// TLS_RSA_WITH_RC4_128_SHA\r
+  MAP (0x000A, "DES-CBC3-SHA"),                     /// TLS_RSA_WITH_3DES_EDE_CBC_SHA, mandatory TLS 1.1\r
+  MAP (0x0016, "DHE-RSA-DES-CBC3-SHA"),             /// TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA\r
+  MAP (0x002F, "AES128-SHA"),                       /// TLS_RSA_WITH_AES_128_CBC_SHA, mandatory TLS 1.2\r
+  MAP (0x0030, "DH-DSS-AES128-SHA"),                /// TLS_DH_DSS_WITH_AES_128_CBC_SHA\r
+  MAP (0x0031, "DH-RSA-AES128-SHA"),                /// TLS_DH_RSA_WITH_AES_128_CBC_SHA\r
+  MAP (0x0033, "DHE-RSA-AES128-SHA"),               /// TLS_DHE_RSA_WITH_AES_128_CBC_SHA\r
+  MAP (0x0035, "AES256-SHA"),                       /// TLS_RSA_WITH_AES_256_CBC_SHA\r
+  MAP (0x0036, "DH-DSS-AES256-SHA"),                /// TLS_DH_DSS_WITH_AES_256_CBC_SHA\r
+  MAP (0x0037, "DH-RSA-AES256-SHA"),                /// TLS_DH_RSA_WITH_AES_256_CBC_SHA\r
+  MAP (0x0039, "DHE-RSA-AES256-SHA"),               /// TLS_DHE_RSA_WITH_AES_256_CBC_SHA\r
+  MAP (0x003B, "NULL-SHA256"),                      /// TLS_RSA_WITH_NULL_SHA256\r
+  MAP (0x003C, "AES128-SHA256"),                    /// TLS_RSA_WITH_AES_128_CBC_SHA256\r
+  MAP (0x003D, "AES256-SHA256"),                    /// TLS_RSA_WITH_AES_256_CBC_SHA256\r
+  MAP (0x003E, "DH-DSS-AES128-SHA256"),             /// TLS_DH_DSS_WITH_AES_128_CBC_SHA256\r
+  MAP (0x003F, "DH-RSA-AES128-SHA256"),             /// TLS_DH_RSA_WITH_AES_128_CBC_SHA256\r
+  MAP (0x0067, "DHE-RSA-AES128-SHA256"),            /// TLS_DHE_RSA_WITH_AES_128_CBC_SHA256\r
+  MAP (0x0068, "DH-DSS-AES256-SHA256"),             /// TLS_DH_DSS_WITH_AES_256_CBC_SHA256\r
+  MAP (0x0069, "DH-RSA-AES256-SHA256"),             /// TLS_DH_RSA_WITH_AES_256_CBC_SHA256\r
+  MAP (0x006B, "DHE-RSA-AES256-SHA256"),            /// TLS_DHE_RSA_WITH_AES_256_CBC_SHA256\r

 };\r
 \r
 /**\r
 };\r
 \r
 /**\r


@@ -76,12 +76,12 @@ STATIC CONST TLS_CIPHER_MAPPING TlsCipherMappingTable[] = {
 STATIC\r
 CONST TLS_CIPHER_MAPPING *\r
 TlsGetCipherMapping (\r
 STATIC\r
 CONST TLS_CIPHER_MAPPING *\r
 TlsGetCipherMapping (\r

-  IN     UINT16                   CipherId\r
+  IN     UINT16  CipherId\r

   )\r
 {\r
   )\r
 {\r

-  INTN                      Left;\r
-  INTN                      Right;\r
-  INTN                      Middle;\r
+  INTN  Left;\r
+  INTN  Right;\r
+  INTN  Middle;\r

 \r
   //\r
   // Binary Search Cipher Mapping Table for IANA-OpenSSL Cipher Translation\r
 \r
   //\r
   // Binary Search Cipher Mapping Table for IANA-OpenSSL Cipher Translation\r


@@ -102,7 +102,7 @@ TlsGetCipherMapping (
     if (CipherId < TlsCipherMappingTable[Middle].IanaCipher) {\r
       Right = Middle - 1;\r
     } else {\r
     if (CipherId < TlsCipherMappingTable[Middle].IanaCipher) {\r
       Right = Middle - 1;\r
     } else {\r

-      Left  = Middle + 1;\r
+      Left = Middle + 1;\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r


@@ -129,16 +129,16 @@ TlsGetCipherMapping (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVersion (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVersion (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   UINT16          ProtoVersion;\r
 \r
   TlsConn = (TLS_CONNECTION *)Tls;\r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   UINT16          ProtoVersion;\r
 \r
   TlsConn = (TLS_CONNECTION *)Tls;\r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -148,35 +148,35 @@ TlsSetVersion (
   // Bound TLS method to the particular specified version.\r
   //\r
   switch (ProtoVersion) {\r
   // Bound TLS method to the particular specified version.\r
   //\r
   switch (ProtoVersion) {\r

-  case TLS1_VERSION:\r
-    //\r
-    // TLS 1.0\r
-    //\r
-    SSL_set_min_proto_version (TlsConn->Ssl, TLS1_VERSION);\r
-    SSL_set_max_proto_version (TlsConn->Ssl, TLS1_VERSION);\r
-    break;\r
-  case TLS1_1_VERSION:\r
-    //\r
-    // TLS 1.1\r
-    //\r
-    SSL_set_min_proto_version (TlsConn->Ssl, TLS1_1_VERSION);\r
-    SSL_set_max_proto_version (TlsConn->Ssl, TLS1_1_VERSION);\r
-    break;\r
-  case TLS1_2_VERSION:\r
-    //\r
-    // TLS 1.2\r
-    //\r
-    SSL_set_min_proto_version (TlsConn->Ssl, TLS1_2_VERSION);\r
-    SSL_set_max_proto_version (TlsConn->Ssl, TLS1_2_VERSION);\r
-    break;\r
-  default:\r
-    //\r
-    // Unsupported Protocol Version\r
-    //\r
-    return EFI_UNSUPPORTED;\r
+    case TLS1_VERSION:\r
+      //\r
+      // TLS 1.0\r
+      //\r
+      SSL_set_min_proto_version (TlsConn->Ssl, TLS1_VERSION);\r
+      SSL_set_max_proto_version (TlsConn->Ssl, TLS1_VERSION);\r
+      break;\r
+    case TLS1_1_VERSION:\r
+      //\r
+      // TLS 1.1\r
+      //\r
+      SSL_set_min_proto_version (TlsConn->Ssl, TLS1_1_VERSION);\r
+      SSL_set_max_proto_version (TlsConn->Ssl, TLS1_1_VERSION);\r
+      break;\r
+    case TLS1_2_VERSION:\r
+      //\r
+      // TLS 1.2\r
+      //\r
+      SSL_set_min_proto_version (TlsConn->Ssl, TLS1_2_VERSION);\r
+      SSL_set_max_proto_version (TlsConn->Ssl, TLS1_2_VERSION);\r
+      break;\r
+    default:\r
+      //\r
+      // Unsupported Protocol Version\r
+      //\r
+      return EFI_UNSUPPORTED;\r

   }\r
 \r
   }\r
 \r

-  return EFI_SUCCESS;;\r
+  return EFI_SUCCESS;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -195,14 +195,14 @@ TlsSetVersion (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetConnectionEnd (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetConnectionEnd (\r

-  IN     VOID                     *Tls,\r
-  IN     BOOLEAN                  IsServer\r
+  IN     VOID     *Tls,\r
+  IN     BOOLEAN  IsServer\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -216,7 +216,7 @@ TlsSetConnectionEnd (
     // Set TLS to work in Server mode.\r
     // It is unsupported for UEFI version currently.\r
     //\r
     // Set TLS to work in Server mode.\r
     // It is unsupported for UEFI version currently.\r
     //\r

-    //SSL_set_accept_state (TlsConn->Ssl);\r
+    // SSL_set_accept_state (TlsConn->Ssl);\r

     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r


@@ -244,24 +244,24 @@ TlsSetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCipherList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCipherList (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT16                   *CipherId,\r
-  IN     UINTN                    CipherNum\r
+  IN     VOID    *Tls,\r
+  IN     UINT16  *CipherId,\r
+  IN     UINTN   CipherNum\r

   )\r
 {\r
   )\r
 {\r

-  TLS_CONNECTION           *TlsConn;\r
-  EFI_STATUS               Status;\r
-  CONST TLS_CIPHER_MAPPING **MappedCipher;\r
-  UINTN                    MappedCipherBytes;\r
-  UINTN                    MappedCipherCount;\r
-  UINTN                    CipherStringSize;\r
-  UINTN                    Index;\r
-  CONST TLS_CIPHER_MAPPING *Mapping;\r
-  CHAR8                    *CipherString;\r
-  CHAR8                    *CipherStringPosition;\r
-\r
-  TlsConn = (TLS_CONNECTION *) Tls;\r
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || CipherId == NULL) {\r
+  TLS_CONNECTION            *TlsConn;\r
+  EFI_STATUS                Status;\r
+  CONST TLS_CIPHER_MAPPING  **MappedCipher;\r
+  UINTN                     MappedCipherBytes;\r
+  UINTN                     MappedCipherCount;\r
+  UINTN                     CipherStringSize;\r
+  UINTN                     Index;\r
+  CONST TLS_CIPHER_MAPPING  *Mapping;\r
+  CHAR8                     *CipherString;\r
+  CHAR8                     *CipherStringPosition;\r
+\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (CipherId == NULL)) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -269,11 +269,15 @@ TlsSetCipherList (
   // Allocate the MappedCipher array for recording the mappings that we find\r
   // for the input IANA identifiers in CipherId.\r
   //\r
   // Allocate the MappedCipher array for recording the mappings that we find\r
   // for the input IANA identifiers in CipherId.\r
   //\r

-  Status = SafeUintnMult (CipherNum, sizeof (*MappedCipher),\r
-             &MappedCipherBytes);\r
+  Status = SafeUintnMult (\r
+             CipherNum,\r
+             sizeof (*MappedCipher),\r
+             &MappedCipherBytes\r
+             );\r

   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

+\r

   MappedCipher = AllocatePool (MappedCipherBytes);\r
   if (MappedCipher == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   MappedCipher = AllocatePool (MappedCipherBytes);\r
   if (MappedCipher == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r


@@ -284,15 +288,20 @@ TlsSetCipherList (
   // CipherString.\r
   //\r
   MappedCipherCount = 0;\r
   // CipherString.\r
   //\r
   MappedCipherCount = 0;\r

-  CipherStringSize = 0;\r
+  CipherStringSize  = 0;\r

   for (Index = 0; Index < CipherNum; Index++) {\r
     //\r
     // Look up the IANA-to-OpenSSL mapping.\r
     //\r
     Mapping = TlsGetCipherMapping (CipherId[Index]);\r
     if (Mapping == NULL) {\r
   for (Index = 0; Index < CipherNum; Index++) {\r
     //\r
     // Look up the IANA-to-OpenSSL mapping.\r
     //\r
     Mapping = TlsGetCipherMapping (CipherId[Index]);\r
     if (Mapping == NULL) {\r

-      DEBUG ((DEBUG_VERBOSE, "%a:%a: skipping CipherId=0x%04x\n",\r
-        gEfiCallerBaseName, __FUNCTION__, CipherId[Index]));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a:%a: skipping CipherId=0x%04x\n",\r
+        gEfiCallerBaseName,\r
+        __FUNCTION__,\r
+        CipherId[Index]\r
+        ));\r

       //\r
       // Skipping the cipher is valid because CipherId is an ordered\r
       // preference list of ciphers, thus we can filter it as long as we\r
       //\r
       // Skipping the cipher is valid because CipherId is an ordered\r
       // preference list of ciphers, thus we can filter it as long as we\r


@@ -300,6 +309,7 @@ TlsSetCipherList (
       //\r
       continue;\r
     }\r
       //\r
       continue;\r
     }\r

+\r

     //\r
     // Accumulate Mapping->OpensslCipherLength into CipherStringSize. If this\r
     // is not the first successful mapping, account for a colon (":") prefix\r
     //\r
     // Accumulate Mapping->OpensslCipherLength into CipherStringSize. If this\r
     // is not the first successful mapping, account for a colon (":") prefix\r


@@ -312,12 +322,17 @@ TlsSetCipherList (
         goto FreeMappedCipher;\r
       }\r
     }\r
         goto FreeMappedCipher;\r
       }\r
     }\r

-    Status = SafeUintnAdd (CipherStringSize, Mapping->OpensslCipherLength,\r
-               &CipherStringSize);\r
+\r
+    Status = SafeUintnAdd (\r
+               CipherStringSize,\r
+               Mapping->OpensslCipherLength,\r
+               &CipherStringSize\r
+               );\r

     if (EFI_ERROR (Status)) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeMappedCipher;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeMappedCipher;\r
     }\r

+\r

     //\r
     // Record the mapping.\r
     //\r
     //\r
     // Record the mapping.\r
     //\r


@@ -329,16 +344,22 @@ TlsSetCipherList (
   // terminating NUL character in CipherStringSize; allocate CipherString.\r
   //\r
   if (MappedCipherCount == 0) {\r
   // terminating NUL character in CipherStringSize; allocate CipherString.\r
   //\r
   if (MappedCipherCount == 0) {\r

-    DEBUG ((DEBUG_ERROR, "%a:%a: no CipherId could be mapped\n",\r
-      gEfiCallerBaseName, __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: no CipherId could be mapped\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r

     Status = EFI_UNSUPPORTED;\r
     goto FreeMappedCipher;\r
   }\r
     Status = EFI_UNSUPPORTED;\r
     goto FreeMappedCipher;\r
   }\r

+\r

   Status = SafeUintnAdd (CipherStringSize, 1, &CipherStringSize);\r
   if (EFI_ERROR (Status)) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeMappedCipher;\r
   }\r
   Status = SafeUintnAdd (CipherStringSize, 1, &CipherStringSize);\r
   if (EFI_ERROR (Status)) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeMappedCipher;\r
   }\r

+\r

   CipherString = AllocatePool (CipherStringSize);\r
   if (CipherString == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
   CipherString = AllocatePool (CipherStringSize);\r
   if (CipherString == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r


@@ -358,8 +379,12 @@ TlsSetCipherList (
     if (Index > 0) {\r
       *(CipherStringPosition++) = ':';\r
     }\r
     if (Index > 0) {\r
       *(CipherStringPosition++) = ':';\r
     }\r

-    CopyMem (CipherStringPosition, Mapping->OpensslCipher,\r
-      Mapping->OpensslCipherLength);\r
+\r
+    CopyMem (\r
+      CipherStringPosition,\r
+      Mapping->OpensslCipher,\r
+      Mapping->OpensslCipherLength\r
+      );\r

     CipherStringPosition += Mapping->OpensslCipherLength;\r
   }\r
 \r
     CipherStringPosition += Mapping->OpensslCipherLength;\r
   }\r
 \r


@@ -376,28 +401,35 @@ TlsSetCipherList (
   // DebugLib instances.)\r
   //\r
   DEBUG_CODE_BEGIN ();\r
   // DebugLib instances.)\r
   //\r
   DEBUG_CODE_BEGIN ();\r

-    UINTN FullLength;\r
-    UINTN SegmentLength;\r
-\r
-    FullLength = CipherStringSize - 1;\r
-    DEBUG ((DEBUG_VERBOSE, "%a:%a: CipherString={\n", gEfiCallerBaseName,\r
-      __FUNCTION__));\r
-    for (CipherStringPosition = CipherString;\r
-         CipherStringPosition < CipherString + FullLength;\r
-         CipherStringPosition += SegmentLength) {\r
-      SegmentLength = FullLength - (CipherStringPosition - CipherString);\r
-      if (SegmentLength > 79) {\r
-        SegmentLength = 79;\r
-      }\r
-      DEBUG ((DEBUG_VERBOSE, "%.*a\n", SegmentLength, CipherStringPosition));\r
+  UINTN  FullLength;\r
+  UINTN  SegmentLength;\r
+\r
+  FullLength = CipherStringSize - 1;\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a:%a: CipherString={\n",\r
+    gEfiCallerBaseName,\r
+    __FUNCTION__\r
+    ));\r
+  for (CipherStringPosition = CipherString;\r
+       CipherStringPosition < CipherString + FullLength;\r
+       CipherStringPosition += SegmentLength)\r
+  {\r
+    SegmentLength = FullLength - (CipherStringPosition - CipherString);\r
+    if (SegmentLength > 79) {\r
+      SegmentLength = 79;\r

     }\r
     }\r

-    DEBUG ((DEBUG_VERBOSE, "}\n"));\r
-    //\r
-    // Restore the pre-debug value of CipherStringPosition by skipping over the\r
-    // trailing NUL.\r
-    //\r
-    CipherStringPosition++;\r
-    ASSERT (CipherStringPosition == CipherString + CipherStringSize);\r
+\r
+    DEBUG ((DEBUG_VERBOSE, "%.*a\n", SegmentLength, CipherStringPosition));\r
+  }\r
+\r
+  DEBUG ((DEBUG_VERBOSE, "}\n"));\r
+  //\r
+  // Restore the pre-debug value of CipherStringPosition by skipping over the\r
+  // trailing NUL.\r
+  //\r
+  CipherStringPosition++;\r
+  ASSERT (CipherStringPosition == CipherString + CipherStringSize);\r

   DEBUG_CODE_END ();\r
 \r
   //\r
   DEBUG_CODE_END ();\r
 \r
   //\r


@@ -434,7 +466,7 @@ FreeMappedCipher:
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCompressionMethod (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCompressionMethod (\r

-  IN     UINT8                    CompMethod\r
+  IN     UINT8  CompMethod\r

   )\r
 {\r
   COMP_METHOD  *Cm;\r
   )\r
 {\r
   COMP_METHOD  *Cm;\r


@@ -451,7 +483,7 @@ TlsSetCompressionMethod (
     //\r
     return EFI_SUCCESS;\r
   } else if (CompMethod == 1) {\r
     //\r
     return EFI_SUCCESS;\r
   } else if (CompMethod == 1) {\r

-    Cm = COMP_zlib();\r
+    Cm = COMP_zlib ();\r

   } else {\r
     return EFI_UNSUPPORTED;\r
   }\r
   } else {\r
     return EFI_UNSUPPORTED;\r
   }\r


@@ -480,14 +512,14 @@ TlsSetCompressionMethod (
 VOID\r
 EFIAPI\r
 TlsSetVerify (\r
 VOID\r
 EFIAPI\r
 TlsSetVerify (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   VerifyMode\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  VerifyMode\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {\r

     return;\r
   }\r
 \r
     return;\r
   }\r
 \r


@@ -512,23 +544,23 @@ TlsSetVerify (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVerifyHost (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVerifyHost (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   Flags,\r
-  IN     CHAR8                    *HostName\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  Flags,\r
+  IN     CHAR8   *HostName\r

   )\r
 {\r
   )\r
 {\r

-  TLS_CONNECTION    *TlsConn;\r
-  X509_VERIFY_PARAM *VerifyParam;\r
-  UINTN             BinaryAddressSize;\r
-  UINT8             BinaryAddress[MAX (NS_INADDRSZ, NS_IN6ADDRSZ)];\r
-  INTN              ParamStatus;\r
-\r
-  TlsConn = (TLS_CONNECTION *) Tls;\r
-  if (TlsConn == NULL || TlsConn->Ssl == NULL || HostName == NULL) {\r
-     return EFI_INVALID_PARAMETER;\r
+  TLS_CONNECTION     *TlsConn;\r
+  X509_VERIFY_PARAM  *VerifyParam;\r
+  UINTN              BinaryAddressSize;\r
+  UINT8              BinaryAddress[MAX (NS_INADDRSZ, NS_IN6ADDRSZ)];\r
+  INTN               ParamStatus;\r
+\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (HostName == NULL)) {\r
+    return EFI_INVALID_PARAMETER;\r

   }\r
 \r
   }\r
 \r

-  SSL_set_hostflags(TlsConn->Ssl, Flags);\r
+  SSL_set_hostflags (TlsConn->Ssl, Flags);\r

 \r
   VerifyParam = SSL_get0_param (TlsConn->Ssl);\r
   ASSERT (VerifyParam != NULL);\r
 \r
   VerifyParam = SSL_get0_param (TlsConn->Ssl);\r
   ASSERT (VerifyParam != NULL);\r


@@ -541,11 +573,20 @@ TlsSetVerifyHost (
   }\r
 \r
   if (BinaryAddressSize > 0) {\r
   }\r
 \r
   if (BinaryAddressSize > 0) {\r

-    DEBUG ((DEBUG_VERBOSE, "%a:%a: parsed \"%a\" as an IPv%c address "\r
-      "literal\n", gEfiCallerBaseName, __FUNCTION__, HostName,\r
-      (UINTN)((BinaryAddressSize == NS_IN6ADDRSZ) ? '6' : '4')));\r
-    ParamStatus = X509_VERIFY_PARAM_set1_ip (VerifyParam, BinaryAddress,\r
-                    BinaryAddressSize);\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "%a:%a: parsed \"%a\" as an IPv%c address "\r
+      "literal\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      HostName,\r
+      (UINTN)((BinaryAddressSize == NS_IN6ADDRSZ) ? '6' : '4')\r
+      ));\r
+    ParamStatus = X509_VERIFY_PARAM_set1_ip (\r
+                    VerifyParam,\r
+                    BinaryAddress,\r
+                    BinaryAddressSize\r
+                    );\r

   } else {\r
     ParamStatus = X509_VERIFY_PARAM_set1_host (VerifyParam, HostName, 0);\r
   }\r
   } else {\r
     ParamStatus = X509_VERIFY_PARAM_set1_host (VerifyParam, HostName, 0);\r
   }\r


@@ -571,18 +612,18 @@ TlsSetVerifyHost (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *SessionId,\r
-  IN     UINT16                   SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN     UINT8   *SessionId,\r
+  IN     UINT16  SessionIdLen\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   SSL_SESSION     *Session;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   SSL_SESSION     *Session;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

   Session = NULL;\r
 \r
   Session = NULL;\r
 \r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL || SessionId == NULL) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (SessionId == NULL)) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -616,9 +657,9 @@ TlsSetSessionId (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   BIO             *BioCert;\r
   )\r
 {\r
   BIO             *BioCert;\r


@@ -634,10 +675,10 @@ TlsSetCaCertificate (
   Cert      = NULL;\r
   X509Store = NULL;\r
   Status    = EFI_SUCCESS;\r
   Cert      = NULL;\r
   X509Store = NULL;\r
   Status    = EFI_SUCCESS;\r

-  TlsConn   = (TLS_CONNECTION *) Tls;\r
+  TlsConn   = (TLS_CONNECTION *)Tls;\r

   Ret       = 0;\r
 \r
   Ret       = 0;\r
 \r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL || Data == NULL || DataSize == 0) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (Data == NULL) || (DataSize == 0)) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -645,7 +686,7 @@ TlsSetCaCertificate (
   // DER-encoded binary X.509 certificate or PEM-encoded X.509 certificate.\r
   // Determine whether certificate is from DER encoding, if so, translate it to X509 structure.\r
   //\r
   // DER-encoded binary X.509 certificate or PEM-encoded X.509 certificate.\r
   // Determine whether certificate is from DER encoding, if so, translate it to X509 structure.\r
   //\r

-  Cert = d2i_X509 (NULL, (const unsigned char ** )&Data, (long) DataSize);\r
+  Cert = d2i_X509 (NULL, (const unsigned char **)&Data, (long)DataSize);\r

   if (Cert == NULL) {\r
     //\r
     // Certificate is from PEM encoding.\r
   if (Cert == NULL) {\r
     //\r
     // Certificate is from PEM encoding.\r


@@ -656,7 +697,7 @@ TlsSetCaCertificate (
       goto ON_EXIT;\r
     }\r
 \r
       goto ON_EXIT;\r
     }\r
 \r

-    if (BIO_write (BioCert, Data, (UINT32) DataSize) <= 0) {\r
+    if (BIO_write (BioCert, Data, (UINT32)DataSize) <= 0) {\r

       Status = EFI_ABORTED;\r
       goto ON_EXIT;\r
     }\r
       Status = EFI_ABORTED;\r
       goto ON_EXIT;\r
     }\r


@@ -671,8 +712,8 @@ TlsSetCaCertificate (
   SslCtx    = SSL_get_SSL_CTX (TlsConn->Ssl);\r
   X509Store = SSL_CTX_get_cert_store (SslCtx);\r
   if (X509Store == NULL) {\r
   SslCtx    = SSL_get_SSL_CTX (TlsConn->Ssl);\r
   X509Store = SSL_CTX_get_cert_store (SslCtx);\r
   if (X509Store == NULL) {\r

-      Status = EFI_ABORTED;\r
-      goto ON_EXIT;\r
+    Status = EFI_ABORTED;\r
+    goto ON_EXIT;\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -684,8 +725,9 @@ TlsSetCaCertificate (
     //\r
     // Ignore "already in table" errors\r
     //\r
     //\r
     // Ignore "already in table" errors\r
     //\r

-    if (!(ERR_GET_FUNC (ErrorCode) == X509_F_X509_STORE_ADD_CERT &&\r
-        ERR_GET_REASON (ErrorCode) == X509_R_CERT_ALREADY_IN_HASH_TABLE)) {\r
+    if (!((ERR_GET_FUNC (ErrorCode) == X509_F_X509_STORE_ADD_CERT) &&\r
+          (ERR_GET_REASON (ErrorCode) == X509_R_CERT_ALREADY_IN_HASH_TABLE)))\r
+    {\r

       Status = EFI_ABORTED;\r
       goto ON_EXIT;\r
     }\r
       Status = EFI_ABORTED;\r
       goto ON_EXIT;\r
     }\r


@@ -723,9 +765,9 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   BIO             *BioCert;\r
   )\r
 {\r
   BIO             *BioCert;\r


@@ -736,9 +778,9 @@ TlsSetHostPublicCert (
   BioCert = NULL;\r
   Cert    = NULL;\r
   Status  = EFI_SUCCESS;\r
   BioCert = NULL;\r
   Cert    = NULL;\r
   Status  = EFI_SUCCESS;\r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

 \r
 \r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL || Data == NULL || DataSize == 0) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (Data == NULL) || (DataSize == 0)) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -746,7 +788,7 @@ TlsSetHostPublicCert (
   // DER-encoded binary X.509 certificate or PEM-encoded X.509 certificate.\r
   // Determine whether certificate is from DER encoding, if so, translate it to X509 structure.\r
   //\r
   // DER-encoded binary X.509 certificate or PEM-encoded X.509 certificate.\r
   // Determine whether certificate is from DER encoding, if so, translate it to X509 structure.\r
   //\r

-  Cert = d2i_X509 (NULL, (const unsigned char ** )&Data, (long) DataSize);\r
+  Cert = d2i_X509 (NULL, (const unsigned char **)&Data, (long)DataSize);\r

   if (Cert == NULL) {\r
     //\r
     // Certificate is from PEM encoding.\r
   if (Cert == NULL) {\r
     //\r
     // Certificate is from PEM encoding.\r


@@ -757,7 +799,7 @@ TlsSetHostPublicCert (
       goto ON_EXIT;\r
     }\r
 \r
       goto ON_EXIT;\r
     }\r
 \r

-    if (BIO_write (BioCert, Data, (UINT32) DataSize) <= 0) {\r
+    if (BIO_write (BioCert, Data, (UINT32)DataSize) <= 0) {\r

       Status = EFI_ABORTED;\r
       goto ON_EXIT;\r
     }\r
       Status = EFI_ABORTED;\r
       goto ON_EXIT;\r
     }\r


@@ -805,9 +847,9 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   return EFI_UNSUPPORTED;\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r


@@ -830,8 +872,8 @@ TlsSetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCertRevocationList (\r

-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   return EFI_UNSUPPORTED;\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r


@@ -853,12 +895,12 @@ TlsSetCertRevocationList (
 UINT16\r
 EFIAPI\r
 TlsGetVersion (\r
 UINT16\r
 EFIAPI\r
 TlsGetVersion (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

 \r
   ASSERT (TlsConn != NULL);\r
 \r
 \r
   ASSERT (TlsConn != NULL);\r
 \r


@@ -881,12 +923,12 @@ TlsGetVersion (
 UINT8\r
 EFIAPI\r
 TlsGetConnectionEnd (\r
 UINT8\r
 EFIAPI\r
 TlsGetConnectionEnd (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

 \r
   ASSERT (TlsConn != NULL);\r
 \r
 \r
   ASSERT (TlsConn != NULL);\r
 \r


@@ -910,17 +952,17 @@ TlsGetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCipher (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCipher (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT16                   *CipherId\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT16  *CipherId\r

   )\r
 {\r
   TLS_CONNECTION    *TlsConn;\r
   CONST SSL_CIPHER  *Cipher;\r
 \r
   )\r
 {\r
   TLS_CONNECTION    *TlsConn;\r
   CONST SSL_CIPHER  *Cipher;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

   Cipher  = NULL;\r
 \r
   Cipher  = NULL;\r
 \r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL || CipherId == NULL) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (CipherId == NULL)) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -953,8 +995,8 @@ TlsGetCurrentCipher (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCompressionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCompressionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *CompressionId\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *CompressionId\r

   )\r
 {\r
   return EFI_UNSUPPORTED;\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r


@@ -976,12 +1018,12 @@ TlsGetCurrentCompressionId (
 UINT32\r
 EFIAPI\r
 TlsGetVerify (\r
 UINT32\r
 EFIAPI\r
 TlsGetVerify (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

 \r
   ASSERT (TlsConn != NULL);\r
 \r
 \r
   ASSERT (TlsConn != NULL);\r
 \r


@@ -1006,19 +1048,19 @@ TlsGetVerify (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *SessionId,\r
-  IN OUT UINT16                   *SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT8   *SessionId,\r
+  IN OUT UINT16  *SessionIdLen\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   SSL_SESSION     *Session;\r
   CONST UINT8     *SslSessionId;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   SSL_SESSION     *Session;\r
   CONST UINT8     *SslSessionId;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

   Session = NULL;\r
 \r
   Session = NULL;\r
 \r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL || SessionId == NULL || SessionIdLen == NULL) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (SessionId == NULL) || (SessionIdLen == NULL)) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -1047,15 +1089,15 @@ TlsGetSessionId (
 VOID\r
 EFIAPI\r
 TlsGetClientRandom (\r
 VOID\r
 EFIAPI\r
 TlsGetClientRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ClientRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ClientRandom\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

 \r
 \r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL || ClientRandom == NULL) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (ClientRandom == NULL)) {\r

     return;\r
   }\r
 \r
     return;\r
   }\r
 \r


@@ -1076,15 +1118,15 @@ TlsGetClientRandom (
 VOID\r
 EFIAPI\r
 TlsGetServerRandom (\r
 VOID\r
 EFIAPI\r
 TlsGetServerRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ServerRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ServerRandom\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

 \r
 \r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL || ServerRandom == NULL) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (ServerRandom == NULL)) {\r

     return;\r
   }\r
 \r
     return;\r
   }\r
 \r


@@ -1108,17 +1150,17 @@ TlsGetServerRandom (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetKeyMaterial (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetKeyMaterial (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *KeyMaterial\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *KeyMaterial\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   SSL_SESSION     *Session;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   SSL_SESSION     *Session;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

   Session = NULL;\r
 \r
   Session = NULL;\r
 \r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL || KeyMaterial == NULL) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (KeyMaterial == NULL)) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -1152,9 +1194,9 @@ TlsGetKeyMaterial (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   return EFI_UNSUPPORTED;\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r


@@ -1180,22 +1222,22 @@ TlsGetCaCertificate (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   X509            *Cert;\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   Cert    = NULL;\r
   )\r
 {\r
   X509            *Cert;\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   Cert    = NULL;\r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

 \r
 \r

-  if (TlsConn == NULL || TlsConn->Ssl == NULL || DataSize == NULL || (*DataSize != 0 && Data == NULL)) {\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL) || (DataSize == NULL) || ((*DataSize != 0) && (Data == NULL))) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  Cert = SSL_get_certificate(TlsConn->Ssl);\r
+  Cert = SSL_get_certificate (TlsConn->Ssl);\r

   if (Cert == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if (Cert == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r


@@ -1203,12 +1245,12 @@ TlsGetHostPublicCert (
   //\r
   // Only DER encoding is supported currently.\r
   //\r
   //\r
   // Only DER encoding is supported currently.\r
   //\r

-  if (*DataSize < (UINTN) i2d_X509 (Cert, NULL)) {\r
-    *DataSize = (UINTN) i2d_X509 (Cert, NULL);\r
+  if (*DataSize < (UINTN)i2d_X509 (Cert, NULL)) {\r
+    *DataSize = (UINTN)i2d_X509 (Cert, NULL);\r

     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r

-  *DataSize = (UINTN) i2d_X509 (Cert, (unsigned char **) &Data);\r
+  *DataSize = (UINTN)i2d_X509 (Cert, (unsigned char **)&Data);\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -1232,9 +1274,9 @@ TlsGetHostPublicCert (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   return EFI_UNSUPPORTED;\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r


@@ -1258,8 +1300,8 @@ TlsGetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCertRevocationList (\r

-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   return EFI_UNSUPPORTED;\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r

diff --git a/CryptoPkg/Library/TlsLib/TlsInit.c b/CryptoPkg/Library/TlsLib/TlsInit.c
index f9ad6f6b946cee6b44fc520fa6fe9f9311db1af0..8d707f82854f232deccb9f51b7eb95a1ecd2eb74 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsInit.c
+++ b/CryptoPkg/Library/TlsLib/TlsInit.c
@@ -26,7 +26,7 @@ TlsInitialize (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  INTN            Ret;\r
+  INTN  Ret;\r

 \r
   //\r
   // Performs initialization of crypto and ssl library, and loads required\r
 \r
   //\r
   // Performs initialization of crypto and ssl library, and loads required\r


@@ -55,7 +55,7 @@ TlsInitialize (
 VOID\r
 EFIAPI\r
 TlsCtxFree (\r
 VOID\r
 EFIAPI\r
 TlsCtxFree (\r

-  IN   VOID                  *TlsCtx\r
+  IN   VOID  *TlsCtx\r

   )\r
 {\r
   if (TlsCtx == NULL) {\r
   )\r
 {\r
   if (TlsCtx == NULL) {\r


@@ -63,7 +63,7 @@ TlsCtxFree (
   }\r
 \r
   if (TlsCtx != NULL) {\r
   }\r
 \r
   if (TlsCtx != NULL) {\r

-    SSL_CTX_free ((SSL_CTX *) (TlsCtx));\r
+    SSL_CTX_free ((SSL_CTX *)(TlsCtx));\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r


@@ -81,8 +81,8 @@ TlsCtxFree (
 VOID *\r
 EFIAPI\r
 TlsCtxNew (\r
 VOID *\r
 EFIAPI\r
 TlsCtxNew (\r

-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   )\r
 {\r
   SSL_CTX  *TlsCtx;\r
   )\r
 {\r
   SSL_CTX  *TlsCtx;\r


@@ -106,7 +106,7 @@ TlsCtxNew (
   //\r
   SSL_CTX_set_min_proto_version (TlsCtx, ProtoVersion);\r
 \r
   //\r
   SSL_CTX_set_min_proto_version (TlsCtx, ProtoVersion);\r
 \r

-  return (VOID *) TlsCtx;\r
+  return (VOID *)TlsCtx;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -121,12 +121,12 @@ TlsCtxNew (
 VOID\r
 EFIAPI\r
 TlsFree (\r
 VOID\r
 EFIAPI\r
 TlsFree (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r

   if (TlsConn == NULL) {\r
     return;\r
   }\r
   if (TlsConn == NULL) {\r
     return;\r
   }\r


@@ -157,7 +157,7 @@ TlsFree (
 VOID *\r
 EFIAPI\r
 TlsNew (\r
 VOID *\r
 EFIAPI\r
 TlsNew (\r

-  IN     VOID                     *TlsCtx\r
+  IN     VOID  *TlsCtx\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r


@@ -169,7 +169,7 @@ TlsNew (
   //\r
   // Allocate one new TLS_CONNECTION object\r
   //\r
   //\r
   // Allocate one new TLS_CONNECTION object\r
   //\r

-  TlsConn = (TLS_CONNECTION *) OPENSSL_malloc (sizeof (TLS_CONNECTION));\r
+  TlsConn = (TLS_CONNECTION *)OPENSSL_malloc (sizeof (TLS_CONNECTION));\r

   if (TlsConn == NULL) {\r
     return NULL;\r
   }\r
   if (TlsConn == NULL) {\r
     return NULL;\r
   }\r


@@ -179,9 +179,9 @@ TlsNew (
   //\r
   // Create a new SSL Object\r
   //\r
   //\r
   // Create a new SSL Object\r
   //\r

-  TlsConn->Ssl = SSL_new ((SSL_CTX *) TlsCtx);\r
+  TlsConn->Ssl = SSL_new ((SSL_CTX *)TlsCtx);\r

   if (TlsConn->Ssl == NULL) {\r
   if (TlsConn->Ssl == NULL) {\r

-    TlsFree ((VOID *) TlsConn);\r
+    TlsFree ((VOID *)TlsConn);\r

     return NULL;\r
   }\r
 \r
     return NULL;\r
   }\r
 \r


@@ -202,7 +202,7 @@ TlsNew (
   //\r
   TlsConn->InBio = BIO_new (BIO_s_mem ());\r
   if (TlsConn->InBio == NULL) {\r
   //\r
   TlsConn->InBio = BIO_new (BIO_s_mem ());\r
   if (TlsConn->InBio == NULL) {\r

-    TlsFree ((VOID *) TlsConn);\r
+    TlsFree ((VOID *)TlsConn);\r

     return NULL;\r
   }\r
 \r
     return NULL;\r
   }\r
 \r


@@ -219,7 +219,7 @@ TlsNew (
   //\r
   TlsConn->OutBio = BIO_new (BIO_s_mem ());\r
   if (TlsConn->OutBio == NULL) {\r
   //\r
   TlsConn->OutBio = BIO_new (BIO_s_mem ());\r
   if (TlsConn->OutBio == NULL) {\r

-    TlsFree ((VOID *) TlsConn);\r
+    TlsFree ((VOID *)TlsConn);\r

     return NULL;\r
   }\r
 \r
     return NULL;\r
   }\r
 \r


@@ -244,9 +244,10 @@ TlsNew (
   if (X509Store == NULL) {\r
     X509Store = X509_STORE_new ();\r
     if (X509Store == NULL) {\r
   if (X509Store == NULL) {\r
     X509Store = X509_STORE_new ();\r
     if (X509Store == NULL) {\r

-      TlsFree ((VOID *) TlsConn);\r
+      TlsFree ((VOID *)TlsConn);\r

       return NULL;\r
     }\r
       return NULL;\r
     }\r

+\r

     SSL_CTX_set1_verify_cert_store (SslCtx, X509Store);\r
     X509_STORE_free (X509Store);\r
   }\r
     SSL_CTX_set1_verify_cert_store (SslCtx, X509Store);\r
     X509_STORE_free (X509Store);\r
   }\r


@@ -258,6 +259,5 @@ TlsNew (
     X509Store,\r
     X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME\r
     );\r
     X509Store,\r
     X509_V_FLAG_PARTIAL_CHAIN | X509_V_FLAG_NO_CHECK_TIME\r
     );\r

-  return (VOID *) TlsConn;\r
+  return (VOID *)TlsConn;\r

 }\r
 }\r

-\r

diff --git a/CryptoPkg/Library/TlsLib/TlsProcess.c b/CryptoPkg/Library/TlsLib/TlsProcess.c
index f64184e3489572ce4accaaec40838245f0515f67..0f2ad7a9fbc0c996a952f45895de9a5c6fcc51a7 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsProcess.c
+++ b/CryptoPkg/Library/TlsLib/TlsProcess.c
@@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "InternalTlsLib.h"\r
 \r
 \r
 #include "InternalTlsLib.h"\r
 \r

-#define MAX_BUFFER_SIZE   32768\r
+#define MAX_BUFFER_SIZE  32768\r

 \r
 /**\r
   Checks if the TLS handshake was done.\r
 \r
 /**\r
   Checks if the TLS handshake was done.\r


@@ -26,13 +26,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 BOOLEAN\r
 EFIAPI\r
 TlsInHandshake (\r
 BOOLEAN\r
 EFIAPI\r
 TlsInHandshake (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r


@@ -71,11 +71,11 @@ TlsInHandshake (
 EFI_STATUS\r
 EFIAPI\r
 TlsDoHandshake (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsDoHandshake (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r


@@ -83,45 +83,47 @@ TlsDoHandshake (
   INTN            Ret;\r
   UINTN           ErrorCode;\r
 \r
   INTN            Ret;\r
   UINTN           ErrorCode;\r
 \r

-  TlsConn           = (TLS_CONNECTION *) Tls;\r
+  TlsConn           = (TLS_CONNECTION *)Tls;\r

   PendingBufferSize = 0;\r
   Ret               = 1;\r
 \r
   PendingBufferSize = 0;\r
   Ret               = 1;\r
 \r

-  if (TlsConn == NULL || \\r
-    TlsConn->Ssl == NULL || TlsConn->InBio == NULL || TlsConn->OutBio == NULL || \\r
-    BufferOutSize == NULL || \\r
-    (BufferIn == NULL && BufferInSize != 0) || \\r
-    (BufferIn != NULL && BufferInSize == 0) || \\r
-    (BufferOut == NULL && *BufferOutSize != 0)) {\r
+  if ((TlsConn == NULL) || \\r
+      (TlsConn->Ssl == NULL) || (TlsConn->InBio == NULL) || (TlsConn->OutBio == NULL) || \\r
+      (BufferOutSize == NULL) || \\r
+      ((BufferIn == NULL) && (BufferInSize != 0)) || \\r
+      ((BufferIn != NULL) && (BufferInSize == 0)) || \\r
+      ((BufferOut == NULL) && (*BufferOutSize != 0)))\r
+  {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  if(BufferIn == NULL && BufferInSize == 0) {\r
+  if ((BufferIn == NULL) && (BufferInSize == 0)) {\r

     //\r
     // If RequestBuffer is NULL and RequestSize is 0, and TLS session\r
     // status is EfiTlsSessionNotStarted, the TLS session will be initiated\r
     // and the response packet needs to be ClientHello.\r
     //\r
     //\r
     // If RequestBuffer is NULL and RequestSize is 0, and TLS session\r
     // status is EfiTlsSessionNotStarted, the TLS session will be initiated\r
     // and the response packet needs to be ClientHello.\r
     //\r

-    PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);\r
+    PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);\r

     if (PendingBufferSize == 0) {\r
       SSL_set_connect_state (TlsConn->Ssl);\r
     if (PendingBufferSize == 0) {\r
       SSL_set_connect_state (TlsConn->Ssl);\r

-      Ret = SSL_do_handshake (TlsConn->Ssl);\r
-      PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);\r
+      Ret               = SSL_do_handshake (TlsConn->Ssl);\r
+      PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);\r

     }\r
   } else {\r
     }\r
   } else {\r

-    PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);\r
+    PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);\r

     if (PendingBufferSize == 0) {\r
     if (PendingBufferSize == 0) {\r

-      BIO_write (TlsConn->InBio, BufferIn, (UINT32) BufferInSize);\r
-      Ret = SSL_do_handshake (TlsConn->Ssl);\r
-      PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);\r
+      BIO_write (TlsConn->InBio, BufferIn, (UINT32)BufferInSize);\r
+      Ret               = SSL_do_handshake (TlsConn->Ssl);\r
+      PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);\r

     }\r
   }\r
 \r
   if (Ret < 1) {\r
     }\r
   }\r
 \r
   if (Ret < 1) {\r

-    Ret = SSL_get_error (TlsConn->Ssl, (int) Ret);\r
-    if (Ret == SSL_ERROR_SSL ||\r
-        Ret == SSL_ERROR_SYSCALL ||\r
-        Ret == SSL_ERROR_ZERO_RETURN) {\r
+    Ret = SSL_get_error (TlsConn->Ssl, (int)Ret);\r
+    if ((Ret == SSL_ERROR_SSL) ||\r
+        (Ret == SSL_ERROR_SYSCALL) ||\r
+        (Ret == SSL_ERROR_ZERO_RETURN))\r
+    {\r

       DEBUG ((\r
         DEBUG_ERROR,\r
         "%a SSL_HANDSHAKE_ERROR State=0x%x SSL_ERROR_%a\n",\r
       DEBUG ((\r
         DEBUG_ERROR,\r
         "%a SSL_HANDSHAKE_ERROR State=0x%x SSL_ERROR_%a\n",\r


@@ -130,21 +132,23 @@ TlsDoHandshake (
         Ret == SSL_ERROR_SSL ? "SSL" : Ret == SSL_ERROR_SYSCALL ? "SYSCALL" : "ZERO_RETURN"\r
         ));\r
       DEBUG_CODE_BEGIN ();\r
         Ret == SSL_ERROR_SSL ? "SSL" : Ret == SSL_ERROR_SYSCALL ? "SYSCALL" : "ZERO_RETURN"\r
         ));\r
       DEBUG_CODE_BEGIN ();\r

-        while (TRUE) {\r
-          ErrorCode = ERR_get_error ();\r
-          if (ErrorCode == 0) {\r
-            break;\r
-          }\r
-          DEBUG ((\r
-            DEBUG_ERROR,\r
-            "%a ERROR 0x%x=L%x:F%x:R%x\n",\r
-            __FUNCTION__,\r
-            ErrorCode,\r
-            ERR_GET_LIB (ErrorCode),\r
-            ERR_GET_FUNC (ErrorCode),\r
-            ERR_GET_REASON (ErrorCode)\r
-            ));\r
+      while (TRUE) {\r
+        ErrorCode = ERR_get_error ();\r
+        if (ErrorCode == 0) {\r
+          break;\r

         }\r
         }\r

+\r
+        DEBUG ((\r
+          DEBUG_ERROR,\r
+          "%a ERROR 0x%x=L%x:F%x:R%x\n",\r
+          __FUNCTION__,\r
+          ErrorCode,\r
+          ERR_GET_LIB (ErrorCode),\r
+          ERR_GET_FUNC (ErrorCode),\r
+          ERR_GET_REASON (ErrorCode)\r
+          ));\r
+      }\r
+\r

       DEBUG_CODE_END ();\r
       return EFI_ABORTED;\r
     }\r
       DEBUG_CODE_END ();\r
       return EFI_ABORTED;\r
     }\r


@@ -156,7 +160,7 @@ TlsDoHandshake (
   }\r
 \r
   if (PendingBufferSize > 0) {\r
   }\r
 \r
   if (PendingBufferSize > 0) {\r

-    *BufferOutSize = BIO_read (TlsConn->OutBio, BufferOut, (UINT32) PendingBufferSize);\r
+    *BufferOutSize = BIO_read (TlsConn->OutBio, BufferOut, (UINT32)PendingBufferSize);\r

   } else {\r
     *BufferOutSize = 0;\r
   }\r
   } else {\r
     *BufferOutSize = 0;\r
   }\r


@@ -192,11 +196,11 @@ TlsDoHandshake (
 EFI_STATUS\r
 EFIAPI\r
 TlsHandleAlert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsHandleAlert (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r


@@ -204,28 +208,29 @@ TlsHandleAlert (
   UINT8           *TempBuffer;\r
   INTN            Ret;\r
 \r
   UINT8           *TempBuffer;\r
   INTN            Ret;\r
 \r

-  TlsConn           = (TLS_CONNECTION *) Tls;\r
+  TlsConn           = (TLS_CONNECTION *)Tls;\r

   PendingBufferSize = 0;\r
   TempBuffer        = NULL;\r
   Ret               = 0;\r
 \r
   PendingBufferSize = 0;\r
   TempBuffer        = NULL;\r
   Ret               = 0;\r
 \r

-  if (TlsConn == NULL || \\r
-    TlsConn->Ssl == NULL || TlsConn->InBio == NULL || TlsConn->OutBio == NULL || \\r
-    BufferOutSize == NULL || \\r
-    (BufferIn == NULL && BufferInSize != 0) || \\r
-    (BufferIn != NULL && BufferInSize == 0) || \\r
-    (BufferOut == NULL && *BufferOutSize != 0)) {\r
+  if ((TlsConn == NULL) || \\r
+      (TlsConn->Ssl == NULL) || (TlsConn->InBio == NULL) || (TlsConn->OutBio == NULL) || \\r
+      (BufferOutSize == NULL) || \\r
+      ((BufferIn == NULL) && (BufferInSize != 0)) || \\r
+      ((BufferIn != NULL) && (BufferInSize == 0)) || \\r
+      ((BufferOut == NULL) && (*BufferOutSize != 0)))\r
+  {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);\r
-  if (PendingBufferSize == 0 && BufferIn != NULL && BufferInSize != 0) {\r
-    Ret = BIO_write (TlsConn->InBio, BufferIn, (UINT32) BufferInSize);\r
-    if (Ret != (INTN) BufferInSize) {\r
+  PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);\r
+  if ((PendingBufferSize == 0) && (BufferIn != NULL) && (BufferInSize != 0)) {\r
+    Ret = BIO_write (TlsConn->InBio, BufferIn, (UINT32)BufferInSize);\r
+    if (Ret != (INTN)BufferInSize) {\r

       return EFI_ABORTED;\r
     }\r
 \r
       return EFI_ABORTED;\r
     }\r
 \r

-    TempBuffer = (UINT8 *) OPENSSL_malloc (MAX_BUFFER_SIZE);\r
+    TempBuffer = (UINT8 *)OPENSSL_malloc (MAX_BUFFER_SIZE);\r

 \r
     //\r
     // ssl3_send_alert() will be called in ssl3_read_bytes() function.\r
 \r
     //\r
     // ssl3_send_alert() will be called in ssl3_read_bytes() function.\r


@@ -235,7 +240,7 @@ TlsHandleAlert (
 \r
     OPENSSL_free (TempBuffer);\r
 \r
 \r
     OPENSSL_free (TempBuffer);\r
 \r

-    PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);\r
+    PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);\r

   }\r
 \r
   if (PendingBufferSize > *BufferOutSize) {\r
   }\r
 \r
   if (PendingBufferSize > *BufferOutSize) {\r


@@ -244,7 +249,7 @@ TlsHandleAlert (
   }\r
 \r
   if (PendingBufferSize > 0) {\r
   }\r
 \r
   if (PendingBufferSize > 0) {\r

-    *BufferOutSize = BIO_read (TlsConn->OutBio, BufferOut, (UINT32) PendingBufferSize);\r
+    *BufferOutSize = BIO_read (TlsConn->OutBio, BufferOut, (UINT32)PendingBufferSize);\r

   } else {\r
     *BufferOutSize = 0;\r
   }\r
   } else {\r
     *BufferOutSize = 0;\r
   }\r


@@ -273,31 +278,32 @@ TlsHandleAlert (
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseNotify (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseNotify (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *Buffer,\r
-  IN OUT UINTN                    *BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *Buffer,\r
+  IN OUT UINTN  *BufferSize\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   UINTN           PendingBufferSize;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
   UINTN           PendingBufferSize;\r
 \r

-  TlsConn           = (TLS_CONNECTION *) Tls;\r
+  TlsConn           = (TLS_CONNECTION *)Tls;\r

   PendingBufferSize = 0;\r
 \r
   PendingBufferSize = 0;\r
 \r

-  if (TlsConn == NULL || \\r
-    TlsConn->Ssl == NULL || TlsConn->InBio == NULL || TlsConn->OutBio == NULL || \\r
-    BufferSize == NULL || \\r
-    (Buffer == NULL && *BufferSize != 0)) {\r
+  if ((TlsConn == NULL) || \\r
+      (TlsConn->Ssl == NULL) || (TlsConn->InBio == NULL) || (TlsConn->OutBio == NULL) || \\r
+      (BufferSize == NULL) || \\r
+      ((Buffer == NULL) && (*BufferSize != 0)))\r
+  {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);\r
+  PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);\r

   if (PendingBufferSize == 0) {\r
     //\r
     // ssl3_send_alert() and ssl3_dispatch_alert() function will be called.\r
     //\r
     SSL_shutdown (TlsConn->Ssl);\r
   if (PendingBufferSize == 0) {\r
     //\r
     // ssl3_send_alert() and ssl3_dispatch_alert() function will be called.\r
     //\r
     SSL_shutdown (TlsConn->Ssl);\r

-    PendingBufferSize = (UINTN) BIO_ctrl_pending (TlsConn->OutBio);\r
+    PendingBufferSize = (UINTN)BIO_ctrl_pending (TlsConn->OutBio);\r

   }\r
 \r
   if (PendingBufferSize > *BufferSize) {\r
   }\r
 \r
   if (PendingBufferSize > *BufferSize) {\r


@@ -306,7 +312,7 @@ TlsCloseNotify (
   }\r
 \r
   if (PendingBufferSize > 0) {\r
   }\r
 \r
   if (PendingBufferSize > 0) {\r

-    *BufferSize = BIO_read (TlsConn->OutBio, Buffer, (UINT32) PendingBufferSize);\r
+    *BufferSize = BIO_read (TlsConn->OutBio, Buffer, (UINT32)PendingBufferSize);\r

   } else {\r
     *BufferSize = 0;\r
   }\r
   } else {\r
     *BufferSize = 0;\r
   }\r


@@ -331,22 +337,22 @@ TlsCloseNotify (
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficOut (\r
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficOut (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
-  if (TlsConn == NULL || TlsConn->OutBio == 0) {\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r
+  if ((TlsConn == NULL) || (TlsConn->OutBio == 0)) {\r

     return -1;\r
   }\r
 \r
   //\r
   // Read and return the amount of data from the BIO.\r
   //\r
     return -1;\r
   }\r
 \r
   //\r
   // Read and return the amount of data from the BIO.\r
   //\r

-  return BIO_read (TlsConn->OutBio, Buffer, (UINT32) BufferSize);\r
+  return BIO_read (TlsConn->OutBio, Buffer, (UINT32)BufferSize);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -366,23 +372,24 @@ TlsCtrlTrafficOut (
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficIn (\r
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficIn (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
-  if (TlsConn == NULL || TlsConn->InBio == 0) {\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r
+  if ((TlsConn == NULL) || (TlsConn->InBio == 0)) {\r

     return -1;\r
   }\r
 \r
   //\r
   // Write and return the amount of data to the BIO.\r
   //\r
     return -1;\r
   }\r
 \r
   //\r
   // Write and return the amount of data to the BIO.\r
   //\r

-  return BIO_write (TlsConn->InBio, Buffer, (UINT32) BufferSize);\r
+  return BIO_write (TlsConn->InBio, Buffer, (UINT32)BufferSize);\r

 }\r
 }\r

+\r

 /**\r
   Attempts to read bytes from the specified TLS connection into the buffer.\r
 \r
 /**\r
   Attempts to read bytes from the specified TLS connection into the buffer.\r
 \r


@@ -401,22 +408,22 @@ TlsCtrlTrafficIn (
 INTN\r
 EFIAPI\r
 TlsRead (\r
 INTN\r
 EFIAPI\r
 TlsRead (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {\r

     return -1;\r
   }\r
 \r
   //\r
   // Read bytes from the specified TLS connection.\r
   //\r
     return -1;\r
   }\r
 \r
   //\r
   // Read bytes from the specified TLS connection.\r
   //\r

-  return SSL_read (TlsConn->Ssl, Buffer, (UINT32) BufferSize);\r
+  return SSL_read (TlsConn->Ssl, Buffer, (UINT32)BufferSize);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -437,20 +444,20 @@ TlsRead (
 INTN\r
 EFIAPI\r
 TlsWrite (\r
 INTN\r
 EFIAPI\r
 TlsWrite (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r
   )\r
 {\r
   TLS_CONNECTION  *TlsConn;\r
 \r

-  TlsConn = (TLS_CONNECTION *) Tls;\r
-  if (TlsConn == NULL || TlsConn->Ssl == NULL) {\r
+  TlsConn = (TLS_CONNECTION *)Tls;\r
+  if ((TlsConn == NULL) || (TlsConn->Ssl == NULL)) {\r

     return -1;\r
   }\r
 \r
   //\r
   // Write bytes to the specified TLS connection.\r
   //\r
     return -1;\r
   }\r
 \r
   //\r
   // Write bytes to the specified TLS connection.\r
   //\r

-  return SSL_write (TlsConn->Ssl, Buffer, (UINT32) BufferSize);\r
+  return SSL_write (TlsConn->Ssl, Buffer, (UINT32)BufferSize);\r

 }\r
 }\r

diff --git a/CryptoPkg/Library/TlsLibNull/TlsConfigNull.c b/CryptoPkg/Library/TlsLibNull/TlsConfigNull.c
index 8033a61790aa00082de8941b9526e026da543789..b5d9aca065352359fa206aec4e88bd6bd988bee6 100644 (file)
--- a/CryptoPkg/Library/TlsLibNull/TlsConfigNull.c
+++ b/CryptoPkg/Library/TlsLibNull/TlsConfigNull.c
@@ -26,12 +26,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVersion (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVersion (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -51,11 +51,11 @@ TlsSetVersion (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetConnectionEnd (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetConnectionEnd (\r

-  IN     VOID                     *Tls,\r
-  IN     BOOLEAN                  IsServer\r
+  IN     VOID     *Tls,\r
+  IN     BOOLEAN  IsServer\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -80,12 +80,12 @@ TlsSetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCipherList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCipherList (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT16                   *CipherId,\r
-  IN     UINTN                    CipherNum\r
+  IN     VOID    *Tls,\r
+  IN     UINT16  *CipherId,\r
+  IN     UINTN   CipherNum\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -104,10 +104,10 @@ TlsSetCipherList (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCompressionMethod (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCompressionMethod (\r

-  IN     UINT8                    CompMethod\r
+  IN     UINT8  CompMethod\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -123,14 +123,15 @@ TlsSetCompressionMethod (
 VOID\r
 EFIAPI\r
 TlsSetVerify (\r
 VOID\r
 EFIAPI\r
 TlsSetVerify (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   VerifyMode\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  VerifyMode\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

 }\r
 \r
 // MU_CHANGE - Proposed fixes for TCBZ960, invalid domain name (CN) accepted. [BEGIN]\r
 }\r
 \r
 // MU_CHANGE - Proposed fixes for TCBZ960, invalid domain name (CN) accepted. [BEGIN]\r

+\r

 /**\r
   Set the specified host name to be verified.\r
 \r
 /**\r
   Set the specified host name to be verified.\r
 \r


@@ -146,12 +147,12 @@ TlsSetVerify (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVerifyHost (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetVerifyHost (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT32                   Flags,\r
-  IN     CHAR8                    *HostName\r
+  IN     VOID    *Tls,\r
+  IN     UINT32  Flags,\r
+  IN     CHAR8   *HostName\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -175,12 +176,12 @@ TlsSetVerifyHost (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *SessionId,\r
-  IN     UINT16                   SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN     UINT8   *SessionId,\r
+  IN     UINT16  SessionIdLen\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -204,12 +205,12 @@ TlsSetSessionId (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -233,12 +234,12 @@ TlsSetCaCertificate (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -261,12 +262,12 @@ TlsSetHostPublicCert (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -287,11 +288,11 @@ TlsSetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsSetCertRevocationList (\r

-  IN     VOID                     *Data,\r
-  IN     UINTN                    DataSize\r
+  IN     VOID   *Data,\r
+  IN     UINTN  DataSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -311,10 +312,10 @@ TlsSetCertRevocationList (
 UINT16\r
 EFIAPI\r
 TlsGetVersion (\r
 UINT16\r
 EFIAPI\r
 TlsGetVersion (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r


@@ -334,10 +335,10 @@ TlsGetVersion (
 UINT8\r
 EFIAPI\r
 TlsGetConnectionEnd (\r
 UINT8\r
 EFIAPI\r
 TlsGetConnectionEnd (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r


@@ -358,11 +359,11 @@ TlsGetConnectionEnd (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCipher (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCipher (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT16                   *CipherId\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT16  *CipherId\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -385,11 +386,11 @@ TlsGetCurrentCipher (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCompressionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCurrentCompressionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *CompressionId\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *CompressionId\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -409,10 +410,10 @@ TlsGetCurrentCompressionId (
 UINT32\r
 EFIAPI\r
 TlsGetVerify (\r
 UINT32\r
 EFIAPI\r
 TlsGetVerify (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r


@@ -434,12 +435,12 @@ TlsGetVerify (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionId (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionId (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *SessionId,\r
-  IN OUT UINT16                   *SessionIdLen\r
+  IN     VOID    *Tls,\r
+  IN OUT UINT8   *SessionId,\r
+  IN OUT UINT16  *SessionIdLen\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -457,11 +458,11 @@ TlsGetSessionId (
 VOID\r
 EFIAPI\r
 TlsGetClientRandom (\r
 VOID\r
 EFIAPI\r
 TlsGetClientRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ClientRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ClientRandom\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -478,11 +479,11 @@ TlsGetClientRandom (
 VOID\r
 EFIAPI\r
 TlsGetServerRandom (\r
 VOID\r
 EFIAPI\r
 TlsGetServerRandom (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *ServerRandom\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *ServerRandom\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -502,11 +503,11 @@ TlsGetServerRandom (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetKeyMaterial (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetKeyMaterial (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *KeyMaterial\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *KeyMaterial\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -529,12 +530,12 @@ TlsGetKeyMaterial (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCaCertificate (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCaCertificate (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -558,12 +559,12 @@ TlsGetCaCertificate (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPublicCert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPublicCert (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -586,12 +587,12 @@ TlsGetHostPublicCert (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPrivateKey (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetHostPrivateKey (\r

-  IN     VOID                     *Tls,\r
-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  IN     VOID   *Tls,\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -613,10 +614,10 @@ TlsGetHostPrivateKey (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCertRevocationList (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsGetCertRevocationList (\r

-  OUT    VOID                     *Data,\r
-  IN OUT UINTN                    *DataSize\r
+  OUT    VOID   *Data,\r
+  IN OUT UINTN  *DataSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
   return EFI_UNSUPPORTED;\r
 }\r

diff --git a/CryptoPkg/Library/TlsLibNull/TlsInitNull.c b/CryptoPkg/Library/TlsLibNull/TlsInitNull.c
index 3e44117b82d2de67f0b46143badb9e9531e87337..478a926e477b8304d11763a48ebf065295765abd 100644 (file)
--- a/CryptoPkg/Library/TlsLibNull/TlsInitNull.c
+++ b/CryptoPkg/Library/TlsLibNull/TlsInitNull.c
@@ -26,7 +26,7 @@ TlsInitialize (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return FALSE;\r
 }\r
 \r
   return FALSE;\r
 }\r
 \r


@@ -39,10 +39,10 @@ TlsInitialize (
 VOID\r
 EFIAPI\r
 TlsCtxFree (\r
 VOID\r
 EFIAPI\r
 TlsCtxFree (\r

-  IN   VOID                  *TlsCtx\r
+  IN   VOID  *TlsCtx\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return;\r
 }\r
 \r
   return;\r
 }\r
 \r


@@ -60,11 +60,11 @@ TlsCtxFree (
 VOID *\r
 EFIAPI\r
 TlsCtxNew (\r
 VOID *\r
 EFIAPI\r
 TlsCtxNew (\r

-  IN     UINT8                    MajorVer,\r
-  IN     UINT8                    MinorVer\r
+  IN     UINT8  MajorVer,\r
+  IN     UINT8  MinorVer\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return NULL;\r
 }\r
 \r
   return NULL;\r
 }\r
 \r


@@ -80,10 +80,10 @@ TlsCtxNew (
 VOID\r
 EFIAPI\r
 TlsFree (\r
 VOID\r
 EFIAPI\r
 TlsFree (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -102,10 +102,9 @@ TlsFree (
 VOID *\r
 EFIAPI\r
 TlsNew (\r
 VOID *\r
 EFIAPI\r
 TlsNew (\r

-  IN     VOID                     *TlsCtx\r
+  IN     VOID  *TlsCtx\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return NULL;\r
 }\r
   return NULL;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/TlsLibNull/TlsProcessNull.c b/CryptoPkg/Library/TlsLibNull/TlsProcessNull.c
index f06777b96d4ea8e0f14ed03f399efda2dcf5fa68..0958ddd8d60848d47e6af6beb406798084344b46 100644 (file)
--- a/CryptoPkg/Library/TlsLibNull/TlsProcessNull.c
+++ b/CryptoPkg/Library/TlsLibNull/TlsProcessNull.c
@@ -24,10 +24,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 BOOLEAN\r
 EFIAPI\r
 TlsInHandshake (\r
 BOOLEAN\r
 EFIAPI\r
 TlsInHandshake (\r

-  IN     VOID                     *Tls\r
+  IN     VOID  *Tls\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return FALSE;\r
 }\r
 \r
   return FALSE;\r
 }\r
 \r


@@ -60,14 +60,14 @@ TlsInHandshake (
 EFI_STATUS\r
 EFIAPI\r
 TlsDoHandshake (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsDoHandshake (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -99,14 +99,14 @@ TlsDoHandshake (
 EFI_STATUS\r
 EFIAPI\r
 TlsHandleAlert (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsHandleAlert (\r

-  IN     VOID                     *Tls,\r
-  IN     UINT8                    *BufferIn  OPTIONAL,\r
-  IN     UINTN                    BufferInSize  OPTIONAL,\r
-     OUT UINT8                    *BufferOut  OPTIONAL,\r
-  IN OUT UINTN                    *BufferOutSize\r
+  IN     VOID   *Tls,\r
+  IN     UINT8  *BufferIn  OPTIONAL,\r
+  IN     UINTN  BufferInSize  OPTIONAL,\r
+  OUT UINT8     *BufferOut  OPTIONAL,\r
+  IN OUT UINTN  *BufferOutSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -131,12 +131,12 @@ TlsHandleAlert (
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseNotify (\r
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseNotify (\r

-  IN     VOID                     *Tls,\r
-  IN OUT UINT8                    *Buffer,\r
-  IN OUT UINTN                    *BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT UINT8  *Buffer,\r
+  IN OUT UINTN  *BufferSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -157,12 +157,12 @@ TlsCloseNotify (
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficOut (\r
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficOut (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r


@@ -183,14 +183,15 @@ TlsCtrlTrafficOut (
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficIn (\r
 INTN\r
 EFIAPI\r
 TlsCtrlTrafficIn (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return 0;\r
 }\r
   return 0;\r
 }\r

+\r

 /**\r
   Attempts to read bytes from the specified TLS connection into the buffer.\r
 \r
 /**\r
   Attempts to read bytes from the specified TLS connection into the buffer.\r
 \r


@@ -209,12 +210,12 @@ TlsCtrlTrafficIn (
 INTN\r
 EFIAPI\r
 TlsRead (\r
 INTN\r
 EFIAPI\r
 TlsRead (\r

-  IN     VOID                     *Tls,\r
-  IN OUT VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN OUT VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r


@@ -236,11 +237,11 @@ TlsRead (
 INTN\r
 EFIAPI\r
 TlsWrite (\r
 INTN\r
 EFIAPI\r
 TlsWrite (\r

-  IN     VOID                     *Tls,\r
-  IN     VOID                     *Buffer,\r
-  IN     UINTN                    BufferSize\r
+  IN     VOID   *Tls,\r
+  IN     VOID   *Buffer,\r
+  IN     UINTN  BufferSize\r

   )\r
 {\r
   )\r
 {\r

-  ASSERT(FALSE);\r
+  ASSERT (FALSE);\r

   return 0;\r
 }\r
   return 0;\r
 }\r

diff --git a/CryptoPkg/Private/Ppi/Crypto.h b/CryptoPkg/Private/Ppi/Crypto.h
index 5241cf9ab226a1f08d43b0e2a6c180d747dc5cc8..ad5a5246447360f9af8ee81c341ef3c904f0c68d 100644 (file)
--- a/CryptoPkg/Private/Ppi/Crypto.h
+++ b/CryptoPkg/Private/Ppi/Crypto.h
@@ -16,6 +16,6 @@
 ///\r
 typedef EDKII_CRYPTO_PROTOCOL EDKII_CRYPTO_PPI;\r
 \r
 ///\r
 typedef EDKII_CRYPTO_PROTOCOL EDKII_CRYPTO_PPI;\r
 \r

-extern GUID gEdkiiCryptoPpiGuid;\r
+extern GUID  gEdkiiCryptoPpiGuid;\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/CryptoPkg/Private/Protocol/Crypto.h b/CryptoPkg/Private/Protocol/Crypto.h
index e38ecbb3b117e80749b790192a05168d41d795d7..e378a8a8c60e7cd4a89e1fe49f93d011debaa707 100644 (file)
--- a/CryptoPkg/Private/Protocol/Crypto.h
+++ b/CryptoPkg/Private/Protocol/Crypto.h
@@ -21,7 +21,7 @@
 /// the EDK II Crypto Protocol is extended, this version define must be\r
 /// increased.\r
 ///\r
 /// the EDK II Crypto Protocol is extended, this version define must be\r
 /// increased.\r
 ///\r

-#define EDKII_CRYPTO_VERSION 7\r
+#define EDKII_CRYPTO_VERSION  7\r

 \r
 ///\r
 /// EDK II Crypto Protocol forward declaration\r
 \r
 ///\r
 /// EDK II Crypto Protocol forward declaration\r


@@ -36,33 +36,34 @@ typedef struct _EDKII_CRYPTO_PROTOCOL EDKII_CRYPTO_PROTOCOL;
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI *EDKII_CRYPTO_GET_VERSION) (\r
+(EFIAPI *EDKII_CRYPTO_GET_VERSION)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    MAC (Message Authentication Code) Primitive\r
 //    MAC (Message Authentication Code) Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r
+\r

 /**\r
   HMAC MD5 is deprecated and unsupported any longer.\r
   Keep the function field for binary compability.\r
 \r
 **/\r
 typedef\r
 /**\r
   HMAC MD5 is deprecated and unsupported any longer.\r
   Keep the function field for binary compability.\r
 \r
 **/\r
 typedef\r

-VOID*\r
-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW) (\r
+VOID *\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW)(\r

   VOID\r
   );\r
 \r
 typedef\r
 VOID\r
   VOID\r
   );\r
 \r
 typedef\r
 VOID\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE)(\r

   IN  VOID  *HmacMd5Ctx\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   IN  VOID  *HmacMd5Ctx\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY)(\r

   OUT  VOID         *HmacMd5Context,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize\r
   OUT  VOID         *HmacMd5Context,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize\r


@@ -70,14 +71,14 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE)(\r

   IN   CONST VOID  *HmacMd5Context,\r
   OUT  VOID        *NewHmacMd5Context\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   IN   CONST VOID  *HmacMd5Context,\r
   OUT  VOID        *NewHmacMd5Context\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE)(\r

   IN OUT  VOID        *HmacMd5Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   IN OUT  VOID        *HmacMd5Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r


@@ -85,7 +86,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL)(\r

   IN OUT  VOID   *HmacMd5Context,\r
   OUT     UINT8  *HmacValue\r
   );\r
   IN OUT  VOID   *HmacMd5Context,\r
   OUT     UINT8  *HmacValue\r
   );\r


@@ -96,20 +97,20 @@ BOOLEAN
 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r

-VOID*\r
-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW) (\r
+VOID *\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW)(\r

   VOID\r
   );\r
 \r
 typedef\r
 VOID\r
   VOID\r
   );\r
 \r
 typedef\r
 VOID\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE)(\r

   IN  VOID  *HmacSha1Ctx\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   IN  VOID  *HmacSha1Ctx\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY)(\r

   OUT  VOID         *HmacSha1Context,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize\r
   OUT  VOID         *HmacSha1Context,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize\r


@@ -117,14 +118,14 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE)(\r

   IN   CONST VOID  *HmacSha1Context,\r
   OUT  VOID        *NewHmacSha1Context\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   IN   CONST VOID  *HmacSha1Context,\r
   OUT  VOID        *NewHmacSha1Context\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE)(\r

   IN OUT  VOID        *HmacSha1Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   IN OUT  VOID        *HmacSha1Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r


@@ -132,12 +133,11 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL)(\r

   IN OUT  VOID   *HmacSha1Context,\r
   OUT     UINT8  *HmacValue\r
   );\r
 \r
   IN OUT  VOID   *HmacSha1Context,\r
   OUT     UINT8  *HmacValue\r
   );\r
 \r

-\r

 /**\r
   Allocates and initializes one HMAC_CTX context for subsequent HMAC-SHA256 use.\r
 \r
 /**\r
   Allocates and initializes one HMAC_CTX context for subsequent HMAC-SHA256 use.\r
 \r


@@ -147,7 +147,7 @@ BOOLEAN
 **/\r
 typedef\r
 VOID *\r
 **/\r
 typedef\r
 VOID *\r

-(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_NEW) (\r
+(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_NEW)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r


@@ -159,11 +159,10 @@ VOID *
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_FREE) (\r
+(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_FREE)(\r

   IN  VOID  *HmacSha256Ctx\r
   );\r
 \r
   IN  VOID  *HmacSha256Ctx\r
   );\r
 \r

-\r

 /**\r
   Set user-supplied key for subsequent use. It must be done before any\r
   calling to HmacSha256Update().\r
 /**\r
   Set user-supplied key for subsequent use. It must be done before any\r
   calling to HmacSha256Update().\r


@@ -182,7 +181,7 @@ VOID
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_SET_KEY) (\r
+(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_SET_KEY)(\r

   OUT  VOID         *HmacSha256Context,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize\r
   OUT  VOID         *HmacSha256Context,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize\r


@@ -205,12 +204,11 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_DUPLICATE) (\r
+(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_DUPLICATE)(\r

   IN   CONST VOID  *HmacSha256Context,\r
   OUT  VOID        *NewHmacSha256Context\r
   );\r
 \r
   IN   CONST VOID  *HmacSha256Context,\r
   OUT  VOID        *NewHmacSha256Context\r
   );\r
 \r

-\r

 /**\r
   Digests the input data and updates HMAC-SHA256 context.\r
 \r
 /**\r
   Digests the input data and updates HMAC-SHA256 context.\r
 \r


@@ -233,7 +231,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_UPDATE) (\r
+(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_UPDATE)(\r

   IN OUT  VOID        *HmacSha256Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   IN OUT  VOID        *HmacSha256Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r


@@ -263,15 +261,14 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_FINAL) (\r
+(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_FINAL)(\r

   IN OUT  VOID   *HmacSha256Context,\r
   OUT     UINT8  *HmacValue\r
   );\r
 \r
   IN OUT  VOID   *HmacSha256Context,\r
   OUT     UINT8  *HmacValue\r
   );\r
 \r

-\r
-//=====================================================================================\r
+// =====================================================================================\r

 //    One-Way Cryptographic Hash Primitives\r
 //    One-Way Cryptographic Hash Primitives\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   MD4 is deprecated and unsupported any longer.\r
 \r
 /**\r
   MD4 is deprecated and unsupported any longer.\r


@@ -280,46 +277,41 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r

-\r

 typedef\r
 BOOLEAN\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_INIT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_INIT)(\r

   OUT  VOID  *Md4Context\r
   );\r
 \r
   OUT  VOID  *Md4Context\r
   );\r
 \r

-\r

 typedef\r
 BOOLEAN\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE)(\r

   IN   CONST VOID  *Md4Context,\r
   OUT  VOID        *NewMd4Context\r
   );\r
 \r
   IN   CONST VOID  *Md4Context,\r
   OUT  VOID        *NewMd4Context\r
   );\r
 \r

-\r

 typedef\r
 BOOLEAN\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_UPDATE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_UPDATE)(\r

   IN OUT  VOID        *Md4Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   );\r
 \r
   IN OUT  VOID        *Md4Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   );\r
 \r

-\r

 typedef\r
 BOOLEAN\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_FINAL) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_FINAL)(\r

   IN OUT  VOID   *Md4Context,\r
   OUT     UINT8  *HashValue\r
   );\r
 \r
   IN OUT  VOID   *Md4Context,\r
   OUT     UINT8  *HashValue\r
   );\r
 \r

-\r

 typedef\r
 BOOLEAN\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL)(\r

   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r


@@ -338,7 +330,7 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI* EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE)(\r
+(EFIAPI *EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r


@@ -358,8 +350,9 @@ UINTN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_MD5_INIT)(\r
-    OUT VOID *Md5Context);\r
+(EFIAPI *EDKII_CRYPTO_MD5_INIT)(\r
+  OUT VOID *Md5Context\r
+  );\r

 \r
 /**\r
   Makes a copy of an existing MD5 context.\r
 \r
 /**\r
   Makes a copy of an existing MD5 context.\r


@@ -378,10 +371,10 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_MD5_DUPLICATE) (\r
-    IN CONST VOID *Md5Context,\r
-    OUT VOID *NewMd5Context);\r
-\r
+(EFIAPI *EDKII_CRYPTO_MD5_DUPLICATE)(\r
+  IN CONST VOID *Md5Context,\r
+  OUT VOID *NewMd5Context\r
+  );\r

 \r
 /**\r
   Digests the input data and updates MD5 context.\r
 \r
 /**\r
   Digests the input data and updates MD5 context.\r


@@ -405,11 +398,11 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_MD5_UPDATE)(\r
-    IN OUT VOID *Md5Context,\r
-    IN CONST VOID *Data,\r
-    IN UINTN DataSize);\r
-\r
+(EFIAPI *EDKII_CRYPTO_MD5_UPDATE)(\r
+  IN OUT VOID *Md5Context,\r
+  IN CONST VOID *Data,\r
+  IN UINTN DataSize\r
+  );\r

 \r
 /**\r
   Completes computation of the MD5 digest value.\r
 \r
 /**\r
   Completes computation of the MD5 digest value.\r


@@ -435,10 +428,10 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_MD5_FINAL)(\r
-    IN OUT VOID *Md5Context,\r
-    OUT UINT8 *HashValue);\r
-\r
+(EFIAPI *EDKII_CRYPTO_MD5_FINAL)(\r
+  IN OUT VOID *Md5Context,\r
+  OUT UINT8 *HashValue\r
+  );\r

 \r
 /**\r
   Computes the MD5 message digest of a input data buffer.\r
 \r
 /**\r
   Computes the MD5 message digest of a input data buffer.\r


@@ -460,16 +453,15 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_MD5_HASH_ALL)(\r
-    IN CONST VOID *Data,\r
-    IN UINTN DataSize,\r
-    OUT UINT8 *HashValue);\r
-\r
+(EFIAPI *EDKII_CRYPTO_MD5_HASH_ALL)(\r
+  IN CONST VOID *Data,\r
+  IN UINTN DataSize,\r
+  OUT UINT8 *HashValue\r
+  );\r

 \r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    PKCS\r
 //    PKCS\r

-//=====================================================================================\r
-\r
+// =====================================================================================\r

 \r
 /**\r
   Encrypts a blob using PKCS1v2 (RSAES-OAEP) schema. On success, will return the encrypted message in\r
 \r
 /**\r
   Encrypts a blob using PKCS1v2 (RSAES-OAEP) schema. On success, will return the encrypted message in\r


@@ -497,19 +489,16 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_PKCS1_ENCRYPT_V2) (\r
-IN   CONST UINT8                   *PublicKey,\r
-IN   UINTN                          PublicKeySize,\r
-IN   UINT8                         *InData,\r
-IN   UINTN                          InDataSize,\r
-IN   CONST UINT8                   *PrngSeed OPTIONAL,\r
-IN   UINTN                          PrngSeedSize OPTIONAL,\r
-OUT  UINT8                        **EncryptedData,\r
-OUT  UINTN                         *EncryptedDataSize\r
-);\r
-\r
-\r
-\r
+(EFIAPI *EDKII_CRYPTO_PKCS1_ENCRYPT_V2)(\r
+  IN   CONST UINT8                   *PublicKey,\r
+  IN   UINTN                          PublicKeySize,\r
+  IN   UINT8                         *InData,\r
+  IN   UINTN                          InDataSize,\r
+  IN   CONST UINT8                   *PrngSeed OPTIONAL,\r
+  IN   UINTN                          PrngSeedSize OPTIONAL,\r
+  OUT  UINT8                        **EncryptedData,\r
+  OUT  UINTN                         *EncryptedDataSize\r
+  );\r

 \r
 // ---------------------------------------------\r
 // PKCS5\r
 \r
 // ---------------------------------------------\r
 // PKCS5\r


@@ -543,7 +532,7 @@ OUT  UINTN                         *EncryptedDataSize
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_PKCS5_PW_HASH) (\r
+(EFIAPI *EDKII_CRYPTO_PKCS5_PW_HASH)(\r

   IN UINTN                      PasswordSize,\r
   IN CONST  CHAR8              *Password,\r
   IN UINTN                      SaltSize,\r
   IN UINTN                      PasswordSize,\r
   IN CONST  CHAR8              *Password,\r
   IN UINTN                      SaltSize,\r


@@ -554,8 +543,6 @@ BOOLEAN
   OUT UINT8                    *Output\r
   );\r
 \r
   OUT UINT8                    *Output\r
   );\r
 \r

-\r
-\r

 // ---------------------------------------------\r
 // PKCS7\r
 \r
 // ---------------------------------------------\r
 // PKCS7\r
 \r


@@ -583,14 +570,14 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_PKCS7_VERIFY) (\r
-IN  CONST UINT8                   *P7Data,\r
-IN  UINTN                          P7DataLength,\r
-IN  CONST UINT8                   *TrustedCert,\r
-IN  UINTN                          TrustedCertLength,\r
-IN  CONST UINT8                   *Data,\r
-IN  UINTN                          DataLength\r
-);\r
+(EFIAPI *EDKII_CRYPTO_PKCS7_VERIFY)(\r
+  IN  CONST UINT8                   *P7Data,\r
+  IN  UINTN                          P7DataLength,\r
+  IN  CONST UINT8                   *TrustedCert,\r
+  IN  UINTN                          TrustedCertLength,\r
+  IN  CONST UINT8                   *Data,\r
+  IN  UINTN                          DataLength\r
+  );\r

 \r
 /**\r
   VerifyEKUsInPkcs7Signature()\r
 \r
 /**\r
   VerifyEKUsInPkcs7Signature()\r


@@ -633,13 +620,13 @@ IN  UINTN                          DataLength
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EDKII_CRYPTO_PKCS7_VERIFY_EKU) (\r
-IN CONST UINT8                *Pkcs7Signature,\r
-IN CONST UINT32                SignatureSize,\r
-IN CONST CHAR8                *RequiredEKUs[],\r
-IN CONST UINT32                RequiredEKUsSize,\r
-IN BOOLEAN                     RequireAllPresent\r
-);\r
+(EFIAPI *EDKII_CRYPTO_PKCS7_VERIFY_EKU)(\r
+  IN CONST UINT8                *Pkcs7Signature,\r
+  IN CONST UINT32                SignatureSize,\r
+  IN CONST CHAR8                *RequiredEKUs[],\r
+  IN CONST UINT32                RequiredEKUsSize,\r
+  IN BOOLEAN                     RequireAllPresent\r
+  );\r

 \r
 /**\r
   Get the signer's certificates from PKCS#7 signed data as described in "PKCS #7:\r
 \r
 /**\r
   Get the signer's certificates from PKCS#7 signed data as described in "PKCS #7:\r


@@ -669,7 +656,7 @@ IN BOOLEAN                     RequireAllPresent
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_PKCS7_GET_SIGNERS) (\r
+(EFIAPI *EDKII_CRYPTO_PKCS7_GET_SIGNERS)(\r

   IN  CONST UINT8  *P7Data,\r
   IN  UINTN        P7Length,\r
   OUT UINT8        **CertStack,\r
   IN  CONST UINT8  *P7Data,\r
   IN  UINTN        P7Length,\r
   OUT UINT8        **CertStack,\r


@@ -688,7 +675,7 @@ BOOLEAN
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI *EDKII_CRYPTO_PKCS7_FREE_SIGNERS) (\r
+(EFIAPI *EDKII_CRYPTO_PKCS7_FREE_SIGNERS)(\r

   IN  UINT8        *Certs\r
   );\r
 \r
   IN  UINT8        *Certs\r
   );\r
 \r


@@ -721,7 +708,7 @@ VOID
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_PKCS7_SIGN) (\r
+(EFIAPI *EDKII_CRYPTO_PKCS7_SIGN)(\r

   IN   CONST UINT8  *PrivateKey,\r
   IN   UINTN        PrivateKeySize,\r
   IN   CONST UINT8  *KeyPassword,\r
   IN   CONST UINT8  *PrivateKey,\r
   IN   UINTN        PrivateKeySize,\r
   IN   CONST UINT8  *KeyPassword,\r


@@ -756,7 +743,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT) (\r
+(EFIAPI *EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT)(\r

   IN  CONST UINT8  *P7Data,\r
   IN  UINTN        P7Length,\r
   OUT VOID         **Content,\r
   IN  CONST UINT8  *P7Data,\r
   IN  UINTN        P7Length,\r
   OUT VOID         **Content,\r


@@ -787,7 +774,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST) (\r
+(EFIAPI *EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST)(\r

   IN  CONST UINT8  *P7Data,\r
   IN  UINTN        P7Length,\r
   OUT UINT8        **SignerChainCerts,\r
   IN  CONST UINT8  *P7Data,\r
   IN  UINTN        P7Length,\r
   OUT UINT8        **SignerChainCerts,\r


@@ -822,7 +809,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_AUTHENTICODE_VERIFY) (\r
+(EFIAPI *EDKII_CRYPTO_AUTHENTICODE_VERIFY)(\r

   IN  CONST UINT8  *AuthData,\r
   IN  UINTN        DataSize,\r
   IN  CONST UINT8  *TrustedCert,\r
   IN  CONST UINT8  *AuthData,\r
   IN  UINTN        DataSize,\r
   IN  CONST UINT8  *TrustedCert,\r


@@ -853,7 +840,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY) (\r
+(EFIAPI *EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY)(\r

   IN  CONST UINT8  *AuthData,\r
   IN  UINTN        DataSize,\r
   IN  CONST UINT8  *TsaCert,\r
   IN  CONST UINT8  *AuthData,\r
   IN  UINTN        DataSize,\r
   IN  CONST UINT8  *TsaCert,\r


@@ -861,10 +848,9 @@ BOOLEAN
   OUT EFI_TIME     *SigningTime\r
   );\r
 \r
   OUT EFI_TIME     *SigningTime\r
   );\r
 \r

-\r
-//=====================================================================================\r
+// =====================================================================================\r

 //    DH Key Exchange Primitive\r
 //    DH Key Exchange Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Allocates and Initializes one Diffie-Hellman Context for subsequent use.\r
 \r
 /**\r
   Allocates and Initializes one Diffie-Hellman Context for subsequent use.\r


@@ -875,8 +861,8 @@ BOOLEAN
 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r

-VOID*\r
-(EFIAPI *EDKII_CRYPTO_DH_NEW) (\r
+VOID *\r
+(EFIAPI *EDKII_CRYPTO_DH_NEW)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r


@@ -890,7 +876,7 @@ VOID*
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI *EDKII_CRYPTO_DH_FREE) (\r
+(EFIAPI *EDKII_CRYPTO_DH_FREE)(\r

   IN  VOID  *DhContext\r
   );\r
 \r
   IN  VOID  *DhContext\r
   );\r
 \r


@@ -920,7 +906,7 @@ VOID
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_DH_GENERATE_PARAMETER) (\r
+(EFIAPI *EDKII_CRYPTO_DH_GENERATE_PARAMETER)(\r

   IN OUT  VOID   *DhContext,\r
   IN      UINTN  Generator,\r
   IN      UINTN  PrimeLength,\r
   IN OUT  VOID   *DhContext,\r
   IN      UINTN  Generator,\r
   IN      UINTN  PrimeLength,\r


@@ -952,7 +938,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_DH_SET_PARAMETER) (\r
+(EFIAPI *EDKII_CRYPTO_DH_SET_PARAMETER)(\r

   IN OUT  VOID         *DhContext,\r
   IN      UINTN        Generator,\r
   IN      UINTN        PrimeLength,\r
   IN OUT  VOID         *DhContext,\r
   IN      UINTN        Generator,\r
   IN      UINTN        PrimeLength,\r


@@ -985,7 +971,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_DH_GENERATE_KEY) (\r
+(EFIAPI *EDKII_CRYPTO_DH_GENERATE_KEY)(\r

   IN OUT  VOID   *DhContext,\r
   OUT     UINT8  *PublicKey,\r
   IN OUT  UINTN  *PublicKeySize\r
   IN OUT  VOID   *DhContext,\r
   OUT     UINT8  *PublicKey,\r
   IN OUT  UINTN  *PublicKeySize\r


@@ -1019,7 +1005,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_DH_COMPUTE_KEY) (\r
+(EFIAPI *EDKII_CRYPTO_DH_COMPUTE_KEY)(\r

   IN OUT  VOID         *DhContext,\r
   IN      CONST UINT8  *PeerPublicKey,\r
   IN      UINTN        PeerPublicKeySize,\r
   IN OUT  VOID         *DhContext,\r
   IN      CONST UINT8  *PeerPublicKey,\r
   IN      UINTN        PeerPublicKeySize,\r


@@ -1027,9 +1013,9 @@ BOOLEAN
   IN OUT  UINTN        *KeySize\r
   );\r
 \r
   IN OUT  UINTN        *KeySize\r
   );\r
 \r

-//=====================================================================================\r
+// =====================================================================================\r

 //    Pseudo-Random Generation Primitive\r
 //    Pseudo-Random Generation Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r
 \r
 /**\r
   Sets up the seed value for the pseudorandom number generator.\r


@@ -1051,7 +1037,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RANDOM_SEED) (\r
+(EFIAPI *EDKII_CRYPTO_RANDOM_SEED)(\r

   IN  CONST  UINT8  *Seed  OPTIONAL,\r
   IN  UINTN         SeedSize\r
   );\r
   IN  CONST  UINT8  *Seed  OPTIONAL,\r
   IN  UINTN         SeedSize\r
   );\r


@@ -1072,7 +1058,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RANDOM_BYTES) (\r
+(EFIAPI *EDKII_CRYPTO_RANDOM_BYTES)(\r

   OUT  UINT8  *Output,\r
   IN   UINTN  Size\r
   );\r
   OUT  UINT8  *Output,\r
   IN   UINTN  Size\r
   );\r


@@ -1098,7 +1084,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RSA_VERIFY_PKCS1) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_VERIFY_PKCS1)(\r

   IN  VOID                         *RsaContext,\r
   IN  CONST UINT8                  *MessageHash,\r
   IN  UINTN                         HashSize,\r
   IN  VOID                         *RsaContext,\r
   IN  CONST UINT8                  *MessageHash,\r
   IN  UINTN                         HashSize,\r


@@ -1114,8 +1100,8 @@ BOOLEAN
 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r

-VOID*\r
-(EFIAPI *EDKII_CRYPTO_RSA_NEW) (\r
+VOID *\r
+(EFIAPI *EDKII_CRYPTO_RSA_NEW)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r


@@ -1129,7 +1115,7 @@ VOID*
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI *EDKII_CRYPTO_RSA_FREE) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_FREE)(\r

   IN  VOID  *RsaContext\r
   );\r
 \r
   IN  VOID  *RsaContext\r
   );\r
 \r


@@ -1157,7 +1143,7 @@ VOID
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RSA_SET_KEY) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_SET_KEY)(\r

   IN OUT  VOID         *RsaContext,\r
   IN      RSA_KEY_TAG  KeyTag,\r
   IN      CONST UINT8  *BigNumber,\r
   IN OUT  VOID         *RsaContext,\r
   IN      RSA_KEY_TAG  KeyTag,\r
   IN      CONST UINT8  *BigNumber,\r


@@ -1194,7 +1180,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RSA_GET_KEY) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_GET_KEY)(\r

   IN OUT  VOID         *RsaContext,\r
   IN      RSA_KEY_TAG  KeyTag,\r
   OUT     UINT8        *BigNumber,\r
   IN OUT  VOID         *RsaContext,\r
   IN      RSA_KEY_TAG  KeyTag,\r
   OUT     UINT8        *BigNumber,\r


@@ -1226,7 +1212,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RSA_GENERATE_KEY) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_GENERATE_KEY)(\r

   IN OUT  VOID         *RsaContext,\r
   IN      UINTN        ModulusLength,\r
   IN      CONST UINT8  *PublicExponent,\r
   IN OUT  VOID         *RsaContext,\r
   IN      UINTN        ModulusLength,\r
   IN      CONST UINT8  *PublicExponent,\r


@@ -1256,7 +1242,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RSA_CHECK_KEY) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_CHECK_KEY)(\r

   IN  VOID  *RsaContext\r
   );\r
 \r
   IN  VOID  *RsaContext\r
   );\r
 \r


@@ -1289,7 +1275,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RSA_PKCS1_SIGN) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_PKCS1_SIGN)(\r

   IN      VOID         *RsaContext,\r
   IN      CONST UINT8  *MessageHash,\r
   IN      UINTN        HashSize,\r
   IN      VOID         *RsaContext,\r
   IN      CONST UINT8  *MessageHash,\r
   IN      UINTN        HashSize,\r


@@ -1318,7 +1304,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RSA_PKCS1_VERIFY) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_PKCS1_VERIFY)(\r

   IN  VOID         *RsaContext,\r
   IN  CONST UINT8  *MessageHash,\r
   IN  UINTN        HashSize,\r
   IN  VOID         *RsaContext,\r
   IN  CONST UINT8  *MessageHash,\r
   IN  UINTN        HashSize,\r


@@ -1347,7 +1333,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM)(\r

   IN   CONST UINT8  *PemData,\r
   IN   UINTN        PemSize,\r
   IN   CONST CHAR8  *Password,\r
   IN   CONST UINT8  *PemData,\r
   IN   UINTN        PemSize,\r
   IN   CONST CHAR8  *Password,\r


@@ -1374,15 +1360,15 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509) (\r
+(EFIAPI *EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509)(\r

   IN   CONST UINT8  *Cert,\r
   IN   UINTN        CertSize,\r
   OUT  VOID         **RsaContext\r
   );\r
 \r
   IN   CONST UINT8  *Cert,\r
   IN   UINTN        CertSize,\r
   OUT  VOID         **RsaContext\r
   );\r
 \r

-//----------------------------------------\r
+// ----------------------------------------\r

 // SHA\r
 // SHA\r

-//----------------------------------------\r
+// ----------------------------------------\r

 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations.\r


@@ -1395,7 +1381,7 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI *EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r


@@ -1415,7 +1401,7 @@ UINTN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA1_INIT ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA1_INIT)(\r

   OUT  VOID  *Sha1Context\r
   );\r
 \r
   OUT  VOID  *Sha1Context\r
   );\r
 \r


@@ -1436,7 +1422,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA1_DUPLICATE ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA1_DUPLICATE)(\r

   IN   CONST VOID  *Sha1Context,\r
   OUT  VOID        *NewSha1Context\r
   );\r
   IN   CONST VOID  *Sha1Context,\r
   OUT  VOID        *NewSha1Context\r
   );\r


@@ -1463,7 +1449,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA1_UPDATE ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA1_UPDATE)(\r

   IN OUT  VOID        *Sha1Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   IN OUT  VOID        *Sha1Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r


@@ -1493,7 +1479,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA1_FINAL ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA1_FINAL)(\r

   IN OUT  VOID   *Sha1Context,\r
   OUT     UINT8  *HashValue\r
   );\r
   IN OUT  VOID   *Sha1Context,\r
   OUT     UINT8  *HashValue\r
   );\r


@@ -1518,7 +1504,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA1_HASH_ALL ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA1_HASH_ALL)(\r

   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r


@@ -1532,9 +1518,9 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI *EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE)(\r

   VOID\r
   VOID\r

-);\r
+  );\r

 \r
 /**\r
   Initializes user-supplied memory pointed by Sha256Context as SHA-256 hash context for\r
 \r
 /**\r
   Initializes user-supplied memory pointed by Sha256Context as SHA-256 hash context for\r


@@ -1550,7 +1536,7 @@ UINTN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA256_INIT ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA256_INIT)(\r

   OUT  VOID  *Sha256Context\r
   );\r
 \r
   OUT  VOID  *Sha256Context\r
   );\r
 \r


@@ -1571,7 +1557,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA256_DUPLICATE ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA256_DUPLICATE)(\r

   IN   CONST VOID  *Sha256Context,\r
   OUT  VOID        *NewSha256Context\r
   );\r
   IN   CONST VOID  *Sha256Context,\r
   OUT  VOID        *NewSha256Context\r
   );\r


@@ -1596,7 +1582,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA256_UPDATE ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA256_UPDATE)(\r

   IN OUT  VOID        *Sha256Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   IN OUT  VOID        *Sha256Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r


@@ -1624,7 +1610,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA256_FINAL ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA256_FINAL)(\r

   IN OUT  VOID   *Sha256Context,\r
   OUT     UINT8  *HashValue\r
   );\r
   IN OUT  VOID   *Sha256Context,\r
   OUT     UINT8  *HashValue\r
   );\r


@@ -1649,13 +1635,12 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA256_HASH_ALL ) (\r
+(EFIAPI *EDKII_CRYPTO_SHA256_HASH_ALL)(\r

   IN   CONST VOID                  *Data,\r
   IN   UINTN                       DataSize,\r
   OUT  UINT8                       *HashValue\r
   );\r
 \r
   IN   CONST VOID                  *Data,\r
   IN   UINTN                       DataSize,\r
   OUT  UINT8                       *HashValue\r
   );\r
 \r

-\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-384 hash operations.\r
   If this interface is not supported, then return zero.\r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SHA-384 hash operations.\r
   If this interface is not supported, then return zero.\r


@@ -1666,11 +1651,10 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI *EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE) (\r
+(EFIAPI *EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r

-\r

 /**\r
   Initializes user-supplied memory pointed by Sha384Context as SHA-384 hash context for\r
   subsequent use.\r
 /**\r
   Initializes user-supplied memory pointed by Sha384Context as SHA-384 hash context for\r
   subsequent use.\r


@@ -1685,11 +1669,10 @@ UINTN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA384_INIT) (\r
+(EFIAPI *EDKII_CRYPTO_SHA384_INIT)(\r

   OUT  VOID  *Sha384Context\r
   );\r
 \r
   OUT  VOID  *Sha384Context\r
   );\r
 \r

-\r

 /**\r
   Makes a copy of an existing SHA-384 context.\r
 \r
 /**\r
   Makes a copy of an existing SHA-384 context.\r
 \r


@@ -1707,12 +1690,11 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA384_DUPLICATE) (\r
+(EFIAPI *EDKII_CRYPTO_SHA384_DUPLICATE)(\r

   IN   CONST VOID  *Sha384Context,\r
   OUT  VOID        *NewSha384Context\r
   );\r
 \r
   IN   CONST VOID  *Sha384Context,\r
   OUT  VOID        *NewSha384Context\r
   );\r
 \r

-\r

 /**\r
   Digests the input data and updates SHA-384 context.\r
 \r
 /**\r
   Digests the input data and updates SHA-384 context.\r
 \r


@@ -1733,13 +1715,12 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA384_UPDATE) (\r
+(EFIAPI *EDKII_CRYPTO_SHA384_UPDATE)(\r

   IN OUT  VOID        *Sha384Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   );\r
 \r
   IN OUT  VOID        *Sha384Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   );\r
 \r

-\r

 /**\r
   Completes computation of the SHA-384 digest value.\r
 \r
 /**\r
   Completes computation of the SHA-384 digest value.\r
 \r


@@ -1762,12 +1743,11 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA384_FINAL) (\r
+(EFIAPI *EDKII_CRYPTO_SHA384_FINAL)(\r

   IN OUT  VOID   *Sha384Context,\r
   OUT     UINT8  *HashValue\r
   );\r
 \r
   IN OUT  VOID   *Sha384Context,\r
   OUT     UINT8  *HashValue\r
   );\r
 \r

-\r

 /**\r
   Computes the SHA-384 message digest of a input data buffer.\r
 \r
 /**\r
   Computes the SHA-384 message digest of a input data buffer.\r
 \r


@@ -1788,7 +1768,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA384_HASH_ALL) (\r
+(EFIAPI *EDKII_CRYPTO_SHA384_HASH_ALL)(\r

   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r


@@ -1802,11 +1782,10 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI *EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE) (\r
+(EFIAPI *EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r

-\r

 /**\r
   Initializes user-supplied memory pointed by Sha512Context as SHA-512 hash context for\r
   subsequent use.\r
 /**\r
   Initializes user-supplied memory pointed by Sha512Context as SHA-512 hash context for\r
   subsequent use.\r


@@ -1821,11 +1800,10 @@ UINTN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA512_INIT) (\r
+(EFIAPI *EDKII_CRYPTO_SHA512_INIT)(\r

   OUT  VOID  *Sha512Context\r
   );\r
 \r
   OUT  VOID  *Sha512Context\r
   );\r
 \r

-\r

 /**\r
   Makes a copy of an existing SHA-512 context.\r
 \r
 /**\r
   Makes a copy of an existing SHA-512 context.\r
 \r


@@ -1843,7 +1821,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA512_DUPLICATE) (\r
+(EFIAPI *EDKII_CRYPTO_SHA512_DUPLICATE)(\r

   IN   CONST VOID  *Sha512Context,\r
   OUT  VOID        *NewSha512Context\r
   );\r
   IN   CONST VOID  *Sha512Context,\r
   OUT  VOID        *NewSha512Context\r
   );\r


@@ -1868,13 +1846,12 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA512_UPDATE) (\r
+(EFIAPI *EDKII_CRYPTO_SHA512_UPDATE)(\r

   IN OUT  VOID        *Sha512Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   );\r
 \r
   IN OUT  VOID        *Sha512Context,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   );\r
 \r

-\r

 /**\r
   Completes computation of the SHA-512 digest value.\r
 \r
 /**\r
   Completes computation of the SHA-512 digest value.\r
 \r


@@ -1897,7 +1874,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA512_FINAL) (\r
+(EFIAPI *EDKII_CRYPTO_SHA512_FINAL)(\r

   IN OUT  VOID   *Sha512Context,\r
   OUT     UINT8  *HashValue\r
   );\r
   IN OUT  VOID   *Sha512Context,\r
   OUT     UINT8  *HashValue\r
   );\r


@@ -1922,15 +1899,15 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_SHA512_HASH_ALL) (\r
+(EFIAPI *EDKII_CRYPTO_SHA512_HASH_ALL)(\r

   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   );\r
 \r
   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   );\r
 \r

-//----------------------------------------------------------------------------\r
+// ----------------------------------------------------------------------------\r

 // X509\r
 // X509\r

-//----------------------------------------------------------------------------\r
+// ----------------------------------------------------------------------------\r

 \r
 /**\r
   Retrieve the subject bytes from one X.509 certificate.\r
 \r
 /**\r
   Retrieve the subject bytes from one X.509 certificate.\r


@@ -1953,7 +1930,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_X509_GET_SUBJECT_NAME) (\r
+(EFIAPI *EDKII_CRYPTO_X509_GET_SUBJECT_NAME)(\r

   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
   OUT     UINT8        *CertSubject,\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
   OUT     UINT8        *CertSubject,\r


@@ -1988,7 +1965,7 @@ BOOLEAN
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EDKII_CRYPTO_X509_GET_COMMON_NAME) (\r
+(EFIAPI *EDKII_CRYPTO_X509_GET_COMMON_NAME)(\r

   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
   OUT     CHAR8        *CommonName   OPTIONAL,\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
   OUT     CHAR8        *CommonName   OPTIONAL,\r


@@ -2023,7 +2000,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME) (\r
+(EFIAPI *EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME)(\r

   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
   OUT     CHAR8        *NameBuffer   OPTIONAL,\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
   OUT     CHAR8        *NameBuffer   OPTIONAL,\r


@@ -2050,7 +2027,7 @@ EFI_STATUS
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_X509_VERIFY_CERT) (\r
+(EFIAPI *EDKII_CRYPTO_X509_VERIFY_CERT)(\r

   IN  CONST UINT8  *Cert,\r
   IN  UINTN        CertSize,\r
   IN  CONST UINT8  *CACert,\r
   IN  CONST UINT8  *Cert,\r
   IN  UINTN        CertSize,\r
   IN  CONST UINT8  *CACert,\r


@@ -2075,7 +2052,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE) (\r
+(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE)(\r

   IN   CONST UINT8  *Cert,\r
   IN   UINTN        CertSize,\r
   OUT  UINT8        **SingleX509Cert\r
   IN   CONST UINT8  *Cert,\r
   IN   UINTN        CertSize,\r
   OUT  UINT8        **SingleX509Cert\r


@@ -2101,7 +2078,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK) (\r
+(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK)(\r

   IN OUT  UINT8  **X509Stack,\r
   ...\r
   );\r
   IN OUT  UINT8  **X509Stack,\r
   ...\r
   );\r


@@ -2127,7 +2104,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V) (\r
+(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V)(\r

   IN OUT  UINT8    **X509Stack,\r
   IN      VA_LIST  Args\r
   );\r
   IN OUT  UINT8    **X509Stack,\r
   IN      VA_LIST  Args\r
   );\r


@@ -2142,7 +2119,7 @@ BOOLEAN
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI *EDKII_CRYPTO_X509_FREE) (\r
+(EFIAPI *EDKII_CRYPTO_X509_FREE)(\r

   IN  VOID  *X509Cert\r
   );\r
 \r
   IN  VOID  *X509Cert\r
   );\r
 \r


@@ -2156,7 +2133,7 @@ VOID
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI *EDKII_CRYPTO_X509_STACK_FREE) (\r
+(EFIAPI *EDKII_CRYPTO_X509_STACK_FREE)(\r

   IN  VOID  *X509Stack\r
   );\r
 \r
   IN  VOID  *X509Stack\r
   );\r
 \r


@@ -2179,18 +2156,16 @@ VOID
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_X509_GET_TBS_CERT) (\r
+(EFIAPI *EDKII_CRYPTO_X509_GET_TBS_CERT)(\r

   IN  CONST UINT8  *Cert,\r
   IN  UINTN        CertSize,\r
   OUT UINT8        **TBSCert,\r
   OUT UINTN        *TBSCertSize\r
   );\r
 \r
   IN  CONST UINT8  *Cert,\r
   IN  UINTN        CertSize,\r
   OUT UINT8        **TBSCert,\r
   OUT UINTN        *TBSCertSize\r
   );\r
 \r

-\r
-\r
-//=====================================================================================\r
+// =====================================================================================\r

 //    Symmetric Cryptography Primitive\r
 //    Symmetric Cryptography Primitive\r

-//=====================================================================================\r
+// =====================================================================================\r

 \r
 /**\r
   TDES is deprecated and unsupported any longer.\r
 \r
 /**\r
   TDES is deprecated and unsupported any longer.\r


@@ -2199,13 +2174,13 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_INIT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_INIT)(\r

   OUT  VOID         *TdesContext,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeyLength\r
   OUT  VOID         *TdesContext,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeyLength\r


@@ -2213,7 +2188,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT)(\r

   IN   VOID         *TdesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *TdesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -2222,7 +2197,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT)(\r

   IN   VOID         *TdesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *TdesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -2231,7 +2206,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT)(\r

   IN   VOID         *TdesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *TdesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -2241,7 +2216,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT)(\r

   IN   VOID         *TdesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *TdesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -2260,7 +2235,7 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI *EDKII_CRYPTO_AES_GET_CONTEXT_SIZE) (\r
+(EFIAPI *EDKII_CRYPTO_AES_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r


@@ -2288,7 +2263,7 @@ UINTN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_AES_INIT) (\r
+(EFIAPI *EDKII_CRYPTO_AES_INIT)(\r

   OUT  VOID         *AesContext,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeyLength\r
   OUT  VOID         *AesContext,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeyLength\r


@@ -2301,7 +2276,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT)(\r

   IN   VOID         *AesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *AesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -2310,7 +2285,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT)(\r

   IN   VOID         *AesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *AesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -2348,7 +2323,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_AES_CBC_ENCRYPT) (\r
+(EFIAPI *EDKII_CRYPTO_AES_CBC_ENCRYPT)(\r

   IN   VOID         *AesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *AesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -2387,7 +2362,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EDKII_CRYPTO_AES_CBC_DECRYPT) (\r
+(EFIAPI *EDKII_CRYPTO_AES_CBC_DECRYPT)(\r

   IN   VOID         *AesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *AesContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -2402,13 +2377,13 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_INIT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_INIT)(\r

   OUT  VOID         *Arc4Context,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize\r
   OUT  VOID         *Arc4Context,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize\r


@@ -2416,7 +2391,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT)(\r

   IN OUT  VOID         *Arc4Context,\r
   IN      CONST UINT8  *Input,\r
   IN      UINTN        InputSize,\r
   IN OUT  VOID         *Arc4Context,\r
   IN      CONST UINT8  *Input,\r
   IN      UINTN        InputSize,\r


@@ -2425,7 +2400,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT)(\r

   IN OUT  VOID   *Arc4Context,\r
   IN      UINT8  *Input,\r
   IN      UINTN  InputSize,\r
   IN OUT  VOID   *Arc4Context,\r
   IN      UINT8  *Input,\r
   IN      UINTN  InputSize,\r


@@ -2434,11 +2409,10 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_RESET) (\r
+(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_RESET)(\r

   IN OUT  VOID  *Arc4Context\r
   );\r
 \r
   IN OUT  VOID  *Arc4Context\r
   );\r
 \r

-\r

 /**\r
   Retrieves the size, in bytes, of the context buffer required for SM3 hash operations.\r
 \r
 /**\r
   Retrieves the size, in bytes, of the context buffer required for SM3 hash operations.\r
 \r


@@ -2450,7 +2424,7 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
 **/\r
 typedef\r
 UINTN\r

-(EFIAPI* EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE)(\r
+(EFIAPI *EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r


@@ -2470,8 +2444,9 @@ UINTN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_SM3_INIT)(\r
-    OUT VOID *Sm3Context);\r
+(EFIAPI *EDKII_CRYPTO_SM3_INIT)(\r
+  OUT VOID *Sm3Context\r
+  );\r

 \r
 /**\r
   Makes a copy of an existing SM3 context.\r
 \r
 /**\r
   Makes a copy of an existing SM3 context.\r


@@ -2490,10 +2465,10 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_SM3_DUPLICATE) (\r
-    IN CONST VOID *Sm3Context,\r
-    OUT VOID *NewSm3Context);\r
-\r
+(EFIAPI *EDKII_CRYPTO_SM3_DUPLICATE)(\r
+  IN CONST VOID *Sm3Context,\r
+  OUT VOID *NewSm3Context\r
+  );\r

 \r
 /**\r
   Digests the input data and updates SM3 context.\r
 \r
 /**\r
   Digests the input data and updates SM3 context.\r


@@ -2517,11 +2492,11 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_SM3_UPDATE)(\r
-    IN OUT VOID *Sm3Context,\r
-    IN CONST VOID *Data,\r
-    IN UINTN DataSize);\r
-\r
+(EFIAPI *EDKII_CRYPTO_SM3_UPDATE)(\r
+  IN OUT VOID *Sm3Context,\r
+  IN CONST VOID *Data,\r
+  IN UINTN DataSize\r
+  );\r

 \r
 /**\r
   Completes computation of the SM3 digest value.\r
 \r
 /**\r
   Completes computation of the SM3 digest value.\r


@@ -2547,10 +2522,10 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_SM3_FINAL)(\r
-    IN OUT VOID *Sm3Context,\r
-    OUT UINT8 *HashValue);\r
-\r
+(EFIAPI *EDKII_CRYPTO_SM3_FINAL)(\r
+  IN OUT VOID *Sm3Context,\r
+  OUT UINT8 *HashValue\r
+  );\r

 \r
 /**\r
   Computes the SM3 message digest of a input data buffer.\r
 \r
 /**\r
   Computes the SM3 message digest of a input data buffer.\r


@@ -2572,11 +2547,11 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_SM3_HASH_ALL)(\r
-    IN CONST VOID *Data,\r
-    IN UINTN DataSize,\r
-    OUT UINT8 *HashValue);\r
-\r
+(EFIAPI *EDKII_CRYPTO_SM3_HASH_ALL)(\r
+  IN CONST VOID *Data,\r
+  IN UINTN DataSize,\r
+  OUT UINT8 *HashValue\r
+  );\r

 \r
 /**\r
   Derive key data using HMAC-SHA256 based KDF.\r
 \r
 /**\r
   Derive key data using HMAC-SHA256 based KDF.\r


@@ -2596,7 +2571,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND)(\r
+(EFIAPI *EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND)(\r

   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize,\r
   IN   CONST UINT8  *Salt,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize,\r
   IN   CONST UINT8  *Salt,\r


@@ -2620,7 +2595,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_TLS_INITIALIZE)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_INITIALIZE)(\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r


@@ -2632,7 +2607,7 @@ BOOLEAN
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI* EDKII_CRYPTO_TLS_CTX_FREE)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_CTX_FREE)(\r

   IN   VOID                  *TlsCtx\r
   );\r
 \r
   IN   VOID                  *TlsCtx\r
   );\r
 \r


@@ -2649,7 +2624,7 @@ VOID
 **/\r
 typedef\r
 VOID *\r
 **/\r
 typedef\r
 VOID *\r

-(EFIAPI* EDKII_CRYPTO_TLS_CTX_NEW)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_CTX_NEW)(\r

   IN     UINT8                    MajorVer,\r
   IN     UINT8                    MinorVer\r
   );\r
   IN     UINT8                    MajorVer,\r
   IN     UINT8                    MinorVer\r
   );\r


@@ -2665,7 +2640,7 @@ VOID *
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI* EDKII_CRYPTO_TLS_FREE)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_FREE)(\r

   IN     VOID                     *Tls\r
   );\r
 \r
   IN     VOID                     *Tls\r
   );\r
 \r


@@ -2684,7 +2659,7 @@ VOID
 **/\r
 typedef\r
 VOID *\r
 **/\r
 typedef\r
 VOID *\r

-(EFIAPI* EDKII_CRYPTO_TLS_NEW)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_NEW)(\r

   IN     VOID                     *TlsCtx\r
   );\r
 \r
   IN     VOID                     *TlsCtx\r
   );\r
 \r


@@ -2701,7 +2676,7 @@ VOID *
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_TLS_IN_HANDSHAKE)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_IN_HANDSHAKE)(\r

   IN     VOID                     *Tls\r
   );\r
 \r
   IN     VOID                     *Tls\r
   );\r
 \r


@@ -2733,11 +2708,11 @@ BOOLEAN
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_DO_HANDSHAKE)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_DO_HANDSHAKE)(\r

   IN     VOID                     *Tls,\r
   IN     UINT8                    *BufferIn  OPTIONAL,\r
   IN     UINTN                    BufferInSize  OPTIONAL,\r
   IN     VOID                     *Tls,\r
   IN     UINT8                    *BufferIn  OPTIONAL,\r
   IN     UINTN                    BufferInSize  OPTIONAL,\r

-     OUT UINT8                    *BufferOut  OPTIONAL,\r
+  OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r
   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r


@@ -2768,11 +2743,11 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_HANDLE_ALERT)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_HANDLE_ALERT)(\r

   IN     VOID                     *Tls,\r
   IN     UINT8                    *BufferIn  OPTIONAL,\r
   IN     UINTN                    BufferInSize  OPTIONAL,\r
   IN     VOID                     *Tls,\r
   IN     UINT8                    *BufferIn  OPTIONAL,\r
   IN     UINTN                    BufferInSize  OPTIONAL,\r

-     OUT UINT8                    *BufferOut  OPTIONAL,\r
+  OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r
   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r


@@ -2796,7 +2771,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_CLOSE_NOTIFY)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_CLOSE_NOTIFY)(\r

   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *Buffer,\r
   IN OUT UINTN                    *BufferSize\r
   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *Buffer,\r
   IN OUT UINTN                    *BufferSize\r


@@ -2818,7 +2793,7 @@ EFI_STATUS
 **/\r
 typedef\r
 INTN\r
 **/\r
 typedef\r
 INTN\r

-(EFIAPI* EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT)(\r

   IN     VOID                     *Tls,\r
   IN OUT VOID                     *Buffer,\r
   IN     UINTN                    BufferSize\r
   IN     VOID                     *Tls,\r
   IN OUT VOID                     *Buffer,\r
   IN     UINTN                    BufferSize\r


@@ -2840,7 +2815,7 @@ INTN
 **/\r
 typedef\r
 INTN\r
 **/\r
 typedef\r
 INTN\r

-(EFIAPI* EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN)(\r

   IN     VOID                     *Tls,\r
   IN     VOID                     *Buffer,\r
   IN     UINTN                    BufferSize\r
   IN     VOID                     *Tls,\r
   IN     VOID                     *Buffer,\r
   IN     UINTN                    BufferSize\r


@@ -2863,7 +2838,7 @@ INTN
 **/\r
 typedef\r
 INTN\r
 **/\r
 typedef\r
 INTN\r

-(EFIAPI* EDKII_CRYPTO_TLS_READ)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_READ)(\r

   IN     VOID                     *Tls,\r
   IN OUT VOID                     *Buffer,\r
   IN     UINTN                    BufferSize\r
   IN     VOID                     *Tls,\r
   IN OUT VOID                     *Buffer,\r
   IN     UINTN                    BufferSize\r


@@ -2886,7 +2861,7 @@ INTN
 **/\r
 typedef\r
 INTN\r
 **/\r
 typedef\r
 INTN\r

-(EFIAPI* EDKII_CRYPTO_TLS_WRITE)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_WRITE)(\r

   IN     VOID                     *Tls,\r
   IN     VOID                     *Buffer,\r
   IN     UINTN                    BufferSize\r
   IN     VOID                     *Tls,\r
   IN     VOID                     *Buffer,\r
   IN     UINTN                    BufferSize\r


@@ -2908,7 +2883,7 @@ INTN
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_VERSION)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_VERSION)(\r

   IN     VOID                     *Tls,\r
   IN     UINT8                    MajorVer,\r
   IN     UINT8                    MinorVer\r
   IN     VOID                     *Tls,\r
   IN     UINT8                    MajorVer,\r
   IN     UINT8                    MinorVer\r


@@ -2929,7 +2904,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_CONNECTION_END)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_CONNECTION_END)(\r

   IN     VOID                     *Tls,\r
   IN     BOOLEAN                  IsServer\r
   );\r
   IN     VOID                     *Tls,\r
   IN     BOOLEAN                  IsServer\r
   );\r


@@ -2954,7 +2929,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_CIPHER_LIST)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_CIPHER_LIST)(\r

   IN     VOID                     *Tls,\r
   IN     UINT16                   *CipherId,\r
   IN     UINTN                    CipherNum\r
   IN     VOID                     *Tls,\r
   IN     UINT16                   *CipherId,\r
   IN     UINTN                    CipherNum\r


@@ -2974,7 +2949,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD)(\r

   IN     UINT8                    CompMethod\r
   );\r
 \r
   IN     UINT8                    CompMethod\r
   );\r
 \r


@@ -2989,7 +2964,7 @@ EFI_STATUS
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_VERIFY)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_VERIFY)(\r

   IN     VOID                     *Tls,\r
   IN     UINT32                   VerifyMode\r
   );\r
   IN     VOID                     *Tls,\r
   IN     UINT32                   VerifyMode\r
   );\r


@@ -3008,7 +2983,7 @@ VOID
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_VERIFY_HOST)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_VERIFY_HOST)(\r

   IN     VOID                     *Tls,\r
   IN     UINT32                   Flags,\r
   IN     CHAR8                    *HostName\r
   IN     VOID                     *Tls,\r
   IN     UINT32                   Flags,\r
   IN     CHAR8                    *HostName\r


@@ -3031,7 +3006,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_SESSIONID)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_SESSIONID)(\r

   IN     VOID                     *Tls,\r
   IN     UINT8                    *SessionId,\r
   IN     UINT16                   SessionIdLen\r
   IN     VOID                     *Tls,\r
   IN     UINT8                    *SessionId,\r
   IN     UINT16                   SessionIdLen\r


@@ -3056,7 +3031,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE)(\r

   IN     VOID                     *Tls,\r
   IN     VOID                     *Data,\r
   IN     UINTN                    DataSize\r
   IN     VOID                     *Tls,\r
   IN     VOID                     *Data,\r
   IN     UINTN                    DataSize\r


@@ -3081,7 +3056,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT)(\r

   IN     VOID                     *Tls,\r
   IN     VOID                     *Data,\r
   IN     UINTN                    DataSize\r
   IN     VOID                     *Tls,\r
   IN     VOID                     *Data,\r
   IN     UINTN                    DataSize\r


@@ -3105,7 +3080,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY)(\r

   IN     VOID                     *Tls,\r
   IN     VOID                     *Data,\r
   IN     UINTN                    DataSize\r
   IN     VOID                     *Tls,\r
   IN     VOID                     *Data,\r
   IN     UINTN                    DataSize\r


@@ -3127,7 +3102,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST)(\r

   IN     VOID                     *Data,\r
   IN     UINTN                    DataSize\r
   );\r
   IN     VOID                     *Data,\r
   IN     UINTN                    DataSize\r
   );\r


@@ -3147,7 +3122,7 @@ EFI_STATUS
 **/\r
 typedef\r
 UINT16\r
 **/\r
 typedef\r
 UINT16\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_VERSION)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_VERSION)(\r

   IN     VOID                     *Tls\r
   );\r
 \r
   IN     VOID                     *Tls\r
   );\r
 \r


@@ -3166,7 +3141,7 @@ UINT16
 **/\r
 typedef\r
 UINT8\r
 **/\r
 typedef\r
 UINT8\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_CONNECTION_END)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_CONNECTION_END)(\r

   IN     VOID                     *Tls\r
   );\r
 \r
   IN     VOID                     *Tls\r
   );\r
 \r


@@ -3186,7 +3161,7 @@ UINT8
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER)(\r

   IN     VOID                     *Tls,\r
   IN OUT UINT16                   *CipherId\r
   );\r
   IN     VOID                     *Tls,\r
   IN OUT UINT16                   *CipherId\r
   );\r


@@ -3209,7 +3184,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID)(\r

   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *CompressionId\r
   );\r
   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *CompressionId\r
   );\r


@@ -3229,7 +3204,7 @@ EFI_STATUS
 **/\r
 typedef\r
 UINT32\r
 **/\r
 typedef\r
 UINT32\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_VERIFY)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_VERIFY)(\r

   IN     VOID                     *Tls\r
   );\r
 \r
   IN     VOID                     *Tls\r
   );\r
 \r


@@ -3250,7 +3225,7 @@ UINT32
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_SESSION_ID)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_SESSION_ID)(\r

   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *SessionId,\r
   IN OUT UINT16                   *SessionIdLen\r
   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *SessionId,\r
   IN OUT UINT16                   *SessionIdLen\r


@@ -3269,7 +3244,7 @@ EFI_STATUS
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM)(\r

   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *ClientRandom\r
   );\r
   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *ClientRandom\r
   );\r


@@ -3287,7 +3262,7 @@ VOID
 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_SERVER_RANDOM)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_SERVER_RANDOM)(\r

   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *ServerRandom\r
   );\r
   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *ServerRandom\r
   );\r


@@ -3308,7 +3283,7 @@ VOID
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_KEY_MATERIAL)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_KEY_MATERIAL)(\r

   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *KeyMaterial\r
   );\r
   IN     VOID                     *Tls,\r
   IN OUT UINT8                    *KeyMaterial\r
   );\r


@@ -3331,7 +3306,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE)(\r

   IN     VOID                     *Tls,\r
   OUT    VOID                     *Data,\r
   IN OUT UINTN                    *DataSize\r
   IN     VOID                     *Tls,\r
   OUT    VOID                     *Data,\r
   IN OUT UINTN                    *DataSize\r


@@ -3356,7 +3331,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT)(\r

   IN     VOID                     *Tls,\r
   OUT    VOID                     *Data,\r
   IN OUT UINTN                    *DataSize\r
   IN     VOID                     *Tls,\r
   OUT    VOID                     *Data,\r
   IN OUT UINTN                    *DataSize\r


@@ -3380,7 +3355,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY)(\r

   IN     VOID                     *Tls,\r
   OUT    VOID                     *Data,\r
   IN OUT UINTN                    *DataSize\r
   IN     VOID                     *Tls,\r
   OUT    VOID                     *Data,\r
   IN OUT UINTN                    *DataSize\r


@@ -3403,7 +3378,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI* EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST)(\r
+(EFIAPI *EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST)(\r

   OUT    VOID                     *DATA,\r
   IN OUT UINTN                    *DataSize\r
   );\r
   OUT    VOID                     *DATA,\r
   IN OUT UINTN                    *DataSize\r
   );\r


@@ -3442,7 +3417,7 @@ EFI_STATUS
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_RSA_PSS_SIGN)(\r
+(EFIAPI *EDKII_CRYPTO_RSA_PSS_SIGN)(\r

   IN      VOID         *RsaContext,\r
   IN      CONST UINT8  *Message,\r
   IN      UINTN        MsgSize,\r
   IN      VOID         *RsaContext,\r
   IN      CONST UINT8  *Message,\r
   IN      UINTN        MsgSize,\r


@@ -3472,7 +3447,7 @@ BOOLEAN
 **/\r
 typedef\r
 BOOLEAN\r
 **/\r
 typedef\r
 BOOLEAN\r

-(EFIAPI* EDKII_CRYPTO_RSA_PSS_VERIFY)(\r
+(EFIAPI *EDKII_CRYPTO_RSA_PSS_VERIFY)(\r

   IN  VOID         *RsaContext,\r
   IN  CONST UINT8  *Message,\r
   IN  UINTN        MsgSize,\r
   IN  VOID         *RsaContext,\r
   IN  CONST UINT8  *Message,\r
   IN  UINTN        MsgSize,\r


@@ -3482,197 +3457,195 @@ BOOLEAN
   IN  UINT16       SaltLen\r
   );\r
 \r
   IN  UINT16       SaltLen\r
   );\r
 \r

-\r
-\r

 ///\r
 /// EDK II Crypto Protocol\r
 ///\r
 struct _EDKII_CRYPTO_PROTOCOL {\r
   /// Version\r
 ///\r
 /// EDK II Crypto Protocol\r
 ///\r
 struct _EDKII_CRYPTO_PROTOCOL {\r
   /// Version\r

-  EDKII_CRYPTO_GET_VERSION                        GetVersion;\r
+  EDKII_CRYPTO_GET_VERSION                           GetVersion;\r

   /// HMAC MD5 - deprecated and unsupported\r
   /// HMAC MD5 - deprecated and unsupported\r

-  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW            DeprecatedHmacMd5New;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE           DeprecatedHmacMd5Free;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY        DeprecatedHmacMd5SetKey;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE      DeprecatedHmacMd5Duplicate;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE         DeprecatedHmacMd5Update;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL          DeprecatedHmacMd5Final;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW               DeprecatedHmacMd5New;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE              DeprecatedHmacMd5Free;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY           DeprecatedHmacMd5SetKey;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE         DeprecatedHmacMd5Duplicate;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE            DeprecatedHmacMd5Update;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL             DeprecatedHmacMd5Final;\r

   /// HMAC SHA1 - deprecated and unsupported\r
   /// HMAC SHA1 - deprecated and unsupported\r

-  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW           DeprecatedHmacSha1New;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE          DeprecatedHmacSha1Free;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY       DeprecatedHmacSha1SetKey;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE     DeprecatedHmacSha1Duplicate;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE        DeprecatedHmacSha1Update;\r
-  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL         DeprecatedHmacSha1Final;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW              DeprecatedHmacSha1New;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE             DeprecatedHmacSha1Free;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY          DeprecatedHmacSha1SetKey;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE        DeprecatedHmacSha1Duplicate;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE           DeprecatedHmacSha1Update;\r
+  DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL            DeprecatedHmacSha1Final;\r

   /// HMAC SHA256\r
   /// HMAC SHA256\r

-  EDKII_CRYPTO_HMAC_SHA256_NEW                    HmacSha256New;\r
-  EDKII_CRYPTO_HMAC_SHA256_FREE                   HmacSha256Free;\r
-  EDKII_CRYPTO_HMAC_SHA256_SET_KEY                HmacSha256SetKey;\r
-  EDKII_CRYPTO_HMAC_SHA256_DUPLICATE              HmacSha256Duplicate;\r
-  EDKII_CRYPTO_HMAC_SHA256_UPDATE                 HmacSha256Update;\r
-  EDKII_CRYPTO_HMAC_SHA256_FINAL                  HmacSha256Final;\r
+  EDKII_CRYPTO_HMAC_SHA256_NEW                       HmacSha256New;\r
+  EDKII_CRYPTO_HMAC_SHA256_FREE                      HmacSha256Free;\r
+  EDKII_CRYPTO_HMAC_SHA256_SET_KEY                   HmacSha256SetKey;\r
+  EDKII_CRYPTO_HMAC_SHA256_DUPLICATE                 HmacSha256Duplicate;\r
+  EDKII_CRYPTO_HMAC_SHA256_UPDATE                    HmacSha256Update;\r
+  EDKII_CRYPTO_HMAC_SHA256_FINAL                     HmacSha256Final;\r

   /// Md4 - deprecated and unsupported\r
   /// Md4 - deprecated and unsupported\r

-  DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE    DeprecatedMd4GetContextSize;\r
-  DEPRECATED_EDKII_CRYPTO_MD4_INIT                DeprecatedMd4Init;\r
-  DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE           DeprecatedMd4Duplicate;\r
-  DEPRECATED_EDKII_CRYPTO_MD4_UPDATE              DeprecatedMd4Update;\r
-  DEPRECATED_EDKII_CRYPTO_MD4_FINAL               DeprecatedMd4Final;\r
-  DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL            DeprecatedMd4HashAll;\r
+  DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE       DeprecatedMd4GetContextSize;\r
+  DEPRECATED_EDKII_CRYPTO_MD4_INIT                   DeprecatedMd4Init;\r
+  DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE              DeprecatedMd4Duplicate;\r
+  DEPRECATED_EDKII_CRYPTO_MD4_UPDATE                 DeprecatedMd4Update;\r
+  DEPRECATED_EDKII_CRYPTO_MD4_FINAL                  DeprecatedMd4Final;\r
+  DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL               DeprecatedMd4HashAll;\r

   /// Md5\r
   /// Md5\r

-  EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE               Md5GetContextSize;\r
-  EDKII_CRYPTO_MD5_INIT                           Md5Init;\r
-  EDKII_CRYPTO_MD5_DUPLICATE                      Md5Duplicate;\r
-  EDKII_CRYPTO_MD5_UPDATE                         Md5Update;\r
-  EDKII_CRYPTO_MD5_FINAL                          Md5Final;\r
-  EDKII_CRYPTO_MD5_HASH_ALL                       Md5HashAll;\r
+  EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE                  Md5GetContextSize;\r
+  EDKII_CRYPTO_MD5_INIT                              Md5Init;\r
+  EDKII_CRYPTO_MD5_DUPLICATE                         Md5Duplicate;\r
+  EDKII_CRYPTO_MD5_UPDATE                            Md5Update;\r
+  EDKII_CRYPTO_MD5_FINAL                             Md5Final;\r
+  EDKII_CRYPTO_MD5_HASH_ALL                          Md5HashAll;\r

   /// Pkcs\r
   /// Pkcs\r

-  EDKII_CRYPTO_PKCS1_ENCRYPT_V2                   Pkcs1v2Encrypt;\r
-  EDKII_CRYPTO_PKCS5_PW_HASH                      Pkcs5HashPassword;\r
-  EDKII_CRYPTO_PKCS7_VERIFY                       Pkcs7Verify;\r
-  EDKII_CRYPTO_PKCS7_VERIFY_EKU                   VerifyEKUsInPkcs7Signature;\r
-  EDKII_CRYPTO_PKCS7_GET_SIGNERS                  Pkcs7GetSigners;\r
-  EDKII_CRYPTO_PKCS7_FREE_SIGNERS                 Pkcs7FreeSigners;\r
-  EDKII_CRYPTO_PKCS7_SIGN                         Pkcs7Sign;\r
-  EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT         Pkcs7GetAttachedContent;\r
-  EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST        Pkcs7GetCertificatesList;\r
-  EDKII_CRYPTO_AUTHENTICODE_VERIFY                AuthenticodeVerify;\r
-  EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY             ImageTimestampVerify;\r
+  EDKII_CRYPTO_PKCS1_ENCRYPT_V2                      Pkcs1v2Encrypt;\r
+  EDKII_CRYPTO_PKCS5_PW_HASH                         Pkcs5HashPassword;\r
+  EDKII_CRYPTO_PKCS7_VERIFY                          Pkcs7Verify;\r
+  EDKII_CRYPTO_PKCS7_VERIFY_EKU                      VerifyEKUsInPkcs7Signature;\r
+  EDKII_CRYPTO_PKCS7_GET_SIGNERS                     Pkcs7GetSigners;\r
+  EDKII_CRYPTO_PKCS7_FREE_SIGNERS                    Pkcs7FreeSigners;\r
+  EDKII_CRYPTO_PKCS7_SIGN                            Pkcs7Sign;\r
+  EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT            Pkcs7GetAttachedContent;\r
+  EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST           Pkcs7GetCertificatesList;\r
+  EDKII_CRYPTO_AUTHENTICODE_VERIFY                   AuthenticodeVerify;\r
+  EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY                ImageTimestampVerify;\r

   /// DH\r
   /// DH\r

-  EDKII_CRYPTO_DH_NEW                             DhNew;\r
-  EDKII_CRYPTO_DH_FREE                            DhFree;\r
-  EDKII_CRYPTO_DH_GENERATE_PARAMETER              DhGenerateParameter;\r
-  EDKII_CRYPTO_DH_SET_PARAMETER                   DhSetParameter;\r
-  EDKII_CRYPTO_DH_GENERATE_KEY                    DhGenerateKey;\r
-  EDKII_CRYPTO_DH_COMPUTE_KEY                     DhComputeKey;\r
+  EDKII_CRYPTO_DH_NEW                                DhNew;\r
+  EDKII_CRYPTO_DH_FREE                               DhFree;\r
+  EDKII_CRYPTO_DH_GENERATE_PARAMETER                 DhGenerateParameter;\r
+  EDKII_CRYPTO_DH_SET_PARAMETER                      DhSetParameter;\r
+  EDKII_CRYPTO_DH_GENERATE_KEY                       DhGenerateKey;\r
+  EDKII_CRYPTO_DH_COMPUTE_KEY                        DhComputeKey;\r

   /// Random\r
   /// Random\r

-  EDKII_CRYPTO_RANDOM_SEED                        RandomSeed;\r
-  EDKII_CRYPTO_RANDOM_BYTES                       RandomBytes;\r
+  EDKII_CRYPTO_RANDOM_SEED                           RandomSeed;\r
+  EDKII_CRYPTO_RANDOM_BYTES                          RandomBytes;\r

   /// RSA\r
   /// RSA\r

-  EDKII_CRYPTO_RSA_VERIFY_PKCS1                   RsaVerifyPkcs1;\r
-  EDKII_CRYPTO_RSA_NEW                            RsaNew;\r
-  EDKII_CRYPTO_RSA_FREE                           RsaFree;\r
-  EDKII_CRYPTO_RSA_SET_KEY                        RsaSetKey;\r
-  EDKII_CRYPTO_RSA_GET_KEY                        RsaGetKey;\r
-  EDKII_CRYPTO_RSA_GENERATE_KEY                   RsaGenerateKey;\r
-  EDKII_CRYPTO_RSA_CHECK_KEY                      RsaCheckKey;\r
-  EDKII_CRYPTO_RSA_PKCS1_SIGN                     RsaPkcs1Sign;\r
-  EDKII_CRYPTO_RSA_PKCS1_VERIFY                   RsaPkcs1Verify;\r
-  EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM       RsaGetPrivateKeyFromPem;\r
-  EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509       RsaGetPublicKeyFromX509;\r
+  EDKII_CRYPTO_RSA_VERIFY_PKCS1                      RsaVerifyPkcs1;\r
+  EDKII_CRYPTO_RSA_NEW                               RsaNew;\r
+  EDKII_CRYPTO_RSA_FREE                              RsaFree;\r
+  EDKII_CRYPTO_RSA_SET_KEY                           RsaSetKey;\r
+  EDKII_CRYPTO_RSA_GET_KEY                           RsaGetKey;\r
+  EDKII_CRYPTO_RSA_GENERATE_KEY                      RsaGenerateKey;\r
+  EDKII_CRYPTO_RSA_CHECK_KEY                         RsaCheckKey;\r
+  EDKII_CRYPTO_RSA_PKCS1_SIGN                        RsaPkcs1Sign;\r
+  EDKII_CRYPTO_RSA_PKCS1_VERIFY                      RsaPkcs1Verify;\r
+  EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM          RsaGetPrivateKeyFromPem;\r
+  EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509          RsaGetPublicKeyFromX509;\r

   /// Sha1\r
   /// Sha1\r

-  EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE              Sha1GetContextSize;\r
-  EDKII_CRYPTO_SHA1_INIT                          Sha1Init;\r
-  EDKII_CRYPTO_SHA1_DUPLICATE                     Sha1Duplicate;\r
-  EDKII_CRYPTO_SHA1_UPDATE                        Sha1Update;\r
-  EDKII_CRYPTO_SHA1_FINAL                         Sha1Final;\r
-  EDKII_CRYPTO_SHA1_HASH_ALL                      Sha1HashAll;\r
+  EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE                 Sha1GetContextSize;\r
+  EDKII_CRYPTO_SHA1_INIT                             Sha1Init;\r
+  EDKII_CRYPTO_SHA1_DUPLICATE                        Sha1Duplicate;\r
+  EDKII_CRYPTO_SHA1_UPDATE                           Sha1Update;\r
+  EDKII_CRYPTO_SHA1_FINAL                            Sha1Final;\r
+  EDKII_CRYPTO_SHA1_HASH_ALL                         Sha1HashAll;\r

   /// Sha256\r
   /// Sha256\r

-  EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE            Sha256GetContextSize;\r
-  EDKII_CRYPTO_SHA256_INIT                        Sha256Init;\r
-  EDKII_CRYPTO_SHA256_DUPLICATE                   Sha256Duplicate;\r
-  EDKII_CRYPTO_SHA256_UPDATE                      Sha256Update;\r
-  EDKII_CRYPTO_SHA256_FINAL                       Sha256Final;\r
-  EDKII_CRYPTO_SHA256_HASH_ALL                    Sha256HashAll;\r
+  EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE               Sha256GetContextSize;\r
+  EDKII_CRYPTO_SHA256_INIT                           Sha256Init;\r
+  EDKII_CRYPTO_SHA256_DUPLICATE                      Sha256Duplicate;\r
+  EDKII_CRYPTO_SHA256_UPDATE                         Sha256Update;\r
+  EDKII_CRYPTO_SHA256_FINAL                          Sha256Final;\r
+  EDKII_CRYPTO_SHA256_HASH_ALL                       Sha256HashAll;\r

   /// Sha384\r
   /// Sha384\r

-  EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE            Sha384GetContextSize;\r
-  EDKII_CRYPTO_SHA384_INIT                        Sha384Init;\r
-  EDKII_CRYPTO_SHA384_DUPLICATE                   Sha384Duplicate;\r
-  EDKII_CRYPTO_SHA384_UPDATE                      Sha384Update;\r
-  EDKII_CRYPTO_SHA384_FINAL                       Sha384Final;\r
-  EDKII_CRYPTO_SHA384_HASH_ALL                    Sha384HashAll;\r
+  EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE               Sha384GetContextSize;\r
+  EDKII_CRYPTO_SHA384_INIT                           Sha384Init;\r
+  EDKII_CRYPTO_SHA384_DUPLICATE                      Sha384Duplicate;\r
+  EDKII_CRYPTO_SHA384_UPDATE                         Sha384Update;\r
+  EDKII_CRYPTO_SHA384_FINAL                          Sha384Final;\r
+  EDKII_CRYPTO_SHA384_HASH_ALL                       Sha384HashAll;\r

   /// Sha512\r
   /// Sha512\r

-  EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE            Sha512GetContextSize;\r
-  EDKII_CRYPTO_SHA512_INIT                        Sha512Init;\r
-  EDKII_CRYPTO_SHA512_DUPLICATE                   Sha512Duplicate;\r
-  EDKII_CRYPTO_SHA512_UPDATE                      Sha512Update;\r
-  EDKII_CRYPTO_SHA512_FINAL                       Sha512Final;\r
-  EDKII_CRYPTO_SHA512_HASH_ALL                    Sha512HashAll;\r
+  EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE               Sha512GetContextSize;\r
+  EDKII_CRYPTO_SHA512_INIT                           Sha512Init;\r
+  EDKII_CRYPTO_SHA512_DUPLICATE                      Sha512Duplicate;\r
+  EDKII_CRYPTO_SHA512_UPDATE                         Sha512Update;\r
+  EDKII_CRYPTO_SHA512_FINAL                          Sha512Final;\r
+  EDKII_CRYPTO_SHA512_HASH_ALL                       Sha512HashAll;\r

   /// X509\r
   /// X509\r

-  EDKII_CRYPTO_X509_GET_SUBJECT_NAME              X509GetSubjectName;\r
-  EDKII_CRYPTO_X509_GET_COMMON_NAME               X509GetCommonName;\r
-  EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME         X509GetOrganizationName;\r
-  EDKII_CRYPTO_X509_VERIFY_CERT                   X509VerifyCert;\r
-  EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE         X509ConstructCertificate;\r
-  EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK   X509ConstructCertificateStack;\r
-  EDKII_CRYPTO_X509_FREE                          X509Free;\r
-  EDKII_CRYPTO_X509_STACK_FREE                    X509StackFree;\r
-  EDKII_CRYPTO_X509_GET_TBS_CERT                  X509GetTBSCert;\r
+  EDKII_CRYPTO_X509_GET_SUBJECT_NAME                 X509GetSubjectName;\r
+  EDKII_CRYPTO_X509_GET_COMMON_NAME                  X509GetCommonName;\r
+  EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME            X509GetOrganizationName;\r
+  EDKII_CRYPTO_X509_VERIFY_CERT                      X509VerifyCert;\r
+  EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE            X509ConstructCertificate;\r
+  EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK      X509ConstructCertificateStack;\r
+  EDKII_CRYPTO_X509_FREE                             X509Free;\r
+  EDKII_CRYPTO_X509_STACK_FREE                       X509StackFree;\r
+  EDKII_CRYPTO_X509_GET_TBS_CERT                     X509GetTBSCert;\r

   /// TDES - deprecated and unsupported\r
   /// TDES - deprecated and unsupported\r

-  DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE   DeprecatedTdesGetContextSize;\r
-  DEPRECATED_EDKII_CRYPTO_TDES_INIT               DeprecatedTdesInit;\r
-  DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT        DeprecatedTdesEcbEncrypt;\r
-  DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT        DeprecatedTdesEcbDecrypt;\r
-  DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT        DeprecatedTdesCbcEncrypt;\r
-  DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT        DeprecatedTdesCbcDecrypt;\r
+  DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE      DeprecatedTdesGetContextSize;\r
+  DEPRECATED_EDKII_CRYPTO_TDES_INIT                  DeprecatedTdesInit;\r
+  DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT           DeprecatedTdesEcbEncrypt;\r
+  DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT           DeprecatedTdesEcbDecrypt;\r
+  DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT           DeprecatedTdesCbcEncrypt;\r
+  DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT           DeprecatedTdesCbcDecrypt;\r

   /// AES - ECB Mode is deprecated and unsupported\r
   /// AES - ECB Mode is deprecated and unsupported\r

-  EDKII_CRYPTO_AES_GET_CONTEXT_SIZE               AesGetContextSize;\r
-  EDKII_CRYPTO_AES_INIT                           AesInit;\r
-  DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT         DeprecatedAesEcbEncrypt;\r
-  DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT         DeprecatedAesEcbDecrypt;\r
-  EDKII_CRYPTO_AES_CBC_ENCRYPT                    AesCbcEncrypt;\r
-  EDKII_CRYPTO_AES_CBC_DECRYPT                    AesCbcDecrypt;\r
+  EDKII_CRYPTO_AES_GET_CONTEXT_SIZE                  AesGetContextSize;\r
+  EDKII_CRYPTO_AES_INIT                              AesInit;\r
+  DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT            DeprecatedAesEcbEncrypt;\r
+  DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT            DeprecatedAesEcbDecrypt;\r
+  EDKII_CRYPTO_AES_CBC_ENCRYPT                       AesCbcEncrypt;\r
+  EDKII_CRYPTO_AES_CBC_DECRYPT                       AesCbcDecrypt;\r

   /// Arc4 - deprecated and unsupported\r
   /// Arc4 - deprecated and unsupported\r

-  DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE   DeprecatedArc4GetContextSize;\r
-  DEPRECATED_EDKII_CRYPTO_ARC4_INIT               DeprecatedArc4Init;\r
-  DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT            DeprecatedArc4Encrypt;\r
-  DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT            DeprecatedArc4Decrypt;\r
-  DEPRECATED_EDKII_CRYPTO_ARC4_RESET              DeprecatedArc4Reset;\r
+  DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE      DeprecatedArc4GetContextSize;\r
+  DEPRECATED_EDKII_CRYPTO_ARC4_INIT                  DeprecatedArc4Init;\r
+  DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT               DeprecatedArc4Encrypt;\r
+  DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT               DeprecatedArc4Decrypt;\r
+  DEPRECATED_EDKII_CRYPTO_ARC4_RESET                 DeprecatedArc4Reset;\r

   /// SM3\r
   /// SM3\r

-  EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE               Sm3GetContextSize;\r
-  EDKII_CRYPTO_SM3_INIT                           Sm3Init;\r
-  EDKII_CRYPTO_SM3_DUPLICATE                      Sm3Duplicate;\r
-  EDKII_CRYPTO_SM3_UPDATE                         Sm3Update;\r
-  EDKII_CRYPTO_SM3_FINAL                          Sm3Final;\r
-  EDKII_CRYPTO_SM3_HASH_ALL                       Sm3HashAll;\r
+  EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE                  Sm3GetContextSize;\r
+  EDKII_CRYPTO_SM3_INIT                              Sm3Init;\r
+  EDKII_CRYPTO_SM3_DUPLICATE                         Sm3Duplicate;\r
+  EDKII_CRYPTO_SM3_UPDATE                            Sm3Update;\r
+  EDKII_CRYPTO_SM3_FINAL                             Sm3Final;\r
+  EDKII_CRYPTO_SM3_HASH_ALL                          Sm3HashAll;\r

   /// HKDF\r
   /// HKDF\r

-  EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND    HkdfSha256ExtractAndExpand;\r
+  EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND       HkdfSha256ExtractAndExpand;\r

   /// X509 (Continued)\r
   /// X509 (Continued)\r

-  EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V X509ConstructCertificateStackV;\r
+  EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V    X509ConstructCertificateStackV;\r

   /// TLS\r
   /// TLS\r

-  EDKII_CRYPTO_TLS_INITIALIZE                     TlsInitialize;\r
-  EDKII_CRYPTO_TLS_CTX_FREE                       TlsCtxFree;\r
-  EDKII_CRYPTO_TLS_CTX_NEW                        TlsCtxNew;\r
-  EDKII_CRYPTO_TLS_FREE                           TlsFree;\r
-  EDKII_CRYPTO_TLS_NEW                            TlsNew;\r
-  EDKII_CRYPTO_TLS_IN_HANDSHAKE                   TlsInHandshake;\r
-  EDKII_CRYPTO_TLS_DO_HANDSHAKE                   TlsDoHandshake;\r
-  EDKII_CRYPTO_TLS_HANDLE_ALERT                   TlsHandleAlert;\r
-  EDKII_CRYPTO_TLS_CLOSE_NOTIFY                   TlsCloseNotify;\r
-  EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT               TlsCtrlTrafficOut;\r
-  EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN                TlsCtrlTrafficIn;\r
-  EDKII_CRYPTO_TLS_READ                           TlsRead;\r
-  EDKII_CRYPTO_TLS_WRITE                          TlsWrite;\r
+  EDKII_CRYPTO_TLS_INITIALIZE                        TlsInitialize;\r
+  EDKII_CRYPTO_TLS_CTX_FREE                          TlsCtxFree;\r
+  EDKII_CRYPTO_TLS_CTX_NEW                           TlsCtxNew;\r
+  EDKII_CRYPTO_TLS_FREE                              TlsFree;\r
+  EDKII_CRYPTO_TLS_NEW                               TlsNew;\r
+  EDKII_CRYPTO_TLS_IN_HANDSHAKE                      TlsInHandshake;\r
+  EDKII_CRYPTO_TLS_DO_HANDSHAKE                      TlsDoHandshake;\r
+  EDKII_CRYPTO_TLS_HANDLE_ALERT                      TlsHandleAlert;\r
+  EDKII_CRYPTO_TLS_CLOSE_NOTIFY                      TlsCloseNotify;\r
+  EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT                  TlsCtrlTrafficOut;\r
+  EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN                   TlsCtrlTrafficIn;\r
+  EDKII_CRYPTO_TLS_READ                              TlsRead;\r
+  EDKII_CRYPTO_TLS_WRITE                             TlsWrite;\r

   /// TLS Set\r
   /// TLS Set\r

-  EDKII_CRYPTO_TLS_SET_VERSION                    TlsSetVersion;\r
-  EDKII_CRYPTO_TLS_SET_CONNECTION_END             TlsSetConnectionEnd;\r
-  EDKII_CRYPTO_TLS_SET_CIPHER_LIST                TlsSetCipherList;\r
-  EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD         TlsSetCompressionMethod;\r
-  EDKII_CRYPTO_TLS_SET_VERIFY                     TlsSetVerify;\r
-  EDKII_CRYPTO_TLS_SET_VERIFY_HOST                TlsSetVerifyHost;\r
-  EDKII_CRYPTO_TLS_SET_SESSIONID                  TlsSetSessionId;\r
-  EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE             TlsSetCaCertificate;\r
-  EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT           TlsSetHostPublicCert;\r
-  EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY           TlsSetHostPrivateKey;\r
-  EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST       TlsSetCertRevocationList;\r
+  EDKII_CRYPTO_TLS_SET_VERSION                       TlsSetVersion;\r
+  EDKII_CRYPTO_TLS_SET_CONNECTION_END                TlsSetConnectionEnd;\r
+  EDKII_CRYPTO_TLS_SET_CIPHER_LIST                   TlsSetCipherList;\r
+  EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD            TlsSetCompressionMethod;\r
+  EDKII_CRYPTO_TLS_SET_VERIFY                        TlsSetVerify;\r
+  EDKII_CRYPTO_TLS_SET_VERIFY_HOST                   TlsSetVerifyHost;\r
+  EDKII_CRYPTO_TLS_SET_SESSIONID                     TlsSetSessionId;\r
+  EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE                TlsSetCaCertificate;\r
+  EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT              TlsSetHostPublicCert;\r
+  EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY              TlsSetHostPrivateKey;\r
+  EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST          TlsSetCertRevocationList;\r

   /// TLS Get\r
   /// TLS Get\r

-  EDKII_CRYPTO_TLS_GET_VERSION                    TlsGetVersion;\r
-  EDKII_CRYPTO_TLS_GET_CONNECTION_END             TlsGetConnectionEnd;\r
-  EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER             TlsGetCurrentCipher;\r
-  EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID     TlsGetCurrentCompressionId;\r
-  EDKII_CRYPTO_TLS_GET_VERIFY                     TlsGetVerify;\r
-  EDKII_CRYPTO_TLS_GET_SESSION_ID                 TlsGetSessionId;\r
-  EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM              TlsGetClientRandom;\r
-  EDKII_CRYPTO_TLS_GET_SERVER_RANDOM              TlsGetServerRandom;\r
-  EDKII_CRYPTO_TLS_GET_KEY_MATERIAL               TlsGetKeyMaterial;\r
-  EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE             TlsGetCaCertificate;\r
-  EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT           TlsGetHostPublicCert;\r
-  EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY           TlsGetHostPrivateKey;\r
-  EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST       TlsGetCertRevocationList;\r
+  EDKII_CRYPTO_TLS_GET_VERSION                       TlsGetVersion;\r
+  EDKII_CRYPTO_TLS_GET_CONNECTION_END                TlsGetConnectionEnd;\r
+  EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER                TlsGetCurrentCipher;\r
+  EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID        TlsGetCurrentCompressionId;\r
+  EDKII_CRYPTO_TLS_GET_VERIFY                        TlsGetVerify;\r
+  EDKII_CRYPTO_TLS_GET_SESSION_ID                    TlsGetSessionId;\r
+  EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM                 TlsGetClientRandom;\r
+  EDKII_CRYPTO_TLS_GET_SERVER_RANDOM                 TlsGetServerRandom;\r
+  EDKII_CRYPTO_TLS_GET_KEY_MATERIAL                  TlsGetKeyMaterial;\r
+  EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE                TlsGetCaCertificate;\r
+  EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT              TlsGetHostPublicCert;\r
+  EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY              TlsGetHostPrivateKey;\r
+  EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST          TlsGetCertRevocationList;\r

   /// RSA PSS\r
   /// RSA PSS\r

-  EDKII_CRYPTO_RSA_PSS_SIGN                       RsaPssSign;\r
-  EDKII_CRYPTO_RSA_PSS_VERIFY                     RsaPssVerify;\r
+  EDKII_CRYPTO_RSA_PSS_SIGN                          RsaPssSign;\r
+  EDKII_CRYPTO_RSA_PSS_VERIFY                        RsaPssVerify;\r

 };\r
 \r
 };\r
 \r

-extern GUID gEdkiiCryptoProtocolGuid;\r
+extern GUID  gEdkiiCryptoProtocolGuid;\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/CryptoPkg/Private/Protocol/SmmCrypto.h b/CryptoPkg/Private/Protocol/SmmCrypto.h
index defdeccfe597d9a7c5ab4ab9edd91b022843dd65..fec5a45523f580b78053fc7f9190cebdcc41d127 100644 (file)
--- a/CryptoPkg/Private/Protocol/SmmCrypto.h
+++ b/CryptoPkg/Private/Protocol/SmmCrypto.h
@@ -16,6 +16,6 @@
 ///\r
 typedef EDKII_CRYPTO_PROTOCOL EDKII_SMM_CRYPTO_PROTOCOL;\r
 \r
 ///\r
 typedef EDKII_CRYPTO_PROTOCOL EDKII_SMM_CRYPTO_PROTOCOL;\r
 \r

-extern GUID gEdkiiSmmCryptoProtocolGuid;\r
+extern GUID  gEdkiiSmmCryptoProtocolGuid;\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/AuthenticodeTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/AuthenticodeTests.c
index 8935f289d87a865f4fe57c7eb911f14785fa544f..4ced78de37cf6a93063c91dd13ace6afd85c35ea 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/AuthenticodeTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/AuthenticodeTests.c
@@ -12,25 +12,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // Sample PE/COFF Image Hash Value (Digested by SHA-1).\r
 // This value should be calculated following MSFT's Authenticode Specification\r
 //\r
 // Sample PE/COFF Image Hash Value (Digested by SHA-1).\r
 // This value should be calculated following MSFT's Authenticode Specification\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 PeSha1Hash[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  PeSha1Hash[] = {\r

   0x44, 0xFD, 0x4F, 0xA9, 0x17, 0xEE, 0xAC, 0xCF, 0x1F, 0x0B, 0xE3, 0xA1, 0x4D, 0x5B, 0xA6, 0x61,\r
   0x82, 0x97, 0xC4, 0xB6\r
   0x44, 0xFD, 0x4F, 0xA9, 0x17, 0xEE, 0xAC, 0xCF, 0x1F, 0x0B, 0xE3, 0xA1, 0x4D, 0x5B, 0xA6, 0x61,\r
   0x82, 0x97, 0xC4, 0xB6\r

-  };\r
+};\r

 \r
 //\r
 // Sample PE/COFF Image Hash Value (Digested by SHA-256).\r
 //\r
 \r
 //\r
 // Sample PE/COFF Image Hash Value (Digested by SHA-256).\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 PeSha256Hash[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  PeSha256Hash[] = {\r

   0x61, 0x82, 0xB7, 0xF8, 0x8C, 0xFF, 0xC2, 0xEB, 0x79, 0x6E, 0x9D, 0xA9, 0xDD, 0x39, 0x52, 0xDD,\r
   0x36, 0xDD, 0xF1, 0x43, 0x27, 0x58, 0x8C, 0xA7, 0xCC, 0xAE, 0xDE, 0xDD, 0x3C, 0x02, 0x12, 0x49\r
   0x61, 0x82, 0xB7, 0xF8, 0x8C, 0xFF, 0xC2, 0xEB, 0x79, 0x6E, 0x9D, 0xA9, 0xDD, 0x39, 0x52, 0xDD,\r
   0x36, 0xDD, 0xF1, 0x43, 0x27, 0x58, 0x8C, 0xA7, 0xCC, 0xAE, 0xDE, 0xDD, 0x3C, 0x02, 0x12, 0x49\r

-  };\r
+};\r

 \r
 //\r
 // Sample Authenticode Data with SHA-1 hash algorithm.\r
 // This data should be retrieved from signed PE/COFF image according to SECURITY\r
 // directory in PE/COFF Header.\r
 //\r
 \r
 //\r
 // Sample Authenticode Data with SHA-1 hash algorithm.\r
 // This data should be retrieved from signed PE/COFF image according to SECURITY\r
 // directory in PE/COFF Header.\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 AuthenticodeWithSha1[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  AuthenticodeWithSha1[] = {\r

   0x30, 0x82, 0x1C, 0x43, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x02, 0xA0,\r
   0x82, 0x1C, 0x34, 0x30, 0x82, 0x1C, 0x30, 0x02, 0x01, 0x01, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x05,\r
   0x2B, 0x0E, 0x03, 0x02, 0x1A, 0x05, 0x00, 0x30, 0x68, 0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01,\r
   0x30, 0x82, 0x1C, 0x43, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x02, 0xA0,\r
   0x82, 0x1C, 0x34, 0x30, 0x82, 0x1C, 0x30, 0x02, 0x01, 0x01, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x05,\r
   0x2B, 0x0E, 0x03, 0x02, 0x1A, 0x05, 0x00, 0x30, 0x68, 0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01,\r


@@ -484,14 +484,14 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINT8 AuthenticodeWithSha1[] = {
   0x0E, 0x99, 0x1F, 0xDF, 0x7E, 0xC9, 0x10, 0x56, 0xC7, 0x00, 0x6D, 0x5F, 0x23, 0x57, 0x12, 0x84,\r
   0xCD, 0xAC, 0x82, 0xAE, 0x39, 0x52, 0xA5, 0x19, 0x23, 0xA3, 0x6B, 0xE7, 0x49, 0x8F, 0x86, 0x74,\r
   0x46, 0x41, 0x2A, 0x0F, 0x3D, 0x29, 0xB7, 0xAE, 0x8C, 0x00\r
   0x0E, 0x99, 0x1F, 0xDF, 0x7E, 0xC9, 0x10, 0x56, 0xC7, 0x00, 0x6D, 0x5F, 0x23, 0x57, 0x12, 0x84,\r
   0xCD, 0xAC, 0x82, 0xAE, 0x39, 0x52, 0xA5, 0x19, 0x23, 0xA3, 0x6B, 0xE7, 0x49, 0x8F, 0x86, 0x74,\r
   0x46, 0x41, 0x2A, 0x0F, 0x3D, 0x29, 0xB7, 0xAE, 0x8C, 0x00\r

-  };\r
+};\r

 \r
 //\r
 // Sample Authenticode Data with SHA-256 hash algorithm.\r
 // This data should be retrieved from signed PE/COFF image according to SECURITY\r
 // directory in PE/COFF Header.\r
 //\r
 \r
 //\r
 // Sample Authenticode Data with SHA-256 hash algorithm.\r
 // This data should be retrieved from signed PE/COFF image according to SECURITY\r
 // directory in PE/COFF Header.\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 AuthenticodeWithSha256[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  AuthenticodeWithSha256[] = {\r

   0x30, 0x82, 0x0e, 0xd1, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0,\r
   0x82, 0x0e, 0xc2, 0x30, 0x82, 0x0e, 0xbe, 0x02, 0x01, 0x01, 0x31, 0x0f, 0x30, 0x0d, 0x06, 0x09,\r
   0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x5c, 0x06, 0x0a, 0x2b,\r
   0x30, 0x82, 0x0e, 0xd1, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0,\r
   0x82, 0x0e, 0xc2, 0x30, 0x82, 0x0e, 0xbe, 0x02, 0x01, 0x01, 0x31, 0x0f, 0x30, 0x0d, 0x06, 0x09,\r
   0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x5c, 0x06, 0x0a, 0x2b,\r


@@ -730,14 +730,14 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINT8 AuthenticodeWithSha256[] = {
   0x22, 0xb6, 0x17, 0x3f, 0x4f, 0x33, 0xed, 0xa6, 0xd9, 0x0f, 0x74, 0xfa, 0x97, 0x8d, 0x98, 0x55,\r
   0x42, 0x14, 0x76, 0xd4, 0x89, 0x07, 0xf2, 0x30, 0x5a, 0x27, 0x96, 0x1b, 0x92, 0x70, 0x5a, 0x83,\r
   0x89, 0x0f, 0xdb, 0x47, 0x7a, 0x00, 0x00, 0x00, 0x0a\r
   0x22, 0xb6, 0x17, 0x3f, 0x4f, 0x33, 0xed, 0xa6, 0xd9, 0x0f, 0x74, 0xfa, 0x97, 0x8d, 0x98, 0x55,\r
   0x42, 0x14, 0x76, 0xd4, 0x89, 0x07, 0xf2, 0x30, 0x5a, 0x27, 0x96, 0x1b, 0x92, 0x70, 0x5a, 0x83,\r
   0x89, 0x0f, 0xdb, 0x47, 0x7a, 0x00, 0x00, 0x00, 0x0a\r

-  };\r
+};\r

 \r
 //\r
 // Sample root certificate for code signing.\r
 // A trusted certificate with self-signing, will be used to construct the certificate chains for\r
 // authority checking.\r
 //\r
 \r
 //\r
 // Sample root certificate for code signing.\r
 // A trusted certificate with self-signing, will be used to construct the certificate chains for\r
 // authority checking.\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 TestRootCert1[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  TestRootCert1[] = {\r

   0x30, 0x82, 0x05, 0x99, 0x30, 0x82, 0x03, 0x81, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10, 0x79,\r
   0xAD, 0x16, 0xA1, 0x4A, 0xA0, 0xA5, 0xAD, 0x4C, 0x73, 0x58, 0xF4, 0x07, 0x13, 0x2E, 0x65, 0x30,\r
   0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x5F,\r
   0x30, 0x82, 0x05, 0x99, 0x30, 0x82, 0x03, 0x81, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10, 0x79,\r
   0xAD, 0x16, 0xA1, 0x4A, 0xA0, 0xA5, 0xAD, 0x4C, 0x73, 0x58, 0xF4, 0x07, 0x13, 0x2E, 0x65, 0x30,\r
   0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x5F,\r


@@ -830,7 +830,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINT8 TestRootCert1[] = {
   0x6B, 0x9D, 0x4A, 0xFD, 0xD1, 0xA1, 0x9D, 0x99, 0x43, 0x77, 0x3F, 0xB0, 0xDA\r
 };\r
 \r
   0x6B, 0x9D, 0x4A, 0xFD, 0xD1, 0xA1, 0x9D, 0x99, 0x43, 0x77, 0x3F, 0xB0, 0xDA\r
 };\r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 TestRootCert2[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  TestRootCert2[] = {\r

   0x30, 0x82, 0x05, 0xfd, 0x30, 0x82, 0x03, 0xe5, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10, 0x74,\r
   0x45, 0xc8, 0x78, 0x4e, 0x0c, 0xc9, 0x96, 0x4a, 0xb4, 0x2f, 0xbc, 0xda, 0x29, 0xe1, 0xbc, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x81,\r
   0x30, 0x82, 0x05, 0xfd, 0x30, 0x82, 0x03, 0xe5, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10, 0x74,\r
   0x45, 0xc8, 0x78, 0x4e, 0x0c, 0xc9, 0x96, 0x4a, 0xb4, 0x2f, 0xbc, 0xda, 0x29, 0xe1, 0xbc, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x81,\r


@@ -928,24 +928,24 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINT8 TestRootCert2[] = {
   0x5f, 0x70, 0x44, 0xfa, 0x89, 0x59, 0x93, 0xb0, 0x7b, 0x12, 0x0f, 0x5e, 0x62, 0x62, 0x51, 0x11,\r
   0xbd, 0xba, 0x5a, 0xd0, 0xce, 0xa1, 0xb6, 0xef, 0x80, 0x20, 0xe6, 0x73, 0x4b, 0x11, 0x06, 0x56,\r
   0xe2, 0x0a\r
   0x5f, 0x70, 0x44, 0xfa, 0x89, 0x59, 0x93, 0xb0, 0x7b, 0x12, 0x0f, 0x5e, 0x62, 0x62, 0x51, 0x11,\r
   0xbd, 0xba, 0x5a, 0xd0, 0xce, 0xa1, 0xb6, 0xef, 0x80, 0x20, 0xe6, 0x73, 0x4b, 0x11, 0x06, 0x56,\r
   0xe2, 0x0a\r

-  };\r
+};\r

 \r
 //\r
 // OID ASN.1 Value for Hash Algorithms\r
 //\r
 \r
 //\r
 // OID ASN.1 Value for Hash Algorithms\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 HashOidValue[] = {\r
-  0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05,         // OBJ_md5\r
-  0x2B, 0x0E, 0x03, 0x02, 0x1A,                           // OBJ_sha1\r
-  0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04,   // OBJ_sha224\r
-  0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01,   // OBJ_sha256\r
-  0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02,   // OBJ_sha384\r
-  0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03,   // OBJ_sha512\r
-  };\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  HashOidValue[] = {\r
+  0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05,       // OBJ_md5\r
+  0x2B, 0x0E, 0x03, 0x02, 0x1A,                         // OBJ_sha1\r
+  0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04, // OBJ_sha224\r
+  0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, // OBJ_sha256\r
+  0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, // OBJ_sha384\r
+  0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, // OBJ_sha512\r
+};\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyAuthenticodeVerify (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyAuthenticodeVerify (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   BOOLEAN  Status;\r
   )\r
 {\r
   BOOLEAN  Status;\r


@@ -992,11 +992,11 @@ TestVerifyAuthenticodeVerify (
   return UNIT_TEST_PASSED;\r
 }\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-TEST_DESC mAuthenticodeTest[] = {\r
-    //\r
-    // -----Description--------------------------------------Class----------------------Function-----------------Pre---Post--Context\r
-    //\r
-    {"TestVerifyAuthenticodeVerify()",        "CryptoPkg.BaseCryptLib.Authenticode",   TestVerifyAuthenticodeVerify,        NULL, NULL, NULL},\r
+TEST_DESC  mAuthenticodeTest[] = {\r
+  //\r
+  // -----Description--------------------------------------Class----------------------Function-----------------Pre---Post--Context\r
+  //\r
+  { "TestVerifyAuthenticodeVerify()", "CryptoPkg.BaseCryptLib.Authenticode", TestVerifyAuthenticodeVerify, NULL, NULL, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mAuthenticodeTestNum = ARRAY_SIZE(mAuthenticodeTest);\r
+UINTN  mAuthenticodeTestNum = ARRAY_SIZE (mAuthenticodeTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BaseCryptLibUnitTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BaseCryptLibUnitTests.c
index 3873de9730646dc53a9675a3194f546c209e6695..3c57aead1e39de739d94c98672a16f9db77f8d83 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BaseCryptLibUnitTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BaseCryptLibUnitTests.c
@@ -8,60 +8,64 @@
 #include "TestBaseCryptLib.h"\r
 \r
 SUITE_DESC  mSuiteDesc[] = {\r
 #include "TestBaseCryptLib.h"\r
 \r
 SUITE_DESC  mSuiteDesc[] = {\r

-    //\r
-    // Title--------------------------Package-------------------Sup--Tdn----TestNum------------TestDesc\r
-    //\r
-    {"EKU verify tests",            "CryptoPkg.BaseCryptLib", NULL, NULL, &mPkcs7EkuTestNum,       mPkcs7EkuTest},\r
-    {"HASH verify tests",           "CryptoPkg.BaseCryptLib", NULL, NULL, &mHashTestNum,           mHashTest},\r
-    {"HMAC verify tests",           "CryptoPkg.BaseCryptLib", NULL, NULL, &mHmacTestNum,           mHmacTest},\r
-    {"BlockCipher verify tests",    "CryptoPkg.BaseCryptLib", NULL, NULL, &mBlockCipherTestNum,    mBlockCipherTest},\r
-    {"RSA verify tests",            "CryptoPkg.BaseCryptLib", NULL, NULL, &mRsaTestNum,            mRsaTest},\r
-    {"RSA PSS verify tests",        "CryptoPkg.BaseCryptLib", NULL, NULL, &mRsaPssTestNum,         mRsaPssTest},\r
-    {"RSACert verify tests",        "CryptoPkg.BaseCryptLib", NULL, NULL, &mRsaCertTestNum,        mRsaCertTest},\r
-    {"PKCS7 verify tests",          "CryptoPkg.BaseCryptLib", NULL, NULL, &mPkcs7TestNum,          mPkcs7Test},\r
-    {"PKCS5 verify tests",          "CryptoPkg.BaseCryptLib", NULL, NULL, &mPkcs5TestNum,          mPkcs5Test},\r
-    {"Authenticode verify tests",   "CryptoPkg.BaseCryptLib", NULL, NULL, &mAuthenticodeTestNum,   mAuthenticodeTest},\r
-    {"ImageTimestamp verify tests", "CryptoPkg.BaseCryptLib", NULL, NULL, &mImageTimestampTestNum, mImageTimestampTest},\r
-    {"DH verify tests",             "CryptoPkg.BaseCryptLib", NULL, NULL, &mDhTestNum,             mDhTest},\r
-    {"PRNG verify tests",           "CryptoPkg.BaseCryptLib", NULL, NULL, &mPrngTestNum,           mPrngTest},\r
-    {"OAEP encrypt verify tests",   "CryptoPkg.BaseCryptLib", NULL, NULL, &mOaepTestNum,           mOaepTest},\r
+  //\r
+  // Title--------------------------Package-------------------Sup--Tdn----TestNum------------TestDesc\r
+  //\r
+  { "EKU verify tests",            "CryptoPkg.BaseCryptLib", NULL, NULL, &mPkcs7EkuTestNum,       mPkcs7EkuTest       },\r
+  { "HASH verify tests",           "CryptoPkg.BaseCryptLib", NULL, NULL, &mHashTestNum,           mHashTest           },\r
+  { "HMAC verify tests",           "CryptoPkg.BaseCryptLib", NULL, NULL, &mHmacTestNum,           mHmacTest           },\r
+  { "BlockCipher verify tests",    "CryptoPkg.BaseCryptLib", NULL, NULL, &mBlockCipherTestNum,    mBlockCipherTest    },\r
+  { "RSA verify tests",            "CryptoPkg.BaseCryptLib", NULL, NULL, &mRsaTestNum,            mRsaTest            },\r
+  { "RSA PSS verify tests",        "CryptoPkg.BaseCryptLib", NULL, NULL, &mRsaPssTestNum,         mRsaPssTest         },\r
+  { "RSACert verify tests",        "CryptoPkg.BaseCryptLib", NULL, NULL, &mRsaCertTestNum,        mRsaCertTest        },\r
+  { "PKCS7 verify tests",          "CryptoPkg.BaseCryptLib", NULL, NULL, &mPkcs7TestNum,          mPkcs7Test          },\r
+  { "PKCS5 verify tests",          "CryptoPkg.BaseCryptLib", NULL, NULL, &mPkcs5TestNum,          mPkcs5Test          },\r
+  { "Authenticode verify tests",   "CryptoPkg.BaseCryptLib", NULL, NULL, &mAuthenticodeTestNum,   mAuthenticodeTest   },\r
+  { "ImageTimestamp verify tests", "CryptoPkg.BaseCryptLib", NULL, NULL, &mImageTimestampTestNum, mImageTimestampTest },\r
+  { "DH verify tests",             "CryptoPkg.BaseCryptLib", NULL, NULL, &mDhTestNum,             mDhTest             },\r
+  { "PRNG verify tests",           "CryptoPkg.BaseCryptLib", NULL, NULL, &mPrngTestNum,           mPrngTest           },\r
+  { "OAEP encrypt verify tests",   "CryptoPkg.BaseCryptLib", NULL, NULL, &mOaepTestNum,           mOaepTest           },\r

 };\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 CreateUnitTest (\r
 };\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 CreateUnitTest (\r

-    IN     CHAR8*                     UnitTestName,\r
-    IN     CHAR8*                     UnitTestVersion,\r
-    IN OUT UNIT_TEST_FRAMEWORK_HANDLE* Framework\r
-) {\r
-    EFI_STATUS                  Status;\r
-    UINTN                       SuiteIndex;\r
-    UINTN                       TestIndex;\r
+  IN     CHAR8                       *UnitTestName,\r
+  IN     CHAR8                       *UnitTestVersion,\r
+  IN OUT UNIT_TEST_FRAMEWORK_HANDLE  *Framework\r
+  )\r
+{\r
+  EFI_STATUS  Status;\r
+  UINTN       SuiteIndex;\r
+  UINTN       TestIndex;\r

 \r
 \r

-    if ( Framework == NULL || UnitTestVersion == NULL || UnitTestName == NULL) {\r
-        return EFI_INVALID_PARAMETER;\r
-    }\r
-    Status = EFI_SUCCESS;\r
-    //\r
-    // Start setting up the test framework for running the tests.\r
-    //\r
-    Status = InitUnitTestFramework (Framework, UnitTestName, gEfiCallerBaseName, UnitTestVersion);\r
+  if ((Framework == NULL) || (UnitTestVersion == NULL) || (UnitTestName == NULL)) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
+  Status = EFI_SUCCESS;\r
+  //\r
+  // Start setting up the test framework for running the tests.\r
+  //\r
+  Status = InitUnitTestFramework (Framework, UnitTestName, gEfiCallerBaseName, UnitTestVersion);\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG ((DEBUG_ERROR, "Failed in InitUnitTestFramework. Status = %r\n", Status));\r
+    goto EXIT;\r
+  }\r
+\r
+  for (SuiteIndex = 0; SuiteIndex < ARRAY_SIZE (mSuiteDesc); SuiteIndex++) {\r
+    UNIT_TEST_SUITE_HANDLE  Suite = NULL;\r
+    Status = CreateUnitTestSuite (&Suite, *Framework, mSuiteDesc[SuiteIndex].Title, mSuiteDesc[SuiteIndex].Package, mSuiteDesc[SuiteIndex].Sup, mSuiteDesc[SuiteIndex].Tdn);\r

     if (EFI_ERROR (Status)) {\r
     if (EFI_ERROR (Status)) {\r

-        DEBUG((DEBUG_ERROR, "Failed in InitUnitTestFramework. Status = %r\n", Status));\r
-        goto EXIT;\r
+      Status = EFI_OUT_OF_RESOURCES;\r
+      goto EXIT;\r

     }\r
 \r
     }\r
 \r

-    for (SuiteIndex = 0; SuiteIndex < ARRAY_SIZE(mSuiteDesc); SuiteIndex++) {\r
-        UNIT_TEST_SUITE_HANDLE Suite = NULL;\r
-        Status = CreateUnitTestSuite (&Suite, *Framework, mSuiteDesc[SuiteIndex].Title, mSuiteDesc[SuiteIndex].Package, mSuiteDesc[SuiteIndex].Sup, mSuiteDesc[SuiteIndex].Tdn);\r
-        if (EFI_ERROR (Status)) {\r
-            Status = EFI_OUT_OF_RESOURCES;\r
-            goto EXIT;\r
-        }\r
-        for (TestIndex = 0; TestIndex < *mSuiteDesc[SuiteIndex].TestNum; TestIndex++) {\r
-            AddTestCase (Suite, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->Description, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->ClassName, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->Func, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->PreReq, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->CleanUp, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->Context);\r
-        }\r
+    for (TestIndex = 0; TestIndex < *mSuiteDesc[SuiteIndex].TestNum; TestIndex++) {\r
+      AddTestCase (Suite, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->Description, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->ClassName, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->Func, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->PreReq, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->CleanUp, (mSuiteDesc[SuiteIndex].TestDesc + TestIndex)->Context);\r

     }\r
     }\r

-    EXIT:\r
-    return Status;\r
+  }\r
+\r
+EXIT:\r
+  return Status;\r

 }\r
 }\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BlockCipherTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BlockCipherTests.c
index b3493073965f67b3e333b232cf2546a87a81b1b1..fe51cafa5be0fd581590bde8b82c0af179f5e45b 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BlockCipherTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BlockCipherTests.c
@@ -11,130 +11,129 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // TDES test vectors are extracted from OpenSSL 0.9.8l, crypto\des\destest.c\r
 //\r
 //\r
 // TDES test vectors are extracted from OpenSSL 0.9.8l, crypto\des\destest.c\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TdesEcbData[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TdesEcbData[] = {\r

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TdesEcbKey[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TdesEcbKey[] = {\r

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TdesEcbCipher[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TdesEcbCipher[] = {\r

   0x8C, 0xA6, 0x4D, 0xE9, 0xC1, 0xB1, 0x23, 0xA7,\r
   0x8C, 0xA6, 0x4D, 0xE9, 0xC1, 0xB1, 0x23, 0xA7,\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TdesEcb2Cipher[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TdesEcb2Cipher[] = {\r

   0x92, 0x95, 0xB5, 0x9B, 0xB3, 0x84, 0x73, 0x6E,\r
   0x92, 0x95, 0xB5, 0x9B, 0xB3, 0x84, 0x73, 0x6E,\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TdesCbcData[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TdesCbcData[] = {\r

   0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20,\r
   0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74,\r
   0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20\r
   0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20,\r
   0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74,\r
   0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TdesCbcKey[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TdesCbcKey[] = {\r

   0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,\r
   0xf1, 0xe0, 0xd3, 0xc2, 0xb5, 0xa4, 0x97, 0x86,\r
   0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10\r
   0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,\r
   0xf1, 0xe0, 0xd3, 0xc2, 0xb5, 0xa4, 0x97, 0x86,\r
   0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 TdesCbcIvec[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  TdesCbcIvec[] = {\r

   0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10\r
   0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TdesCbc3Cipher[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TdesCbc3Cipher[] = {\r

   0x3F, 0xE3, 0x01, 0xC9, 0x62, 0xAC, 0x01, 0xD0,\r
   0x22, 0x13, 0x76, 0x3C, 0x1C, 0xBD, 0x4C, 0xDC,\r
   0x79, 0x96, 0x57, 0xC0, 0x64, 0xEC, 0xF5, 0xD4\r
   0x3F, 0xE3, 0x01, 0xC9, 0x62, 0xAC, 0x01, 0xD0,\r
   0x22, 0x13, 0x76, 0x3C, 0x1C, 0xBD, 0x4C, 0xDC,\r
   0x79, 0x96, 0x57, 0xC0, 0x64, 0xEC, 0xF5, 0xD4\r

-  };\r
+};\r

 \r
 //\r
 // AES test vectors are from NIST KAT of AES\r
 //\r
 \r
 //\r
 // AES test vectors are from NIST KAT of AES\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes128EcbData[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes128EcbData[] = {\r

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes128EcbKey[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes128EcbKey[] = {\r

   0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3, 0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59\r
   0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3, 0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes128EcbCipher[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes128EcbCipher[] = {\r

   0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0, 0x4e, 0xaa, 0x6f, 0xb4, 0xdb, 0xf7, 0x84, 0x65\r
   0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0, 0x4e, 0xaa, 0x6f, 0xb4, 0xdb, 0xf7, 0x84, 0x65\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes192EcbData[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes192EcbData[] = {\r

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes192EcbKey[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes192EcbKey[] = {\r

   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\r
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff\r
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\r
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes192EcbCipher[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes192EcbCipher[] = {\r

   0xdd, 0x8a, 0x49, 0x35, 0x14, 0x23, 0x1c, 0xbf, 0x56, 0xec, 0xce, 0xe4, 0xc4, 0x08, 0x89, 0xfb\r
   0xdd, 0x8a, 0x49, 0x35, 0x14, 0x23, 0x1c, 0xbf, 0x56, 0xec, 0xce, 0xe4, 0xc4, 0x08, 0x89, 0xfb\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes256EcbData[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes256EcbData[] = {\r

   0x01, 0x47, 0x30, 0xf8, 0x0a, 0xc6, 0x25, 0xfe, 0x84, 0xf0, 0x26, 0xc6, 0x0b, 0xfd, 0x54, 0x7d\r
   0x01, 0x47, 0x30, 0xf8, 0x0a, 0xc6, 0x25, 0xfe, 0x84, 0xf0, 0x26, 0xc6, 0x0b, 0xfd, 0x54, 0x7d\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes256EcbKey[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes256EcbKey[] = {\r

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes256EcbCipher[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes256EcbCipher[] = {\r

   0x5c, 0x9d, 0x84, 0x4e, 0xd4, 0x6f, 0x98, 0x85, 0x08, 0x5e, 0x5d, 0x6a, 0x4f, 0x94, 0xc7, 0xd7\r
   0x5c, 0x9d, 0x84, 0x4e, 0xd4, 0x6f, 0x98, 0x85, 0x08, 0x5e, 0x5d, 0x6a, 0x4f, 0x94, 0xc7, 0xd7\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes128CbcData[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes128CbcData[] = {\r

   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,\r
   0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f\r
   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,\r
   0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes128CbcKey[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes128CbcKey[] = {\r

   0xc2, 0x86, 0x69, 0x6d, 0x88, 0x7c, 0x9a, 0xa0, 0x61, 0x1b, 0xbb, 0x3e, 0x20, 0x25, 0xa4, 0x5a\r
   0xc2, 0x86, 0x69, 0x6d, 0x88, 0x7c, 0x9a, 0xa0, 0x61, 0x1b, 0xbb, 0x3e, 0x20, 0x25, 0xa4, 0x5a\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes128CbcIvec[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes128CbcIvec[] = {\r

   0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58\r
   0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Aes128CbcCipher[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Aes128CbcCipher[] = {\r

   0xd2, 0x96, 0xcd, 0x94, 0xc2, 0xcc, 0xcf, 0x8a, 0x3a, 0x86, 0x30, 0x28, 0xb5, 0xe1, 0xdc, 0x0a,\r
   0x75, 0x86, 0x60, 0x2d, 0x25, 0x3c, 0xff, 0xf9, 0x1b, 0x82, 0x66, 0xbe, 0xa6, 0xd6, 0x1a, 0xb1\r
   0xd2, 0x96, 0xcd, 0x94, 0xc2, 0xcc, 0xcf, 0x8a, 0x3a, 0x86, 0x30, 0x28, 0xb5, 0xe1, 0xdc, 0x0a,\r
   0x75, 0x86, 0x60, 0x2d, 0x25, 0x3c, 0xff, 0xf9, 0x1b, 0x82, 0x66, 0xbe, 0xa6, 0xd6, 0x1a, 0xb1\r

-  };\r
+};\r

 \r
 //\r
 // ARC4 Test Vector defined in "Appendix A.1 Test Vectors from [CRYPTLIB]" of\r
 // IETF Draft draft-kaukonen-cipher-arcfour-03 ("A Stream Cipher Encryption Algorithm 'Arcfour'").\r
 //\r
 \r
 //\r
 // ARC4 Test Vector defined in "Appendix A.1 Test Vectors from [CRYPTLIB]" of\r
 // IETF Draft draft-kaukonen-cipher-arcfour-03 ("A Stream Cipher Encryption Algorithm 'Arcfour'").\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Arc4Data[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Arc4Data[] = {\r

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Arc4Key[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Arc4Key[] = {\r

   0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF\r
   0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Arc4Cipher[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Arc4Cipher[] = {\r

   0x74, 0x94, 0xC2, 0xE7, 0x10, 0x4B, 0x08, 0x79\r
   0x74, 0x94, 0xC2, 0xE7, 0x10, 0x4B, 0x08, 0x79\r

-  };\r
-\r
+};\r

 \r
 typedef\r
 UINTN\r
 \r
 typedef\r
 UINTN\r

-(EFIAPI *EFI_BLOCK_CIPHER_GET_CONTEXT_SIZE) (\r
+(EFIAPI *EFI_BLOCK_CIPHER_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_BLOCK_CIPHER_INIT) (\r
+(EFIAPI *EFI_BLOCK_CIPHER_INIT)(\r

   OUT  VOID         *BlockCipherContext,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeyLength\r
   OUT  VOID         *BlockCipherContext,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeyLength\r


@@ -142,7 +141,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_BLOCK_CIPHER_ECB_ENCRYPT_DECRYPT) (\r
+(EFIAPI *EFI_BLOCK_CIPHER_ECB_ENCRYPT_DECRYPT)(\r

   IN   VOID         *BlockCipherContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *BlockCipherContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -151,7 +150,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_BLOCK_CIPHER_CBC_ENCRYPT_DECRYPT) (\r
+(EFIAPI *EFI_BLOCK_CIPHER_CBC_ENCRYPT_DECRYPT)(\r

   IN   VOID         *BlockCipherContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r
   IN   VOID         *BlockCipherContext,\r
   IN   CONST UINT8  *Input,\r
   IN   UINTN        InputSize,\r


@@ -161,49 +160,48 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_BLOCK_CIPHER_RESET) (\r
+(EFIAPI *EFI_BLOCK_CIPHER_RESET)(\r

   IN OUT  VOID  *BlockCipherContext\r
   );\r
 \r
 typedef struct {\r
   IN OUT  VOID  *BlockCipherContext\r
   );\r
 \r
 typedef struct {\r

-  EFI_BLOCK_CIPHER_GET_CONTEXT_SIZE      GetContextSize;\r
-  EFI_BLOCK_CIPHER_INIT                  Init;\r
-  EFI_BLOCK_CIPHER_ECB_ENCRYPT_DECRYPT   EcbEncrypt;\r
-  EFI_BLOCK_CIPHER_ECB_ENCRYPT_DECRYPT   EcbDecrypt;\r
-  EFI_BLOCK_CIPHER_CBC_ENCRYPT_DECRYPT   CbcEncrypt;\r
-  EFI_BLOCK_CIPHER_CBC_ENCRYPT_DECRYPT   CbcDecrypt;\r
-  EFI_BLOCK_CIPHER_RESET                 Reset;\r
-  CONST UINT8                            *Key;\r
-  UINTN                                  KeySize;\r
-  CONST UINT8                            *Ivec;\r
-  CONST UINT8                            *Data;\r
-  UINTN                                  DataSize;\r
-  CONST UINT8                            *Cipher;\r
-  UINTN                                  CipherSize;\r
-  VOID                                   *Ctx;\r
+  EFI_BLOCK_CIPHER_GET_CONTEXT_SIZE       GetContextSize;\r
+  EFI_BLOCK_CIPHER_INIT                   Init;\r
+  EFI_BLOCK_CIPHER_ECB_ENCRYPT_DECRYPT    EcbEncrypt;\r
+  EFI_BLOCK_CIPHER_ECB_ENCRYPT_DECRYPT    EcbDecrypt;\r
+  EFI_BLOCK_CIPHER_CBC_ENCRYPT_DECRYPT    CbcEncrypt;\r
+  EFI_BLOCK_CIPHER_CBC_ENCRYPT_DECRYPT    CbcDecrypt;\r
+  EFI_BLOCK_CIPHER_RESET                  Reset;\r
+  CONST UINT8                             *Key;\r
+  UINTN                                   KeySize;\r
+  CONST UINT8                             *Ivec;\r
+  CONST UINT8                             *Data;\r
+  UINTN                                   DataSize;\r
+  CONST UINT8                             *Cipher;\r
+  UINTN                                   CipherSize;\r
+  VOID                                    *Ctx;\r

 } BLOCK_CIPHER_TEST_CONTEXT;\r
 \r
 // These are commented out as they are deprecated, but are left in should they be used again\r
 } BLOCK_CIPHER_TEST_CONTEXT;\r
 \r
 // These are commented out as they are deprecated, but are left in should they be used again\r

-//BLOCK_CIPHER_TEST_CONTEXT mTdesEcbTestCtx   = {TdesGetContextSize, TdesInit, TdesEcbEncrypt, TdesEcbDecrypt, NULL,           NULL,           NULL,      TdesEcbKey,   64,              NULL,          TdesEcbData,   8,                     TdesEcbCipher,   8};\r
-//BLOCK_CIPHER_TEST_CONTEXT mTdesCbcTestCtx   = {TdesGetContextSize, TdesInit, NULL,           NULL,           TdesCbcEncrypt, TdesCbcDecrypt, NULL,      TdesCbcKey,   192,             TdesCbcIvec,   TdesCbcData,   sizeof(TdesCbcData),   TdesCbc3Cipher,  sizeof(TdesCbc3Cipher)};\r
-//BLOCK_CIPHER_TEST_CONTEXT mAes128EcbTestCtx = {AesGetContextSize,  AesInit,  AesEcbEncrypt,  AesEcbDecrypt,  NULL,           NULL,           NULL,      Aes128EcbKey, 128,             NULL,          Aes128EcbData, sizeof(Aes128EcbData), Aes128EcbCipher, sizeof(Aes128EcbCipher)};\r
-//BLOCK_CIPHER_TEST_CONTEXT mAes192EcbTestCtx = {AesGetContextSize,  AesInit,  AesEcbEncrypt,  AesEcbDecrypt,  NULL,           NULL,           NULL,      Aes192EcbKey, 192,             NULL,          Aes192EcbData, sizeof(Aes192EcbData), Aes192EcbCipher, sizeof(Aes192EcbCipher)};\r
-//BLOCK_CIPHER_TEST_CONTEXT mAes256EcbTestCtx = {AesGetContextSize,  AesInit,  AesEcbEncrypt,  AesEcbDecrypt,  NULL,           NULL,           NULL,      Aes256EcbKey, 256,             NULL,          Aes256EcbData, sizeof(Aes256EcbData), Aes256EcbCipher, sizeof(Aes256EcbCipher)};\r
-//BLOCK_CIPHER_TEST_CONTEXT mArc4TestCtx      = {Arc4GetContextSize, Arc4Init, Arc4Encrypt,    (EFI_BLOCK_CIPHER_ECB_ENCRYPT_DECRYPT), Arc4Decrypt,    NULL,           NULL,           Arc4Reset, Arc4Key,      sizeof(Arc4Key), NULL,          Arc4Data,      sizeof(Arc4Data),      Arc4Cipher,      sizeof(Arc4Cipher)};\r
-BLOCK_CIPHER_TEST_CONTEXT mAes128CbcTestCtx = {AesGetContextSize,  AesInit,  NULL,           NULL,           AesCbcEncrypt,  AesCbcDecrypt,  NULL,      Aes128CbcKey, 128,             Aes128CbcIvec, Aes128CbcData, sizeof(Aes128CbcData), Aes128CbcCipher, sizeof(Aes128CbcCipher)};\r
-\r
+// BLOCK_CIPHER_TEST_CONTEXT mTdesEcbTestCtx   = {TdesGetContextSize, TdesInit, TdesEcbEncrypt, TdesEcbDecrypt, NULL,           NULL,           NULL,      TdesEcbKey,   64,              NULL,          TdesEcbData,   8,                     TdesEcbCipher,   8};\r
+// BLOCK_CIPHER_TEST_CONTEXT mTdesCbcTestCtx   = {TdesGetContextSize, TdesInit, NULL,           NULL,           TdesCbcEncrypt, TdesCbcDecrypt, NULL,      TdesCbcKey,   192,             TdesCbcIvec,   TdesCbcData,   sizeof(TdesCbcData),   TdesCbc3Cipher,  sizeof(TdesCbc3Cipher)};\r
+// BLOCK_CIPHER_TEST_CONTEXT mAes128EcbTestCtx = {AesGetContextSize,  AesInit,  AesEcbEncrypt,  AesEcbDecrypt,  NULL,           NULL,           NULL,      Aes128EcbKey, 128,             NULL,          Aes128EcbData, sizeof(Aes128EcbData), Aes128EcbCipher, sizeof(Aes128EcbCipher)};\r
+// BLOCK_CIPHER_TEST_CONTEXT mAes192EcbTestCtx = {AesGetContextSize,  AesInit,  AesEcbEncrypt,  AesEcbDecrypt,  NULL,           NULL,           NULL,      Aes192EcbKey, 192,             NULL,          Aes192EcbData, sizeof(Aes192EcbData), Aes192EcbCipher, sizeof(Aes192EcbCipher)};\r
+// BLOCK_CIPHER_TEST_CONTEXT mAes256EcbTestCtx = {AesGetContextSize,  AesInit,  AesEcbEncrypt,  AesEcbDecrypt,  NULL,           NULL,           NULL,      Aes256EcbKey, 256,             NULL,          Aes256EcbData, sizeof(Aes256EcbData), Aes256EcbCipher, sizeof(Aes256EcbCipher)};\r
+// BLOCK_CIPHER_TEST_CONTEXT mArc4TestCtx      = {Arc4GetContextSize, Arc4Init, Arc4Encrypt,    (EFI_BLOCK_CIPHER_ECB_ENCRYPT_DECRYPT), Arc4Decrypt,    NULL,           NULL,           Arc4Reset, Arc4Key,      sizeof(Arc4Key), NULL,          Arc4Data,      sizeof(Arc4Data),      Arc4Cipher,      sizeof(Arc4Cipher)};\r
+BLOCK_CIPHER_TEST_CONTEXT  mAes128CbcTestCtx = { AesGetContextSize, AesInit, NULL, NULL, AesCbcEncrypt, AesCbcDecrypt, NULL, Aes128CbcKey, 128, Aes128CbcIvec, Aes128CbcData, sizeof (Aes128CbcData), Aes128CbcCipher, sizeof (Aes128CbcCipher) };\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyBLockCiperPreReq (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyBLockCiperPreReq (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  BLOCK_CIPHER_TEST_CONTEXT *TestContext;\r
-  UINTN             CtxSize;\r
+  BLOCK_CIPHER_TEST_CONTEXT  *TestContext;\r
+  UINTN                      CtxSize;\r

 \r
 \r

-  TestContext = Context;\r
-  CtxSize = TestContext->GetContextSize ();\r
+  TestContext      = Context;\r
+  CtxSize          = TestContext->GetContextSize ();\r

   TestContext->Ctx = AllocatePool (CtxSize);\r
   if (TestContext->Ctx == NULL) {\r
     return UNIT_TEST_ERROR_TEST_FAILED;\r
   TestContext->Ctx = AllocatePool (CtxSize);\r
   if (TestContext->Ctx == NULL) {\r
     return UNIT_TEST_ERROR_TEST_FAILED;\r


@@ -215,10 +213,10 @@ TestVerifyBLockCiperPreReq (
 VOID\r
 EFIAPI\r
 TestVerifyBLockCiperCleanUp (\r
 VOID\r
 EFIAPI\r
 TestVerifyBLockCiperCleanUp (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  BLOCK_CIPHER_TEST_CONTEXT *TestContext;\r
+  BLOCK_CIPHER_TEST_CONTEXT  *TestContext;\r

 \r
   TestContext = Context;\r
   if (TestContext->Ctx != NULL) {\r
 \r
   TestContext = Context;\r
   if (TestContext->Ctx != NULL) {\r


@@ -229,13 +227,13 @@ TestVerifyBLockCiperCleanUp (
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyBLockCiper (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyBLockCiper (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  UINT8    Encrypt[256];\r
-  UINT8    Decrypt[256];\r
-  BOOLEAN  Status;\r
-  BLOCK_CIPHER_TEST_CONTEXT *TestContext;\r
+  UINT8                      Encrypt[256];\r
+  UINT8                      Decrypt[256];\r
+  BOOLEAN                    Status;\r
+  BLOCK_CIPHER_TEST_CONTEXT  *TestContext;\r

 \r
   TestContext = Context;\r
 \r
 \r
   TestContext = Context;\r
 \r


@@ -256,7 +254,6 @@ TestVerifyBLockCiper (
 \r
     Status = TestContext->EcbDecrypt (TestContext->Ctx, Encrypt, TestContext->DataSize, Decrypt);\r
     UT_ASSERT_TRUE (Status);\r
 \r
     Status = TestContext->EcbDecrypt (TestContext->Ctx, Encrypt, TestContext->DataSize, Decrypt);\r
     UT_ASSERT_TRUE (Status);\r

-\r

   } else {\r
     Status = TestContext->CbcEncrypt (TestContext->Ctx, TestContext->Data, TestContext->DataSize, TestContext->Ivec, Encrypt);\r
     UT_ASSERT_TRUE (Status);\r
   } else {\r
     Status = TestContext->CbcEncrypt (TestContext->Ctx, TestContext->Data, TestContext->DataSize, TestContext->Ivec, Encrypt);\r
     UT_ASSERT_TRUE (Status);\r


@@ -271,23 +268,23 @@ TestVerifyBLockCiper (
   }\r
 \r
   UT_ASSERT_MEM_EQUAL (Encrypt, TestContext->Cipher, TestContext->CipherSize);\r
   }\r
 \r
   UT_ASSERT_MEM_EQUAL (Encrypt, TestContext->Cipher, TestContext->CipherSize);\r

-  UT_ASSERT_MEM_EQUAL (Decrypt, TestContext->Data,   TestContext->DataSize);\r
+  UT_ASSERT_MEM_EQUAL (Decrypt, TestContext->Data, TestContext->DataSize);\r

 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-TEST_DESC mBlockCipherTest[] = {\r
-    //\r
-    // -----Description-------------------------Class-------------------------Function---------------Pre---------------------------Post------------------Context\r
-    //\r
-    {"TestVerifyAes128Cbc()",  "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mAes128CbcTestCtx},\r
-    // These are commented out as these functions have been deprecated, but they have been left in for future reference\r
-    //{"TestVerifyTdesEcb()",    "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mTdesEcbTestCtx},\r
-    //{"TestVerifyTdesCbc()",    "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mTdesCbcTestCtx},\r
-    //{"TestVerifyAes128Ecb()",  "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mAes128EcbTestCtx},\r
-    //{"TestVerifyAes192Ecb()",  "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mAes192EcbTestCtx},\r
-    //{"TestVerifyAes256Ecb()",  "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mAes256EcbTestCtx},\r
-    //{"TestVerifyArc4()",       "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mArc4TestCtx},\r
+TEST_DESC  mBlockCipherTest[] = {\r
+  //\r
+  // -----Description-------------------------Class-------------------------Function---------------Pre---------------------------Post------------------Context\r
+  //\r
+  { "TestVerifyAes128Cbc()", "CryptoPkg.BaseCryptLib.BlockCipher", TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mAes128CbcTestCtx },\r
+  // These are commented out as these functions have been deprecated, but they have been left in for future reference\r
+  // {"TestVerifyTdesEcb()",    "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mTdesEcbTestCtx},\r
+  // {"TestVerifyTdesCbc()",    "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mTdesCbcTestCtx},\r
+  // {"TestVerifyAes128Ecb()",  "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mAes128EcbTestCtx},\r
+  // {"TestVerifyAes192Ecb()",  "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mAes192EcbTestCtx},\r
+  // {"TestVerifyAes256Ecb()",  "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mAes256EcbTestCtx},\r
+  // {"TestVerifyArc4()",       "CryptoPkg.BaseCryptLib.BlockCipher",   TestVerifyBLockCiper, TestVerifyBLockCiperPreReq, TestVerifyBLockCiperCleanUp, &mArc4TestCtx},\r

 };\r
 \r
 };\r
 \r

-UINTN mBlockCipherTestNum = ARRAY_SIZE(mBlockCipherTest);\r
+UINTN  mBlockCipherTestNum = ARRAY_SIZE (mBlockCipherTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/DhTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/DhTests.c
index 422b990f2c2d9b03d3ea108e7a98601c27a5ebfc..5cfe8d70535b852b18973256e482e57ad1c68b17 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/DhTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/DhTests.c
@@ -8,13 +8,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "TestBaseCryptLib.h"\r
 \r
 \r
 #include "TestBaseCryptLib.h"\r
 \r

-VOID    *mDh1;\r
-VOID    *mDh2;\r
+VOID  *mDh1;\r
+VOID  *mDh2;\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyDhPreReq (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyDhPreReq (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   mDh1 = DhNew ();\r
   )\r
 {\r
   mDh1 = DhNew ();\r


@@ -33,13 +33,14 @@ TestVerifyDhPreReq (
 VOID\r
 EFIAPI\r
 TestVerifyDhCleanUp (\r
 VOID\r
 EFIAPI\r
 TestVerifyDhCleanUp (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   if (mDh1 != NULL) {\r
     DhFree (mDh1);\r
     mDh1 = NULL;\r
   }\r
   )\r
 {\r
   if (mDh1 != NULL) {\r
     DhFree (mDh1);\r
     mDh1 = NULL;\r
   }\r

+\r

   if (mDh2 != NULL) {\r
     DhFree (mDh2);\r
     mDh2 = NULL;\r
   if (mDh2 != NULL) {\r
     DhFree (mDh2);\r
     mDh2 = NULL;\r


@@ -49,19 +50,19 @@ TestVerifyDhCleanUp (
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyDhGenerateKey (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyDhGenerateKey (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  UINT8   Prime[64];\r
-  UINT8   PublicKey1[64];\r
-  UINTN   PublicKey1Length;\r
-  UINT8   PublicKey2[64];\r
-  UINTN   PublicKey2Length;\r
-  UINT8   Key1[64];\r
-  UINTN   Key1Length;\r
-  UINT8   Key2[64];\r
-  UINTN   Key2Length;\r
-  BOOLEAN Status;\r
+  UINT8    Prime[64];\r
+  UINT8    PublicKey1[64];\r
+  UINTN    PublicKey1Length;\r
+  UINT8    PublicKey2[64];\r
+  UINTN    PublicKey2Length;\r
+  UINT8    Key1[64];\r
+  UINTN    Key1Length;\r
+  UINT8    Key2[64];\r
+  UINTN    Key2Length;\r
+  BOOLEAN  Status;\r

 \r
   //\r
   // Initialize Key Length\r
 \r
   //\r
   // Initialize Key Length\r


@@ -96,11 +97,11 @@ TestVerifyDhGenerateKey (
   return UNIT_TEST_PASSED;\r
 }\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-TEST_DESC mDhTest[] = {\r
-    //\r
-    // -----Description--------------------------------Class---------------------Function----------------Pre-----------------Post------------Context\r
-    //\r
-    {"TestVerifyDhGenerateKey()",        "CryptoPkg.BaseCryptLib.Dh",   TestVerifyDhGenerateKey,  TestVerifyDhPreReq, TestVerifyDhCleanUp, NULL},\r
+TEST_DESC  mDhTest[] = {\r
+  //\r
+  // -----Description--------------------------------Class---------------------Function----------------Pre-----------------Post------------Context\r
+  //\r
+  { "TestVerifyDhGenerateKey()", "CryptoPkg.BaseCryptLib.Dh", TestVerifyDhGenerateKey, TestVerifyDhPreReq, TestVerifyDhCleanUp, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mDhTestNum = ARRAY_SIZE(mDhTest);\r
+UINTN  mDhTestNum = ARRAY_SIZE (mDhTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
index aebba853e05f2b8ed2e8b1bfbe58df3ba309c125..e7e67b645b9c8378465fcb45be1ea3658ed41733 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
@@ -11,72 +11,72 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Max Known Digest Size is SHA512 Output (64 bytes) by far\r
 //\r
 //\r
 // Max Known Digest Size is SHA512 Output (64 bytes) by far\r
 //\r

-#define MAX_DIGEST_SIZE    64\r
+#define MAX_DIGEST_SIZE  64\r

 \r
 //\r
 // Message string for digest validation\r
 //\r
 \r
 //\r
 // Message string for digest validation\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *HashData = "abc";\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  *HashData = "abc";\r

 \r
 //\r
 // Result for MD5("abc"). (From "A.5 Test suite" of IETF RFC1321)\r
 //\r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r
 \r
 //\r
 // Result for MD5("abc"). (From "A.5 Test suite" of IETF RFC1321)\r
 //\r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Md5Digest[MD5_DIGEST_SIZE] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Md5Digest[MD5_DIGEST_SIZE] = {\r

   0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72\r
   0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72\r

-  };\r
+};\r

 #endif\r
 \r
 //\r
 // Result for SHA-1("abc"). (From "A.1 SHA-1 Example" of NIST FIPS 180-2)\r
 //\r
 #endif\r
 \r
 //\r
 // Result for SHA-1("abc"). (From "A.1 SHA-1 Example" of NIST FIPS 180-2)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Sha1Digest[SHA1_DIGEST_SIZE] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Sha1Digest[SHA1_DIGEST_SIZE] = {\r

   0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a, 0xba, 0x3e, 0x25, 0x71, 0x78, 0x50, 0xc2, 0x6c,\r
   0x9c, 0xd0, 0xd8, 0x9d\r
   0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a, 0xba, 0x3e, 0x25, 0x71, 0x78, 0x50, 0xc2, 0x6c,\r
   0x9c, 0xd0, 0xd8, 0x9d\r

-  };\r
+};\r

 \r
 //\r
 // Result for SHA-256("abc"). (From "B.1 SHA-256 Example" of NIST FIPS 180-2)\r
 //\r
 \r
 //\r
 // Result for SHA-256("abc"). (From "B.1 SHA-256 Example" of NIST FIPS 180-2)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Sha256Digest[SHA256_DIGEST_SIZE] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Sha256Digest[SHA256_DIGEST_SIZE] = {\r

   0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, 0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23,\r
   0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c, 0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad\r
   0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, 0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23,\r
   0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c, 0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad\r

-  };\r
+};\r

 \r
 //\r
 // Result for SHA-384("abc"). (From "D.1 SHA-384 Example" of NIST FIPS 180-2)\r
 //\r
 \r
 //\r
 // Result for SHA-384("abc"). (From "D.1 SHA-384 Example" of NIST FIPS 180-2)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Sha384Digest[SHA384_DIGEST_SIZE] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Sha384Digest[SHA384_DIGEST_SIZE] = {\r

   0xcb, 0x00, 0x75, 0x3f, 0x45, 0xa3, 0x5e, 0x8b, 0xb5, 0xa0, 0x3d, 0x69, 0x9a, 0xc6, 0x50, 0x07,\r
   0x27, 0x2c, 0x32, 0xab, 0x0e, 0xde, 0xd1, 0x63, 0x1a, 0x8b, 0x60, 0x5a, 0x43, 0xff, 0x5b, 0xed,\r
   0x80, 0x86, 0x07, 0x2b, 0xa1, 0xe7, 0xcc, 0x23, 0x58, 0xba, 0xec, 0xa1, 0x34, 0xc8, 0x25, 0xa7\r
   0xcb, 0x00, 0x75, 0x3f, 0x45, 0xa3, 0x5e, 0x8b, 0xb5, 0xa0, 0x3d, 0x69, 0x9a, 0xc6, 0x50, 0x07,\r
   0x27, 0x2c, 0x32, 0xab, 0x0e, 0xde, 0xd1, 0x63, 0x1a, 0x8b, 0x60, 0x5a, 0x43, 0xff, 0x5b, 0xed,\r
   0x80, 0x86, 0x07, 0x2b, 0xa1, 0xe7, 0xcc, 0x23, 0x58, 0xba, 0xec, 0xa1, 0x34, 0xc8, 0x25, 0xa7\r

-  };\r
+};\r

 \r
 //\r
 // Result for SHA-512("abc"). (From "C.1 SHA-512 Example" of NIST FIPS 180-2)\r
 //\r
 \r
 //\r
 // Result for SHA-512("abc"). (From "C.1 SHA-512 Example" of NIST FIPS 180-2)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Sha512Digest[SHA512_DIGEST_SIZE] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  Sha512Digest[SHA512_DIGEST_SIZE] = {\r

   0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, 0xcc, 0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31,\r
   0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2, 0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55, 0xd3, 0x9a,\r
   0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8, 0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd,\r
   0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e, 0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4, 0x9f\r
   0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, 0xcc, 0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31,\r
   0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2, 0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55, 0xd3, 0x9a,\r
   0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8, 0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd,\r
   0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e, 0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4, 0x9f\r

-  };\r
+};\r

 \r
 typedef\r
 UINTN\r
 \r
 typedef\r
 UINTN\r

-(EFIAPI *EFI_HASH_GET_CONTEXT_SIZE) (\r
+(EFIAPI *EFI_HASH_GET_CONTEXT_SIZE)(\r

   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_HASH_INIT) (\r
+(EFIAPI *EFI_HASH_INIT)(\r

   OUT  VOID  *HashContext\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   OUT  VOID  *HashContext\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_HASH_UPDATE) (\r
+(EFIAPI *EFI_HASH_UPDATE)(\r

   IN OUT  VOID        *HashContext,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   IN OUT  VOID        *HashContext,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r


@@ -84,49 +84,49 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_HASH_FINAL) (\r
+(EFIAPI *EFI_HASH_FINAL)(\r

   IN OUT  VOID   *HashContext,\r
   OUT     UINT8  *HashValue\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   IN OUT  VOID   *HashContext,\r
   OUT     UINT8  *HashValue\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_HASH_ALL) (\r
+(EFIAPI *EFI_HASH_ALL)(\r

   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   );\r
 \r
 typedef struct {\r
   IN   CONST VOID  *Data,\r
   IN   UINTN       DataSize,\r
   OUT  UINT8       *HashValue\r
   );\r
 \r
 typedef struct {\r

-  UINT32                     DigestSize;\r
-  EFI_HASH_GET_CONTEXT_SIZE  GetContextSize;\r
-  EFI_HASH_INIT              HashInit;\r
-  EFI_HASH_UPDATE            HashUpdate;\r
-  EFI_HASH_FINAL             HashFinal;\r
-  EFI_HASH_ALL               HashAll;\r
-  CONST UINT8                *Digest;\r
-  VOID                       *HashCtx;\r
+  UINT32                       DigestSize;\r
+  EFI_HASH_GET_CONTEXT_SIZE    GetContextSize;\r
+  EFI_HASH_INIT                HashInit;\r
+  EFI_HASH_UPDATE              HashUpdate;\r
+  EFI_HASH_FINAL               HashFinal;\r
+  EFI_HASH_ALL                 HashAll;\r
+  CONST UINT8                  *Digest;\r
+  VOID                         *HashCtx;\r

 } HASH_TEST_CONTEXT;\r
 \r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r
 } HASH_TEST_CONTEXT;\r
 \r
 #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r

-HASH_TEST_CONTEXT       mMd5TestCtx    = {MD5_DIGEST_SIZE,    Md5GetContextSize,    Md5Init,    Md5Update,    Md5Final,    Md5HashAll,    Md5Digest};\r
+HASH_TEST_CONTEXT  mMd5TestCtx = { MD5_DIGEST_SIZE, Md5GetContextSize, Md5Init, Md5Update, Md5Final, Md5HashAll, Md5Digest };\r

 #endif\r
 #endif\r

-HASH_TEST_CONTEXT       mSha1TestCtx   = {SHA1_DIGEST_SIZE,   Sha1GetContextSize,   Sha1Init,   Sha1Update,   Sha1Final,   Sha1HashAll,   Sha1Digest};\r
-HASH_TEST_CONTEXT       mSha256TestCtx = {SHA256_DIGEST_SIZE, Sha256GetContextSize, Sha256Init, Sha256Update, Sha256Final, Sha256HashAll, Sha256Digest};\r
-HASH_TEST_CONTEXT       mSha384TestCtx = {SHA384_DIGEST_SIZE, Sha384GetContextSize, Sha384Init, Sha384Update, Sha384Final, Sha384HashAll, Sha384Digest};\r
-HASH_TEST_CONTEXT       mSha512TestCtx = {SHA512_DIGEST_SIZE, Sha512GetContextSize, Sha512Init, Sha512Update, Sha512Final, Sha512HashAll, Sha512Digest};\r
+HASH_TEST_CONTEXT  mSha1TestCtx   = { SHA1_DIGEST_SIZE, Sha1GetContextSize, Sha1Init, Sha1Update, Sha1Final, Sha1HashAll, Sha1Digest };\r
+HASH_TEST_CONTEXT  mSha256TestCtx = { SHA256_DIGEST_SIZE, Sha256GetContextSize, Sha256Init, Sha256Update, Sha256Final, Sha256HashAll, Sha256Digest };\r
+HASH_TEST_CONTEXT  mSha384TestCtx = { SHA384_DIGEST_SIZE, Sha384GetContextSize, Sha384Init, Sha384Update, Sha384Final, Sha384HashAll, Sha384Digest };\r
+HASH_TEST_CONTEXT  mSha512TestCtx = { SHA512_DIGEST_SIZE, Sha512GetContextSize, Sha512Init, Sha512Update, Sha512Final, Sha512HashAll, Sha512Digest };\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyHashPreReq (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyHashPreReq (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  HASH_TEST_CONTEXT *HashTestContext;\r
-  UINTN             CtxSize;\r
+  HASH_TEST_CONTEXT  *HashTestContext;\r
+  UINTN              CtxSize;\r

 \r
 \r

-  HashTestContext = Context;\r
-  CtxSize = HashTestContext->GetContextSize ();\r
+  HashTestContext          = Context;\r
+  CtxSize                  = HashTestContext->GetContextSize ();\r

   HashTestContext->HashCtx = AllocatePool (CtxSize);\r
   if (HashTestContext->HashCtx == NULL) {\r
     return UNIT_TEST_ERROR_TEST_FAILED;\r
   HashTestContext->HashCtx = AllocatePool (CtxSize);\r
   if (HashTestContext->HashCtx == NULL) {\r
     return UNIT_TEST_ERROR_TEST_FAILED;\r


@@ -138,10 +138,10 @@ TestVerifyHashPreReq (
 VOID\r
 EFIAPI\r
 TestVerifyHashCleanUp (\r
 VOID\r
 EFIAPI\r
 TestVerifyHashCleanUp (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  HASH_TEST_CONTEXT *HashTestContext;\r
+  HASH_TEST_CONTEXT  *HashTestContext;\r

 \r
   HashTestContext = Context;\r
   if (HashTestContext->HashCtx != NULL) {\r
 \r
   HashTestContext = Context;\r
   if (HashTestContext->HashCtx != NULL) {\r


@@ -152,13 +152,13 @@ TestVerifyHashCleanUp (
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyHash (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyHash (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  UINTN    DataSize;\r
-  UINT8    Digest[MAX_DIGEST_SIZE];\r
-  BOOLEAN  Status;\r
-  HASH_TEST_CONTEXT *HashTestContext;\r
+  UINTN              DataSize;\r
+  UINT8              Digest[MAX_DIGEST_SIZE];\r
+  BOOLEAN            Status;\r
+  HASH_TEST_CONTEXT  *HashTestContext;\r

 \r
   HashTestContext = Context;\r
 \r
 \r
   HashTestContext = Context;\r
 \r


@@ -166,19 +166,19 @@ TestVerifyHash (
 \r
   ZeroMem (Digest, MAX_DIGEST_SIZE);\r
 \r
 \r
   ZeroMem (Digest, MAX_DIGEST_SIZE);\r
 \r

-  Status  = HashTestContext->HashInit (HashTestContext->HashCtx);\r
+  Status = HashTestContext->HashInit (HashTestContext->HashCtx);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_TRUE (Status);\r
 \r

-  Status  = HashTestContext->HashUpdate (HashTestContext->HashCtx, HashData, DataSize);\r
+  Status = HashTestContext->HashUpdate (HashTestContext->HashCtx, HashData, DataSize);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_TRUE (Status);\r
 \r

-  Status  = HashTestContext->HashFinal (HashTestContext->HashCtx, Digest);\r
+  Status = HashTestContext->HashFinal (HashTestContext->HashCtx, Digest);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_MEM_EQUAL (Digest, HashTestContext->Digest, HashTestContext->DigestSize);\r
 \r
   ZeroMem (Digest, MAX_DIGEST_SIZE);\r
   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_MEM_EQUAL (Digest, HashTestContext->Digest, HashTestContext->DigestSize);\r
 \r
   ZeroMem (Digest, MAX_DIGEST_SIZE);\r

-  Status  = HashTestContext->HashAll (HashData, DataSize, Digest);\r
+  Status = HashTestContext->HashAll (HashData, DataSize, Digest);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_MEM_EQUAL (Digest, HashTestContext->Digest, HashTestContext->DigestSize);\r
   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_MEM_EQUAL (Digest, HashTestContext->Digest, HashTestContext->DigestSize);\r


@@ -186,17 +186,17 @@ TestVerifyHash (
   return UNIT_TEST_PASSED;\r
 }\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-TEST_DESC mHashTest[] = {\r
-    //\r
-    // -----Description----------------Class---------------------Function---------------Pre------------------Post------------Context\r
-    //\r
-#ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r
-    {"TestVerifyMd5()",    "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mMd5TestCtx},\r
-#endif\r
-    {"TestVerifySha1()",   "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha1TestCtx},\r
-    {"TestVerifySha256()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha256TestCtx},\r
-    {"TestVerifySha384()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha384TestCtx},\r
-    {"TestVerifySha512()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha512TestCtx},\r
+TEST_DESC  mHashTest[] = {\r
+  //\r
+  // -----Description----------------Class---------------------Function---------------Pre------------------Post------------Context\r
+  //\r
+ #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r
+  { "TestVerifyMd5()",    "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mMd5TestCtx    },\r
+ #endif\r
+  { "TestVerifySha1()",   "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha1TestCtx   },\r
+  { "TestVerifySha256()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha256TestCtx },\r
+  { "TestVerifySha384()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha384TestCtx },\r
+  { "TestVerifySha512()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha512TestCtx },\r

 };\r
 \r
 };\r
 \r

-UINTN mHashTestNum = ARRAY_SIZE(mHashTest);\r
+UINTN  mHashTestNum = ARRAY_SIZE (mHashTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HmacTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HmacTests.c
index 2e0cdd7c45703960dcf2248069758d1217b41102..595729424bfad60b01a6ab207d0d926dae5a5ea4 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HmacTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HmacTests.c
@@ -11,68 +11,68 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Max Known Digest Size is SHA512 Output (64 bytes) by far\r
 //\r
 //\r
 // Max Known Digest Size is SHA512 Output (64 bytes) by far\r
 //\r

-#define MAX_DIGEST_SIZE    64\r
+#define MAX_DIGEST_SIZE  64\r

 \r
 //\r
 // Data string for HMAC validation\r
 //\r
 \r
 //\r
 // Data string for HMAC validation\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *HmacData = "Hi There";\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  *HmacData = "Hi There";\r

 \r
 //\r
 // Key value for HMAC-MD5 validation. (From "2. Test Cases for HMAC-MD5" of IETF RFC2202)\r
 //\r
 \r
 //\r
 // Key value for HMAC-MD5 validation. (From "2. Test Cases for HMAC-MD5" of IETF RFC2202)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 HmacMd5Key[16] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  HmacMd5Key[16] = {\r

   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b\r
   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b\r

-  };\r
+};\r

 \r
 //\r
 // Result for HMAC-MD5("Hi There"). (From "2. Test Cases for HMAC-MD5" of IETF RFC2202)\r
 //\r
 \r
 //\r
 // Result for HMAC-MD5("Hi There"). (From "2. Test Cases for HMAC-MD5" of IETF RFC2202)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 HmacMd5Digest[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  HmacMd5Digest[] = {\r

   0x92, 0x94, 0x72, 0x7a, 0x36, 0x38, 0xbb, 0x1c, 0x13, 0xf4, 0x8e, 0xf8, 0x15, 0x8b, 0xfc, 0x9d\r
   0x92, 0x94, 0x72, 0x7a, 0x36, 0x38, 0xbb, 0x1c, 0x13, 0xf4, 0x8e, 0xf8, 0x15, 0x8b, 0xfc, 0x9d\r

-  };\r
+};\r

 \r
 //\r
 // Key value for HMAC-SHA-1 validation. (From "3. Test Cases for HMAC-SHA-1" of IETF RFC2202)\r
 //\r
 \r
 //\r
 // Key value for HMAC-SHA-1 validation. (From "3. Test Cases for HMAC-SHA-1" of IETF RFC2202)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 HmacSha1Key[20] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  HmacSha1Key[20] = {\r

   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,\r
   0x0b, 0x0b, 0x0b, 0x0b\r
   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,\r
   0x0b, 0x0b, 0x0b, 0x0b\r

-  };\r
+};\r

 \r
 //\r
 // Result for HMAC-SHA-1 ("Hi There"). (From "3. Test Cases for HMAC-SHA-1" of IETF RFC2202)\r
 //\r
 \r
 //\r
 // Result for HMAC-SHA-1 ("Hi There"). (From "3. Test Cases for HMAC-SHA-1" of IETF RFC2202)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 HmacSha1Digest[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  HmacSha1Digest[] = {\r

   0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, 0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e,\r
   0xf1, 0x46, 0xbe, 0x00\r
   0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, 0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e,\r
   0xf1, 0x46, 0xbe, 0x00\r

-  };\r
+};\r

 \r
 //\r
 // Key value for HMAC-SHA-256 validation. (From "4. Test Vectors" of IETF RFC4231)\r
 //\r
 \r
 //\r
 // Key value for HMAC-SHA-256 validation. (From "4. Test Vectors" of IETF RFC4231)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 HmacSha256Key[20] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  HmacSha256Key[20] = {\r

   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,\r
   0x0b, 0x0b, 0x0b, 0x0b\r
   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,\r
   0x0b, 0x0b, 0x0b, 0x0b\r

-  };\r
+};\r

 \r
 //\r
 // Result for HMAC-SHA-256 ("Hi There"). (From "4. Test Vectors" of IETF RFC4231)\r
 //\r
 \r
 //\r
 // Result for HMAC-SHA-256 ("Hi There"). (From "4. Test Vectors" of IETF RFC4231)\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 HmacSha256Digest[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  HmacSha256Digest[] = {\r

   0xb0, 0x34, 0x4c, 0x61, 0xd8, 0xdb, 0x38, 0x53, 0x5c, 0xa8, 0xaf, 0xce, 0xaf, 0x0b, 0xf1, 0x2b,\r
   0x88, 0x1d, 0xc2, 0x00, 0xc9, 0x83, 0x3d, 0xa7, 0x26, 0xe9, 0x37, 0x6c, 0x2e, 0x32, 0xcf, 0xf7\r
   0xb0, 0x34, 0x4c, 0x61, 0xd8, 0xdb, 0x38, 0x53, 0x5c, 0xa8, 0xaf, 0xce, 0xaf, 0x0b, 0xf1, 0x2b,\r
   0x88, 0x1d, 0xc2, 0x00, 0xc9, 0x83, 0x3d, 0xa7, 0x26, 0xe9, 0x37, 0x6c, 0x2e, 0x32, 0xcf, 0xf7\r

-  };\r
+};\r

 \r
 typedef\r
 \r
 typedef\r

-VOID*\r
-(EFIAPI *EFI_HMAC_NEW) (\r
+VOID *\r
+(EFIAPI *EFI_HMAC_NEW)(\r

   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_HMAC_INIT) (\r
+(EFIAPI *EFI_HMAC_INIT)(\r

   IN OUT  VOID        *HashContext,\r
   IN   CONST UINT8    *Key,\r
   IN   UINTN           KeySize\r
   IN OUT  VOID        *HashContext,\r
   IN   CONST UINT8    *Key,\r
   IN   UINTN           KeySize\r


@@ -80,7 +80,7 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_HMAC_UPDATE) (\r
+(EFIAPI *EFI_HMAC_UPDATE)(\r

   IN OUT  VOID        *HashContext,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r
   IN OUT  VOID        *HashContext,\r
   IN      CONST VOID  *Data,\r
   IN      UINTN       DataSize\r


@@ -88,39 +88,38 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
 \r
 typedef\r
 BOOLEAN\r

-(EFIAPI *EFI_HMAC_FINAL) (\r
+(EFIAPI *EFI_HMAC_FINAL)(\r

   IN OUT  VOID   *HashContext,\r
   OUT     UINT8  *HashValue\r
   );\r
 \r
 typedef struct {\r
   IN OUT  VOID   *HashContext,\r
   OUT     UINT8  *HashValue\r
   );\r
 \r
 typedef struct {\r

-  UINT32                     DigestSize;\r
-  EFI_HMAC_NEW               HmacNew;\r
-  EFI_HMAC_INIT              HmacInit;\r
-  EFI_HMAC_UPDATE            HmacUpdate;\r
-  EFI_HMAC_FINAL             HmacFinal;\r
-  CONST UINT8                *Key;\r
-  UINTN                      KeySize;\r
-  CONST UINT8                *Digest;\r
-  VOID                       *HmacCtx;\r
+  UINT32             DigestSize;\r
+  EFI_HMAC_NEW       HmacNew;\r
+  EFI_HMAC_INIT      HmacInit;\r
+  EFI_HMAC_UPDATE    HmacUpdate;\r
+  EFI_HMAC_FINAL     HmacFinal;\r
+  CONST UINT8        *Key;\r
+  UINTN              KeySize;\r
+  CONST UINT8        *Digest;\r
+  VOID               *HmacCtx;\r

 } HMAC_TEST_CONTEXT;\r
 \r
 // These functions have been deprecated but they've been left commented out for future reference\r
 } HMAC_TEST_CONTEXT;\r
 \r
 // These functions have been deprecated but they've been left commented out for future reference\r

-//HMAC_TEST_CONTEXT       mHmacMd5TestCtx    = {MD5_DIGEST_SIZE,    HmacMd5New,    HmacMd5SetKey,    HmacMd5Update,    HmacMd5Final,    HmacMd5Key,    sizeof(HmacMd5Key),    HmacMd5Digest};\r
-//HMAC_TEST_CONTEXT       mHmacSha1TestCtx   = {SHA1_DIGEST_SIZE,   HmacSha1New,   HmacSha1SetKey,   HmacSha1Update,   HmacSha1Final,   HmacSha1Key,   sizeof(HmacSha1Key),   HmacSha1Digest};\r
-HMAC_TEST_CONTEXT       mHmacSha256TestCtx = {SHA256_DIGEST_SIZE, HmacSha256New, HmacSha256SetKey, HmacSha256Update, HmacSha256Final, HmacSha256Key, sizeof(HmacSha256Key), HmacSha256Digest};\r
-\r
+// HMAC_TEST_CONTEXT       mHmacMd5TestCtx    = {MD5_DIGEST_SIZE,    HmacMd5New,    HmacMd5SetKey,    HmacMd5Update,    HmacMd5Final,    HmacMd5Key,    sizeof(HmacMd5Key),    HmacMd5Digest};\r
+// HMAC_TEST_CONTEXT       mHmacSha1TestCtx   = {SHA1_DIGEST_SIZE,   HmacSha1New,   HmacSha1SetKey,   HmacSha1Update,   HmacSha1Final,   HmacSha1Key,   sizeof(HmacSha1Key),   HmacSha1Digest};\r
+HMAC_TEST_CONTEXT  mHmacSha256TestCtx = { SHA256_DIGEST_SIZE, HmacSha256New, HmacSha256SetKey, HmacSha256Update, HmacSha256Final, HmacSha256Key, sizeof (HmacSha256Key), HmacSha256Digest };\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyHmacPreReq (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyHmacPreReq (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  HMAC_TEST_CONTEXT *HmacTestContext;\r
+  HMAC_TEST_CONTEXT  *HmacTestContext;\r

 \r
 \r

-  HmacTestContext = Context;\r
-  HmacTestContext->HmacCtx = HmacTestContext->HmacNew();\r
+  HmacTestContext          = Context;\r
+  HmacTestContext->HmacCtx = HmacTestContext->HmacNew ();\r

   if (HmacTestContext->HmacCtx == NULL) {\r
     return UNIT_TEST_ERROR_TEST_FAILED;\r
   }\r
   if (HmacTestContext->HmacCtx == NULL) {\r
     return UNIT_TEST_ERROR_TEST_FAILED;\r
   }\r


@@ -131,10 +130,10 @@ TestVerifyHmacPreReq (
 VOID\r
 EFIAPI\r
 TestVerifyHmacCleanUp (\r
 VOID\r
 EFIAPI\r
 TestVerifyHmacCleanUp (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  HMAC_TEST_CONTEXT *HmacTestContext;\r
+  HMAC_TEST_CONTEXT  *HmacTestContext;\r

 \r
   HmacTestContext = Context;\r
   if (HmacTestContext->HmacCtx != NULL) {\r
 \r
   HmacTestContext = Context;\r
   if (HmacTestContext->HmacCtx != NULL) {\r


@@ -145,24 +144,24 @@ TestVerifyHmacCleanUp (
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyHmac (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyHmac (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  UINT8    Digest[MAX_DIGEST_SIZE];\r
-  BOOLEAN  Status;\r
-  HMAC_TEST_CONTEXT *HmacTestContext;\r
+  UINT8              Digest[MAX_DIGEST_SIZE];\r
+  BOOLEAN            Status;\r
+  HMAC_TEST_CONTEXT  *HmacTestContext;\r

 \r
   HmacTestContext = Context;\r
 \r
   ZeroMem (Digest, MAX_DIGEST_SIZE);\r
 \r
 \r
   HmacTestContext = Context;\r
 \r
   ZeroMem (Digest, MAX_DIGEST_SIZE);\r
 \r

-  Status  = HmacTestContext->HmacInit (HmacTestContext->HmacCtx, HmacTestContext->Key, HmacTestContext->KeySize);\r
+  Status = HmacTestContext->HmacInit (HmacTestContext->HmacCtx, HmacTestContext->Key, HmacTestContext->KeySize);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_TRUE (Status);\r
 \r

-  Status  = HmacTestContext->HmacUpdate (HmacTestContext->HmacCtx, HmacData, 8);\r
+  Status = HmacTestContext->HmacUpdate (HmacTestContext->HmacCtx, HmacData, 8);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_TRUE (Status);\r
 \r

-  Status  = HmacTestContext->HmacFinal (HmacTestContext->HmacCtx, Digest);\r
+  Status = HmacTestContext->HmacFinal (HmacTestContext->HmacCtx, Digest);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_MEM_EQUAL (Digest, HmacTestContext->Digest, HmacTestContext->DigestSize);\r
   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_MEM_EQUAL (Digest, HmacTestContext->Digest, HmacTestContext->DigestSize);\r


@@ -170,15 +169,14 @@ TestVerifyHmac (
   return UNIT_TEST_PASSED;\r
 }\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-TEST_DESC mHmacTest[] = {\r
-    //\r
-    // -----Description---------------------Class---------------------Function---------------Pre------------------Post------------Context\r
-    //\r
-    {"TestVerifyHmacSha256()", "CryptoPkg.BaseCryptLib.Hmac",   TestVerifyHmac, TestVerifyHmacPreReq, TestVerifyHmacCleanUp, &mHmacSha256TestCtx},\r
-    // These functions have been deprecated but they've been left commented out for future reference\r
-    //{"TestVerifyHmacMd5()",    "CryptoPkg.BaseCryptLib.Hmac",   TestVerifyHmac, TestVerifyHmacPreReq, TestVerifyHmacCleanUp, &mHmacMd5TestCtx},\r
-    //{"TestVerifyHmacSha1()",   "CryptoPkg.BaseCryptLib.Hmac",   TestVerifyHmac, TestVerifyHmacPreReq, TestVerifyHmacCleanUp, &mHmacSha1TestCtx},\r
-\r
+TEST_DESC  mHmacTest[] = {\r
+  //\r
+  // -----Description---------------------Class---------------------Function---------------Pre------------------Post------------Context\r
+  //\r
+  { "TestVerifyHmacSha256()", "CryptoPkg.BaseCryptLib.Hmac", TestVerifyHmac, TestVerifyHmacPreReq, TestVerifyHmacCleanUp, &mHmacSha256TestCtx },\r
+  // These functions have been deprecated but they've been left commented out for future reference\r
+  // {"TestVerifyHmacMd5()",    "CryptoPkg.BaseCryptLib.Hmac",   TestVerifyHmac, TestVerifyHmacPreReq, TestVerifyHmacCleanUp, &mHmacMd5TestCtx},\r
+  // {"TestVerifyHmacSha1()",   "CryptoPkg.BaseCryptLib.Hmac",   TestVerifyHmac, TestVerifyHmacPreReq, TestVerifyHmacCleanUp, &mHmacSha1TestCtx},\r

 };\r
 \r
 };\r
 \r

-UINTN mHmacTestNum = ARRAY_SIZE(mHmacTest);\r
+UINTN  mHmacTestNum = ARRAY_SIZE (mHmacTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/OaepEncryptTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/OaepEncryptTests.c
index 404020f967267235877ff9908e5bf2113da4a894..22a4ea7e46a1b0c0f198ddffb4fefcc6fe905186 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/OaepEncryptTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/OaepEncryptTests.c
@@ -14,7 +14,7 @@ CONST  UINT8  RandSeed[] = "This is the random seed for PRNG verification.";
 // CN = ca.self\r
 // O = Intel\r
 //\r
 // CN = ca.self\r
 // O = Intel\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 SelfTestCert[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  SelfTestCert[] = {\r

   0x30, 0x82, 0x03, 0x90, 0x30, 0x82, 0x02, 0x78, 0x02, 0x09, 0x00, 0xE4, 0xDF, 0x47, 0x80, 0xEF,\r
   0x4B, 0x3C, 0x6D, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x0B,\r
   0x05, 0x00, 0x30, 0x81, 0x89, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02,\r
   0x30, 0x82, 0x03, 0x90, 0x30, 0x82, 0x02, 0x78, 0x02, 0x09, 0x00, 0xE4, 0xDF, 0x47, 0x80, 0xEF,\r
   0x4B, 0x3C, 0x6D, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x0B,\r
   0x05, 0x00, 0x30, 0x81, 0x89, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02,\r


@@ -73,9 +73,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 SelfTestCert[] = {
   0xF2, 0x6C, 0xCC, 0x57, 0x36, 0x20, 0x06, 0xE6, 0xA7, 0x24, 0x22, 0xB0, 0xB1, 0xC4, 0xBC, 0x2C,\r
   0x5C, 0xCE, 0x92, 0x11, 0xFF, 0x6F, 0x8C, 0x14, 0x7E, 0xC4, 0x10, 0x02, 0xF6, 0x69, 0x86, 0x6D,\r
   0x5B, 0x64, 0x81, 0x13,\r
   0xF2, 0x6C, 0xCC, 0x57, 0x36, 0x20, 0x06, 0xE6, 0xA7, 0x24, 0x22, 0xB0, 0xB1, 0xC4, 0xBC, 0x2C,\r
   0x5C, 0xCE, 0x92, 0x11, 0xFF, 0x6F, 0x8C, 0x14, 0x7E, 0xC4, 0x10, 0x02, 0xF6, 0x69, 0x86, 0x6D,\r
   0x5B, 0x64, 0x81, 0x13,\r

-  };\r
+};\r

 \r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 PrivateKey[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  PrivateKey[] = {\r

   0x30, 0x82, 0x04, 0xA4, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xBC, 0xE4, 0x67, 0xDC,\r
   0xC7, 0xEA, 0x6F, 0x8A, 0xA7, 0xCC, 0xB2, 0x54, 0x47, 0x48, 0x6A, 0xE2, 0x39, 0xFF, 0xC2, 0x48,\r
   0x58, 0x34, 0x07, 0x03, 0x6D, 0x39, 0xB3, 0x67, 0x46, 0x4C, 0xBC, 0xA0, 0xFA, 0x4E, 0x64, 0x23,\r
   0x30, 0x82, 0x04, 0xA4, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xBC, 0xE4, 0x67, 0xDC,\r
   0xC7, 0xEA, 0x6F, 0x8A, 0xA7, 0xCC, 0xB2, 0x54, 0x47, 0x48, 0x6A, 0xE2, 0x39, 0xFF, 0xC2, 0x48,\r
   0x58, 0x34, 0x07, 0x03, 0x6D, 0x39, 0xB3, 0x67, 0x46, 0x4C, 0xBC, 0xA0, 0xFA, 0x4E, 0x64, 0x23,\r


@@ -151,20 +151,20 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 PrivateKey[] = {
   0x6E, 0x35, 0x24, 0xA6, 0xDA, 0x42, 0x63, 0xC6, 0xBF, 0xCA, 0xE8, 0x32, 0xFD, 0x61, 0xC0, 0x80,\r
   0x39, 0xD2, 0xB7, 0x0D, 0xF3, 0xA2, 0xF3, 0xE4, 0x49, 0x26, 0x89, 0xD0, 0xA0, 0x24, 0xC8, 0x27,\r
   0x86, 0x10, 0x09, 0x88, 0x6C, 0x35, 0x60, 0xF2,\r
   0x6E, 0x35, 0x24, 0xA6, 0xDA, 0x42, 0x63, 0xC6, 0xBF, 0xCA, 0xE8, 0x32, 0xFD, 0x61, 0xC0, 0x80,\r
   0x39, 0xD2, 0xB7, 0x0D, 0xF3, 0xA2, 0xF3, 0xE4, 0x49, 0x26, 0x89, 0xD0, 0xA0, 0x24, 0xC8, 0x27,\r
   0x86, 0x10, 0x09, 0x88, 0x6C, 0x35, 0x60, 0xF2,\r

-  };\r
+};\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyOaepEncrypt (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyOaepEncrypt (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  BOOLEAN             Status;\r
-  UINT8               File[4];\r
-  UINT8               *OutBuffer;\r
-  UINTN               OutBufferSize;\r
-  UINT8               *OutBuffer2;\r
-  UINTN               OutBuffer2Size;\r
+  BOOLEAN  Status;\r
+  UINT8    File[4];\r
+  UINT8    *OutBuffer;\r
+  UINTN    OutBufferSize;\r
+  UINT8    *OutBuffer2;\r
+  UINTN    OutBuffer2Size;\r

 \r
   // Create a file and add content '123' in it\r
   File[0] = '1';\r
 \r
   // Create a file and add content '123' in it\r
   File[0] = '1';\r


@@ -172,33 +172,33 @@ TestVerifyOaepEncrypt (
   File[2] = '3';\r
   File[3] = 0;\r
 \r
   File[2] = '3';\r
   File[3] = 0;\r
 \r

-  OutBuffer = NULL;\r
-  OutBufferSize = 0;\r
-  OutBuffer2 = NULL;\r
+  OutBuffer      = NULL;\r
+  OutBufferSize  = 0;\r
+  OutBuffer2     = NULL;\r

   OutBuffer2Size = 0;\r
 \r
   Status = Pkcs1v2Encrypt (\r
   OutBuffer2Size = 0;\r
 \r
   Status = Pkcs1v2Encrypt (\r

-            SelfTestCert,\r
-            (UINTN)sizeof (SelfTestCert),\r
-            File,\r
-            (UINTN)sizeof (File),\r
-            NULL,\r
-            0,\r
-            &OutBuffer,\r
-            (UINTN *)&OutBufferSize\r
-            );\r
+             SelfTestCert,\r
+             (UINTN)sizeof (SelfTestCert),\r
+             File,\r
+             (UINTN)sizeof (File),\r
+             NULL,\r
+             0,\r
+             &OutBuffer,\r
+             (UINTN *)&OutBufferSize\r
+             );\r

   UT_ASSERT_TRUE (Status);\r
 \r
   Status = Pkcs1v2Encrypt (\r
   UT_ASSERT_TRUE (Status);\r
 \r
   Status = Pkcs1v2Encrypt (\r

-            SelfTestCert,\r
-            (UINTN)sizeof (SelfTestCert),\r
-            File,\r
-            (UINTN)4,\r
-            NULL,\r
-            0,\r
-            &OutBuffer2,\r
-            (UINTN *)&OutBuffer2Size\r
-            );\r
+             SelfTestCert,\r
+             (UINTN)sizeof (SelfTestCert),\r
+             File,\r
+             (UINTN)4,\r
+             NULL,\r
+             0,\r
+             &OutBuffer2,\r
+             (UINTN *)&OutBuffer2Size\r
+             );\r

   UT_ASSERT_TRUE (Status);\r
 \r
   // TRUE - the two OutBuffers are indentical. That means the Oaep encrypt result is incorrect.\r
   UT_ASSERT_TRUE (Status);\r
 \r
   // TRUE - the two OutBuffers are indentical. That means the Oaep encrypt result is incorrect.\r


@@ -207,38 +207,38 @@ TestVerifyOaepEncrypt (
 \r
   if (OutBuffer) {\r
     FreePool (OutBuffer);\r
 \r
   if (OutBuffer) {\r
     FreePool (OutBuffer);\r

-    OutBuffer = NULL;\r
+    OutBuffer     = NULL;\r

     OutBufferSize = 0;\r
   }\r
 \r
   if (OutBuffer2) {\r
     FreePool (OutBuffer2);\r
     OutBufferSize = 0;\r
   }\r
 \r
   if (OutBuffer2) {\r
     FreePool (OutBuffer2);\r

-    OutBuffer2 = NULL;\r
+    OutBuffer2     = NULL;\r

     OutBuffer2Size = 0;\r
   }\r
 \r
   Status = Pkcs1v2Encrypt (\r
     OutBuffer2Size = 0;\r
   }\r
 \r
   Status = Pkcs1v2Encrypt (\r

-              SelfTestCert,\r
-              (UINTN)sizeof (SelfTestCert),\r
-              File,\r
-              (UINTN)4,\r
-              RandSeed,\r
-              (UINTN)sizeof (RandSeed),\r
-              &OutBuffer,\r
-              (UINTN *)&OutBufferSize\r
-              );\r
+             SelfTestCert,\r
+             (UINTN)sizeof (SelfTestCert),\r
+             File,\r
+             (UINTN)4,\r
+             RandSeed,\r
+             (UINTN)sizeof (RandSeed),\r
+             &OutBuffer,\r
+             (UINTN *)&OutBufferSize\r
+             );\r

   UT_ASSERT_TRUE (Status);\r
 \r
   Status = Pkcs1v2Encrypt (\r
   UT_ASSERT_TRUE (Status);\r
 \r
   Status = Pkcs1v2Encrypt (\r

-              SelfTestCert,\r
-              (UINTN)sizeof (SelfTestCert),\r
-              File,\r
-              (UINTN)4,\r
-              RandSeed,\r
-              (UINTN)sizeof (RandSeed),\r
-              &OutBuffer2,\r
-              (UINTN *)&OutBuffer2Size\r
-              );\r
+             SelfTestCert,\r
+             (UINTN)sizeof (SelfTestCert),\r
+             File,\r
+             (UINTN)4,\r
+             RandSeed,\r
+             (UINTN)sizeof (RandSeed),\r
+             &OutBuffer2,\r
+             (UINTN *)&OutBuffer2Size\r
+             );\r

   UT_ASSERT_TRUE (Status);\r
 \r
   // TRUE - the two OutBuffers are indentical. That means the Oaep encrypt result is incorrect.\r
   UT_ASSERT_TRUE (Status);\r
 \r
   // TRUE - the two OutBuffers are indentical. That means the Oaep encrypt result is incorrect.\r


@@ -247,62 +247,60 @@ TestVerifyOaepEncrypt (
 \r
   if (OutBuffer) {\r
     FreePool (OutBuffer);\r
 \r
   if (OutBuffer) {\r
     FreePool (OutBuffer);\r

-    OutBuffer = NULL;\r
+    OutBuffer     = NULL;\r

     OutBufferSize = 0;\r
   }\r
 \r
   if (OutBuffer2) {\r
     FreePool (OutBuffer2);\r
     OutBufferSize = 0;\r
   }\r
 \r
   if (OutBuffer2) {\r
     FreePool (OutBuffer2);\r

-    OutBuffer2 = NULL;\r
+    OutBuffer2     = NULL;\r

     OutBuffer2Size = 0;\r
   }\r
 \r
   Status = Pkcs1v2Encrypt (\r
     OutBuffer2Size = 0;\r
   }\r
 \r
   Status = Pkcs1v2Encrypt (\r

-              NULL,\r
-              (UINTN)sizeof (SelfTestCert),\r
-              File,\r
-              (UINTN)4,\r
-              NULL,\r
-              0,\r
-              &OutBuffer,\r
-              (UINTN *)&OutBufferSize\r
-              );\r
+             NULL,\r
+             (UINTN)sizeof (SelfTestCert),\r
+             File,\r
+             (UINTN)4,\r
+             NULL,\r
+             0,\r
+             &OutBuffer,\r
+             (UINTN *)&OutBufferSize\r
+             );\r

   UT_ASSERT_FALSE (Status);\r
 \r
   Status = Pkcs1v2Encrypt (\r
   UT_ASSERT_FALSE (Status);\r
 \r
   Status = Pkcs1v2Encrypt (\r

-              SelfTestCert,\r
-              (UINTN)sizeof (SelfTestCert),\r
-              File,\r
-              (UINTN)4,\r
-              NULL,\r
-              0,\r
-              (UINT8 **)NULL,\r
-              (UINTN *)&OutBufferSize\r
-              );\r
+             SelfTestCert,\r
+             (UINTN)sizeof (SelfTestCert),\r
+             File,\r
+             (UINTN)4,\r
+             NULL,\r
+             0,\r
+             (UINT8 **)NULL,\r
+             (UINTN *)&OutBufferSize\r
+             );\r

   UT_ASSERT_FALSE (Status);\r
 \r
   Status = Pkcs1v2Encrypt (\r
   UT_ASSERT_FALSE (Status);\r
 \r
   Status = Pkcs1v2Encrypt (\r

-              SelfTestCert,\r
-              (UINTN)sizeof (SelfTestCert),\r
-              File,\r
-              (UINTN)4,\r
-              NULL,\r
-              0,\r
-              &OutBuffer,\r
-              (UINTN *)NULL\r
-              );\r
+             SelfTestCert,\r
+             (UINTN)sizeof (SelfTestCert),\r
+             File,\r
+             (UINTN)4,\r
+             NULL,\r
+             0,\r
+             &OutBuffer,\r
+             (UINTN *)NULL\r
+             );\r

   UT_ASSERT_FALSE (Status);\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r
   UT_ASSERT_FALSE (Status);\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-TEST_DESC mOaepTest[] = {\r
-    //\r
-    // -----Description--------------------------------------Class----------------------Function-----------------Pre---Post--Context\r
-    //\r
-    {"TestVerifyOaepEncrypt()", "CryptoPkg.BaseCryptLib.Pkcs1v2Encrypt", TestVerifyOaepEncrypt, NULL, NULL, NULL},\r
+TEST_DESC  mOaepTest[] = {\r
+  //\r
+  // -----Description--------------------------------------Class----------------------Function-----------------Pre---Post--Context\r
+  //\r
+  { "TestVerifyOaepEncrypt()", "CryptoPkg.BaseCryptLib.Pkcs1v2Encrypt", TestVerifyOaepEncrypt, NULL, NULL, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mOaepTestNum = ARRAY_SIZE(mOaepTest);\r
-\r
-\r
+UINTN  mOaepTestNum = ARRAY_SIZE (mOaepTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs5Pbkdf2Tests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs5Pbkdf2Tests.c
index b64248aa56199cdba0e4b36ab88f07520503381a..376188f9a3b455b34d7674fe3f5a2ace49f31b66 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs5Pbkdf2Tests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs5Pbkdf2Tests.c
@@ -11,21 +11,22 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // PBKDF2 HMAC-SHA1 Test Vector from RFC6070\r
 //\r
 //\r
 // PBKDF2 HMAC-SHA1 Test Vector from RFC6070\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  *Password = "password";  // Input Password\r
-GLOBAL_REMOVE_IF_UNREFERENCED UINTN        PassLen   = 8;           // Length of Input Password\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  *Salt     = "salt";      // Input Salt\r
-GLOBAL_REMOVE_IF_UNREFERENCED UINTN        SaltLen   = 4;           // Length of Input Salt\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINTN  Count     = 2;           // InterationCount\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINTN  KeyLen    = 20;          // Length of derived key\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  DerivedKey[]  = {        // Expected output key\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  *Password    = "password"; // Input Password\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINTN        PassLen      = 8;          // Length of Input Password\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  *Salt        = "salt";     // Input Salt\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINTN        SaltLen      = 4;          // Length of Input Salt\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINTN  Count        = 2;          // InterationCount\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINTN  KeyLen       = 20;         // Length of derived key\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  DerivedKey[] = {\r
+  // Expected output key\r

   0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f, 0x8c, 0xcd, 0x1e, 0xd9, 0x2a, 0xce, 0x1d, 0x41, 0xf0,\r
   0xd8, 0xde, 0x89, 0x57\r
   0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f, 0x8c, 0xcd, 0x1e, 0xd9, 0x2a, 0xce, 0x1d, 0x41, 0xf0,\r
   0xd8, 0xde, 0x89, 0x57\r

-  };\r
+};\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyPkcs5Pbkdf2 (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyPkcs5Pbkdf2 (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   BOOLEAN  Status;\r
   )\r
 {\r
   BOOLEAN  Status;\r


@@ -61,11 +62,11 @@ TestVerifyPkcs5Pbkdf2 (
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-TEST_DESC mPkcs5Test[] = {\r
-    //\r
-    // -----Description------------------------------Class----------------------Function-----------------Pre---Post--Context\r
-    //\r
-    {"TestVerifyPkcs5Pbkdf2()",        "CryptoPkg.BaseCryptLib.Pkcs5",   TestVerifyPkcs5Pbkdf2,        NULL, NULL, NULL},\r
+TEST_DESC  mPkcs5Test[] = {\r
+  //\r
+  // -----Description------------------------------Class----------------------Function-----------------Pre---Post--Context\r
+  //\r
+  { "TestVerifyPkcs5Pbkdf2()", "CryptoPkg.BaseCryptLib.Pkcs5", TestVerifyPkcs5Pbkdf2, NULL, NULL, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mPkcs5TestNum = ARRAY_SIZE(mPkcs5Test);\r
+UINTN  mPkcs5TestNum = ARRAY_SIZE (mPkcs5Test);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs7EkuTestSignatures.h b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs7EkuTestSignatures.h
index 9f5f813ef8b145d50b1735f85d4836cee4df6dd9..338b0a5fae41ee26f0b78a055391ffa2033eebec 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs7EkuTestSignatures.h
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs7EkuTestSignatures.h
@@ -24,91 +24,90 @@ Abstract:
          signature files.\r
 --*/\r
 \r
          signature files.\r
 --*/\r
 \r

-\r

 //\r
 // This is the ProductionECCSignature.p7b in byte array format.  It has one\r
 // EKU in it. (Firmware signing)\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r
 //\r
 // This is the ProductionECCSignature.p7b in byte array format.  It has one\r
 // EKU in it. (Firmware signing)\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r

-CONST UINT8 ProductionECCSignature[] =\r
+CONST UINT8  ProductionECCSignature[] =\r

 {\r
 {\r

- 0x30, 0x82, 0x04, 0xC0, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
- 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r
- 0xF7, 0x0D, 0x01, 0x07, 0x01, 0xA0, 0x82, 0x03, 0x80, 0x30, 0x82, 0x03, 0x7C, 0x30, 0x82, 0x03,\r
- 0x22, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x13, 0x33, 0x00, 0x00, 0x00, 0x03, 0x7E, 0x2E, 0x8F,\r
- 0xBD, 0xA5, 0xC9, 0x2C, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x30, 0x0A, 0x06, 0x08, 0x2A,\r
- 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02, 0x30, 0x81, 0x8F, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03,\r
- 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08,\r
- 0x13, 0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E,\r
- 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x07, 0x52, 0x65, 0x64, 0x6D, 0x6F, 0x6E, 0x64, 0x31, 0x1E,\r
- 0x30, 0x1C, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x15, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F,\r
- 0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x6F, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x31, 0x39,\r
- 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x30, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F,\r
- 0x66, 0x74, 0x20, 0x45, 0x43, 0x43, 0x20, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x20, 0x41,\r
- 0x63, 0x63, 0x65, 0x73, 0x73, 0x6F, 0x72, 0x79, 0x20, 0x46, 0x69, 0x72, 0x6D, 0x77, 0x61, 0x72,\r
- 0x65, 0x20, 0x43, 0x41, 0x20, 0x32, 0x30, 0x31, 0x38, 0x30, 0x1E, 0x17, 0x0D, 0x31, 0x38, 0x30,\r
- 0x37, 0x31, 0x32, 0x31, 0x38, 0x33, 0x37, 0x30, 0x37, 0x5A, 0x17, 0x0D, 0x31, 0x39, 0x30, 0x37,\r
- 0x31, 0x32, 0x31, 0x38, 0x33, 0x37, 0x30, 0x37, 0x5A, 0x30, 0x3A, 0x31, 0x38, 0x30, 0x36, 0x06,\r
- 0x03, 0x55, 0x04, 0x03, 0x13, 0x2F, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20,\r
- 0x45, 0x43, 0x43, 0x20, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x20, 0x41, 0x63, 0x63, 0x65,\r
- 0x73, 0x73, 0x6F, 0x72, 0x79, 0x20, 0x46, 0x69, 0x72, 0x6D, 0x77, 0x61, 0x72, 0x65, 0x20, 0x53,\r
- 0x69, 0x67, 0x6E, 0x65, 0x72, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D,\r
- 0x02, 0x01, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04,\r
- 0x7D, 0xDF, 0xDE, 0xFA, 0xEE, 0xA5, 0x66, 0x33, 0xAA, 0xCC, 0xA4, 0x18, 0x65, 0x9E, 0x3A, 0xC6,\r
- 0x4B, 0xCB, 0xD5, 0x78, 0x94, 0x14, 0xEE, 0xAA, 0xF3, 0x9D, 0xCB, 0x38, 0x6C, 0x5D, 0xFE, 0x3F,\r
- 0x8A, 0xA9, 0x8D, 0x04, 0xD2, 0xFE, 0xAA, 0x38, 0xF3, 0xD6, 0x4A, 0x7E, 0xCF, 0x12, 0x95, 0xCF,\r
- 0xAD, 0x92, 0x33, 0xF7, 0x38, 0x83, 0xC5, 0xFD, 0xCF, 0xD0, 0x96, 0x08, 0xCA, 0x62, 0x7D, 0x22,\r
- 0xA3, 0x82, 0x01, 0xAF, 0x30, 0x82, 0x01, 0xAB, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x1D, 0x0F, 0x01,\r
- 0x01, 0xFF, 0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x16, 0x06, 0x03, 0x55, 0x1D, 0x25, 0x04,\r
- 0x0F, 0x30, 0x0D, 0x06, 0x0B, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x4C, 0x09, 0x15, 0x01,\r
- 0x30, 0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x01, 0x01, 0xFF, 0x04, 0x02, 0x30, 0x00, 0x30, 0x1D,\r
- 0x06, 0x03, 0x55, 0x1D, 0x0E, 0x04, 0x16, 0x04, 0x14, 0xE7, 0xD1, 0xD4, 0x74, 0x71, 0xF4, 0xC9,\r
- 0x35, 0x04, 0xA7, 0x9A, 0x1E, 0x0C, 0xDD, 0xF4, 0x8D, 0x5C, 0x1E, 0xF2, 0x29, 0x30, 0x37, 0x06,\r
- 0x03, 0x55, 0x1D, 0x11, 0x04, 0x30, 0x30, 0x2E, 0xA4, 0x2C, 0x30, 0x2A, 0x31, 0x10, 0x30, 0x0E,\r
- 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x07, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x31, 0x16,\r
- 0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x05, 0x13, 0x0D, 0x34, 0x34, 0x30, 0x38, 0x31, 0x31, 0x2B,\r
- 0x34, 0x34, 0x30, 0x38, 0x36, 0x32, 0x30, 0x1F, 0x06, 0x03, 0x55, 0x1D, 0x23, 0x04, 0x18, 0x30,\r
- 0x16, 0x80, 0x14, 0x6F, 0x3A, 0xCC, 0x1B, 0x2F, 0x17, 0x5C, 0xED, 0xEB, 0xC8, 0xBF, 0x93, 0xA7,\r
- 0xB5, 0x93, 0xD1, 0x4D, 0x40, 0xAA, 0x03, 0x30, 0x75, 0x06, 0x03, 0x55, 0x1D, 0x1F, 0x04, 0x6E,\r
- 0x30, 0x6C, 0x30, 0x6A, 0xA0, 0x68, 0xA0, 0x66, 0x86, 0x64, 0x68, 0x74, 0x74, 0x70, 0x3A, 0x2F,\r
- 0x2F, 0x77, 0x77, 0x77, 0x2E, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x2E, 0x63,\r
- 0x6F, 0x6D, 0x2F, 0x70, 0x6B, 0x69, 0x6F, 0x70, 0x73, 0x2F, 0x63, 0x72, 0x6C, 0x2F, 0x4D, 0x69,\r
- 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x25, 0x32, 0x30, 0x45, 0x43, 0x43, 0x25, 0x32, 0x30,\r
- 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x25, 0x32, 0x30, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73,\r
- 0x6F, 0x72, 0x79, 0x25, 0x32, 0x30, 0x46, 0x69, 0x72, 0x6D, 0x77, 0x61, 0x72, 0x65, 0x25, 0x32,\r
- 0x30, 0x43, 0x41, 0x25, 0x32, 0x30, 0x32, 0x30, 0x31, 0x38, 0x2E, 0x63, 0x72, 0x6C, 0x30, 0x81,\r
- 0x82, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x01, 0x01, 0x04, 0x76, 0x30, 0x74, 0x30,\r
- 0x72, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02, 0x86, 0x66, 0x68, 0x74, 0x74,\r
- 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66,\r
- 0x74, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x70, 0x6B, 0x69, 0x6F, 0x70, 0x73, 0x2F, 0x63, 0x65, 0x72,\r
- 0x74, 0x73, 0x2F, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x25, 0x32, 0x30, 0x45,\r
- 0x43, 0x43, 0x25, 0x32, 0x30, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x25, 0x32, 0x30, 0x41,\r
- 0x63, 0x63, 0x65, 0x73, 0x73, 0x6F, 0x72, 0x79, 0x25, 0x32, 0x30, 0x46, 0x69, 0x72, 0x6D, 0x77,\r
- 0x61, 0x72, 0x65, 0x25, 0x32, 0x30, 0x43, 0x41, 0x25, 0x32, 0x30, 0x32, 0x30, 0x31, 0x38, 0x2E,\r
- 0x63, 0x72, 0x74, 0x30, 0x0A, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02, 0x03,\r
- 0x48, 0x00, 0x30, 0x45, 0x02, 0x20, 0x3D, 0xCF, 0xEF, 0xB8, 0xF0, 0x87, 0xEE, 0x7E, 0x80, 0x71,\r
- 0x04, 0x77, 0x68, 0xDC, 0x66, 0x2F, 0x09, 0xA7, 0xF0, 0x76, 0x57, 0x7C, 0x12, 0x5A, 0xE4, 0x80,\r
- 0x5A, 0xA0, 0xF2, 0x2C, 0x45, 0x1B, 0x02, 0x21, 0x00, 0xEB, 0x5F, 0x89, 0xD5, 0xEB, 0x03, 0x46,\r
- 0x9E, 0x08, 0x95, 0x2A, 0x39, 0x30, 0x5D, 0x49, 0xB6, 0x24, 0xCE, 0x78, 0x1B, 0xB8, 0x1D, 0x0F,\r
- 0xD1, 0x24, 0xD0, 0xA9, 0x18, 0x0F, 0x45, 0x4F, 0xF6, 0x31, 0x82, 0x01, 0x17, 0x30, 0x82, 0x01,\r
- 0x13, 0x02, 0x01, 0x01, 0x30, 0x81, 0xA7, 0x30, 0x81, 0x8F, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03,\r
- 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08,\r
- 0x13, 0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E,\r
- 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x07, 0x52, 0x65, 0x64, 0x6D, 0x6F, 0x6E, 0x64, 0x31, 0x1E,\r
- 0x30, 0x1C, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x15, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F,\r
- 0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x6F, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x31, 0x39,\r
- 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x30, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F,\r
- 0x66, 0x74, 0x20, 0x45, 0x43, 0x43, 0x20, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x20, 0x41,\r
- 0x63, 0x63, 0x65, 0x73, 0x73, 0x6F, 0x72, 0x79, 0x20, 0x46, 0x69, 0x72, 0x6D, 0x77, 0x61, 0x72,\r
- 0x65, 0x20, 0x43, 0x41, 0x20, 0x32, 0x30, 0x31, 0x38, 0x02, 0x13, 0x33, 0x00, 0x00, 0x00, 0x03,\r
- 0x7E, 0x2E, 0x8F, 0xBD, 0xA5, 0xC9, 0x2C, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x30, 0x0D,\r
- 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06,\r
- 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01, 0x05, 0x00, 0x04, 0x48, 0x30, 0x46, 0x02, 0x21,\r
- 0x00, 0x85, 0xC7, 0x25, 0x5C, 0xF8, 0x5A, 0x13, 0xB7, 0xB6, 0x3A, 0xF1, 0x04, 0x72, 0xAC, 0xB3,\r
- 0xF8, 0xC3, 0xE0, 0xE3, 0xD7, 0x98, 0x1B, 0xCF, 0x04, 0xA8, 0x0C, 0x7B, 0xBB, 0x7D, 0x40, 0xC2,\r
- 0x99, 0x02, 0x21, 0x00, 0xA3, 0x83, 0x12, 0xE4, 0xB6, 0x3C, 0xC9, 0x3F, 0x05, 0xCF, 0x70, 0x57,\r
- 0x54, 0x74, 0x0E, 0xEC, 0x14, 0xAD, 0x2C, 0x66, 0x9D, 0x72, 0x73, 0x62, 0x41, 0xA6, 0xC7, 0x90,\r
- 0x05, 0x35, 0xF5, 0x80,\r
+  0x30, 0x82, 0x04, 0xC0, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
+  0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r
+  0xF7, 0x0D, 0x01, 0x07, 0x01, 0xA0, 0x82, 0x03, 0x80, 0x30, 0x82, 0x03, 0x7C, 0x30, 0x82, 0x03,\r
+  0x22, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x13, 0x33, 0x00, 0x00, 0x00, 0x03, 0x7E, 0x2E, 0x8F,\r
+  0xBD, 0xA5, 0xC9, 0x2C, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x30, 0x0A, 0x06, 0x08, 0x2A,\r
+  0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02, 0x30, 0x81, 0x8F, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03,\r
+  0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08,\r
+  0x13, 0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E,\r
+  0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x07, 0x52, 0x65, 0x64, 0x6D, 0x6F, 0x6E, 0x64, 0x31, 0x1E,\r
+  0x30, 0x1C, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x15, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F,\r
+  0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x6F, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x31, 0x39,\r
+  0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x30, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F,\r
+  0x66, 0x74, 0x20, 0x45, 0x43, 0x43, 0x20, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x20, 0x41,\r
+  0x63, 0x63, 0x65, 0x73, 0x73, 0x6F, 0x72, 0x79, 0x20, 0x46, 0x69, 0x72, 0x6D, 0x77, 0x61, 0x72,\r
+  0x65, 0x20, 0x43, 0x41, 0x20, 0x32, 0x30, 0x31, 0x38, 0x30, 0x1E, 0x17, 0x0D, 0x31, 0x38, 0x30,\r
+  0x37, 0x31, 0x32, 0x31, 0x38, 0x33, 0x37, 0x30, 0x37, 0x5A, 0x17, 0x0D, 0x31, 0x39, 0x30, 0x37,\r
+  0x31, 0x32, 0x31, 0x38, 0x33, 0x37, 0x30, 0x37, 0x5A, 0x30, 0x3A, 0x31, 0x38, 0x30, 0x36, 0x06,\r
+  0x03, 0x55, 0x04, 0x03, 0x13, 0x2F, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20,\r
+  0x45, 0x43, 0x43, 0x20, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x20, 0x41, 0x63, 0x63, 0x65,\r
+  0x73, 0x73, 0x6F, 0x72, 0x79, 0x20, 0x46, 0x69, 0x72, 0x6D, 0x77, 0x61, 0x72, 0x65, 0x20, 0x53,\r
+  0x69, 0x67, 0x6E, 0x65, 0x72, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D,\r
+  0x02, 0x01, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04,\r
+  0x7D, 0xDF, 0xDE, 0xFA, 0xEE, 0xA5, 0x66, 0x33, 0xAA, 0xCC, 0xA4, 0x18, 0x65, 0x9E, 0x3A, 0xC6,\r
+  0x4B, 0xCB, 0xD5, 0x78, 0x94, 0x14, 0xEE, 0xAA, 0xF3, 0x9D, 0xCB, 0x38, 0x6C, 0x5D, 0xFE, 0x3F,\r
+  0x8A, 0xA9, 0x8D, 0x04, 0xD2, 0xFE, 0xAA, 0x38, 0xF3, 0xD6, 0x4A, 0x7E, 0xCF, 0x12, 0x95, 0xCF,\r
+  0xAD, 0x92, 0x33, 0xF7, 0x38, 0x83, 0xC5, 0xFD, 0xCF, 0xD0, 0x96, 0x08, 0xCA, 0x62, 0x7D, 0x22,\r
+  0xA3, 0x82, 0x01, 0xAF, 0x30, 0x82, 0x01, 0xAB, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x1D, 0x0F, 0x01,\r
+  0x01, 0xFF, 0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x16, 0x06, 0x03, 0x55, 0x1D, 0x25, 0x04,\r
+  0x0F, 0x30, 0x0D, 0x06, 0x0B, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x4C, 0x09, 0x15, 0x01,\r
+  0x30, 0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x01, 0x01, 0xFF, 0x04, 0x02, 0x30, 0x00, 0x30, 0x1D,\r
+  0x06, 0x03, 0x55, 0x1D, 0x0E, 0x04, 0x16, 0x04, 0x14, 0xE7, 0xD1, 0xD4, 0x74, 0x71, 0xF4, 0xC9,\r
+  0x35, 0x04, 0xA7, 0x9A, 0x1E, 0x0C, 0xDD, 0xF4, 0x8D, 0x5C, 0x1E, 0xF2, 0x29, 0x30, 0x37, 0x06,\r
+  0x03, 0x55, 0x1D, 0x11, 0x04, 0x30, 0x30, 0x2E, 0xA4, 0x2C, 0x30, 0x2A, 0x31, 0x10, 0x30, 0x0E,\r
+  0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x07, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x31, 0x16,\r
+  0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x05, 0x13, 0x0D, 0x34, 0x34, 0x30, 0x38, 0x31, 0x31, 0x2B,\r
+  0x34, 0x34, 0x30, 0x38, 0x36, 0x32, 0x30, 0x1F, 0x06, 0x03, 0x55, 0x1D, 0x23, 0x04, 0x18, 0x30,\r
+  0x16, 0x80, 0x14, 0x6F, 0x3A, 0xCC, 0x1B, 0x2F, 0x17, 0x5C, 0xED, 0xEB, 0xC8, 0xBF, 0x93, 0xA7,\r
+  0xB5, 0x93, 0xD1, 0x4D, 0x40, 0xAA, 0x03, 0x30, 0x75, 0x06, 0x03, 0x55, 0x1D, 0x1F, 0x04, 0x6E,\r
+  0x30, 0x6C, 0x30, 0x6A, 0xA0, 0x68, 0xA0, 0x66, 0x86, 0x64, 0x68, 0x74, 0x74, 0x70, 0x3A, 0x2F,\r
+  0x2F, 0x77, 0x77, 0x77, 0x2E, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x2E, 0x63,\r
+  0x6F, 0x6D, 0x2F, 0x70, 0x6B, 0x69, 0x6F, 0x70, 0x73, 0x2F, 0x63, 0x72, 0x6C, 0x2F, 0x4D, 0x69,\r
+  0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x25, 0x32, 0x30, 0x45, 0x43, 0x43, 0x25, 0x32, 0x30,\r
+  0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x25, 0x32, 0x30, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73,\r
+  0x6F, 0x72, 0x79, 0x25, 0x32, 0x30, 0x46, 0x69, 0x72, 0x6D, 0x77, 0x61, 0x72, 0x65, 0x25, 0x32,\r
+  0x30, 0x43, 0x41, 0x25, 0x32, 0x30, 0x32, 0x30, 0x31, 0x38, 0x2E, 0x63, 0x72, 0x6C, 0x30, 0x81,\r
+  0x82, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x01, 0x01, 0x04, 0x76, 0x30, 0x74, 0x30,\r
+  0x72, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02, 0x86, 0x66, 0x68, 0x74, 0x74,\r
+  0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66,\r
+  0x74, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x70, 0x6B, 0x69, 0x6F, 0x70, 0x73, 0x2F, 0x63, 0x65, 0x72,\r
+  0x74, 0x73, 0x2F, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x25, 0x32, 0x30, 0x45,\r
+  0x43, 0x43, 0x25, 0x32, 0x30, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x25, 0x32, 0x30, 0x41,\r
+  0x63, 0x63, 0x65, 0x73, 0x73, 0x6F, 0x72, 0x79, 0x25, 0x32, 0x30, 0x46, 0x69, 0x72, 0x6D, 0x77,\r
+  0x61, 0x72, 0x65, 0x25, 0x32, 0x30, 0x43, 0x41, 0x25, 0x32, 0x30, 0x32, 0x30, 0x31, 0x38, 0x2E,\r
+  0x63, 0x72, 0x74, 0x30, 0x0A, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02, 0x03,\r
+  0x48, 0x00, 0x30, 0x45, 0x02, 0x20, 0x3D, 0xCF, 0xEF, 0xB8, 0xF0, 0x87, 0xEE, 0x7E, 0x80, 0x71,\r
+  0x04, 0x77, 0x68, 0xDC, 0x66, 0x2F, 0x09, 0xA7, 0xF0, 0x76, 0x57, 0x7C, 0x12, 0x5A, 0xE4, 0x80,\r
+  0x5A, 0xA0, 0xF2, 0x2C, 0x45, 0x1B, 0x02, 0x21, 0x00, 0xEB, 0x5F, 0x89, 0xD5, 0xEB, 0x03, 0x46,\r
+  0x9E, 0x08, 0x95, 0x2A, 0x39, 0x30, 0x5D, 0x49, 0xB6, 0x24, 0xCE, 0x78, 0x1B, 0xB8, 0x1D, 0x0F,\r
+  0xD1, 0x24, 0xD0, 0xA9, 0x18, 0x0F, 0x45, 0x4F, 0xF6, 0x31, 0x82, 0x01, 0x17, 0x30, 0x82, 0x01,\r
+  0x13, 0x02, 0x01, 0x01, 0x30, 0x81, 0xA7, 0x30, 0x81, 0x8F, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03,\r
+  0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08,\r
+  0x13, 0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E,\r
+  0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x07, 0x52, 0x65, 0x64, 0x6D, 0x6F, 0x6E, 0x64, 0x31, 0x1E,\r
+  0x30, 0x1C, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x15, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F,\r
+  0x66, 0x74, 0x20, 0x43, 0x6F, 0x72, 0x70, 0x6F, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x31, 0x39,\r
+  0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x30, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F,\r
+  0x66, 0x74, 0x20, 0x45, 0x43, 0x43, 0x20, 0x53, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x20, 0x41,\r
+  0x63, 0x63, 0x65, 0x73, 0x73, 0x6F, 0x72, 0x79, 0x20, 0x46, 0x69, 0x72, 0x6D, 0x77, 0x61, 0x72,\r
+  0x65, 0x20, 0x43, 0x41, 0x20, 0x32, 0x30, 0x31, 0x38, 0x02, 0x13, 0x33, 0x00, 0x00, 0x00, 0x03,\r
+  0x7E, 0x2E, 0x8F, 0xBD, 0xA5, 0xC9, 0x2C, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x30, 0x0D,\r
+  0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06,\r
+  0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01, 0x05, 0x00, 0x04, 0x48, 0x30, 0x46, 0x02, 0x21,\r
+  0x00, 0x85, 0xC7, 0x25, 0x5C, 0xF8, 0x5A, 0x13, 0xB7, 0xB6, 0x3A, 0xF1, 0x04, 0x72, 0xAC, 0xB3,\r
+  0xF8, 0xC3, 0xE0, 0xE3, 0xD7, 0x98, 0x1B, 0xCF, 0x04, 0xA8, 0x0C, 0x7B, 0xBB, 0x7D, 0x40, 0xC2,\r
+  0x99, 0x02, 0x21, 0x00, 0xA3, 0x83, 0x12, 0xE4, 0xB6, 0x3C, 0xC9, 0x3F, 0x05, 0xCF, 0x70, 0x57,\r
+  0x54, 0x74, 0x0E, 0xEC, 0x14, 0xAD, 0x2C, 0x66, 0x9D, 0x72, 0x73, 0x62, 0x41, 0xA6, 0xC7, 0x90,\r
+  0x05, 0x35, 0xF5, 0x80,\r

 };\r
 \r
 //\r
 };\r
 \r
 //\r


@@ -116,7 +115,7 @@ CONST UINT8 ProductionECCSignature[] =
 // format.  It has two certs in it, and the leaf has an EKU of\r
 //  "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r
 // format.  It has two certs in it, and the leaf has an EKU of\r
 //  "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r

-CONST UINT8 TestSignedMultipleCerts[] =\r
+CONST UINT8  TestSignedMultipleCerts[] =\r

 {\r
   0x30, 0x82, 0x04, 0x90, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r
 {\r
   0x30, 0x82, 0x04, 0x90, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r


@@ -200,7 +199,7 @@ CONST UINT8 TestSignedMultipleCerts[] =
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 // "1.3.6.1.4.1.311.76.9.21.2"\r
 //\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 // "1.3.6.1.4.1.311.76.9.21.2"\r
 //\r

-CONST UINT8 TestSignedWithMultipleEKUsInCert[] =\r
+CONST UINT8  TestSignedWithMultipleEKUsInCert[] =\r

 {\r
   0x30, 0x82, 0x06, 0x2C, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r
 {\r
   0x30, 0x82, 0x06, 0x2C, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r


@@ -301,7 +300,6 @@ CONST UINT8 TestSignedWithMultipleEKUsInCert[] =
   0xB5, 0xEA, 0xBA, 0x90, 0x51, 0xC0, 0xC6, 0x94, 0x09, 0xE4, 0xB7, 0x15, 0x3F, 0x07, 0x23, 0xE8,\r
   0x46, 0x93, 0xA5, 0x7B, 0x7A, 0x91, 0xDA, 0x8E, 0x7C, 0xAF, 0xBD, 0x41, 0xB9, 0xDE, 0x85, 0x04,\r
   0xBC, 0x08, 0x6C, 0x08, 0x56, 0x16, 0xDB, 0xB5, 0xEE, 0x65, 0x76, 0xE9, 0x78, 0xD3, 0xDD, 0xD8,\r
   0xB5, 0xEA, 0xBA, 0x90, 0x51, 0xC0, 0xC6, 0x94, 0x09, 0xE4, 0xB7, 0x15, 0x3F, 0x07, 0x23, 0xE8,\r
   0x46, 0x93, 0xA5, 0x7B, 0x7A, 0x91, 0xDA, 0x8E, 0x7C, 0xAF, 0xBD, 0x41, 0xB9, 0xDE, 0x85, 0x04,\r
   0xBC, 0x08, 0x6C, 0x08, 0x56, 0x16, 0xDB, 0xB5, 0xEE, 0x65, 0x76, 0xE9, 0x78, 0xD3, 0xDD, 0xD8,\r

-\r

 };\r
 \r
 //\r
 };\r
 \r
 //\r


@@ -310,7 +308,7 @@ CONST UINT8 TestSignedWithMultipleEKUsInCert[] =
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 // "1.3.6.1.4.1.311.76.9.21.1.10001"\r
 //\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 // "1.3.6.1.4.1.311.76.9.21.1.10001"\r
 //\r

-CONST UINT8 TestSignedWithProductId10001[] =\r
+CONST UINT8  TestSignedWithProductId10001[] =\r

 {\r
   0x30, 0x82, 0x06, 0x1E, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r
 {\r
   0x30, 0x82, 0x06, 0x1E, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r


@@ -418,7 +416,7 @@ CONST UINT8 TestSignedWithProductId10001[] =
 // It has one EKU in it:\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r
 // It has one EKU in it:\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r

-CONST UINT8 TestSignEKUsWith1CertInSignature[] =\r
+CONST UINT8  TestSignEKUsWith1CertInSignature[] =\r

 {\r
   0x30, 0x82, 0x02, 0x7D, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r
 {\r
   0x30, 0x82, 0x02, 0x7D, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r


@@ -468,7 +466,7 @@ CONST UINT8 TestSignEKUsWith1CertInSignature[] =
 // It has one EKU in it:\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r
 // It has one EKU in it:\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r

-CONST UINT8 TestSignEKUsWith2CertsInSignature[] =\r
+CONST UINT8  TestSignEKUsWith2CertsInSignature[] =\r

 {\r
   0x30, 0x82, 0x04, 0x61, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r
 {\r
   0x30, 0x82, 0x04, 0x61, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r


@@ -548,7 +546,7 @@ CONST UINT8 TestSignEKUsWith2CertsInSignature[] =
 // It has one EKU in it:\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r
 // It has one EKU in it:\r
 // "1.3.6.1.4.1.311.76.9.21.1"\r
 //\r

-const UINT8 TestSignEKUsWith3CertsInSignature[] =\r
+const UINT8  TestSignEKUsWith3CertsInSignature[] =\r

 {\r
   0x30, 0x82, 0x06, 0x65, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r
 {\r
   0x30, 0x82, 0x06, 0x65, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r


@@ -658,7 +656,7 @@ const UINT8 TestSignEKUsWith3CertsInSignature[] =
 //\r
 // This signature was signed with a leaf that has no EKU's present in the certificate.\r
 //\r
 //\r
 // This signature was signed with a leaf that has no EKU's present in the certificate.\r
 //\r

-CONST UINT8 TestSignatureWithNoEKUsPresent[] =\r
+CONST UINT8  TestSignatureWithNoEKUsPresent[] =\r

 {\r
   0x30, 0x82, 0x07, 0xDB, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r
 {\r
   0x30, 0x82, 0x07, 0xDB, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48,\r
   0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs7EkuTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs7EkuTests.c
index b5ae4f6a89e07a76b6447b00c76c906fc5528607..7e3dcdc4e6a1b6646c160a7a5ba01b8c60bca088 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs7EkuTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs7EkuTests.c
@@ -50,23 +50,22 @@
 EFI_STATUS\r
 EFIAPI\r
 VerifyEKUsInPkcs7Signature (\r
 EFI_STATUS\r
 EFIAPI\r
 VerifyEKUsInPkcs7Signature (\r

-  IN CONST UINT8  *Pkcs7Signature,\r
+  IN CONST UINT8   *Pkcs7Signature,\r

   IN CONST UINT32  SignatureSize,\r
   IN CONST UINT32  SignatureSize,\r

-  IN CONST CHAR8  *RequiredEKUs[],\r
+  IN CONST CHAR8   *RequiredEKUs[],\r

   IN CONST UINT32  RequiredEKUsSize,\r
   IN BOOLEAN       RequireAllPresent\r
   );\r
 \r
   IN CONST UINT32  RequiredEKUsSize,\r
   IN BOOLEAN       RequireAllPresent\r
   );\r
 \r

-///================================================================================================\r
-///================================================================================================\r
+/// ================================================================================================\r
+/// ================================================================================================\r

 ///\r
 /// TEST CASES\r
 ///\r
 ///\r
 /// TEST CASES\r
 ///\r

-///================================================================================================\r
-///================================================================================================\r
-\r
-CONST CHAR8 FIRMWARE_SIGNER_EKU[] = "1.3.6.1.4.1.311.76.9.21.1";\r
+/// ================================================================================================\r
+/// ================================================================================================\r

 \r
 \r

+CONST CHAR8  FIRMWARE_SIGNER_EKU[] = "1.3.6.1.4.1.311.76.9.21.1";\r

 \r
 /**\r
   TestVerifyEKUsInSignature()\r
 \r
 /**\r
   TestVerifyEKUsInSignature()\r


@@ -85,24 +84,25 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsInSignature (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsInSignature (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
 \r

-  CONST CHAR8* RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
+  CONST CHAR8  *RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r

 \r
 \r

-  Status = VerifyEKUsInPkcs7Signature(ProductionECCSignature,\r
-                                      ARRAY_SIZE(ProductionECCSignature),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             ProductionECCSignature,\r
+             ARRAY_SIZE (ProductionECCSignature),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r

   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsInSignature()\r
 \r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsInSignature()\r
 \r

-\r

 /**\r
   TestVerifyEKUsWith3CertsInSignature()\r
 \r
 /**\r
   TestVerifyEKUsWith3CertsInSignature()\r
 \r


@@ -120,18 +120,20 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWith3CertsInSignature (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWith3CertsInSignature (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
 \r

-  CONST CHAR8* RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
+  CONST CHAR8  *RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r

 \r
 \r

-  Status = VerifyEKUsInPkcs7Signature(TestSignEKUsWith3CertsInSignature,\r
-                                      ARRAY_SIZE(TestSignEKUsWith3CertsInSignature),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignEKUsWith3CertsInSignature,\r
+             ARRAY_SIZE (TestSignEKUsWith3CertsInSignature),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r

   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r


@@ -153,24 +155,25 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWith2CertsInSignature (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWith2CertsInSignature (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
 \r

-  CONST CHAR8* RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
+  CONST CHAR8  *RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r

 \r
 \r

-  Status = VerifyEKUsInPkcs7Signature(TestSignEKUsWith2CertsInSignature,\r
-                                      ARRAY_SIZE(TestSignEKUsWith2CertsInSignature),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignEKUsWith2CertsInSignature,\r
+             ARRAY_SIZE (TestSignEKUsWith2CertsInSignature),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r

   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsWith2CertsInSignature()\r
 \r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsWith2CertsInSignature()\r
 \r

-\r

 /**\r
   TestVerifyEKUsWith1CertInSignature()\r
 \r
 /**\r
   TestVerifyEKUsWith1CertInSignature()\r
 \r


@@ -187,24 +190,25 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWith1CertInSignature (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWith1CertInSignature (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
 \r

-  CONST CHAR8* RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
+  CONST CHAR8  *RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r

 \r
 \r

-  Status = VerifyEKUsInPkcs7Signature(TestSignEKUsWith1CertInSignature,\r
-                                      ARRAY_SIZE(TestSignEKUsWith1CertInSignature),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignEKUsWith1CertInSignature,\r
+             ARRAY_SIZE (TestSignEKUsWith1CertInSignature),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r

   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsWith1CertInSignature()\r
 \r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsWith1CertInSignature()\r
 \r

-\r

 /**\r
   TestVerifyEKUsWithMultipleEKUsInCert()\r
 \r
 /**\r
   TestVerifyEKUsWithMultipleEKUsInCert()\r
 \r


@@ -224,25 +228,28 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWithMultipleEKUsInCert (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWithMultipleEKUsInCert (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS       Status     = EFI_SUCCESS;\r
-\r
-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1",\r
-                                  "1.3.6.1.4.1.311.76.9.21.1.2" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithMultipleEKUsInCert,\r
-                                      ARRAY_SIZE(TestSignedWithMultipleEKUsInCert),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
+\r
+  CONST CHAR8  *RequiredEKUs[] = {\r
+    "1.3.6.1.4.1.311.76.9.21.1",\r
+    "1.3.6.1.4.1.311.76.9.21.1.2"\r
+  };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithMultipleEKUsInCert,\r
+             ARRAY_SIZE (TestSignedWithMultipleEKUsInCert),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r

   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsWithMultipleEKUsInCert()\r
 \r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsWithMultipleEKUsInCert()\r
 \r

-\r

 /**\r
   TestEkusNotPresentInSignature()\r
 \r
 /**\r
   TestEkusNotPresentInSignature()\r
 \r


@@ -259,21 +266,23 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestEkusNotPresentInSignature (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestEkusNotPresentInSignature (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS       Status = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
   //\r
   // This EKU is not in the signature.\r
   //\r
 \r
   //\r
   // This EKU is not in the signature.\r
   //\r

-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.3" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithMultipleEKUsInCert,\r
-                                      ARRAY_SIZE(TestSignedWithMultipleEKUsInCert),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.3" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithMultipleEKUsInCert,\r
+             ARRAY_SIZE (TestSignedWithMultipleEKUsInCert),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r

   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r


@@ -292,33 +301,35 @@ TestEkusNotPresentInSignature (
   @retval UNIT_TEST_PASSED            - The required EKUs were found in the signature.\r
   @retval UNIT_TEST_ERROR_TEST_FAILED - Something failed, check the debug output.\r
 **/\r
   @retval UNIT_TEST_PASSED            - The required EKUs were found in the signature.\r
   @retval UNIT_TEST_ERROR_TEST_FAILED - Something failed, check the debug output.\r
 **/\r

-\r

 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r

-TestProductId10001PresentInSignature(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestProductId10001PresentInSignature (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r

 {\r
 {\r

-  EFI_STATUS       Status = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
   //\r
   // These EKU's are present in the leaf signer certificate.\r
   //\r
 \r
   //\r
   // These EKU's are present in the leaf signer certificate.\r
   //\r

-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1",\r
-                                  "1.3.6.1.4.1.311.76.9.21.1.10001" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithProductId10001,\r
-                                      ARRAY_SIZE(TestSignedWithProductId10001),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs[] = {\r
+    "1.3.6.1.4.1.311.76.9.21.1",\r
+    "1.3.6.1.4.1.311.76.9.21.1.10001"\r
+  };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithProductId10001,\r
+             ARRAY_SIZE (TestSignedWithProductId10001),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r

   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestProductId10001PresentInSignature()\r
 \r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestProductId10001PresentInSignature()\r
 \r

-\r

 /**\r
   TestOnlyOneEkuInListRequired()\r
 \r
 /**\r
   TestOnlyOneEkuInListRequired()\r
 \r


@@ -337,27 +348,28 @@ TestProductId10001PresentInSignature(
   @retval UNIT_TEST_PASSED            - The required EKUs were found in the signature.\r
   @retval UNIT_TEST_ERROR_TEST_FAILED - Something failed, check the debug output.\r
 **/\r
   @retval UNIT_TEST_PASSED            - The required EKUs were found in the signature.\r
   @retval UNIT_TEST_ERROR_TEST_FAILED - Something failed, check the debug output.\r
 **/\r

-\r

 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r

-TestOnlyOneEkuInListRequired(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestOnlyOneEkuInListRequired (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r

 {\r
 {\r

-  EFI_STATUS       Status = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
   //\r
   // This will test the flag that specifies it is OK to succeed if\r
   // any one of the EKU's passed in is found.\r
   //\r
 \r
   //\r
   // This will test the flag that specifies it is OK to succeed if\r
   // any one of the EKU's passed in is found.\r
   //\r

-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1.10001" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithProductId10001,\r
-                                      ARRAY_SIZE(TestSignedWithProductId10001),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      FALSE);\r
+  CONST CHAR8  *RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1.10001" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithProductId10001,\r
+             ARRAY_SIZE (TestSignedWithProductId10001),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             FALSE\r
+             );\r

   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r


@@ -376,32 +388,32 @@ TestOnlyOneEkuInListRequired(
   @retval UNIT_TEST_PASSED            - The required EKUs were found in the signature.\r
   @retval UNIT_TEST_ERROR_TEST_FAILED - Something failed, check the debug output.\r
 **/\r
   @retval UNIT_TEST_PASSED            - The required EKUs were found in the signature.\r
   @retval UNIT_TEST_ERROR_TEST_FAILED - Something failed, check the debug output.\r
 **/\r

-\r

 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r

-TestNoEKUsInSignature(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestNoEKUsInSignature (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r

 {\r
 {\r

-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
   //\r
   // This EKU is not in the certificate, so it should fail.\r
   //\r
 \r
   //\r
   // This EKU is not in the certificate, so it should fail.\r
   //\r

-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignatureWithNoEKUsPresent,\r
-                                      ARRAY_SIZE(TestSignatureWithNoEKUsPresent),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignatureWithNoEKUsPresent,\r
+             ARRAY_SIZE (TestSignatureWithNoEKUsPresent),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r

   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestNoEKUsInSignature()\r
 \r
   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestNoEKUsInSignature()\r
 \r

-\r

 /**\r
   TestInvalidParameters()\r
 \r
 /**\r
   TestInvalidParameters()\r
 \r


@@ -416,38 +428,41 @@ TestNoEKUsInSignature(
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r

-TestInvalidParameters(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestInvalidParameters (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r

 {\r
 {\r

-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
 \r

-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1" };\r
+  CONST CHAR8  *RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1" };\r

 \r
   //\r
   // Check bad signature.\r
   //\r
 \r
   //\r
   // Check bad signature.\r
   //\r

-  Status = VerifyEKUsInPkcs7Signature(NULL,\r
-                                      0,\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             NULL,\r
+             0,\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r

   UT_ASSERT_STATUS_EQUAL (Status, EFI_INVALID_PARAMETER);\r
 \r
   //\r
   // Check invalid EKU's\r
   //\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_INVALID_PARAMETER);\r
 \r
   //\r
   // Check invalid EKU's\r
   //\r

-  Status = VerifyEKUsInPkcs7Signature(TestSignatureWithNoEKUsPresent,\r
-                                      ARRAY_SIZE(TestSignatureWithNoEKUsPresent),\r
-                                      (CONST CHAR8**)NULL,\r
-                                      0,\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignatureWithNoEKUsPresent,\r
+             ARRAY_SIZE (TestSignatureWithNoEKUsPresent),\r
+             (CONST CHAR8 **)NULL,\r
+             0,\r
+             TRUE\r
+             );\r

   UT_ASSERT_STATUS_EQUAL (Status, EFI_INVALID_PARAMETER);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestInvalidParameters()\r
 \r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_INVALID_PARAMETER);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestInvalidParameters()\r
 \r

-\r

 /**\r
   TestEKUSubStringFails()\r
 \r
 /**\r
   TestEKUSubStringFails()\r
 \r


@@ -463,11 +478,11 @@ TestInvalidParameters(
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r

-TestEKUSubsetSupersetFails(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestEKUSubsetSupersetFails (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r

 {\r
 {\r

-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r

 \r
   //\r
   // This signature has an EKU of:\r
 \r
   //\r
   // This signature has an EKU of:\r


@@ -476,13 +491,15 @@ TestEKUSubsetSupersetFails(
   // "1.3.6.1.4.1.311.76.9.21"\r
   // does not pass.\r
   //\r
   // "1.3.6.1.4.1.311.76.9.21"\r
   // does not pass.\r
   //\r

-  CONST CHAR8* RequiredEKUs1[] = { "1.3.6.1.4.1.311.76.9.21" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithProductId10001,\r
-                                      ARRAY_SIZE(TestSignedWithProductId10001),\r
-                                      (CONST CHAR8**)RequiredEKUs1,\r
-                                      ARRAY_SIZE(RequiredEKUs1),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs1[] = { "1.3.6.1.4.1.311.76.9.21" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithProductId10001,\r
+             ARRAY_SIZE (TestSignedWithProductId10001),\r
+             (CONST CHAR8 **)RequiredEKUs1,\r
+             ARRAY_SIZE (RequiredEKUs1),\r
+             TRUE\r
+             );\r

   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   //\r
   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   //\r


@@ -492,33 +509,35 @@ TestEKUSubsetSupersetFails(
   // "1.3.6.1.4.1.311.76.9.21.1.10001.1"\r
   // does not pass.\r
   //\r
   // "1.3.6.1.4.1.311.76.9.21.1.10001.1"\r
   // does not pass.\r
   //\r

-  CONST CHAR8* RequiredEKUs2[] = { "1.3.6.1.4.1.311.76.9.21.1.10001.1" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithProductId10001,\r
-                                      ARRAY_SIZE(TestSignedWithProductId10001),\r
-                                      (CONST CHAR8**)RequiredEKUs2,\r
-                                      ARRAY_SIZE(RequiredEKUs2),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs2[] = { "1.3.6.1.4.1.311.76.9.21.1.10001.1" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithProductId10001,\r
+             ARRAY_SIZE (TestSignedWithProductId10001),\r
+             (CONST CHAR8 **)RequiredEKUs2,\r
+             ARRAY_SIZE (RequiredEKUs2),\r
+             TRUE\r
+             );\r

   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestEKUSubsetSupersetFails()\r
 \r
   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestEKUSubsetSupersetFails()\r
 \r

-TEST_DESC mPkcs7EkuTest[] = {\r
-    //\r
-    // -----Description--------------------------------Class----------------------------Function------------------------------Pre---Post--Context\r
-    //\r
-    {"TestVerifyEKUsInSignature()",            "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsInSignature,            NULL, NULL, NULL},\r
-    {"TestVerifyEKUsWith3CertsInSignature()",  "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsWith3CertsInSignature,  NULL, NULL, NULL},\r
-    {"TestVerifyEKUsWith2CertsInSignature()",  "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsWith2CertsInSignature,  NULL, NULL, NULL},\r
-    {"TestVerifyEKUsWith1CertInSignature()",   "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsWith1CertInSignature,   NULL, NULL, NULL},\r
-    {"TestVerifyEKUsWithMultipleEKUsInCert()", "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsWithMultipleEKUsInCert, NULL, NULL, NULL},\r
-    {"TestEkusNotPresentInSignature()",        "CryptoPkg.BaseCryptLib.Eku",   TestEkusNotPresentInSignature,        NULL, NULL, NULL},\r
-    {"TestProductId10001PresentInSignature()", "CryptoPkg.BaseCryptLib.Eku",   TestProductId10001PresentInSignature, NULL, NULL, NULL},\r
-    {"TestOnlyOneEkuInListRequired()",         "CryptoPkg.BaseCryptLib.Eku",   TestOnlyOneEkuInListRequired,         NULL, NULL, NULL},\r
-    {"TestNoEKUsInSignature()",                "CryptoPkg.BaseCryptLib.Eku",   TestNoEKUsInSignature,                NULL, NULL, NULL},\r
-    {"TestInvalidParameters()",                "CryptoPkg.BaseCryptLib.Eku",   TestInvalidParameters,                NULL, NULL, NULL},\r
-    {"TestEKUSubsetSupersetFails()",           "CryptoPkg.BaseCryptLib.Eku",   TestEKUSubsetSupersetFails,           NULL, NULL, NULL},\r
+TEST_DESC  mPkcs7EkuTest[] = {\r
+  //\r
+  // -----Description--------------------------------Class----------------------------Function------------------------------Pre---Post--Context\r
+  //\r
+  { "TestVerifyEKUsInSignature()",            "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsInSignature,            NULL, NULL, NULL },\r
+  { "TestVerifyEKUsWith3CertsInSignature()",  "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsWith3CertsInSignature,  NULL, NULL, NULL },\r
+  { "TestVerifyEKUsWith2CertsInSignature()",  "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsWith2CertsInSignature,  NULL, NULL, NULL },\r
+  { "TestVerifyEKUsWith1CertInSignature()",   "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsWith1CertInSignature,   NULL, NULL, NULL },\r
+  { "TestVerifyEKUsWithMultipleEKUsInCert()", "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsWithMultipleEKUsInCert, NULL, NULL, NULL },\r
+  { "TestEkusNotPresentInSignature()",        "CryptoPkg.BaseCryptLib.Eku", TestEkusNotPresentInSignature,        NULL, NULL, NULL },\r
+  { "TestProductId10001PresentInSignature()", "CryptoPkg.BaseCryptLib.Eku", TestProductId10001PresentInSignature, NULL, NULL, NULL },\r
+  { "TestOnlyOneEkuInListRequired()",         "CryptoPkg.BaseCryptLib.Eku", TestOnlyOneEkuInListRequired,         NULL, NULL, NULL },\r
+  { "TestNoEKUsInSignature()",                "CryptoPkg.BaseCryptLib.Eku", TestNoEKUsInSignature,                NULL, NULL, NULL },\r
+  { "TestInvalidParameters()",                "CryptoPkg.BaseCryptLib.Eku", TestInvalidParameters,                NULL, NULL, NULL },\r
+  { "TestEKUSubsetSupersetFails()",           "CryptoPkg.BaseCryptLib.Eku", TestEKUSubsetSupersetFails,           NULL, NULL, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mPkcs7EkuTestNum = ARRAY_SIZE(mPkcs7EkuTest);\r
+UINTN  mPkcs7EkuTestNum = ARRAY_SIZE (mPkcs7EkuTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RandTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RandTests.c
index cc6b2ca46ba1812084648a990eff9fbb1c620fe3..9d297f0052be940fa009c7a4761f0f4e78ca6b6b 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RandTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RandTests.c
@@ -19,7 +19,7 @@ UINT8  RandomBuffer[RANDOM_NUMBER_SIZE] = { 0x0 };
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyPrngGeneration (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyPrngGeneration (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   UINTN    Index;\r
   )\r
 {\r
   UINTN    Index;\r


@@ -28,7 +28,7 @@ TestVerifyPrngGeneration (
   Status = RandomSeed (SeedString, sizeof (SeedString));\r
   UT_ASSERT_TRUE (Status);\r
 \r
   Status = RandomSeed (SeedString, sizeof (SeedString));\r
   UT_ASSERT_TRUE (Status);\r
 \r

-  for (Index = 0; Index < 10; Index ++) {\r
+  for (Index = 0; Index < 10; Index++) {\r

     Status = RandomBytes (RandomBuffer, RANDOM_NUMBER_SIZE);\r
     UT_ASSERT_TRUE (Status);\r
 \r
     Status = RandomBytes (RandomBuffer, RANDOM_NUMBER_SIZE);\r
     UT_ASSERT_TRUE (Status);\r
 \r


@@ -41,11 +41,11 @@ TestVerifyPrngGeneration (
   return UNIT_TEST_PASSED;\r
 }\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-TEST_DESC mPrngTest[] = {\r
-    //\r
-    // -----Description--------------------------------Class--------------------Function----------------Pre---Post--Context\r
-    //\r
-    {"TestVerifyPrngGeneration()",       "CryptoPkg.BaseCryptLib.Prng",   TestVerifyPrngGeneration,   NULL, NULL, NULL},\r
+TEST_DESC  mPrngTest[] = {\r
+  //\r
+  // -----Description--------------------------------Class--------------------Function----------------Pre---Post--Context\r
+  //\r
+  { "TestVerifyPrngGeneration()", "CryptoPkg.BaseCryptLib.Prng", TestVerifyPrngGeneration, NULL, NULL, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mPrngTestNum = ARRAY_SIZE(mPrngTest);\r
+UINTN  mPrngTestNum = ARRAY_SIZE (mPrngTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPkcs7Tests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPkcs7Tests.c
index 85a3d6a5a13b5378736ab572af528469242ccb39..8b464cb694b54fbeb267e08084cbcefa9c1a85a5 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPkcs7Tests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPkcs7Tests.c
@@ -9,7 +9,6 @@
 \r
 #include "TestBaseCryptLib.h"\r
 \r
 \r
 #include "TestBaseCryptLib.h"\r
 \r

-\r

 //\r
 // Password-protected PEM Key data for RSA Private Key Retrieving (encryption key is "client").\r
 // (Generated by OpenSSL utility).\r
 //\r
 // Password-protected PEM Key data for RSA Private Key Retrieving (encryption key is "client").\r
 // (Generated by OpenSSL utility).\r


@@ -17,8 +16,8 @@
 // password should match PemPass in this file\r
 // $ xxd --include TestKeyPem\r
 //\r
 // password should match PemPass in this file\r
 // $ xxd --include TestKeyPem\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TestKeyPem[] = {\r
-   0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x52,\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TestKeyPem[] = {\r
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x52,\r

   0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b,\r
   0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x50, 0x72, 0x6f, 0x63,\r
   0x2d, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x34, 0x2c, 0x45, 0x4e, 0x43,\r
   0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b,\r
   0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x50, 0x72, 0x6f, 0x63,\r
   0x2d, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x34, 0x2c, 0x45, 0x4e, 0x43,\r


@@ -99,12 +98,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TestKeyPem[] = {
   0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x52, 0x53, 0x41,\r
   0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59,\r
   0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a\r
   0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x52, 0x53, 0x41,\r
   0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59,\r
   0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a\r

- };\r
+};\r

 \r
 //\r
 // Password for private key retrieving from encrypted PEM ("TestKeyPem").\r
 //\r
 \r
 //\r
 // Password for private key retrieving from encrypted PEM ("TestKeyPem").\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *PemPass = "client";\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  *PemPass = "client";\r

 \r
 //\r
 // Test CA X509 Certificate for X509 Verification Routine (Generated by OpenSSL utility).\r
 \r
 //\r
 // Test CA X509 Certificate for X509 Verification Routine (Generated by OpenSSL utility).\r


@@ -112,7 +111,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *PemPass = "client";
 // use password from PemPass variable in this file\r
 // $ xxd --include TestCACert\r
 //\r
 // use password from PemPass variable in this file\r
 // $ xxd --include TestCACert\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TestCACert[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TestCACert[] = {\r

   0x30, 0x82, 0x02, 0x98, 0x30, 0x82, 0x02, 0x01, 0xa0, 0x03, 0x02, 0x01,\r
   0x02, 0x02, 0x14, 0x39, 0xde, 0x9e, 0xce, 0x3a, 0x36, 0x11, 0x38, 0x6f,\r
   0x64, 0xb4, 0x69, 0xa7, 0x93, 0xdd, 0xff, 0xbd, 0x3e, 0x75, 0x6a, 0x30,\r
   0x30, 0x82, 0x02, 0x98, 0x30, 0x82, 0x02, 0x01, 0xa0, 0x03, 0x02, 0x01,\r
   0x02, 0x02, 0x14, 0x39, 0xde, 0x9e, 0xce, 0x3a, 0x36, 0x11, 0x38, 0x6f,\r
   0x64, 0xb4, 0x69, 0xa7, 0x93, 0xdd, 0xff, 0xbd, 0x3e, 0x75, 0x6a, 0x30,\r


@@ -177,7 +176,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TestCACert[] = {
 // $ openssl x509 -days 10000 -CA TestCACert.pem -CAkey TestKeyPem -req -out TestCert -set_serial 3432 --outform DER -in TestCertCsr\r
 // password should be in the PemPass variable\r
 // $ xxd --include TestCert\r
 // $ openssl x509 -days 10000 -CA TestCACert.pem -CAkey TestKeyPem -req -out TestCert -set_serial 3432 --outform DER -in TestCertCsr\r
 // password should be in the PemPass variable\r
 // $ xxd --include TestCert\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TestCert[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  TestCert[] = {\r

   0x30, 0x82, 0x02, 0x31, 0x30, 0x82, 0x01, 0x9a, 0x02, 0x02, 0x0d, 0x68,\r
   0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,\r
   0x0b, 0x05, 0x00, 0x30, 0x5e, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55,\r
   0x30, 0x82, 0x02, 0x31, 0x30, 0x82, 0x01, 0x9a, 0x02, 0x02, 0x0d, 0x68,\r
   0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,\r
   0x0b, 0x05, 0x00, 0x30, 0x5e, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55,\r


@@ -231,21 +230,20 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 TestCert[] = {
 //\r
 // Message Hash for Signing & Verification Validation.\r
 //\r
 //\r
 // Message Hash for Signing & Verification Validation.\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 MsgHash[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  MsgHash[] = {\r

   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,\r
   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09\r
   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,\r
   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09\r

-  };\r
+};\r

 \r
 //\r
 // Payload for PKCS#7 Signing & Verification Validation.\r
 //\r
 \r
 //\r
 // Payload for PKCS#7 Signing & Verification Validation.\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *Payload = "Payload Data for PKCS#7 Signing";\r
-\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  *Payload = "Payload Data for PKCS#7 Signing";\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaCertPkcs1SignVerify (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaCertPkcs1SignVerify (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   BOOLEAN        Status;\r
   )\r
 {\r
   BOOLEAN        Status;\r


@@ -296,9 +294,9 @@ TestVerifyRsaCertPkcs1SignVerify (
   // X509 Certificate Subject Retrieving.\r
   //\r
   SubjectSize = 0;\r
   // X509 Certificate Subject Retrieving.\r
   //\r
   SubjectSize = 0;\r

-  Status  = X509GetSubjectName (TestCert, sizeof (TestCert), NULL, &SubjectSize);\r
-  Subject = (UINT8 *)AllocatePool (SubjectSize);\r
-  Status  = X509GetSubjectName (TestCert, sizeof (TestCert), Subject, &SubjectSize);\r
+  Status      = X509GetSubjectName (TestCert, sizeof (TestCert), NULL, &SubjectSize);\r
+  Subject     = (UINT8 *)AllocatePool (SubjectSize);\r
+  Status      = X509GetSubjectName (TestCert, sizeof (TestCert), Subject, &SubjectSize);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   //\r
   UT_ASSERT_TRUE (Status);\r
 \r
   //\r


@@ -329,8 +327,8 @@ TestVerifyRsaCertPkcs1SignVerify (
   //\r
   // Release Resources.\r
   //\r
   //\r
   // Release Resources.\r
   //\r

-  RsaFree  (RsaPubKey);\r
-  RsaFree  (RsaPrivKey);\r
+  RsaFree (RsaPubKey);\r
+  RsaFree (RsaPrivKey);\r

   FreePool (Signature);\r
   FreePool (Subject);\r
 \r
   FreePool (Signature);\r
   FreePool (Subject);\r
 \r


@@ -340,7 +338,7 @@ TestVerifyRsaCertPkcs1SignVerify (
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyPkcs7SignVerify (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyPkcs7SignVerify (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   BOOLEAN  Status;\r
   )\r
 {\r
   BOOLEAN  Status;\r


@@ -354,7 +352,7 @@ TestVerifyPkcs7SignVerify (
   //\r
   // Construct Signer Certificate from RAW data.\r
   //\r
   //\r
   // Construct Signer Certificate from RAW data.\r
   //\r

-  Status = X509ConstructCertificate (TestCert, sizeof (TestCert), (UINT8 **) &SignCert);\r
+  Status = X509ConstructCertificate (TestCert, sizeof (TestCert), (UINT8 **)&SignCert);\r

   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_NOT_NULL (SignCert);\r
 \r
   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_NOT_NULL (SignCert);\r
 \r


@@ -365,8 +363,8 @@ TestVerifyPkcs7SignVerify (
   Status = Pkcs7Sign (\r
              TestKeyPem,\r
              sizeof (TestKeyPem),\r
   Status = Pkcs7Sign (\r
              TestKeyPem,\r
              sizeof (TestKeyPem),\r

-             (CONST UINT8 *) PemPass,\r
-             (UINT8 *) Payload,\r
+             (CONST UINT8 *)PemPass,\r
+             (UINT8 *)Payload,\r

              AsciiStrLen (Payload),\r
              SignCert,\r
              NULL,\r
              AsciiStrLen (Payload),\r
              SignCert,\r
              NULL,\r


@@ -381,7 +379,7 @@ TestVerifyPkcs7SignVerify (
              P7SignedDataSize,\r
              TestCACert,\r
              sizeof (TestCACert),\r
              P7SignedDataSize,\r
              TestCACert,\r
              sizeof (TestCACert),\r

-             (UINT8 *) Payload,\r
+             (UINT8 *)Payload,\r

              AsciiStrLen (Payload)\r
              );\r
   UT_ASSERT_TRUE (Status);\r
              AsciiStrLen (Payload)\r
              );\r
   UT_ASSERT_TRUE (Status);\r


@@ -389,6 +387,7 @@ TestVerifyPkcs7SignVerify (
   if (P7SignedData != NULL) {\r
     FreePool (P7SignedData);\r
   }\r
   if (P7SignedData != NULL) {\r
     FreePool (P7SignedData);\r
   }\r

+\r

   if (SignCert != NULL) {\r
     X509Free (SignCert);\r
   }\r
   if (SignCert != NULL) {\r
     X509Free (SignCert);\r
   }\r


@@ -396,20 +395,20 @@ TestVerifyPkcs7SignVerify (
   return UNIT_TEST_PASSED;\r
 }\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-TEST_DESC mRsaCertTest[] = {\r
-    //\r
-    // -----Description--------------------------------------Class----------------------Function-----------------Pre---Post--Context\r
-    //\r
-    {"TestVerifyRsaCertPkcs1SignVerify()", "CryptoPkg.BaseCryptLib.RsaCert", TestVerifyRsaCertPkcs1SignVerify, NULL, NULL, NULL},\r
+TEST_DESC  mRsaCertTest[] = {\r
+  //\r
+  // -----Description--------------------------------------Class----------------------Function-----------------Pre---Post--Context\r
+  //\r
+  { "TestVerifyRsaCertPkcs1SignVerify()", "CryptoPkg.BaseCryptLib.RsaCert", TestVerifyRsaCertPkcs1SignVerify, NULL, NULL, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mRsaCertTestNum = ARRAY_SIZE(mRsaCertTest);\r
+UINTN  mRsaCertTestNum = ARRAY_SIZE (mRsaCertTest);\r

 \r
 \r

-TEST_DESC mPkcs7Test[] = {\r
-    //\r
-    // -----Description--------------------------------------Class----------------------Function-----------------Pre---Post--Context\r
-    //\r
-    {"TestVerifyPkcs7SignVerify()",        "CryptoPkg.BaseCryptLib.Pkcs7",   TestVerifyPkcs7SignVerify,        NULL, NULL, NULL},\r
+TEST_DESC  mPkcs7Test[] = {\r
+  //\r
+  // -----Description--------------------------------------Class----------------------Function-----------------Pre---Post--Context\r
+  //\r
+  { "TestVerifyPkcs7SignVerify()", "CryptoPkg.BaseCryptLib.Pkcs7", TestVerifyPkcs7SignVerify, NULL, NULL, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mPkcs7TestNum = ARRAY_SIZE(mPkcs7Test);\r
+UINTN  mPkcs7TestNum = ARRAY_SIZE (mPkcs7Test);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPssTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPssTests.c
index 7970523c5fe857435ca3c0e3c3511f6f5b2e0a5f..42baf88524c3a27615252d4dd8d86afe3ea17909 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPssTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPssTests.c
@@ -15,103 +15,102 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Public Modulus of RSA Key\r
 //\r
 //\r
 // Public Modulus of RSA Key\r
 //\r

-UINT8 RsaPssN[]={\r
-    0xa4, 0x7d, 0x04, 0xe7, 0xca, 0xcd, 0xba, 0x4e, 0xa2, 0x6e, 0xca, 0x8a, 0x4c, 0x6e, 0x14, 0x56,\r
-    0x3c, 0x2c, 0xe0, 0x3b, 0x62, 0x3b, 0x76, 0x8c, 0x0d, 0x49, 0x86, 0x8a, 0x57, 0x12, 0x13, 0x01,\r
-    0xdb, 0xf7, 0x83, 0xd8, 0x2f, 0x4c, 0x05, 0x5e, 0x73, 0x96, 0x0e, 0x70, 0x55, 0x01, 0x87, 0xd0,\r
-    0xaf, 0x62, 0xac, 0x34, 0x96, 0xf0, 0xa3, 0xd9, 0x10, 0x3c, 0x2e, 0xb7, 0x91, 0x9a, 0x72, 0x75,\r
-    0x2f, 0xa7, 0xce, 0x8c, 0x68, 0x8d, 0x81, 0xe3, 0xae, 0xe9, 0x94, 0x68, 0x88, 0x7a, 0x15, 0x28,\r
-    0x8a, 0xfb, 0xb7, 0xac, 0xb8, 0x45, 0xb7, 0xc5, 0x22, 0xb5, 0xc6, 0x4e, 0x67, 0x8f, 0xcd, 0x3d,\r
-    0x22, 0xfe, 0xb8, 0x4b, 0x44, 0x27, 0x27, 0x00, 0xbe, 0x52, 0x7d, 0x2b, 0x20, 0x25, 0xa3, 0xf8,\r
-    0x3c, 0x23, 0x83, 0xbf, 0x6a, 0x39, 0xcf, 0x5b, 0x4e, 0x48, 0xb3, 0xcf, 0x2f, 0x56, 0xee, 0xf0,\r
-    0xdf, 0xff, 0x18, 0x55, 0x5e, 0x31, 0x03, 0x7b, 0x91, 0x52, 0x48, 0x69, 0x48, 0x76, 0xf3, 0x04,\r
-    0x78, 0x14, 0x41, 0x51, 0x64, 0xf2, 0xc6, 0x60, 0x88, 0x1e, 0x69, 0x4b, 0x58, 0xc2, 0x80, 0x38,\r
-    0xa0, 0x32, 0xad, 0x25, 0x63, 0x4a, 0xad, 0x7b, 0x39, 0x17, 0x1d, 0xee, 0x36, 0x8e, 0x3d, 0x59,\r
-    0xbf, 0xb7, 0x29, 0x9e, 0x46, 0x01, 0xd4, 0x58, 0x7e, 0x68, 0xca, 0xaf, 0x8d, 0xb4, 0x57, 0xb7,\r
-    0x5a, 0xf4, 0x2f, 0xc0, 0xcf, 0x1a, 0xe7, 0xca, 0xce, 0xd2, 0x86, 0xd7, 0x7f, 0xac, 0x6c, 0xed,\r
-    0xb0, 0x3a, 0xd9, 0x4f, 0x14, 0x33, 0xd2, 0xc9, 0x4d, 0x08, 0xe6, 0x0b, 0xc1, 0xfd, 0xef, 0x05,\r
-    0x43, 0xcd, 0x29, 0x51, 0xe7, 0x65, 0xb3, 0x82, 0x30, 0xfd, 0xd1, 0x8d, 0xe5, 0xd2, 0xca, 0x62,\r
-    0x7d, 0xdc, 0x03, 0x2f, 0xe0, 0x5b, 0xbd, 0x2f, 0xf2, 0x1e, 0x2d, 0xb1, 0xc2, 0xf9, 0x4d, 0x8b,\r
-    };\r
+UINT8  RsaPssN[] = {\r
+  0xa4, 0x7d, 0x04, 0xe7, 0xca, 0xcd, 0xba, 0x4e, 0xa2, 0x6e, 0xca, 0x8a, 0x4c, 0x6e, 0x14, 0x56,\r
+  0x3c, 0x2c, 0xe0, 0x3b, 0x62, 0x3b, 0x76, 0x8c, 0x0d, 0x49, 0x86, 0x8a, 0x57, 0x12, 0x13, 0x01,\r
+  0xdb, 0xf7, 0x83, 0xd8, 0x2f, 0x4c, 0x05, 0x5e, 0x73, 0x96, 0x0e, 0x70, 0x55, 0x01, 0x87, 0xd0,\r
+  0xaf, 0x62, 0xac, 0x34, 0x96, 0xf0, 0xa3, 0xd9, 0x10, 0x3c, 0x2e, 0xb7, 0x91, 0x9a, 0x72, 0x75,\r
+  0x2f, 0xa7, 0xce, 0x8c, 0x68, 0x8d, 0x81, 0xe3, 0xae, 0xe9, 0x94, 0x68, 0x88, 0x7a, 0x15, 0x28,\r
+  0x8a, 0xfb, 0xb7, 0xac, 0xb8, 0x45, 0xb7, 0xc5, 0x22, 0xb5, 0xc6, 0x4e, 0x67, 0x8f, 0xcd, 0x3d,\r
+  0x22, 0xfe, 0xb8, 0x4b, 0x44, 0x27, 0x27, 0x00, 0xbe, 0x52, 0x7d, 0x2b, 0x20, 0x25, 0xa3, 0xf8,\r
+  0x3c, 0x23, 0x83, 0xbf, 0x6a, 0x39, 0xcf, 0x5b, 0x4e, 0x48, 0xb3, 0xcf, 0x2f, 0x56, 0xee, 0xf0,\r
+  0xdf, 0xff, 0x18, 0x55, 0x5e, 0x31, 0x03, 0x7b, 0x91, 0x52, 0x48, 0x69, 0x48, 0x76, 0xf3, 0x04,\r
+  0x78, 0x14, 0x41, 0x51, 0x64, 0xf2, 0xc6, 0x60, 0x88, 0x1e, 0x69, 0x4b, 0x58, 0xc2, 0x80, 0x38,\r
+  0xa0, 0x32, 0xad, 0x25, 0x63, 0x4a, 0xad, 0x7b, 0x39, 0x17, 0x1d, 0xee, 0x36, 0x8e, 0x3d, 0x59,\r
+  0xbf, 0xb7, 0x29, 0x9e, 0x46, 0x01, 0xd4, 0x58, 0x7e, 0x68, 0xca, 0xaf, 0x8d, 0xb4, 0x57, 0xb7,\r
+  0x5a, 0xf4, 0x2f, 0xc0, 0xcf, 0x1a, 0xe7, 0xca, 0xce, 0xd2, 0x86, 0xd7, 0x7f, 0xac, 0x6c, 0xed,\r
+  0xb0, 0x3a, 0xd9, 0x4f, 0x14, 0x33, 0xd2, 0xc9, 0x4d, 0x08, 0xe6, 0x0b, 0xc1, 0xfd, 0xef, 0x05,\r
+  0x43, 0xcd, 0x29, 0x51, 0xe7, 0x65, 0xb3, 0x82, 0x30, 0xfd, 0xd1, 0x8d, 0xe5, 0xd2, 0xca, 0x62,\r
+  0x7d, 0xdc, 0x03, 0x2f, 0xe0, 0x5b, 0xbd, 0x2f, 0xf2, 0x1e, 0x2d, 0xb1, 0xc2, 0xf9, 0x4d, 0x8b,\r
+};\r

 \r
 //\r
 // Public Exponent of RSA Key\r
 //\r
 \r
 //\r
 // Public Exponent of RSA Key\r
 //\r

-UINT8 RsaPssE[]={ 0x10, 0xe4, 0x3f };\r
+UINT8  RsaPssE[] = { 0x10, 0xe4, 0x3f };\r

 \r
 //\r
 // Private Exponent of RSA Key\r
 //\r
 \r
 //\r
 // Private Exponent of RSA Key\r
 //\r

-UINT8 RsaPssD[]={\r
-    0x11, 0xa0, 0xdd, 0x28, 0x5f, 0x66, 0x47, 0x1a, 0x8d, 0xa3, 0x0b, 0xcb, 0x8c, 0x24, 0xa1, 0xd5,\r
-    0xc8, 0xdb, 0x94, 0x2f, 0xc9, 0x92, 0x07, 0x97, 0xca, 0x44, 0x24, 0x60, 0xa8, 0x00, 0xb7, 0x5b,\r
-    0xbc, 0x73, 0x8b, 0xeb, 0x8e, 0xe0, 0xe8, 0x74, 0xb0, 0x53, 0xe6, 0x47, 0x07, 0xdf, 0x4c, 0xfc,\r
-    0x78, 0x37, 0xc4, 0x0e, 0x5b, 0xe6, 0x8b, 0x8a, 0x8e, 0x1d, 0x01, 0x45, 0x16, 0x9c, 0xa6, 0x27,\r
-    0x1d, 0x81, 0x88, 0x7e, 0x19, 0xa1, 0xcd, 0x95, 0xb2, 0xfd, 0x0d, 0xe0, 0xdb, 0xa3, 0x47, 0xfe,\r
-    0x63, 0x7b, 0xcc, 0x6c, 0xdc, 0x24, 0xee, 0xbe, 0x03, 0xc2, 0x4d, 0x4c, 0xf3, 0xa5, 0xc6, 0x15,\r
-    0x4d, 0x78, 0xf1, 0x41, 0xfe, 0x34, 0x16, 0x99, 0x24, 0xd0, 0xf8, 0x95, 0x33, 0x65, 0x8e, 0xac,\r
-    0xfd, 0xea, 0xe9, 0x9c, 0xe1, 0xa8, 0x80, 0x27, 0xc1, 0x8f, 0xf9, 0x26, 0x53, 0xa8, 0x35, 0xaa,\r
-    0x38, 0x91, 0xbf, 0xff, 0xcd, 0x38, 0x8f, 0xfc, 0x23, 0x88, 0xce, 0x2b, 0x10, 0x56, 0x85, 0x43,\r
-    0x75, 0x05, 0x02, 0xcc, 0xbc, 0x69, 0xc0, 0x08, 0x8f, 0x1d, 0x69, 0x0e, 0x97, 0xa5, 0xf5, 0xbd,\r
-    0xd1, 0x88, 0x8c, 0xd2, 0xfa, 0xa4, 0x3c, 0x04, 0xae, 0x24, 0x53, 0x95, 0x22, 0xdd, 0xe2, 0xd9,\r
-    0xc2, 0x02, 0xf6, 0x55, 0xfc, 0x55, 0x75, 0x44, 0x40, 0xb5, 0x3a, 0x15, 0x32, 0xaa, 0xb4, 0x78,\r
-    0x51, 0xf6, 0x0b, 0x7a, 0x06, 0x7e, 0x24, 0x0b, 0x73, 0x8e, 0x1b, 0x1d, 0xaa, 0xe6, 0xca, 0x0d,\r
-    0x59, 0xee, 0xae, 0x27, 0x68, 0x6c, 0xd8, 0x88, 0x57, 0xe9, 0xad, 0xad, 0xc2, 0xd4, 0xb8, 0x2b,\r
-    0x07, 0xa6, 0x1a, 0x35, 0x84, 0x56, 0xaa, 0xf8, 0x07, 0x66, 0x96, 0x93, 0xff, 0xb1, 0x3c, 0x99,\r
-    0x64, 0xa6, 0x36, 0x54, 0xca, 0xdc, 0x81, 0xee, 0x59, 0xdf, 0x51, 0x1c, 0xa3, 0xa4, 0xbd, 0x67,\r
-    };\r
+UINT8  RsaPssD[] = {\r
+  0x11, 0xa0, 0xdd, 0x28, 0x5f, 0x66, 0x47, 0x1a, 0x8d, 0xa3, 0x0b, 0xcb, 0x8c, 0x24, 0xa1, 0xd5,\r
+  0xc8, 0xdb, 0x94, 0x2f, 0xc9, 0x92, 0x07, 0x97, 0xca, 0x44, 0x24, 0x60, 0xa8, 0x00, 0xb7, 0x5b,\r
+  0xbc, 0x73, 0x8b, 0xeb, 0x8e, 0xe0, 0xe8, 0x74, 0xb0, 0x53, 0xe6, 0x47, 0x07, 0xdf, 0x4c, 0xfc,\r
+  0x78, 0x37, 0xc4, 0x0e, 0x5b, 0xe6, 0x8b, 0x8a, 0x8e, 0x1d, 0x01, 0x45, 0x16, 0x9c, 0xa6, 0x27,\r
+  0x1d, 0x81, 0x88, 0x7e, 0x19, 0xa1, 0xcd, 0x95, 0xb2, 0xfd, 0x0d, 0xe0, 0xdb, 0xa3, 0x47, 0xfe,\r
+  0x63, 0x7b, 0xcc, 0x6c, 0xdc, 0x24, 0xee, 0xbe, 0x03, 0xc2, 0x4d, 0x4c, 0xf3, 0xa5, 0xc6, 0x15,\r
+  0x4d, 0x78, 0xf1, 0x41, 0xfe, 0x34, 0x16, 0x99, 0x24, 0xd0, 0xf8, 0x95, 0x33, 0x65, 0x8e, 0xac,\r
+  0xfd, 0xea, 0xe9, 0x9c, 0xe1, 0xa8, 0x80, 0x27, 0xc1, 0x8f, 0xf9, 0x26, 0x53, 0xa8, 0x35, 0xaa,\r
+  0x38, 0x91, 0xbf, 0xff, 0xcd, 0x38, 0x8f, 0xfc, 0x23, 0x88, 0xce, 0x2b, 0x10, 0x56, 0x85, 0x43,\r
+  0x75, 0x05, 0x02, 0xcc, 0xbc, 0x69, 0xc0, 0x08, 0x8f, 0x1d, 0x69, 0x0e, 0x97, 0xa5, 0xf5, 0xbd,\r
+  0xd1, 0x88, 0x8c, 0xd2, 0xfa, 0xa4, 0x3c, 0x04, 0xae, 0x24, 0x53, 0x95, 0x22, 0xdd, 0xe2, 0xd9,\r
+  0xc2, 0x02, 0xf6, 0x55, 0xfc, 0x55, 0x75, 0x44, 0x40, 0xb5, 0x3a, 0x15, 0x32, 0xaa, 0xb4, 0x78,\r
+  0x51, 0xf6, 0x0b, 0x7a, 0x06, 0x7e, 0x24, 0x0b, 0x73, 0x8e, 0x1b, 0x1d, 0xaa, 0xe6, 0xca, 0x0d,\r
+  0x59, 0xee, 0xae, 0x27, 0x68, 0x6c, 0xd8, 0x88, 0x57, 0xe9, 0xad, 0xad, 0xc2, 0xd4, 0xb8, 0x2b,\r
+  0x07, 0xa6, 0x1a, 0x35, 0x84, 0x56, 0xaa, 0xf8, 0x07, 0x66, 0x96, 0x93, 0xff, 0xb1, 0x3c, 0x99,\r
+  0x64, 0xa6, 0x36, 0x54, 0xca, 0xdc, 0x81, 0xee, 0x59, 0xdf, 0x51, 0x1c, 0xa3, 0xa4, 0xbd, 0x67,\r
+};\r

 \r
 //\r
 // Binary message to be signed and verified\r
 //\r
 \r
 //\r
 // Binary message to be signed and verified\r
 //\r

-UINT8 PssMessage[]={\r
-    0xe0, 0x02, 0x37, 0x7a, 0xff, 0xb0, 0x4f, 0x0f, 0xe4, 0x59, 0x8d, 0xe9, 0xd9, 0x2d, 0x31, 0xd6,\r
-    0xc7, 0x86, 0x04, 0x0d, 0x57, 0x76, 0x97, 0x65, 0x56, 0xa2, 0xcf, 0xc5, 0x5e, 0x54, 0xa1, 0xdc,\r
-    0xb3, 0xcb, 0x1b, 0x12, 0x6b, 0xd6, 0xa4, 0xbe, 0xd2, 0xa1, 0x84, 0x99, 0x0c, 0xce, 0xa7, 0x73,\r
-    0xfc, 0xc7, 0x9d, 0x24, 0x65, 0x53, 0xe6, 0xc6, 0x4f, 0x68, 0x6d, 0x21, 0xad, 0x41, 0x52, 0x67,\r
-    0x3c, 0xaf, 0xec, 0x22, 0xae, 0xb4, 0x0f, 0x6a, 0x08, 0x4e, 0x8a, 0x5b, 0x49, 0x91, 0xf4, 0xc6,\r
-    0x4c, 0xf8, 0xa9, 0x27, 0xef, 0xfd, 0x0f, 0xd7, 0x75, 0xe7, 0x1e, 0x83, 0x29, 0xe4, 0x1f, 0xdd,\r
-    0x44, 0x57, 0xb3, 0x91, 0x11, 0x73, 0x18, 0x7b, 0x4f, 0x09, 0xa8, 0x17, 0xd7, 0x9e, 0xa2, 0x39,\r
-    0x7f, 0xc1, 0x2d, 0xfe, 0x3d, 0x9c, 0x9a, 0x02, 0x90, 0xc8, 0xea, 0xd3, 0x1b, 0x66, 0x90, 0xa6,\r
-    };\r
+UINT8  PssMessage[] = {\r
+  0xe0, 0x02, 0x37, 0x7a, 0xff, 0xb0, 0x4f, 0x0f, 0xe4, 0x59, 0x8d, 0xe9, 0xd9, 0x2d, 0x31, 0xd6,\r
+  0xc7, 0x86, 0x04, 0x0d, 0x57, 0x76, 0x97, 0x65, 0x56, 0xa2, 0xcf, 0xc5, 0x5e, 0x54, 0xa1, 0xdc,\r
+  0xb3, 0xcb, 0x1b, 0x12, 0x6b, 0xd6, 0xa4, 0xbe, 0xd2, 0xa1, 0x84, 0x99, 0x0c, 0xce, 0xa7, 0x73,\r
+  0xfc, 0xc7, 0x9d, 0x24, 0x65, 0x53, 0xe6, 0xc6, 0x4f, 0x68, 0x6d, 0x21, 0xad, 0x41, 0x52, 0x67,\r
+  0x3c, 0xaf, 0xec, 0x22, 0xae, 0xb4, 0x0f, 0x6a, 0x08, 0x4e, 0x8a, 0x5b, 0x49, 0x91, 0xf4, 0xc6,\r
+  0x4c, 0xf8, 0xa9, 0x27, 0xef, 0xfd, 0x0f, 0xd7, 0x75, 0xe7, 0x1e, 0x83, 0x29, 0xe4, 0x1f, 0xdd,\r
+  0x44, 0x57, 0xb3, 0x91, 0x11, 0x73, 0x18, 0x7b, 0x4f, 0x09, 0xa8, 0x17, 0xd7, 0x9e, 0xa2, 0x39,\r
+  0x7f, 0xc1, 0x2d, 0xfe, 0x3d, 0x9c, 0x9a, 0x02, 0x90, 0xc8, 0xea, 0xd3, 0x1b, 0x66, 0x90, 0xa6,\r
+};\r

 \r
 //\r
 // Binary message to be signed and verified\r
 //\r
 \r
 //\r
 // Binary message to be signed and verified\r
 //\r

-UINT8 PssSalt[]={\r
-    0xd6, 0x6f, 0x72, 0xf1, 0x0b, 0x69, 0x00, 0x1a, 0x5b, 0x59, 0xcf, 0x10, 0x92, 0xad, 0x27, 0x4d,\r
-    0x50, 0x56, 0xc4, 0xe9, 0x5c, 0xcc, 0xcf, 0xbe, 0x3b, 0x53, 0x0d, 0xcb, 0x02, 0x7e, 0x57, 0xd6\r
-    };\r
+UINT8  PssSalt[] = {\r
+  0xd6, 0x6f, 0x72, 0xf1, 0x0b, 0x69, 0x00, 0x1a, 0x5b, 0x59, 0xcf, 0x10, 0x92, 0xad, 0x27, 0x4d,\r
+  0x50, 0x56, 0xc4, 0xe9, 0x5c, 0xcc, 0xcf, 0xbe, 0x3b, 0x53, 0x0d, 0xcb, 0x02, 0x7e, 0x57, 0xd6\r
+};\r

 \r
 //\r
 // RSASSA-PSS Signature over above message using above keys, salt and SHA256 digest(and MGF1) algo.\r
 //\r
 \r
 //\r
 // RSASSA-PSS Signature over above message using above keys, salt and SHA256 digest(and MGF1) algo.\r
 //\r

-UINT8 TestVectorSignature[]={\r
-    0x4f, 0x9b, 0x42, 0x5c, 0x20, 0x58, 0x46, 0x0e, 0x4a, 0xb2, 0xf5, 0xc9, 0x63, 0x84, 0xda, 0x23,\r
-    0x27, 0xfd, 0x29, 0x15, 0x0f, 0x01, 0x95, 0x5a, 0x76, 0xb4, 0xef, 0xe9, 0x56, 0xaf, 0x06, 0xdc,\r
-    0x08, 0x77, 0x9a, 0x37, 0x4e, 0xe4, 0x60, 0x7e, 0xab, 0x61, 0xa9, 0x3a, 0xdc, 0x56, 0x08, 0xf4,\r
-    0xec, 0x36, 0xe4, 0x7f, 0x2a, 0x0f, 0x75, 0x4e, 0x8f, 0xf8, 0x39, 0xa8, 0xa1, 0x9b, 0x1d, 0xb1,\r
-    0xe8, 0x84, 0xea, 0x4c, 0xf3, 0x48, 0xcd, 0x45, 0x50, 0x69, 0xeb, 0x87, 0xaf, 0xd5, 0x36, 0x45,\r
-    0xb4, 0x4e, 0x28, 0xa0, 0xa5, 0x68, 0x08, 0xf5, 0x03, 0x1d, 0xa5, 0xba, 0x91, 0x12, 0x76, 0x8d,\r
-    0xfb, 0xfc, 0xa4, 0x4e, 0xbe, 0x63, 0xa0, 0xc0, 0x57, 0x2b, 0x73, 0x1d, 0x66, 0x12, 0x2f, 0xb7,\r
-    0x16, 0x09, 0xbe, 0x14, 0x80, 0xfa, 0xa4, 0xe4, 0xf7, 0x5e, 0x43, 0x95, 0x51, 0x59, 0xd7, 0x0f,\r
-    0x08, 0x1e, 0x2a, 0x32, 0xfb, 0xb1, 0x9a, 0x48, 0xb9, 0xf1, 0x62, 0xcf, 0x6b, 0x2f, 0xb4, 0x45,\r
-    0xd2, 0xd6, 0x99, 0x4b, 0xc5, 0x89, 0x10, 0xa2, 0x6b, 0x59, 0x43, 0x47, 0x78, 0x03, 0xcd, 0xaa,\r
-    0xa1, 0xbd, 0x74, 0xb0, 0xda, 0x0a, 0x5d, 0x05, 0x3d, 0x8b, 0x1d, 0xc5, 0x93, 0x09, 0x1d, 0xb5,\r
-    0x38, 0x83, 0x83, 0xc2, 0x60, 0x79, 0xf3, 0x44, 0xe2, 0xae, 0xa6, 0x00, 0xd0, 0xe3, 0x24, 0x16,\r
-    0x4b, 0x45, 0x0f, 0x7b, 0x9b, 0x46, 0x51, 0x11, 0xb7, 0x26, 0x5f, 0x3b, 0x1b, 0x06, 0x30, 0x89,\r
-    0xae, 0x7e, 0x26, 0x23, 0xfc, 0x0f, 0xda, 0x80, 0x52, 0xcf, 0x4b, 0xf3, 0x37, 0x91, 0x02, 0xfb,\r
-    0xf7, 0x1d, 0x7c, 0x98, 0xe8, 0x25, 0x86, 0x64, 0xce, 0xed, 0x63, 0x7d, 0x20, 0xf9, 0x5f, 0xf0,\r
-    0x11, 0x18, 0x81, 0xe6, 0x50, 0xce, 0x61, 0xf2, 0x51, 0xd9, 0xc3, 0xa6, 0x29, 0xef, 0x22, 0x2d,\r
-    };\r
-\r
-\r
-STATIC VOID     *mRsa;\r
+UINT8  TestVectorSignature[] = {\r
+  0x4f, 0x9b, 0x42, 0x5c, 0x20, 0x58, 0x46, 0x0e, 0x4a, 0xb2, 0xf5, 0xc9, 0x63, 0x84, 0xda, 0x23,\r
+  0x27, 0xfd, 0x29, 0x15, 0x0f, 0x01, 0x95, 0x5a, 0x76, 0xb4, 0xef, 0xe9, 0x56, 0xaf, 0x06, 0xdc,\r
+  0x08, 0x77, 0x9a, 0x37, 0x4e, 0xe4, 0x60, 0x7e, 0xab, 0x61, 0xa9, 0x3a, 0xdc, 0x56, 0x08, 0xf4,\r
+  0xec, 0x36, 0xe4, 0x7f, 0x2a, 0x0f, 0x75, 0x4e, 0x8f, 0xf8, 0x39, 0xa8, 0xa1, 0x9b, 0x1d, 0xb1,\r
+  0xe8, 0x84, 0xea, 0x4c, 0xf3, 0x48, 0xcd, 0x45, 0x50, 0x69, 0xeb, 0x87, 0xaf, 0xd5, 0x36, 0x45,\r
+  0xb4, 0x4e, 0x28, 0xa0, 0xa5, 0x68, 0x08, 0xf5, 0x03, 0x1d, 0xa5, 0xba, 0x91, 0x12, 0x76, 0x8d,\r
+  0xfb, 0xfc, 0xa4, 0x4e, 0xbe, 0x63, 0xa0, 0xc0, 0x57, 0x2b, 0x73, 0x1d, 0x66, 0x12, 0x2f, 0xb7,\r
+  0x16, 0x09, 0xbe, 0x14, 0x80, 0xfa, 0xa4, 0xe4, 0xf7, 0x5e, 0x43, 0x95, 0x51, 0x59, 0xd7, 0x0f,\r
+  0x08, 0x1e, 0x2a, 0x32, 0xfb, 0xb1, 0x9a, 0x48, 0xb9, 0xf1, 0x62, 0xcf, 0x6b, 0x2f, 0xb4, 0x45,\r
+  0xd2, 0xd6, 0x99, 0x4b, 0xc5, 0x89, 0x10, 0xa2, 0x6b, 0x59, 0x43, 0x47, 0x78, 0x03, 0xcd, 0xaa,\r
+  0xa1, 0xbd, 0x74, 0xb0, 0xda, 0x0a, 0x5d, 0x05, 0x3d, 0x8b, 0x1d, 0xc5, 0x93, 0x09, 0x1d, 0xb5,\r
+  0x38, 0x83, 0x83, 0xc2, 0x60, 0x79, 0xf3, 0x44, 0xe2, 0xae, 0xa6, 0x00, 0xd0, 0xe3, 0x24, 0x16,\r
+  0x4b, 0x45, 0x0f, 0x7b, 0x9b, 0x46, 0x51, 0x11, 0xb7, 0x26, 0x5f, 0x3b, 0x1b, 0x06, 0x30, 0x89,\r
+  0xae, 0x7e, 0x26, 0x23, 0xfc, 0x0f, 0xda, 0x80, 0x52, 0xcf, 0x4b, 0xf3, 0x37, 0x91, 0x02, 0xfb,\r
+  0xf7, 0x1d, 0x7c, 0x98, 0xe8, 0x25, 0x86, 0x64, 0xce, 0xed, 0x63, 0x7d, 0x20, 0xf9, 0x5f, 0xf0,\r
+  0x11, 0x18, 0x81, 0xe6, 0x50, 0xce, 0x61, 0xf2, 0x51, 0xd9, 0xc3, 0xa6, 0x29, 0xef, 0x22, 0x2d,\r
+};\r
+\r
+STATIC VOID  *mRsa;\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaPssPreReq (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaPssPreReq (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   mRsa = RsaNew ();\r
   )\r
 {\r
   mRsa = RsaNew ();\r


@@ -126,7 +125,7 @@ TestVerifyRsaPssPreReq (
 VOID\r
 EFIAPI\r
 TestVerifyRsaPssCleanUp (\r
 VOID\r
 EFIAPI\r
 TestVerifyRsaPssCleanUp (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   if (mRsa != NULL) {\r
   )\r
 {\r
   if (mRsa != NULL) {\r


@@ -135,11 +134,10 @@ TestVerifyRsaPssCleanUp (
   }\r
 }\r
 \r
   }\r
 }\r
 \r

-\r

 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaPssSignVerify (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaPssSignVerify (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   UINT8    *Signature;\r
   )\r
 {\r
   UINT8    *Signature;\r


@@ -156,36 +154,35 @@ TestVerifyRsaPssSignVerify (
   UT_ASSERT_TRUE (Status);\r
 \r
   SigSize = 0;\r
   UT_ASSERT_TRUE (Status);\r
 \r
   SigSize = 0;\r

-  Status = RsaPssSign (mRsa, PssMessage, sizeof(PssMessage), SHA256_DIGEST_SIZE, SHA256_DIGEST_SIZE, NULL, &SigSize);\r
+  Status  = RsaPssSign (mRsa, PssMessage, sizeof (PssMessage), SHA256_DIGEST_SIZE, SHA256_DIGEST_SIZE, NULL, &SigSize);\r

   UT_ASSERT_FALSE (Status);\r
   UT_ASSERT_NOT_EQUAL (SigSize, 0);\r
 \r
   Signature = AllocatePool (SigSize);\r
   UT_ASSERT_FALSE (Status);\r
   UT_ASSERT_NOT_EQUAL (SigSize, 0);\r
 \r
   Signature = AllocatePool (SigSize);\r

-  Status = RsaPssSign (mRsa, PssMessage, sizeof(PssMessage), SHA256_DIGEST_SIZE, SHA256_DIGEST_SIZE, Signature, &SigSize);\r
+  Status    = RsaPssSign (mRsa, PssMessage, sizeof (PssMessage), SHA256_DIGEST_SIZE, SHA256_DIGEST_SIZE, Signature, &SigSize);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   //\r
   // Verify RSA PSS encoded Signature generated in above step\r
   //\r
   UT_ASSERT_TRUE (Status);\r
 \r
   //\r
   // Verify RSA PSS encoded Signature generated in above step\r
   //\r

-  Status = RsaPssVerify (mRsa, PssMessage, sizeof(PssMessage), Signature, SigSize, SHA256_DIGEST_SIZE, SHA256_DIGEST_SIZE);\r
+  Status = RsaPssVerify (mRsa, PssMessage, sizeof (PssMessage), Signature, SigSize, SHA256_DIGEST_SIZE, SHA256_DIGEST_SIZE);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   //\r
   // Verify NIST FIPS 186-3 RSA test vector signature\r
   //\r
   UT_ASSERT_TRUE (Status);\r
 \r
   //\r
   // Verify NIST FIPS 186-3 RSA test vector signature\r
   //\r

-  Status = RsaPssVerify (mRsa, PssMessage, sizeof(PssMessage), TestVectorSignature, sizeof(TestVectorSignature), SHA256_DIGEST_SIZE, SHA256_DIGEST_SIZE);\r
+  Status = RsaPssVerify (mRsa, PssMessage, sizeof (PssMessage), TestVectorSignature, sizeof (TestVectorSignature), SHA256_DIGEST_SIZE, SHA256_DIGEST_SIZE);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   UT_ASSERT_TRUE (Status);\r
 \r

-  FreePool(Signature);\r
+  FreePool (Signature);\r

   return UNIT_TEST_PASSED;\r
 }\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-\r
-TEST_DESC mRsaPssTest[] = {\r
-    //\r
-    // -----Description--------------------------------------Class----------------------Function---------------------------------Pre---------------------Post---------Context\r
-    //\r
-    {"TestVerifyRsaPssSignVerify()",           "CryptoPkg.BaseCryptLib.Rsa",   TestVerifyRsaPssSignVerify,           TestVerifyRsaPssPreReq, TestVerifyRsaPssCleanUp, NULL},\r
+TEST_DESC  mRsaPssTest[] = {\r
+  //\r
+  // -----Description--------------------------------------Class----------------------Function---------------------------------Pre---------------------Post---------Context\r
+  //\r
+  { "TestVerifyRsaPssSignVerify()", "CryptoPkg.BaseCryptLib.Rsa", TestVerifyRsaPssSignVerify, TestVerifyRsaPssPreReq, TestVerifyRsaPssCleanUp, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mRsaPssTestNum = ARRAY_SIZE(mRsaPssTest);\r
+UINTN  mRsaPssTestNum = ARRAY_SIZE (mRsaPssTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaTests.c
index 0969b6aea66045a1e06bcc124ebdceea5a608f22..3f06e89b3cc362d16643535f6eab3020ba03105b 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaTests.c
@@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Public Modulus of RSA Key\r
 //\r
 //\r
 // Public Modulus of RSA Key\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaN[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  RsaN[] = {\r

   0xBB, 0xF8, 0x2F, 0x09, 0x06, 0x82, 0xCE, 0x9C, 0x23, 0x38, 0xAC, 0x2B, 0x9D, 0xA8, 0x71, 0xF7,\r
   0x36, 0x8D, 0x07, 0xEE, 0xD4, 0x10, 0x43, 0xA4, 0x40, 0xD6, 0xB6, 0xF0, 0x74, 0x54, 0xF5, 0x1F,\r
   0xB8, 0xDF, 0xBA, 0xAF, 0x03, 0x5C, 0x02, 0xAB, 0x61, 0xEA, 0x48, 0xCE, 0xEB, 0x6F, 0xCD, 0x48,\r
   0xBB, 0xF8, 0x2F, 0x09, 0x06, 0x82, 0xCE, 0x9C, 0x23, 0x38, 0xAC, 0x2B, 0x9D, 0xA8, 0x71, 0xF7,\r
   0x36, 0x8D, 0x07, 0xEE, 0xD4, 0x10, 0x43, 0xA4, 0x40, 0xD6, 0xB6, 0xF0, 0x74, 0x54, 0xF5, 0x1F,\r
   0xB8, 0xDF, 0xBA, 0xAF, 0x03, 0x5C, 0x02, 0xAB, 0x61, 0xEA, 0x48, 0xCE, 0xEB, 0x6F, 0xCD, 0x48,\r


@@ -26,17 +26,17 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaN[] = {
   0xEE, 0x6A, 0x64, 0x9D, 0x06, 0x09, 0x53, 0x74, 0x88, 0x34, 0xB2, 0x45, 0x45, 0x98, 0x39, 0x4E,\r
   0xE0, 0xAA, 0xB1, 0x2D, 0x7B, 0x61, 0xA5, 0x1F, 0x52, 0x7A, 0x9A, 0x41, 0xF6, 0xC1, 0x68, 0x7F,\r
   0xE2, 0x53, 0x72, 0x98, 0xCA, 0x2A, 0x8F, 0x59, 0x46, 0xF8, 0xE5, 0xFD, 0x09, 0x1D, 0xBD, 0xCB\r
   0xEE, 0x6A, 0x64, 0x9D, 0x06, 0x09, 0x53, 0x74, 0x88, 0x34, 0xB2, 0x45, 0x45, 0x98, 0x39, 0x4E,\r
   0xE0, 0xAA, 0xB1, 0x2D, 0x7B, 0x61, 0xA5, 0x1F, 0x52, 0x7A, 0x9A, 0x41, 0xF6, 0xC1, 0x68, 0x7F,\r
   0xE2, 0x53, 0x72, 0x98, 0xCA, 0x2A, 0x8F, 0x59, 0x46, 0xF8, 0xE5, 0xFD, 0x09, 0x1D, 0xBD, 0xCB\r

-  };\r
+};\r

 \r
 //\r
 // Public Exponent of RSA Key\r
 //\r
 \r
 //\r
 // Public Exponent of RSA Key\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaE[] = { 0x11 };\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  RsaE[] = { 0x11 };\r

 \r
 //\r
 // Private Exponent of RSA Key\r
 //\r
 \r
 //\r
 // Private Exponent of RSA Key\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaD[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  RsaD[] = {\r

   0xA5, 0xDA, 0xFC, 0x53, 0x41, 0xFA, 0xF2, 0x89, 0xC4, 0xB9, 0x88, 0xDB, 0x30, 0xC1, 0xCD, 0xF8,\r
   0x3F, 0x31, 0x25, 0x1E, 0x06, 0x68, 0xB4, 0x27, 0x84, 0x81, 0x38, 0x01, 0x57, 0x96, 0x41, 0xB2,\r
   0x94, 0x10, 0xB3, 0xC7, 0x99, 0x8D, 0x6B, 0xC4, 0x65, 0x74, 0x5E, 0x5C, 0x39, 0x26, 0x69, 0xD6,\r
   0xA5, 0xDA, 0xFC, 0x53, 0x41, 0xFA, 0xF2, 0x89, 0xC4, 0xB9, 0x88, 0xDB, 0x30, 0xC1, 0xCD, 0xF8,\r
   0x3F, 0x31, 0x25, 0x1E, 0x06, 0x68, 0xB4, 0x27, 0x84, 0x81, 0x38, 0x01, 0x57, 0x96, 0x41, 0xB2,\r
   0x94, 0x10, 0xB3, 0xC7, 0x99, 0x8D, 0x6B, 0xC4, 0x65, 0x74, 0x5E, 0x5C, 0x39, 0x26, 0x69, 0xD6,\r


@@ -45,17 +45,17 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaD[] = {
   0xE5, 0x6A, 0xAF, 0x68, 0xC5, 0x6C, 0x09, 0x2C, 0xD3, 0x8D, 0xC3, 0xBE, 0xF5, 0xD2, 0x0A, 0x93,\r
   0x99, 0x26, 0xED, 0x4F, 0x74, 0xA1, 0x3E, 0xDD, 0xFB, 0xE1, 0xA1, 0xCE, 0xCC, 0x48, 0x94, 0xAF,\r
   0x94, 0x28, 0xC2, 0xB7, 0xB8, 0x88, 0x3F, 0xE4, 0x46, 0x3A, 0x4B, 0xC8, 0x5B, 0x1C, 0xB3, 0xC1\r
   0xE5, 0x6A, 0xAF, 0x68, 0xC5, 0x6C, 0x09, 0x2C, 0xD3, 0x8D, 0xC3, 0xBE, 0xF5, 0xD2, 0x0A, 0x93,\r
   0x99, 0x26, 0xED, 0x4F, 0x74, 0xA1, 0x3E, 0xDD, 0xFB, 0xE1, 0xA1, 0xCE, 0xCC, 0x48, 0x94, 0xAF,\r
   0x94, 0x28, 0xC2, 0xB7, 0xB8, 0x88, 0x3F, 0xE4, 0x46, 0x3A, 0x4B, 0xC8, 0x5B, 0x1C, 0xB3, 0xC1\r

-  };\r
+};\r

 \r
 //\r
 // Known Answer Test (KAT) Data for RSA PKCS#1 Signing\r
 //\r
 \r
 //\r
 // Known Answer Test (KAT) Data for RSA PKCS#1 Signing\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 RsaSignData[] = "OpenSSL FIPS 140-2 Public Key RSA KAT";\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  RsaSignData[] = "OpenSSL FIPS 140-2 Public Key RSA KAT";\r

 \r
 //\r
 // Known Signature for the above message, under SHA-1 Digest\r
 //\r
 \r
 //\r
 // Known Signature for the above message, under SHA-1 Digest\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaPkcs1Signature[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  RsaPkcs1Signature[] = {\r

   0x71, 0xEE, 0x1A, 0xC0, 0xFE, 0x01, 0x93, 0x54, 0x79, 0x5C, 0xF2, 0x4C, 0x4A, 0xFD, 0x1A, 0x05,\r
   0x8F, 0x64, 0xB1, 0x6D, 0x61, 0x33, 0x8D, 0x9B, 0xE7, 0xFD, 0x60, 0xA3, 0x83, 0xB5, 0xA3, 0x51,\r
   0x55, 0x77, 0x90, 0xCF, 0xDC, 0x22, 0x37, 0x8E, 0xD0, 0xE1, 0xAE, 0x09, 0xE3, 0x3D, 0x1E, 0xF8,\r
   0x71, 0xEE, 0x1A, 0xC0, 0xFE, 0x01, 0x93, 0x54, 0x79, 0x5C, 0xF2, 0x4C, 0x4A, 0xFD, 0x1A, 0x05,\r
   0x8F, 0x64, 0xB1, 0x6D, 0x61, 0x33, 0x8D, 0x9B, 0xE7, 0xFD, 0x60, 0xA3, 0x83, 0xB5, 0xA3, 0x51,\r
   0x55, 0x77, 0x90, 0xCF, 0xDC, 0x22, 0x37, 0x8E, 0xD0, 0xE1, 0xAE, 0x09, 0xE3, 0x3D, 0x1E, 0xF8,\r


@@ -64,21 +64,21 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaPkcs1Signature[] = {
   0x4E, 0xCA, 0x2E, 0x4E, 0xBC, 0x29, 0xA8, 0x67, 0x13, 0xB7, 0x9F, 0x1D, 0x04, 0x44, 0xE5, 0x5F,\r
   0x35, 0x07, 0x11, 0xBC, 0xED, 0x19, 0x37, 0x21, 0xCF, 0x23, 0x48, 0x1F, 0x72, 0x05, 0xDE, 0xE6,\r
   0xE8, 0x7F, 0x33, 0x8A, 0x76, 0x4B, 0x2F, 0x95, 0xDF, 0xF1, 0x5F, 0x84, 0x80, 0xD9, 0x46, 0xB4\r
   0x4E, 0xCA, 0x2E, 0x4E, 0xBC, 0x29, 0xA8, 0x67, 0x13, 0xB7, 0x9F, 0x1D, 0x04, 0x44, 0xE5, 0x5F,\r
   0x35, 0x07, 0x11, 0xBC, 0xED, 0x19, 0x37, 0x21, 0xCF, 0x23, 0x48, 0x1F, 0x72, 0x05, 0xDE, 0xE6,\r
   0xE8, 0x7F, 0x33, 0x8A, 0x76, 0x4B, 0x2F, 0x95, 0xDF, 0xF1, 0x5F, 0x84, 0x80, 0xD9, 0x46, 0xB4\r

-  };\r
+};\r

 \r
 //\r
 // Default public key 0x10001 = 65537\r
 //\r
 \r
 //\r
 // Default public key 0x10001 = 65537\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 DefaultPublicKey[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  DefaultPublicKey[] = {\r

   0x01, 0x00, 0x01\r
 };\r
 \r
   0x01, 0x00, 0x01\r
 };\r
 \r

-VOID     *mRsa;\r
+VOID  *mRsa;\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaPreReq (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaPreReq (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   mRsa = RsaNew ();\r
   )\r
 {\r
   mRsa = RsaNew ();\r


@@ -93,7 +93,7 @@ TestVerifyRsaPreReq (
 VOID\r
 EFIAPI\r
 TestVerifyRsaCleanUp (\r
 VOID\r
 EFIAPI\r
 TestVerifyRsaCleanUp (\r

-  UNIT_TEST_CONTEXT           Context\r
+  UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   if (mRsa != NULL) {\r
   )\r
 {\r
   if (mRsa != NULL) {\r


@@ -105,7 +105,7 @@ TestVerifyRsaCleanUp (
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaSetGetKeyComponents (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaSetGetKeyComponents (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   BOOLEAN  Status;\r
   )\r
 {\r
   BOOLEAN  Status;\r


@@ -123,12 +123,12 @@ TestVerifyRsaSetGetKeyComponents (
   UT_ASSERT_TRUE (Status);\r
 \r
   KeySize = 0;\r
   UT_ASSERT_TRUE (Status);\r
 \r
   KeySize = 0;\r

-  Status = RsaGetKey (mRsa, RsaKeyN, NULL, &KeySize);\r
+  Status  = RsaGetKey (mRsa, RsaKeyN, NULL, &KeySize);\r

   UT_ASSERT_FALSE (Status);\r
   UT_ASSERT_EQUAL (KeySize, sizeof (RsaN));\r
 \r
   KeyBuffer = AllocatePool (KeySize);\r
   UT_ASSERT_FALSE (Status);\r
   UT_ASSERT_EQUAL (KeySize, sizeof (RsaN));\r
 \r
   KeyBuffer = AllocatePool (KeySize);\r

-  Status = RsaGetKey (mRsa, RsaKeyN, KeyBuffer, &KeySize);\r
+  Status    = RsaGetKey (mRsa, RsaKeyN, KeyBuffer, &KeySize);\r

   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, sizeof (RsaN));\r
 \r
   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, sizeof (RsaN));\r
 \r


@@ -143,12 +143,12 @@ TestVerifyRsaSetGetKeyComponents (
   UT_ASSERT_TRUE (Status);\r
 \r
   KeySize = 0;\r
   UT_ASSERT_TRUE (Status);\r
 \r
   KeySize = 0;\r

-  Status = RsaGetKey (mRsa, RsaKeyE, NULL, &KeySize);\r
+  Status  = RsaGetKey (mRsa, RsaKeyE, NULL, &KeySize);\r

   UT_ASSERT_FALSE (Status);\r
   UT_ASSERT_EQUAL (KeySize, sizeof (RsaE));\r
 \r
   KeyBuffer = AllocatePool (KeySize);\r
   UT_ASSERT_FALSE (Status);\r
   UT_ASSERT_EQUAL (KeySize, sizeof (RsaE));\r
 \r
   KeyBuffer = AllocatePool (KeySize);\r

-  Status = RsaGetKey (mRsa, RsaKeyE, KeyBuffer, &KeySize);\r
+  Status    = RsaGetKey (mRsa, RsaKeyE, KeyBuffer, &KeySize);\r

   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, sizeof (RsaE));\r
 \r
   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, sizeof (RsaE));\r
 \r


@@ -167,7 +167,7 @@ TestVerifyRsaSetGetKeyComponents (
   UT_ASSERT_TRUE (Status);\r
 \r
   KeySize = 1;\r
   UT_ASSERT_TRUE (Status);\r
 \r
   KeySize = 1;\r

-  Status = RsaGetKey (mRsa, RsaKeyN, NULL, &KeySize);\r
+  Status  = RsaGetKey (mRsa, RsaKeyN, NULL, &KeySize);\r

   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, 0);\r
 \r
   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, 0);\r
 \r


@@ -178,7 +178,7 @@ TestVerifyRsaSetGetKeyComponents (
   UT_ASSERT_TRUE (Status);\r
 \r
   KeySize = 1;\r
   UT_ASSERT_TRUE (Status);\r
 \r
   KeySize = 1;\r

-  Status = RsaGetKey (mRsa, RsaKeyE, NULL, &KeySize);\r
+  Status  = RsaGetKey (mRsa, RsaKeyE, NULL, &KeySize);\r

   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, 0);\r
 \r
   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, 0);\r
 \r


@@ -188,7 +188,7 @@ TestVerifyRsaSetGetKeyComponents (
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaGenerateKeyComponents (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaGenerateKeyComponents (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   BOOLEAN  Status;\r
   )\r
 {\r
   BOOLEAN  Status;\r


@@ -202,15 +202,15 @@ TestVerifyRsaGenerateKeyComponents (
   Status = RsaGenerateKey (mRsa, RSA_MODULUS_LENGTH, NULL, 0);\r
   UT_ASSERT_TRUE (Status);\r
 \r
   Status = RsaGenerateKey (mRsa, RSA_MODULUS_LENGTH, NULL, 0);\r
   UT_ASSERT_TRUE (Status);\r
 \r

-  KeySize = RSA_MODULUS_LENGTH / 8;\r
+  KeySize   = RSA_MODULUS_LENGTH / 8;\r

   KeyBuffer = AllocatePool (KeySize);\r
   KeyBuffer = AllocatePool (KeySize);\r

-  Status = RsaGetKey (mRsa, RsaKeyE, KeyBuffer, &KeySize);\r
+  Status    = RsaGetKey (mRsa, RsaKeyE, KeyBuffer, &KeySize);\r

   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, 3);\r
   UT_ASSERT_MEM_EQUAL (KeyBuffer, DefaultPublicKey, 3);\r
 \r
   KeySize = RSA_MODULUS_LENGTH / 8;\r
   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, 3);\r
   UT_ASSERT_MEM_EQUAL (KeyBuffer, DefaultPublicKey, 3);\r
 \r
   KeySize = RSA_MODULUS_LENGTH / 8;\r

-  Status = RsaGetKey (mRsa, RsaKeyN, KeyBuffer, &KeySize);\r
+  Status  = RsaGetKey (mRsa, RsaKeyN, KeyBuffer, &KeySize);\r

   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, RSA_MODULUS_LENGTH / 8);\r
 \r
   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (KeySize, RSA_MODULUS_LENGTH / 8);\r
 \r


@@ -246,7 +246,7 @@ TestVerifyRsaGenerateKeyComponents (
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaPkcs1SignVerify (\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyRsaPkcs1SignVerify (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   UINT8    HashValue[SHA1_DIGEST_SIZE];\r
   )\r
 {\r
   UINT8    HashValue[SHA1_DIGEST_SIZE];\r


@@ -261,7 +261,7 @@ TestVerifyRsaPkcs1SignVerify (
   HashSize = SHA1_DIGEST_SIZE;\r
   ZeroMem (HashValue, HashSize);\r
 \r
   HashSize = SHA1_DIGEST_SIZE;\r
   ZeroMem (HashValue, HashSize);\r
 \r

-  Status  = Sha1HashAll (RsaSignData, AsciiStrLen (RsaSignData), HashValue);\r
+  Status = Sha1HashAll (RsaSignData, AsciiStrLen (RsaSignData), HashValue);\r

   UT_ASSERT_TRUE (Status);\r
 \r
   //\r
   UT_ASSERT_TRUE (Status);\r
 \r
   //\r


@@ -283,7 +283,7 @@ TestVerifyRsaPkcs1SignVerify (
   UT_ASSERT_NOT_EQUAL (SigSize, 0);\r
 \r
   Signature = AllocatePool (SigSize);\r
   UT_ASSERT_NOT_EQUAL (SigSize, 0);\r
 \r
   Signature = AllocatePool (SigSize);\r

-  Status  = RsaPkcs1Sign (mRsa, HashValue, HashSize, Signature, &SigSize);\r
+  Status    = RsaPkcs1Sign (mRsa, HashValue, HashSize, Signature, &SigSize);\r

   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (SigSize, sizeof (RsaPkcs1Signature));\r
 \r
   UT_ASSERT_TRUE (Status);\r
   UT_ASSERT_EQUAL (SigSize, sizeof (RsaPkcs1Signature));\r
 \r


@@ -295,18 +295,18 @@ TestVerifyRsaPkcs1SignVerify (
   Status = RsaPkcs1Verify (mRsa, HashValue, HashSize, Signature, SigSize);\r
   UT_ASSERT_TRUE (Status);\r
 \r
   Status = RsaPkcs1Verify (mRsa, HashValue, HashSize, Signature, SigSize);\r
   UT_ASSERT_TRUE (Status);\r
 \r

-  FreePool(Signature);\r
+  FreePool (Signature);\r

 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
 \r

-TEST_DESC mRsaTest[] = {\r
-    //\r
-    // -----Description--------------------------------------Class----------------------Function---------------------------------Pre---------------------Post---------Context\r
-    //\r
-    {"TestVerifyRsaSetGetKeyComponents()",       "CryptoPkg.BaseCryptLib.Rsa",   TestVerifyRsaSetGetKeyComponents,       TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL},\r
-    {"TestVerifyRsaGenerateKeyComponents()",     "CryptoPkg.BaseCryptLib.Rsa",   TestVerifyRsaGenerateKeyComponents,     TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL},\r
-    {"TestVerifyRsaPkcs1SignVerify()",           "CryptoPkg.BaseCryptLib.Rsa",   TestVerifyRsaPkcs1SignVerify,           TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL},\r
+TEST_DESC  mRsaTest[] = {\r
+  //\r
+  // -----Description--------------------------------------Class----------------------Function---------------------------------Pre---------------------Post---------Context\r
+  //\r
+  { "TestVerifyRsaSetGetKeyComponents()",   "CryptoPkg.BaseCryptLib.Rsa", TestVerifyRsaSetGetKeyComponents,   TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL },\r
+  { "TestVerifyRsaGenerateKeyComponents()", "CryptoPkg.BaseCryptLib.Rsa", TestVerifyRsaGenerateKeyComponents, TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL },\r
+  { "TestVerifyRsaPkcs1SignVerify()",       "CryptoPkg.BaseCryptLib.Rsa", TestVerifyRsaPkcs1SignVerify,       TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mRsaTestNum = ARRAY_SIZE(mRsaTest);\r
+UINTN  mRsaTestNum = ARRAY_SIZE (mRsaTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TSTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TSTests.c
index 2a891ef8bcb0971fae512b57a74c4b222929ab19..225ec3e59746c328d6c63bbdc9c54fd887ba3c8d 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TSTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TSTests.c
@@ -15,7 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //   signtool sign /ac <xxx.cer> / f <xxx.pfx> /p <pass> /fd <digestAlg>\r
 //     /tr http://timestamp.comodoca.com/rfc3161 sample.efi\r
 //\r
 //   signtool sign /ac <xxx.cer> / f <xxx.pfx> /p <pass> /fd <digestAlg>\r
 //     /tr http://timestamp.comodoca.com/rfc3161 sample.efi\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 AuthenticodeWithTS[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  AuthenticodeWithTS[] = {\r

   0x30, 0x82, 0x0c, 0x00, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0,\r
   0x82, 0x0b, 0xf1, 0x30, 0x82, 0x0b, 0xed, 0x02, 0x01, 0x01, 0x31, 0x0f, 0x30, 0x0d, 0x06, 0x09,\r
   0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x78, 0x06, 0x0a, 0x2b,\r
   0x30, 0x82, 0x0c, 0x00, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0,\r
   0x82, 0x0b, 0xf1, 0x30, 0x82, 0x0b, 0xed, 0x02, 0x01, 0x01, 0x31, 0x0f, 0x30, 0x0d, 0x06, 0x09,\r
   0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x30, 0x78, 0x06, 0x0a, 0x2b,\r


@@ -210,12 +210,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINT8 AuthenticodeWithTS[] = {
   0xb2, 0x6d, 0x75, 0xf4, 0x23, 0x58, 0x13, 0x78, 0x73, 0x1a, 0xb2, 0x84, 0xde, 0xad, 0xe8, 0x6d,\r
   0xe6, 0xe7, 0x5c, 0xb6, 0xe6, 0x5b, 0x10, 0x37, 0x1f, 0xe3, 0x6e, 0xbd, 0x83, 0xd7, 0x51, 0xb1,\r
   0x00, 0x00, 0x00, 0x00, 0x0a\r
   0xb2, 0x6d, 0x75, 0xf4, 0x23, 0x58, 0x13, 0x78, 0x73, 0x1a, 0xb2, 0x84, 0xde, 0xad, 0xe8, 0x6d,\r
   0xe6, 0xe7, 0x5c, 0xb6, 0xe6, 0x5b, 0x10, 0x37, 0x1f, 0xe3, 0x6e, 0xbd, 0x83, 0xd7, 0x51, 0xb1,\r
   0x00, 0x00, 0x00, 0x00, 0x0a\r

-  };\r
+};\r

 \r
 //\r
 // The Comodo Time Stamping Signer Certificate Used for the verification of TimeStamp signature.\r
 //\r
 \r
 //\r
 // The Comodo Time Stamping Signer Certificate Used for the verification of TimeStamp signature.\r
 //\r

-GLOBAL_REMOVE_IF_UNREFERENCED UINT8 TSTrustedCert[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8  TSTrustedCert[] = {\r

   0x30, 0x82, 0x04, 0x93, 0x30, 0x82, 0x03, 0x7b, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10, 0x47,\r
   0x8a, 0x8e, 0xfb, 0x59, 0xe1, 0xd8, 0x3f, 0x0c, 0xe1, 0x42, 0xd2, 0xa2, 0x87, 0x07, 0xbe, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x81,\r
   0x30, 0x82, 0x04, 0x93, 0x30, 0x82, 0x03, 0x7b, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10, 0x47,\r
   0x8a, 0x8e, 0xfb, 0x59, 0xe1, 0xd8, 0x3f, 0x0c, 0xe1, 0x42, 0xd2, 0xa2, 0x87, 0x07, 0xbe, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x81,\r


@@ -290,12 +290,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINT8 TSTrustedCert[] = {
   0x86, 0x08, 0xeb, 0xdb, 0xe0, 0x1f, 0x8c, 0x10, 0xf2, 0x39, 0x64, 0x9b, 0xae, 0x4f, 0x0a, 0x2c,\r
   0x92, 0x8a, 0x4f, 0x18, 0xb5, 0x91, 0xe5, 0x8d, 0x1a, 0x93, 0x5f, 0x1f, 0xae, 0xf1, 0xa6, 0xf0,\r
   0x2e, 0x97, 0xd0, 0xd2, 0xf6, 0x2b, 0x3c, 0x0a\r
   0x86, 0x08, 0xeb, 0xdb, 0xe0, 0x1f, 0x8c, 0x10, 0xf2, 0x39, 0x64, 0x9b, 0xae, 0x4f, 0x0a, 0x2c,\r
   0x92, 0x8a, 0x4f, 0x18, 0xb5, 0x91, 0xe5, 0x8d, 0x1a, 0x93, 0x5f, 0x1f, 0xae, 0xf1, 0xa6, 0xf0,\r
   0x2e, 0x97, 0xd0, 0xd2, 0xf6, 0x2b, 0x3c, 0x0a\r

-  };\r
+};\r

 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyImageTimestampVerify (\r
 \r
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyImageTimestampVerify (\r

-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r

   )\r
 {\r
   BOOLEAN   Status;\r
   )\r
 {\r
   BOOLEAN   Status;\r


@@ -325,11 +325,11 @@ TestVerifyImageTimestampVerify (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-TEST_DESC mImageTimestampTest[] = {\r
-    //\r
-    // -----Description--------------------------------------Class----------------------------Function-----------------Pre---Post--Context\r
-    //\r
-    {"TestVerifyImageTimestampVerify()",  "CryptoPkg.BaseCryptLib.ImageTimestamp",   TestVerifyImageTimestampVerify, NULL, NULL, NULL},\r
+TEST_DESC  mImageTimestampTest[] = {\r
+  //\r
+  // -----Description--------------------------------------Class----------------------------Function-----------------Pre---Post--Context\r
+  //\r
+  { "TestVerifyImageTimestampVerify()", "CryptoPkg.BaseCryptLib.ImageTimestamp", TestVerifyImageTimestampVerify, NULL, NULL, NULL },\r

 };\r
 \r
 };\r
 \r

-UINTN mImageTimestampTestNum = ARRAY_SIZE(mImageTimestampTest);\r
+UINTN  mImageTimestampTestNum = ARRAY_SIZE (mImageTimestampTest);\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLib.h b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLib.h
index 25c1379f1a777923ab65d93c78a2717da47b370b..a6b348274234e01fc6a6ccf438b634654b1fafe8 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLib.h
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLib.h
@@ -19,81 +19,81 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r

-//#include <UnitTestTypes.h>\r
+// #include <UnitTestTypes.h>\r

 #include <Library/UnitTestLib.h>\r
 #include <Library/UnitTestLib.h>\r

-//#include <Library/UnitTestAssertLib.h>\r
+// #include <Library/UnitTestAssertLib.h>\r

 \r
 \r

-#define UNIT_TEST_NAME        "BaseCryptLib Unit Test"\r
-#define UNIT_TEST_VERSION     "1.0"\r
+#define UNIT_TEST_NAME     "BaseCryptLib Unit Test"\r
+#define UNIT_TEST_VERSION  "1.0"\r

 \r
 typedef struct {\r
 \r
 typedef struct {\r

-  CHAR8                *Description;\r
-  CHAR8                *ClassName;\r
-  UNIT_TEST_FUNCTION     Func;\r
-  UNIT_TEST_PREREQUISITE PreReq;\r
-  UNIT_TEST_CLEANUP      CleanUp;\r
-  UNIT_TEST_CONTEXT      Context;\r
+  CHAR8                     *Description;\r
+  CHAR8                     *ClassName;\r
+  UNIT_TEST_FUNCTION        Func;\r
+  UNIT_TEST_PREREQUISITE    PreReq;\r
+  UNIT_TEST_CLEANUP         CleanUp;\r
+  UNIT_TEST_CONTEXT         Context;\r

 } TEST_DESC;\r
 \r
 typedef struct {\r
 } TEST_DESC;\r
 \r
 typedef struct {\r

-  CHAR8                     *Title;\r
-  CHAR8                     *Package;\r
-  UNIT_TEST_SUITE_SETUP      Sup;\r
-  UNIT_TEST_SUITE_TEARDOWN   Tdn;\r
-  UINTN                      *TestNum;\r
-  TEST_DESC                  *TestDesc;\r
+  CHAR8                       *Title;\r
+  CHAR8                       *Package;\r
+  UNIT_TEST_SUITE_SETUP       Sup;\r
+  UNIT_TEST_SUITE_TEARDOWN    Tdn;\r
+  UINTN                       *TestNum;\r
+  TEST_DESC                   *TestDesc;\r

 } SUITE_DESC;\r
 \r
 } SUITE_DESC;\r
 \r

-extern UINTN mPkcs7EkuTestNum;\r
-extern TEST_DESC mPkcs7EkuTest[];\r
+extern UINTN      mPkcs7EkuTestNum;\r
+extern TEST_DESC  mPkcs7EkuTest[];\r

 \r
 \r

-extern UINTN mHashTestNum;\r
-extern TEST_DESC mHashTest[];\r
+extern UINTN      mHashTestNum;\r
+extern TEST_DESC  mHashTest[];\r

 \r
 \r

-extern UINTN mHmacTestNum;\r
-extern TEST_DESC mHmacTest[];\r
+extern UINTN      mHmacTestNum;\r
+extern TEST_DESC  mHmacTest[];\r

 \r
 \r

-extern UINTN mBlockCipherTestNum;\r
-extern TEST_DESC mBlockCipherTest[];\r
+extern UINTN      mBlockCipherTestNum;\r
+extern TEST_DESC  mBlockCipherTest[];\r

 \r
 \r

-extern UINTN mRsaTestNum;\r
-extern TEST_DESC mRsaTest[];\r
+extern UINTN      mRsaTestNum;\r
+extern TEST_DESC  mRsaTest[];\r

 \r
 \r

-extern UINTN mRsaCertTestNum;\r
-extern TEST_DESC mRsaCertTest[];\r
+extern UINTN      mRsaCertTestNum;\r
+extern TEST_DESC  mRsaCertTest[];\r

 \r
 \r

-extern UINTN mPkcs7TestNum;\r
-extern TEST_DESC mPkcs7Test[];\r
+extern UINTN      mPkcs7TestNum;\r
+extern TEST_DESC  mPkcs7Test[];\r

 \r
 \r

-extern UINTN mPkcs5TestNum;\r
-extern TEST_DESC mPkcs5Test[];\r
+extern UINTN      mPkcs5TestNum;\r
+extern TEST_DESC  mPkcs5Test[];\r

 \r
 \r

-extern UINTN mAuthenticodeTestNum;\r
-extern TEST_DESC mAuthenticodeTest[];\r
+extern UINTN      mAuthenticodeTestNum;\r
+extern TEST_DESC  mAuthenticodeTest[];\r

 \r
 \r

-extern UINTN mImageTimestampTestNum;\r
-extern TEST_DESC mImageTimestampTest[];\r
+extern UINTN      mImageTimestampTestNum;\r
+extern TEST_DESC  mImageTimestampTest[];\r

 \r
 \r

-extern UINTN mDhTestNum;\r
-extern TEST_DESC mDhTest[];\r
+extern UINTN      mDhTestNum;\r
+extern TEST_DESC  mDhTest[];\r

 \r
 \r

-extern UINTN mPrngTestNum;\r
-extern TEST_DESC mPrngTest[];\r
+extern UINTN      mPrngTestNum;\r
+extern TEST_DESC  mPrngTest[];\r

 \r
 \r

-extern UINTN mOaepTestNum;\r
-extern TEST_DESC mOaepTest[];\r
+extern UINTN      mOaepTestNum;\r
+extern TEST_DESC  mOaepTest[];\r

 \r
 \r

-extern UINTN mRsaPssTestNum;\r
-extern TEST_DESC mRsaPssTest[];\r
+extern UINTN      mRsaPssTestNum;\r
+extern TEST_DESC  mRsaPssTest[];\r

 \r
 /** Creates a framework you can use */\r
 EFI_STATUS\r
 EFIAPI\r
 CreateUnitTest (\r
 \r
 /** Creates a framework you can use */\r
 EFI_STATUS\r
 EFIAPI\r
 CreateUnitTest (\r

-    IN     CHAR8*                     UnitTestName,\r
-    IN     CHAR8*                     UnitTestVersion,\r
-    IN OUT UNIT_TEST_FRAMEWORK_HANDLE* Framework\r
-);\r
+  IN     CHAR8                       *UnitTestName,\r
+  IN     CHAR8                       *UnitTestVersion,\r
+  IN OUT UNIT_TEST_FRAMEWORK_HANDLE  *Framework\r
+  );\r

 \r
 /**\r
   Validate UEFI-OpenSSL DH Interfaces.\r
 \r
 /**\r
   Validate UEFI-OpenSSL DH Interfaces.\r


@@ -119,6 +119,4 @@ ValidateCryptPrng (
   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r

-\r
-\r

 #endif\r
 #endif\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/UnitTestMain.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/UnitTestMain.c
index 88a3f96305c3775e02a652680502eb17c49e5d06..d0c1c7a4f7e0bb19cf049d712985921683f06e5d 100644 (file)
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/UnitTestMain.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/UnitTestMain.c
@@ -8,7 +8,6 @@
 **/\r
 #include "TestBaseCryptLib.h"\r
 \r
 **/\r
 #include "TestBaseCryptLib.h"\r
 \r

-\r

 /**\r
   Initialize the unit test framework, suite, and unit tests for the\r
   sample unit tests and run the unit tests.\r
 /**\r
   Initialize the unit test framework, suite, and unit tests for the\r
   sample unit tests and run the unit tests.\r


@@ -26,8 +25,8 @@ UefiTestMain (
   EFI_STATUS                  Status;\r
   UNIT_TEST_FRAMEWORK_HANDLE  Framework;\r
 \r
   EFI_STATUS                  Status;\r
   UNIT_TEST_FRAMEWORK_HANDLE  Framework;\r
 \r

-  DEBUG(( DEBUG_INFO, "%a v%a\n", UNIT_TEST_NAME, UNIT_TEST_VERSION ));\r
-  CreateUnitTest(UNIT_TEST_NAME, UNIT_TEST_VERSION, &Framework);\r
+  DEBUG ((DEBUG_INFO, "%a v%a\n", UNIT_TEST_NAME, UNIT_TEST_VERSION));\r
+  CreateUnitTest (UNIT_TEST_NAME, UNIT_TEST_VERSION, &Framework);\r

 \r
   //\r
   // Execute the tests.\r
 \r
   //\r
   // Execute the tests.\r


@@ -73,8 +72,8 @@ DxeEntryPoint (
 **/\r
 int\r
 main (\r
 **/\r
 int\r
 main (\r

-  int argc,\r
-  char *argv[]\r
+  int   argc,\r
+  char  *argv[]\r

   )\r
 {\r
   return UefiTestMain ();\r
   )\r
 {\r
   return UefiTestMain ();\r