CryptoPkg: Change OPTIONAL keyword usage style

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

Update all use of ', OPTIONAL' to ' OPTIONAL,' for function params.

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

diff --git a/CryptoPkg/Driver/Crypto.c b/CryptoPkg/Driver/Crypto.c
index 26f280cd5dbe2b69ea95ae3e9dac879d206803ff..de9c5e9a015c663b0637a1ccecab093fb86420fa 100644 (file)
--- a/CryptoPkg/Driver/Crypto.c
+++ b/CryptoPkg/Driver/Crypto.c
@@ -2638,7 +2638,7 @@ EFIAPI
 CryptoServiceX509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
 CryptoServiceX509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r

-  OUT     CHAR8        *CommonName,  OPTIONAL\r
+  OUT     CHAR8        *CommonName   OPTIONAL,\r

   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r
   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r


@@ -2676,7 +2676,7 @@ EFIAPI
 CryptoServiceX509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r
 CryptoServiceX509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r

-  OUT     CHAR8         *NameBuffer,  OPTIONAL\r
+  OUT     CHAR8         *NameBuffer   OPTIONAL,\r

   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r
   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r


@@ -2945,8 +2945,8 @@ CryptoServicePkcs1v2Encrypt (
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r

-  IN   CONST UINT8  *PrngSeed,  OPTIONAL\r
-  IN   UINTN        PrngSeedSize,  OPTIONAL\r
+  IN   CONST UINT8  *PrngSeed   OPTIONAL,\r
+  IN   UINTN        PrngSeedSize   OPTIONAL,\r

   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r
   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r


@@ -3697,9 +3697,9 @@ EFI_STATUS
 EFIAPI\r
 CryptoServiceTlsDoHandshake (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r
   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r


@@ -3735,9 +3735,9 @@ EFI_STATUS
 EFIAPI\r
 CryptoServiceTlsHandleAlert (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r
   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r

diff --git a/CryptoPkg/Include/Library/BaseCryptLib.h b/CryptoPkg/Include/Library/BaseCryptLib.h
index 630ccb5e75002d4834861729edea20d7831031c8..3755cfab4051d005a7a3a24402f8c902bc19d8bd 100644 (file)
--- a/CryptoPkg/Include/Library/BaseCryptLib.h
+++ b/CryptoPkg/Include/Library/BaseCryptLib.h
@@ -1550,7 +1550,7 @@ EFIAPI
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r

-  OUT     CHAR8        *CommonName,  OPTIONAL\r
+  OUT     CHAR8        *CommonName   OPTIONAL,\r

   IN OUT  UINTN        *CommonNameSize\r
   );\r
 \r
   IN OUT  UINTN        *CommonNameSize\r
   );\r
 \r


@@ -1585,7 +1585,7 @@ EFIAPI
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r

-  OUT     CHAR8         *NameBuffer,  OPTIONAL\r
+  OUT     CHAR8         *NameBuffer   OPTIONAL,\r

   IN OUT  UINTN         *NameBufferSize\r
   );\r
 \r
   IN OUT  UINTN         *NameBufferSize\r
   );\r
 \r


@@ -1821,8 +1821,8 @@ Pkcs1v2Encrypt (
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r

-  IN   CONST UINT8  *PrngSeed,  OPTIONAL\r
-  IN   UINTN        PrngSeedSize,  OPTIONAL\r
+  IN   CONST UINT8  *PrngSeed   OPTIONAL,\r
+  IN   UINTN        PrngSeedSize   OPTIONAL,\r

   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   );\r
   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   );\r

