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>

1 files changed, 35 insertions, 35 deletions

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaTests.c
index 0969b6aea6..3f06e89b3c 100644
--- 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
 //

 // Public Modulus of RSA Key

 //

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaN[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  RsaN[] = {

   0xBB, 0xF8, 0x2F, 0x09, 0x06, 0x82, 0xCE, 0x9C, 0x23, 0x38, 0xAC, 0x2B, 0x9D, 0xA8, 0x71, 0xF7,

   0x36, 0x8D, 0x07, 0xEE, 0xD4, 0x10, 0x43, 0xA4, 0x40, 0xD6, 0xB6, 0xF0, 0x74, 0x54, 0xF5, 0x1F,

   0xB8, 0xDF, 0xBA, 0xAF, 0x03, 0x5C, 0x02, 0xAB, 0x61, 0xEA, 0x48, 0xCE, 0xEB, 0x6F, 0xCD, 0x48,

@@ -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,

   0xE0, 0xAA, 0xB1, 0x2D, 0x7B, 0x61, 0xA5, 0x1F, 0x52, 0x7A, 0x9A, 0x41, 0xF6, 0xC1, 0x68, 0x7F,

   0xE2, 0x53, 0x72, 0x98, 0xCA, 0x2A, 0x8F, 0x59, 0x46, 0xF8, 0xE5, 0xFD, 0x09, 0x1D, 0xBD, 0xCB

-  };

+};

 

 //

 // Public Exponent of RSA Key

 //

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaE[] = { 0x11 };

+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  RsaE[] = { 0x11 };

 

 //

 // Private Exponent of RSA Key

 //

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaD[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  RsaD[] = {

   0xA5, 0xDA, 0xFC, 0x53, 0x41, 0xFA, 0xF2, 0x89, 0xC4, 0xB9, 0x88, 0xDB, 0x30, 0xC1, 0xCD, 0xF8,

   0x3F, 0x31, 0x25, 0x1E, 0x06, 0x68, 0xB4, 0x27, 0x84, 0x81, 0x38, 0x01, 0x57, 0x96, 0x41, 0xB2,

   0x94, 0x10, 0xB3, 0xC7, 0x99, 0x8D, 0x6B, 0xC4, 0x65, 0x74, 0x5E, 0x5C, 0x39, 0x26, 0x69, 0xD6,

@@ -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,

   0x99, 0x26, 0xED, 0x4F, 0x74, 0xA1, 0x3E, 0xDD, 0xFB, 0xE1, 0xA1, 0xCE, 0xCC, 0x48, 0x94, 0xAF,

   0x94, 0x28, 0xC2, 0xB7, 0xB8, 0x88, 0x3F, 0xE4, 0x46, 0x3A, 0x4B, 0xC8, 0x5B, 0x1C, 0xB3, 0xC1

-  };

+};

 

 //

 // Known Answer Test (KAT) Data for RSA PKCS#1 Signing

 //

-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 RsaSignData[] = "OpenSSL FIPS 140-2 Public Key RSA KAT";

+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  RsaSignData[] = "OpenSSL FIPS 140-2 Public Key RSA KAT";

 

 //

 // Known Signature for the above message, under SHA-1 Digest

 //

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 RsaPkcs1Signature[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  RsaPkcs1Signature[] = {

   0x71, 0xEE, 0x1A, 0xC0, 0xFE, 0x01, 0x93, 0x54, 0x79, 0x5C, 0xF2, 0x4C, 0x4A, 0xFD, 0x1A, 0x05,

   0x8F, 0x64, 0xB1, 0x6D, 0x61, 0x33, 0x8D, 0x9B, 0xE7, 0xFD, 0x60, 0xA3, 0x83, 0xB5, 0xA3, 0x51,

   0x55, 0x77, 0x90, 0xCF, 0xDC, 0x22, 0x37, 0x8E, 0xD0, 0xE1, 0xAE, 0x09, 0xE3, 0x3D, 0x1E, 0xF8,

@@ -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,

   0x35, 0x07, 0x11, 0xBC, 0xED, 0x19, 0x37, 0x21, 0xCF, 0x23, 0x48, 0x1F, 0x72, 0x05, 0xDE, 0xE6,

   0xE8, 0x7F, 0x33, 0x8A, 0x76, 0x4B, 0x2F, 0x95, 0xDF, 0xF1, 0x5F, 0x84, 0x80, 0xD9, 0x46, 0xB4

-  };

+};

 

 //

 // Default public key 0x10001 = 65537

 //

-GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 DefaultPublicKey[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8  DefaultPublicKey[] = {

   0x01, 0x00, 0x01

 };

 

-VOID     *mRsa;

+VOID  *mRsa;

 

 UNIT_TEST_STATUS

 EFIAPI

 TestVerifyRsaPreReq (

-  UNIT_TEST_CONTEXT           Context

+  UNIT_TEST_CONTEXT  Context

   )

 {

   mRsa = RsaNew ();

@@ -93,7 +93,7 @@ TestVerifyRsaPreReq (
 VOID

 EFIAPI

 TestVerifyRsaCleanUp (

-  UNIT_TEST_CONTEXT           Context

+  UNIT_TEST_CONTEXT  Context

   )

 {

   if (mRsa != NULL) {

@@ -105,7 +105,7 @@ TestVerifyRsaCleanUp (
 UNIT_TEST_STATUS

 EFIAPI

 TestVerifyRsaSetGetKeyComponents (

-  IN UNIT_TEST_CONTEXT           Context

+  IN UNIT_TEST_CONTEXT  Context

   )

 {

   BOOLEAN  Status;

@@ -123,12 +123,12 @@ TestVerifyRsaSetGetKeyComponents (
   UT_ASSERT_TRUE (Status);

 

   KeySize = 0;

-  Status = RsaGetKey (mRsa, RsaKeyN, NULL, &KeySize);

+  Status  = RsaGetKey (mRsa, RsaKeyN, NULL, &KeySize);

   UT_ASSERT_FALSE (Status);

   UT_ASSERT_EQUAL (KeySize, sizeof (RsaN));

 

   KeyBuffer = AllocatePool (KeySize);

-  Status = RsaGetKey (mRsa, RsaKeyN, KeyBuffer, &KeySize);

+  Status    = RsaGetKey (mRsa, RsaKeyN, KeyBuffer, &KeySize);

   UT_ASSERT_TRUE (Status);

   UT_ASSERT_EQUAL (KeySize, sizeof (RsaN));

 

@@ -143,12 +143,12 @@ TestVerifyRsaSetGetKeyComponents (
   UT_ASSERT_TRUE (Status);

 

   KeySize = 0;

-  Status = RsaGetKey (mRsa, RsaKeyE, NULL, &KeySize);

+  Status  = RsaGetKey (mRsa, RsaKeyE, NULL, &KeySize);

   UT_ASSERT_FALSE (Status);

   UT_ASSERT_EQUAL (KeySize, sizeof (RsaE));

 

   KeyBuffer = AllocatePool (KeySize);

-  Status = RsaGetKey (mRsa, RsaKeyE, KeyBuffer, &KeySize);

+  Status    = RsaGetKey (mRsa, RsaKeyE, KeyBuffer, &KeySize);

   UT_ASSERT_TRUE (Status);

   UT_ASSERT_EQUAL (KeySize, sizeof (RsaE));

 

@@ -167,7 +167,7 @@ TestVerifyRsaSetGetKeyComponents (
   UT_ASSERT_TRUE (Status);

 

   KeySize = 1;

-  Status = RsaGetKey (mRsa, RsaKeyN, NULL, &KeySize);

+  Status  = RsaGetKey (mRsa, RsaKeyN, NULL, &KeySize);

   UT_ASSERT_TRUE (Status);

   UT_ASSERT_EQUAL (KeySize, 0);

 

@@ -178,7 +178,7 @@ TestVerifyRsaSetGetKeyComponents (
   UT_ASSERT_TRUE (Status);

 

   KeySize = 1;

-  Status = RsaGetKey (mRsa, RsaKeyE, NULL, &KeySize);

+  Status  = RsaGetKey (mRsa, RsaKeyE, NULL, &KeySize);

   UT_ASSERT_TRUE (Status);

   UT_ASSERT_EQUAL (KeySize, 0);

 

@@ -188,7 +188,7 @@ TestVerifyRsaSetGetKeyComponents (
 UNIT_TEST_STATUS

 EFIAPI

 TestVerifyRsaGenerateKeyComponents (

-  IN UNIT_TEST_CONTEXT           Context

+  IN UNIT_TEST_CONTEXT  Context

   )

 {

   BOOLEAN  Status;

@@ -202,15 +202,15 @@ TestVerifyRsaGenerateKeyComponents (
   Status = RsaGenerateKey (mRsa, RSA_MODULUS_LENGTH, NULL, 0);

   UT_ASSERT_TRUE (Status);

 

-  KeySize = RSA_MODULUS_LENGTH / 8;

+  KeySize   = RSA_MODULUS_LENGTH / 8;

   KeyBuffer = AllocatePool (KeySize);

-  Status = RsaGetKey (mRsa, RsaKeyE, KeyBuffer, &KeySize);

+  Status    = RsaGetKey (mRsa, RsaKeyE, KeyBuffer, &KeySize);

   UT_ASSERT_TRUE (Status);

   UT_ASSERT_EQUAL (KeySize, 3);

   UT_ASSERT_MEM_EQUAL (KeyBuffer, DefaultPublicKey, 3);

 

   KeySize = RSA_MODULUS_LENGTH / 8;

-  Status = RsaGetKey (mRsa, RsaKeyN, KeyBuffer, &KeySize);

+  Status  = RsaGetKey (mRsa, RsaKeyN, KeyBuffer, &KeySize);

   UT_ASSERT_TRUE (Status);

   UT_ASSERT_EQUAL (KeySize, RSA_MODULUS_LENGTH / 8);

 

@@ -246,7 +246,7 @@ TestVerifyRsaGenerateKeyComponents (
 UNIT_TEST_STATUS

 EFIAPI

 TestVerifyRsaPkcs1SignVerify (

-  IN UNIT_TEST_CONTEXT           Context

+  IN UNIT_TEST_CONTEXT  Context

   )

 {

   UINT8    HashValue[SHA1_DIGEST_SIZE];

@@ -261,7 +261,7 @@ TestVerifyRsaPkcs1SignVerify (
   HashSize = SHA1_DIGEST_SIZE;

   ZeroMem (HashValue, HashSize);

 

-  Status  = Sha1HashAll (RsaSignData, AsciiStrLen (RsaSignData), HashValue);

+  Status = Sha1HashAll (RsaSignData, AsciiStrLen (RsaSignData), HashValue);

   UT_ASSERT_TRUE (Status);

 

   //

@@ -283,7 +283,7 @@ TestVerifyRsaPkcs1SignVerify (
   UT_ASSERT_NOT_EQUAL (SigSize, 0);

 

   Signature = AllocatePool (SigSize);

-  Status  = RsaPkcs1Sign (mRsa, HashValue, HashSize, Signature, &SigSize);

+  Status    = RsaPkcs1Sign (mRsa, HashValue, HashSize, Signature, &SigSize);

   UT_ASSERT_TRUE (Status);

   UT_ASSERT_EQUAL (SigSize, sizeof (RsaPkcs1Signature));

 

@@ -295,18 +295,18 @@ TestVerifyRsaPkcs1SignVerify (
   Status = RsaPkcs1Verify (mRsa, HashValue, HashSize, Signature, SigSize);

   UT_ASSERT_TRUE (Status);

 

-  FreePool(Signature);

+  FreePool (Signature);

 

   return UNIT_TEST_PASSED;

 }

 

-TEST_DESC mRsaTest[] = {

-    //

-    // -----Description--------------------------------------Class----------------------Function---------------------------------Pre---------------------Post---------Context

-    //

-    {"TestVerifyRsaSetGetKeyComponents()",       "CryptoPkg.BaseCryptLib.Rsa",   TestVerifyRsaSetGetKeyComponents,       TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL},

-    {"TestVerifyRsaGenerateKeyComponents()",     "CryptoPkg.BaseCryptLib.Rsa",   TestVerifyRsaGenerateKeyComponents,     TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL},

-    {"TestVerifyRsaPkcs1SignVerify()",           "CryptoPkg.BaseCryptLib.Rsa",   TestVerifyRsaPkcs1SignVerify,           TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL},

+TEST_DESC  mRsaTest[] = {

+  //

+  // -----Description--------------------------------------Class----------------------Function---------------------------------Pre---------------------Post---------Context

+  //

+  { "TestVerifyRsaSetGetKeyComponents()",   "CryptoPkg.BaseCryptLib.Rsa", TestVerifyRsaSetGetKeyComponents,   TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL },

+  { "TestVerifyRsaGenerateKeyComponents()", "CryptoPkg.BaseCryptLib.Rsa", TestVerifyRsaGenerateKeyComponents, TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL },

+  { "TestVerifyRsaPkcs1SignVerify()",       "CryptoPkg.BaseCryptLib.Rsa", TestVerifyRsaPkcs1SignVerify,       TestVerifyRsaPreReq, TestVerifyRsaCleanUp, NULL },

 };

 

-UINTN mRsaTestNum = ARRAY_SIZE(mRsaTest);

+UINTN  mRsaTestNum = ARRAY_SIZE (mRsaTest);