CryptoPkg/Library/BaseCryptLib: Update internal functions/variables

[mirror_edk2.git] / CryptoPkg / Library / BaseCryptLib / Pk / CryptTs.c

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
index f118f2e9d6aa913e5a906f1ff066b07ae6f12eb1..027dbb6842dc552b3b234aedc9756458d7aab061 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
@@ -21,7 +21,7 @@ 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
-UINT8  mSpcRFC3161OidValue[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  mSpcRFC3161OidValue[] = {\r
   0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x03, 0x03, 0x01\r
 };\r
 \r
@@ -43,11 +43,17 @@ typedef struct {
 //\r
 // ASN.1 Functions for TS_MESSAGE_IMPRINT\r
 //\r
-DECLARE_ASN1_FUNCTIONS (TS_MESSAGE_IMPRINT)\r
-ASN1_SEQUENCE (TS_MESSAGE_IMPRINT) = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED\r
+DECLARE_ASN1_FUNCTIONS (\r
+  TS_MESSAGE_IMPRINT\r
+  )\r
+ASN1_SEQUENCE (TS_MESSAGE_IMPRINT) =\r
+{\r
   ASN1_SIMPLE (TS_MESSAGE_IMPRINT, HashAlgorithm, X509_ALGOR),\r
   ASN1_SIMPLE (TS_MESSAGE_IMPRINT, HashedMessage, ASN1_OCTET_STRING)\r
-} ASN1_SEQUENCE_END (TS_MESSAGE_IMPRINT)\r
+}\r
+\r
+ASN1_SEQUENCE_END (TS_MESSAGE_IMPRINT)\r
 IMPLEMENT_ASN1_FUNCTIONS (TS_MESSAGE_IMPRINT)\r
 \r
 ///\r
@@ -68,12 +74,18 @@ typedef struct {
 //\r
 // ASN.1 Functions for TS_ACCURACY\r
 //\r
-DECLARE_ASN1_FUNCTIONS (TS_ACCURACY)\r
-ASN1_SEQUENCE (TS_ACCURACY) = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED\r
+DECLARE_ASN1_FUNCTIONS (\r
+  TS_ACCURACY\r
+  )\r
+ASN1_SEQUENCE (TS_ACCURACY) =\r
+{\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
+}\r
+\r
+ASN1_SEQUENCE_END (TS_ACCURACY)\r
 IMPLEMENT_ASN1_FUNCTIONS (TS_ACCURACY)\r
 \r
 ///\r
@@ -114,8 +126,12 @@ typedef struct {
 //\r
 // ASN.1 Functions for TS_TST_INFO\r
 //\r
-DECLARE_ASN1_FUNCTIONS (TS_TST_INFO)\r
-ASN1_SEQUENCE (TS_TST_INFO) = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED\r
+DECLARE_ASN1_FUNCTIONS (\r
+  TS_TST_INFO\r
+  )\r
+ASN1_SEQUENCE (TS_TST_INFO) =\r
+{\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
@@ -126,7 +142,9 @@ ASN1_SEQUENCE (TS_TST_INFO) = {
   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
+}\r
+\r
+ASN1_SEQUENCE_END (TS_TST_INFO)\r
 IMPLEMENT_ASN1_FUNCTIONS (TS_TST_INFO)\r
 \r
 /**\r
@@ -139,8 +157,8 @@ IMPLEMENT_ASN1_FUNCTIONS (TS_TST_INFO)
   @retval  FALSE  Invalid parameters.\r
 \r
 **/\r
+STATIC\r
 BOOLEAN\r
-EFIAPI\r
 ConvertAsn1TimeToEfiTime (\r
   IN  ASN1_TIME  *Asn1Time,\r
   OUT EFI_TIME   *EfiTime\r
@@ -222,8 +240,8 @@ ConvertAsn1TimeToEfiTime (
   @retval  FALSE  Invalid TimeStamp Token Information.\r
 \r
 **/\r
+STATIC\r
 BOOLEAN\r
-EFIAPI\r
 CheckTSTInfo (\r
   IN  CONST TS_TST_INFO  *TstInfo,\r
   IN  CONST UINT8        *TimestampedData,\r
@@ -352,8 +370,8 @@ _Exit:
   @retval  FALSE  Invalid timestamp token.\r
 \r
 **/\r
+STATIC\r
 BOOLEAN\r
-EFIAPI\r
 TimestampTokenVerify (\r
   IN  CONST UINT8  *TSToken,\r
   IN  UINTN        TokenSize,\r