diff --git a/CryptoPkg/Include/Library/TlsLib.h b/CryptoPkg/Include/Library/TlsLib.h
index 3af7d4bc095edb751e9e0b699c579d2d6a1047d5..df529bc1382a22319be454baa315659020bac7fc 100644 (file)
--- a/CryptoPkg/Include/Library/TlsLib.h
+++ b/CryptoPkg/Include/Library/TlsLib.h
@@ -137,9 +137,9 @@ EFI_STATUS
 EFIAPI\r
 TlsDoHandshake (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r
   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r


@@ -172,9 +172,9 @@ EFI_STATUS
 EFIAPI\r
 TlsHandleAlert (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r
   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r


@@ -811,4 +811,3 @@ TlsGetCertRevocationList (
   );\r
 \r
 #endif // __TLS_LIB_H__\r
   );\r
 \r
 #endif // __TLS_LIB_H__\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1Oaep.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1Oaep.c
index 75225e18e1fe9f689c43c5dbfae0dc98560da70d..970fa2a36e87955bca1e434df7407501075ebe22 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1Oaep.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1Oaep.c
@@ -50,8 +50,8 @@ Pkcs1v2Encrypt (
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r

-  IN   CONST UINT8  *PrngSeed,  OPTIONAL\r
-  IN   UINTN        PrngSeedSize,  OPTIONAL\r
+  IN   CONST UINT8  *PrngSeed   OPTIONAL,\r
+  IN   UINTN        PrngSeedSize   OPTIONAL,\r

   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r
   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r


@@ -205,4 +205,3 @@ _Exit:
 \r
   return Result;\r
 }\r
 \r
   return Result;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1OaepNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1OaepNull.c
index 6571fc4a2e93e4608f079cda03799d7805769195..36508947c5d544aaf672a3924e468d2e2287c3bf 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1OaepNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs1OaepNull.c
@@ -39,8 +39,8 @@ Pkcs1v2Encrypt (
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r

-  IN   CONST UINT8  *PrngSeed,  OPTIONAL\r
-  IN   UINTN        PrngSeedSize,  OPTIONAL\r
+  IN   CONST UINT8  *PrngSeed   OPTIONAL,\r
+  IN   UINTN        PrngSeedSize   OPTIONAL,\r

   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r
   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r


@@ -48,4 +48,3 @@ Pkcs1v2Encrypt (
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
index b1393a89c5abb8de7f219737c3c948bc5bc63645..ff96d30b57148fe268f9bb0b5ed0941a99d20b70 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
@@ -354,7 +354,7 @@ InternalX509GetNIDName (
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r
   IN      INT32         Request_NID,\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r
   IN      INT32         Request_NID,\r

-  OUT     CHAR8         *CommonName,  OPTIONAL\r
+  OUT     CHAR8         *CommonName   OPTIONAL,\r

   IN OUT  UINTN         *CommonNameSize\r
   )\r
 {\r
   IN OUT  UINTN         *CommonNameSize\r
   )\r
 {\r


@@ -496,7 +496,7 @@ EFIAPI
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r

-  OUT     CHAR8        *CommonName,  OPTIONAL\r
+  OUT     CHAR8        *CommonName   OPTIONAL,\r

   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r
   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r


@@ -534,7 +534,7 @@ EFIAPI
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r

-  OUT     CHAR8         *NameBuffer,  OPTIONAL\r
+  OUT     CHAR8         *NameBuffer   OPTIONAL,\r

   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r
   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
index 14309825ed758139f9ff7349ccef45faca33a485..2835f20a1de02a6befdd71a9f424032f2a6f72b2 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
@@ -175,7 +175,7 @@ EFIAPI
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r

-  OUT     CHAR8        *CommonName,  OPTIONAL\r
+  OUT     CHAR8        *CommonName   OPTIONAL,\r

   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r
   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r


@@ -207,7 +207,7 @@ EFIAPI
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r

-  OUT     CHAR8         *NameBuffer,  OPTIONAL\r
+  OUT     CHAR8         *NameBuffer   OPTIONAL,\r

   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r
   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs1OaepNull.c b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs1OaepNull.c
index 6571fc4a2e93e4608f079cda03799d7805769195..36508947c5d544aaf672a3924e468d2e2287c3bf 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs1OaepNull.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptPkcs1OaepNull.c
@@ -39,8 +39,8 @@ Pkcs1v2Encrypt (
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r

-  IN   CONST UINT8  *PrngSeed,  OPTIONAL\r
-  IN   UINTN        PrngSeedSize,  OPTIONAL\r
+  IN   CONST UINT8  *PrngSeed   OPTIONAL,\r
+  IN   UINTN        PrngSeedSize   OPTIONAL,\r

   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r
   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r


@@ -48,4 +48,3 @@ Pkcs1v2Encrypt (
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r
   ASSERT (FALSE);\r
   return FALSE;\r
 }\r

-\r

diff --git a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c
index 14309825ed758139f9ff7349ccef45faca33a485..2835f20a1de02a6befdd71a9f424032f2a6f72b2 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c
+++ b/CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c
@@ -175,7 +175,7 @@ EFIAPI
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r

-  OUT     CHAR8        *CommonName,  OPTIONAL\r
+  OUT     CHAR8        *CommonName   OPTIONAL,\r

   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r
   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r


@@ -207,7 +207,7 @@ EFIAPI
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r

-  OUT     CHAR8         *NameBuffer,  OPTIONAL\r
+  OUT     CHAR8         *NameBuffer   OPTIONAL,\r

   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r
   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r

diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
index fcb59137805b1d924e2483ef52650c0d1554b37c..6b2a5b11b5bcc581b2ebe67176f92a40da01d226 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
+++ b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
@@ -1752,7 +1752,7 @@ EFIAPI
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
 X509GetCommonName (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r

-  OUT     CHAR8        *CommonName,  OPTIONAL\r
+  OUT     CHAR8        *CommonName   OPTIONAL,\r

   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r
   IN OUT  UINTN        *CommonNameSize\r
   )\r
 {\r


@@ -1790,7 +1790,7 @@ EFIAPI
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r
 X509GetOrganizationName (\r
   IN      CONST UINT8   *Cert,\r
   IN      UINTN         CertSize,\r

-  OUT     CHAR8         *NameBuffer,  OPTIONAL\r
+  OUT     CHAR8         *NameBuffer   OPTIONAL,\r

   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r
   IN OUT  UINTN         *NameBufferSize\r
   )\r
 {\r


@@ -2060,8 +2060,8 @@ Pkcs1v2Encrypt (
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r
   IN   UINTN        PublicKeySize,\r
   IN   UINT8        *InData,\r
   IN   UINTN        InDataSize,\r

-  IN   CONST UINT8  *PrngSeed,  OPTIONAL\r
-  IN   UINTN        PrngSeedSize,  OPTIONAL\r
+  IN   CONST UINT8  *PrngSeed   OPTIONAL,\r
+  IN   UINTN        PrngSeedSize   OPTIONAL,\r

   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r
   OUT  UINT8        **EncryptedData,\r
   OUT  UINTN        *EncryptedDataSize\r
   )\r


@@ -2812,9 +2812,9 @@ EFI_STATUS
 EFIAPI\r
 TlsDoHandshake (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r
   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r


@@ -2850,9 +2850,9 @@ EFI_STATUS
 EFIAPI\r
 TlsHandleAlert (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r
   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r

diff --git a/CryptoPkg/Library/TlsLib/TlsProcess.c b/CryptoPkg/Library/TlsLib/TlsProcess.c
index ac952e903db84019d2984b06dcc1ef9bb7fae366..f64184e3489572ce4accaaec40838245f0515f67 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsProcess.c
+++ b/CryptoPkg/Library/TlsLib/TlsProcess.c
@@ -72,9 +72,9 @@ EFI_STATUS
 EFIAPI\r
 TlsDoHandshake (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r
   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r


@@ -193,9 +193,9 @@ EFI_STATUS
 EFIAPI\r
 TlsHandleAlert (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r
   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r


@@ -454,4 +454,3 @@ TlsWrite (
   //\r
   return SSL_write (TlsConn->Ssl, Buffer, (UINT32) BufferSize);\r
 }\r
   //\r
   return SSL_write (TlsConn->Ssl, Buffer, (UINT32) BufferSize);\r
 }\r

-\r

diff --git a/CryptoPkg/Library/TlsLibNull/TlsProcessNull.c b/CryptoPkg/Library/TlsLibNull/TlsProcessNull.c
index 2949d4c88571ca3c63fd9f79cb33ddf6928a237d..f06777b96d4ea8e0f14ed03f399efda2dcf5fa68 100644 (file)
--- a/CryptoPkg/Library/TlsLibNull/TlsProcessNull.c
+++ b/CryptoPkg/Library/TlsLibNull/TlsProcessNull.c
@@ -61,9 +61,9 @@ EFI_STATUS
 EFIAPI\r
 TlsDoHandshake (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r
   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r


@@ -100,9 +100,9 @@ EFI_STATUS
 EFIAPI\r
 TlsHandleAlert (\r
   IN     VOID                     *Tls,\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     UINT8                    *BufferIn  OPTIONAL,\r
+  IN     UINTN                    BufferInSize  OPTIONAL,\r
+     OUT UINT8                    *BufferOut  OPTIONAL,\r

   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r
   IN OUT UINTN                    *BufferOutSize\r
   )\r
 {\r


@@ -244,4 +244,3 @@ TlsWrite (
   ASSERT(FALSE);\r
   return 0;\r
 }\r
   ASSERT(FALSE);\r
   return 0;\r
 }\r

-\r

diff --git a/CryptoPkg/Private/Protocol/Crypto.h b/CryptoPkg/Private/Protocol/Crypto.h
index 498f8e387dba31c0a6676cdb030be3e3d961b2d2..e38ecbb3b117e80749b790192a05168d41d795d7 100644 (file)
--- a/CryptoPkg/Private/Protocol/Crypto.h
+++ b/CryptoPkg/Private/Protocol/Crypto.h
@@ -1991,7 +1991,7 @@ EFI_STATUS
 (EFIAPI *EDKII_CRYPTO_X509_GET_COMMON_NAME) (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
 (EFIAPI *EDKII_CRYPTO_X509_GET_COMMON_NAME) (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r

-  OUT     CHAR8        *CommonName,  OPTIONAL\r
+  OUT     CHAR8        *CommonName   OPTIONAL,\r

   IN OUT  UINTN        *CommonNameSize\r
   );\r
 \r
   IN OUT  UINTN        *CommonNameSize\r
   );\r
 \r


@@ -2026,7 +2026,7 @@ EFI_STATUS
 (EFIAPI *EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME) (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r
 (EFIAPI *EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME) (\r
   IN      CONST UINT8  *Cert,\r
   IN      UINTN        CertSize,\r

-  OUT     CHAR8        *NameBuffer,  OPTIONAL\r
+  OUT     CHAR8        *NameBuffer   OPTIONAL,\r

   IN OUT  UINTN        *NameBufferSize\r
   );\r
 \r
   IN OUT  UINTN        *NameBufferSize\r
   );\r
 \r


@@ -2735,9 +2735,9 @@ typedef
 EFI_STATUS\r
 (EFIAPI* EDKII_CRYPTO_TLS_DO_HANDSHAKE)(\r
   IN     VOID                     *Tls,\r
 EFI_STATUS\r
 (EFIAPI* EDKII_CRYPTO_TLS_DO_HANDSHAKE)(\r
   IN     VOID                     *Tls,\r

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

   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r
   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r


@@ -2770,9 +2770,9 @@ typedef
 EFI_STATUS\r
 (EFIAPI* EDKII_CRYPTO_TLS_HANDLE_ALERT)(\r
   IN     VOID                     *Tls,\r
 EFI_STATUS\r
 (EFIAPI* EDKII_CRYPTO_TLS_HANDLE_ALERT)(\r
   IN     VOID                     *Tls,\r

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

   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r
   IN OUT UINTN                    *BufferOutSize\r
   );\r
 \r