From 7c342378317039e632d9a1a5d4cf7c21aec8cb7a Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sun, 5 Dec 2021 14:53:54 -0800 Subject: 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 Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Jian J Wang --- CryptoPkg/Private/Ppi/Crypto.h | 2 +- CryptoPkg/Private/Protocol/Crypto.h | 819 ++++++++++++++++----------------- CryptoPkg/Private/Protocol/SmmCrypto.h | 2 +- 3 files changed, 398 insertions(+), 425 deletions(-) (limited to 'CryptoPkg/Private') diff --git a/CryptoPkg/Private/Ppi/Crypto.h b/CryptoPkg/Private/Ppi/Crypto.h index 5241cf9ab2..ad5a524644 100644 --- a/CryptoPkg/Private/Ppi/Crypto.h +++ b/CryptoPkg/Private/Ppi/Crypto.h @@ -16,6 +16,6 @@ /// typedef EDKII_CRYPTO_PROTOCOL EDKII_CRYPTO_PPI; -extern GUID gEdkiiCryptoPpiGuid; +extern GUID gEdkiiCryptoPpiGuid; #endif diff --git a/CryptoPkg/Private/Protocol/Crypto.h b/CryptoPkg/Private/Protocol/Crypto.h index e38ecbb3b1..e378a8a8c6 100644 --- 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 /// increased. /// -#define EDKII_CRYPTO_VERSION 7 +#define EDKII_CRYPTO_VERSION 7 /// /// EDK II Crypto Protocol forward declaration @@ -36,33 +36,34 @@ typedef struct _EDKII_CRYPTO_PROTOCOL EDKII_CRYPTO_PROTOCOL; **/ typedef UINTN -(EFIAPI *EDKII_CRYPTO_GET_VERSION) ( +(EFIAPI *EDKII_CRYPTO_GET_VERSION)( VOID ); -//===================================================================================== +// ===================================================================================== // MAC (Message Authentication Code) Primitive -//===================================================================================== +// ===================================================================================== + /** HMAC MD5 is deprecated and unsupported any longer. Keep the function field for binary compability. **/ typedef -VOID* -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW) ( +VOID * +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW)( VOID ); typedef VOID -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE)( IN VOID *HmacMd5Ctx ); typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY)( OUT VOID *HmacMd5Context, IN CONST UINT8 *Key, IN UINTN KeySize @@ -70,14 +71,14 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE)( IN CONST VOID *HmacMd5Context, OUT VOID *NewHmacMd5Context ); typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE)( IN OUT VOID *HmacMd5Context, IN CONST VOID *Data, IN UINTN DataSize @@ -85,7 +86,7 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL)( IN OUT VOID *HmacMd5Context, OUT UINT8 *HmacValue ); @@ -96,20 +97,20 @@ BOOLEAN **/ typedef -VOID* -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW) ( +VOID * +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW)( VOID ); typedef VOID -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE)( IN VOID *HmacSha1Ctx ); typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY)( OUT VOID *HmacSha1Context, IN CONST UINT8 *Key, IN UINTN KeySize @@ -117,14 +118,14 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE)( IN CONST VOID *HmacSha1Context, OUT VOID *NewHmacSha1Context ); typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE)( IN OUT VOID *HmacSha1Context, IN CONST VOID *Data, IN UINTN DataSize @@ -132,12 +133,11 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL)( IN OUT VOID *HmacSha1Context, OUT UINT8 *HmacValue ); - /** Allocates and initializes one HMAC_CTX context for subsequent HMAC-SHA256 use. @@ -147,7 +147,7 @@ BOOLEAN **/ typedef VOID * -(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_NEW) ( +(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_NEW)( VOID ); @@ -159,11 +159,10 @@ VOID * **/ typedef VOID -(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_FREE) ( +(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_FREE)( IN VOID *HmacSha256Ctx ); - /** Set user-supplied key for subsequent use. It must be done before any calling to HmacSha256Update(). @@ -182,7 +181,7 @@ VOID **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_SET_KEY) ( +(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_SET_KEY)( OUT VOID *HmacSha256Context, IN CONST UINT8 *Key, IN UINTN KeySize @@ -205,12 +204,11 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_DUPLICATE) ( +(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_DUPLICATE)( IN CONST VOID *HmacSha256Context, OUT VOID *NewHmacSha256Context ); - /** Digests the input data and updates HMAC-SHA256 context. @@ -233,7 +231,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_UPDATE) ( +(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_UPDATE)( IN OUT VOID *HmacSha256Context, IN CONST VOID *Data, IN UINTN DataSize @@ -263,15 +261,14 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_FINAL) ( +(EFIAPI *EDKII_CRYPTO_HMAC_SHA256_FINAL)( IN OUT VOID *HmacSha256Context, OUT UINT8 *HmacValue ); - -//===================================================================================== +// ===================================================================================== // One-Way Cryptographic Hash Primitives -//===================================================================================== +// ===================================================================================== /** MD4 is deprecated and unsupported any longer. @@ -280,46 +277,41 @@ BOOLEAN **/ typedef UINTN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE)( VOID ); - typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_INIT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_INIT)( OUT VOID *Md4Context ); - typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE)( IN CONST VOID *Md4Context, OUT VOID *NewMd4Context ); - typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_UPDATE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_UPDATE)( IN OUT VOID *Md4Context, IN CONST VOID *Data, IN UINTN DataSize ); - typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_FINAL) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_FINAL)( IN OUT VOID *Md4Context, OUT UINT8 *HashValue ); - typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL)( IN CONST VOID *Data, IN UINTN DataSize, OUT UINT8 *HashValue @@ -338,7 +330,7 @@ BOOLEAN **/ typedef UINTN -(EFIAPI* EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE)( +(EFIAPI *EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE)( VOID ); @@ -358,8 +350,9 @@ UINTN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_MD5_INIT)( - OUT VOID *Md5Context); +(EFIAPI *EDKII_CRYPTO_MD5_INIT)( + OUT VOID *Md5Context + ); /** Makes a copy of an existing MD5 context. @@ -378,10 +371,10 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_MD5_DUPLICATE) ( - IN CONST VOID *Md5Context, - OUT VOID *NewMd5Context); - +(EFIAPI *EDKII_CRYPTO_MD5_DUPLICATE)( + IN CONST VOID *Md5Context, + OUT VOID *NewMd5Context + ); /** Digests the input data and updates MD5 context. @@ -405,11 +398,11 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_MD5_UPDATE)( - IN OUT VOID *Md5Context, - IN CONST VOID *Data, - IN UINTN DataSize); - +(EFIAPI *EDKII_CRYPTO_MD5_UPDATE)( + IN OUT VOID *Md5Context, + IN CONST VOID *Data, + IN UINTN DataSize + ); /** Completes computation of the MD5 digest value. @@ -435,10 +428,10 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_MD5_FINAL)( - IN OUT VOID *Md5Context, - OUT UINT8 *HashValue); - +(EFIAPI *EDKII_CRYPTO_MD5_FINAL)( + IN OUT VOID *Md5Context, + OUT UINT8 *HashValue + ); /** Computes the MD5 message digest of a input data buffer. @@ -460,16 +453,15 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_MD5_HASH_ALL)( - IN CONST VOID *Data, - IN UINTN DataSize, - OUT UINT8 *HashValue); - +(EFIAPI *EDKII_CRYPTO_MD5_HASH_ALL)( + IN CONST VOID *Data, + IN UINTN DataSize, + OUT UINT8 *HashValue + ); -//===================================================================================== +// ===================================================================================== // PKCS -//===================================================================================== - +// ===================================================================================== /** Encrypts a blob using PKCS1v2 (RSAES-OAEP) schema. On success, will return the encrypted message in @@ -497,19 +489,16 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_PKCS1_ENCRYPT_V2) ( -IN CONST UINT8 *PublicKey, -IN UINTN PublicKeySize, -IN UINT8 *InData, -IN UINTN InDataSize, -IN CONST UINT8 *PrngSeed OPTIONAL, -IN UINTN PrngSeedSize OPTIONAL, -OUT UINT8 **EncryptedData, -OUT UINTN *EncryptedDataSize -); - - - +(EFIAPI *EDKII_CRYPTO_PKCS1_ENCRYPT_V2)( + IN CONST UINT8 *PublicKey, + IN UINTN PublicKeySize, + IN UINT8 *InData, + IN UINTN InDataSize, + IN CONST UINT8 *PrngSeed OPTIONAL, + IN UINTN PrngSeedSize OPTIONAL, + OUT UINT8 **EncryptedData, + OUT UINTN *EncryptedDataSize + ); // --------------------------------------------- // PKCS5 @@ -543,7 +532,7 @@ OUT UINTN *EncryptedDataSize **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_PKCS5_PW_HASH) ( +(EFIAPI *EDKII_CRYPTO_PKCS5_PW_HASH)( IN UINTN PasswordSize, IN CONST CHAR8 *Password, IN UINTN SaltSize, @@ -554,8 +543,6 @@ BOOLEAN OUT UINT8 *Output ); - - // --------------------------------------------- // PKCS7 @@ -583,14 +570,14 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_PKCS7_VERIFY) ( -IN CONST UINT8 *P7Data, -IN UINTN P7DataLength, -IN CONST UINT8 *TrustedCert, -IN UINTN TrustedCertLength, -IN CONST UINT8 *Data, -IN UINTN DataLength -); +(EFIAPI *EDKII_CRYPTO_PKCS7_VERIFY)( + IN CONST UINT8 *P7Data, + IN UINTN P7DataLength, + IN CONST UINT8 *TrustedCert, + IN UINTN TrustedCertLength, + IN CONST UINT8 *Data, + IN UINTN DataLength + ); /** VerifyEKUsInPkcs7Signature() @@ -633,13 +620,13 @@ IN UINTN DataLength **/ typedef EFI_STATUS -(EFIAPI *EDKII_CRYPTO_PKCS7_VERIFY_EKU) ( -IN CONST UINT8 *Pkcs7Signature, -IN CONST UINT32 SignatureSize, -IN CONST CHAR8 *RequiredEKUs[], -IN CONST UINT32 RequiredEKUsSize, -IN BOOLEAN RequireAllPresent -); +(EFIAPI *EDKII_CRYPTO_PKCS7_VERIFY_EKU)( + IN CONST UINT8 *Pkcs7Signature, + IN CONST UINT32 SignatureSize, + IN CONST CHAR8 *RequiredEKUs[], + IN CONST UINT32 RequiredEKUsSize, + IN BOOLEAN RequireAllPresent + ); /** Get the signer's certificates from PKCS#7 signed data as described in "PKCS #7: @@ -669,7 +656,7 @@ IN BOOLEAN RequireAllPresent **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_PKCS7_GET_SIGNERS) ( +(EFIAPI *EDKII_CRYPTO_PKCS7_GET_SIGNERS)( IN CONST UINT8 *P7Data, IN UINTN P7Length, OUT UINT8 **CertStack, @@ -688,7 +675,7 @@ BOOLEAN **/ typedef VOID -(EFIAPI *EDKII_CRYPTO_PKCS7_FREE_SIGNERS) ( +(EFIAPI *EDKII_CRYPTO_PKCS7_FREE_SIGNERS)( IN UINT8 *Certs ); @@ -721,7 +708,7 @@ VOID **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_PKCS7_SIGN) ( +(EFIAPI *EDKII_CRYPTO_PKCS7_SIGN)( IN CONST UINT8 *PrivateKey, IN UINTN PrivateKeySize, IN CONST UINT8 *KeyPassword, @@ -756,7 +743,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT) ( +(EFIAPI *EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT)( IN CONST UINT8 *P7Data, IN UINTN P7Length, OUT VOID **Content, @@ -787,7 +774,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST) ( +(EFIAPI *EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST)( IN CONST UINT8 *P7Data, IN UINTN P7Length, OUT UINT8 **SignerChainCerts, @@ -822,7 +809,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_AUTHENTICODE_VERIFY) ( +(EFIAPI *EDKII_CRYPTO_AUTHENTICODE_VERIFY)( IN CONST UINT8 *AuthData, IN UINTN DataSize, IN CONST UINT8 *TrustedCert, @@ -853,7 +840,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY) ( +(EFIAPI *EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY)( IN CONST UINT8 *AuthData, IN UINTN DataSize, IN CONST UINT8 *TsaCert, @@ -861,10 +848,9 @@ BOOLEAN OUT EFI_TIME *SigningTime ); - -//===================================================================================== +// ===================================================================================== // DH Key Exchange Primitive -//===================================================================================== +// ===================================================================================== /** Allocates and Initializes one Diffie-Hellman Context for subsequent use. @@ -875,8 +861,8 @@ BOOLEAN **/ typedef -VOID* -(EFIAPI *EDKII_CRYPTO_DH_NEW) ( +VOID * +(EFIAPI *EDKII_CRYPTO_DH_NEW)( VOID ); @@ -890,7 +876,7 @@ VOID* **/ typedef VOID -(EFIAPI *EDKII_CRYPTO_DH_FREE) ( +(EFIAPI *EDKII_CRYPTO_DH_FREE)( IN VOID *DhContext ); @@ -920,7 +906,7 @@ VOID **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_DH_GENERATE_PARAMETER) ( +(EFIAPI *EDKII_CRYPTO_DH_GENERATE_PARAMETER)( IN OUT VOID *DhContext, IN UINTN Generator, IN UINTN PrimeLength, @@ -952,7 +938,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_DH_SET_PARAMETER) ( +(EFIAPI *EDKII_CRYPTO_DH_SET_PARAMETER)( IN OUT VOID *DhContext, IN UINTN Generator, IN UINTN PrimeLength, @@ -985,7 +971,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_DH_GENERATE_KEY) ( +(EFIAPI *EDKII_CRYPTO_DH_GENERATE_KEY)( IN OUT VOID *DhContext, OUT UINT8 *PublicKey, IN OUT UINTN *PublicKeySize @@ -1019,7 +1005,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_DH_COMPUTE_KEY) ( +(EFIAPI *EDKII_CRYPTO_DH_COMPUTE_KEY)( IN OUT VOID *DhContext, IN CONST UINT8 *PeerPublicKey, IN UINTN PeerPublicKeySize, @@ -1027,9 +1013,9 @@ BOOLEAN IN OUT UINTN *KeySize ); -//===================================================================================== +// ===================================================================================== // Pseudo-Random Generation Primitive -//===================================================================================== +// ===================================================================================== /** Sets up the seed value for the pseudorandom number generator. @@ -1051,7 +1037,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RANDOM_SEED) ( +(EFIAPI *EDKII_CRYPTO_RANDOM_SEED)( IN CONST UINT8 *Seed OPTIONAL, IN UINTN SeedSize ); @@ -1072,7 +1058,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RANDOM_BYTES) ( +(EFIAPI *EDKII_CRYPTO_RANDOM_BYTES)( OUT UINT8 *Output, IN UINTN Size ); @@ -1098,7 +1084,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RSA_VERIFY_PKCS1) ( +(EFIAPI *EDKII_CRYPTO_RSA_VERIFY_PKCS1)( IN VOID *RsaContext, IN CONST UINT8 *MessageHash, IN UINTN HashSize, @@ -1114,8 +1100,8 @@ BOOLEAN **/ typedef -VOID* -(EFIAPI *EDKII_CRYPTO_RSA_NEW) ( +VOID * +(EFIAPI *EDKII_CRYPTO_RSA_NEW)( VOID ); @@ -1129,7 +1115,7 @@ VOID* **/ typedef VOID -(EFIAPI *EDKII_CRYPTO_RSA_FREE) ( +(EFIAPI *EDKII_CRYPTO_RSA_FREE)( IN VOID *RsaContext ); @@ -1157,7 +1143,7 @@ VOID **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RSA_SET_KEY) ( +(EFIAPI *EDKII_CRYPTO_RSA_SET_KEY)( IN OUT VOID *RsaContext, IN RSA_KEY_TAG KeyTag, IN CONST UINT8 *BigNumber, @@ -1194,7 +1180,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RSA_GET_KEY) ( +(EFIAPI *EDKII_CRYPTO_RSA_GET_KEY)( IN OUT VOID *RsaContext, IN RSA_KEY_TAG KeyTag, OUT UINT8 *BigNumber, @@ -1226,7 +1212,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RSA_GENERATE_KEY) ( +(EFIAPI *EDKII_CRYPTO_RSA_GENERATE_KEY)( IN OUT VOID *RsaContext, IN UINTN ModulusLength, IN CONST UINT8 *PublicExponent, @@ -1256,7 +1242,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RSA_CHECK_KEY) ( +(EFIAPI *EDKII_CRYPTO_RSA_CHECK_KEY)( IN VOID *RsaContext ); @@ -1289,7 +1275,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RSA_PKCS1_SIGN) ( +(EFIAPI *EDKII_CRYPTO_RSA_PKCS1_SIGN)( IN VOID *RsaContext, IN CONST UINT8 *MessageHash, IN UINTN HashSize, @@ -1318,7 +1304,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RSA_PKCS1_VERIFY) ( +(EFIAPI *EDKII_CRYPTO_RSA_PKCS1_VERIFY)( IN VOID *RsaContext, IN CONST UINT8 *MessageHash, IN UINTN HashSize, @@ -1347,7 +1333,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM) ( +(EFIAPI *EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM)( IN CONST UINT8 *PemData, IN UINTN PemSize, IN CONST CHAR8 *Password, @@ -1374,15 +1360,15 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509) ( +(EFIAPI *EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509)( IN CONST UINT8 *Cert, IN UINTN CertSize, OUT VOID **RsaContext ); -//---------------------------------------- +// ---------------------------------------- // SHA -//---------------------------------------- +// ---------------------------------------- /** Retrieves the size, in bytes, of the context buffer required for SHA-1 hash operations. @@ -1395,7 +1381,7 @@ BOOLEAN **/ typedef UINTN -(EFIAPI *EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE ) ( +(EFIAPI *EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE)( VOID ); @@ -1415,7 +1401,7 @@ UINTN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA1_INIT ) ( +(EFIAPI *EDKII_CRYPTO_SHA1_INIT)( OUT VOID *Sha1Context ); @@ -1436,7 +1422,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA1_DUPLICATE ) ( +(EFIAPI *EDKII_CRYPTO_SHA1_DUPLICATE)( IN CONST VOID *Sha1Context, OUT VOID *NewSha1Context ); @@ -1463,7 +1449,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA1_UPDATE ) ( +(EFIAPI *EDKII_CRYPTO_SHA1_UPDATE)( IN OUT VOID *Sha1Context, IN CONST VOID *Data, IN UINTN DataSize @@ -1493,7 +1479,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA1_FINAL ) ( +(EFIAPI *EDKII_CRYPTO_SHA1_FINAL)( IN OUT VOID *Sha1Context, OUT UINT8 *HashValue ); @@ -1518,7 +1504,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA1_HASH_ALL ) ( +(EFIAPI *EDKII_CRYPTO_SHA1_HASH_ALL)( IN CONST VOID *Data, IN UINTN DataSize, OUT UINT8 *HashValue @@ -1532,9 +1518,9 @@ BOOLEAN **/ typedef UINTN -(EFIAPI *EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE ) ( +(EFIAPI *EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE)( VOID -); + ); /** Initializes user-supplied memory pointed by Sha256Context as SHA-256 hash context for @@ -1550,7 +1536,7 @@ UINTN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA256_INIT ) ( +(EFIAPI *EDKII_CRYPTO_SHA256_INIT)( OUT VOID *Sha256Context ); @@ -1571,7 +1557,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA256_DUPLICATE ) ( +(EFIAPI *EDKII_CRYPTO_SHA256_DUPLICATE)( IN CONST VOID *Sha256Context, OUT VOID *NewSha256Context ); @@ -1596,7 +1582,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA256_UPDATE ) ( +(EFIAPI *EDKII_CRYPTO_SHA256_UPDATE)( IN OUT VOID *Sha256Context, IN CONST VOID *Data, IN UINTN DataSize @@ -1624,7 +1610,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA256_FINAL ) ( +(EFIAPI *EDKII_CRYPTO_SHA256_FINAL)( IN OUT VOID *Sha256Context, OUT UINT8 *HashValue ); @@ -1649,13 +1635,12 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA256_HASH_ALL ) ( +(EFIAPI *EDKII_CRYPTO_SHA256_HASH_ALL)( IN CONST VOID *Data, IN UINTN DataSize, OUT UINT8 *HashValue ); - /** Retrieves the size, in bytes, of the context buffer required for SHA-384 hash operations. If this interface is not supported, then return zero. @@ -1666,11 +1651,10 @@ BOOLEAN **/ typedef UINTN -(EFIAPI *EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE) ( +(EFIAPI *EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE)( VOID ); - /** Initializes user-supplied memory pointed by Sha384Context as SHA-384 hash context for subsequent use. @@ -1685,11 +1669,10 @@ UINTN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA384_INIT) ( +(EFIAPI *EDKII_CRYPTO_SHA384_INIT)( OUT VOID *Sha384Context ); - /** Makes a copy of an existing SHA-384 context. @@ -1707,12 +1690,11 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA384_DUPLICATE) ( +(EFIAPI *EDKII_CRYPTO_SHA384_DUPLICATE)( IN CONST VOID *Sha384Context, OUT VOID *NewSha384Context ); - /** Digests the input data and updates SHA-384 context. @@ -1733,13 +1715,12 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA384_UPDATE) ( +(EFIAPI *EDKII_CRYPTO_SHA384_UPDATE)( IN OUT VOID *Sha384Context, IN CONST VOID *Data, IN UINTN DataSize ); - /** Completes computation of the SHA-384 digest value. @@ -1762,12 +1743,11 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA384_FINAL) ( +(EFIAPI *EDKII_CRYPTO_SHA384_FINAL)( IN OUT VOID *Sha384Context, OUT UINT8 *HashValue ); - /** Computes the SHA-384 message digest of a input data buffer. @@ -1788,7 +1768,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA384_HASH_ALL) ( +(EFIAPI *EDKII_CRYPTO_SHA384_HASH_ALL)( IN CONST VOID *Data, IN UINTN DataSize, OUT UINT8 *HashValue @@ -1802,11 +1782,10 @@ BOOLEAN **/ typedef UINTN -(EFIAPI *EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE) ( +(EFIAPI *EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE)( VOID ); - /** Initializes user-supplied memory pointed by Sha512Context as SHA-512 hash context for subsequent use. @@ -1821,11 +1800,10 @@ UINTN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA512_INIT) ( +(EFIAPI *EDKII_CRYPTO_SHA512_INIT)( OUT VOID *Sha512Context ); - /** Makes a copy of an existing SHA-512 context. @@ -1843,7 +1821,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA512_DUPLICATE) ( +(EFIAPI *EDKII_CRYPTO_SHA512_DUPLICATE)( IN CONST VOID *Sha512Context, OUT VOID *NewSha512Context ); @@ -1868,13 +1846,12 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA512_UPDATE) ( +(EFIAPI *EDKII_CRYPTO_SHA512_UPDATE)( IN OUT VOID *Sha512Context, IN CONST VOID *Data, IN UINTN DataSize ); - /** Completes computation of the SHA-512 digest value. @@ -1897,7 +1874,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA512_FINAL) ( +(EFIAPI *EDKII_CRYPTO_SHA512_FINAL)( IN OUT VOID *Sha512Context, OUT UINT8 *HashValue ); @@ -1922,15 +1899,15 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_SHA512_HASH_ALL) ( +(EFIAPI *EDKII_CRYPTO_SHA512_HASH_ALL)( IN CONST VOID *Data, IN UINTN DataSize, OUT UINT8 *HashValue ); -//---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // X509 -//---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- /** Retrieve the subject bytes from one X.509 certificate. @@ -1953,7 +1930,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_X509_GET_SUBJECT_NAME) ( +(EFIAPI *EDKII_CRYPTO_X509_GET_SUBJECT_NAME)( IN CONST UINT8 *Cert, IN UINTN CertSize, OUT UINT8 *CertSubject, @@ -1988,7 +1965,7 @@ BOOLEAN **/ typedef EFI_STATUS -(EFIAPI *EDKII_CRYPTO_X509_GET_COMMON_NAME) ( +(EFIAPI *EDKII_CRYPTO_X509_GET_COMMON_NAME)( IN CONST UINT8 *Cert, IN UINTN CertSize, OUT CHAR8 *CommonName OPTIONAL, @@ -2023,7 +2000,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME) ( +(EFIAPI *EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME)( IN CONST UINT8 *Cert, IN UINTN CertSize, OUT CHAR8 *NameBuffer OPTIONAL, @@ -2050,7 +2027,7 @@ EFI_STATUS **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_X509_VERIFY_CERT) ( +(EFIAPI *EDKII_CRYPTO_X509_VERIFY_CERT)( IN CONST UINT8 *Cert, IN UINTN CertSize, IN CONST UINT8 *CACert, @@ -2075,7 +2052,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE) ( +(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE)( IN CONST UINT8 *Cert, IN UINTN CertSize, OUT UINT8 **SingleX509Cert @@ -2101,7 +2078,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK) ( +(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK)( IN OUT UINT8 **X509Stack, ... ); @@ -2127,7 +2104,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V) ( +(EFIAPI *EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V)( IN OUT UINT8 **X509Stack, IN VA_LIST Args ); @@ -2142,7 +2119,7 @@ BOOLEAN **/ typedef VOID -(EFIAPI *EDKII_CRYPTO_X509_FREE) ( +(EFIAPI *EDKII_CRYPTO_X509_FREE)( IN VOID *X509Cert ); @@ -2156,7 +2133,7 @@ VOID **/ typedef VOID -(EFIAPI *EDKII_CRYPTO_X509_STACK_FREE) ( +(EFIAPI *EDKII_CRYPTO_X509_STACK_FREE)( IN VOID *X509Stack ); @@ -2179,18 +2156,16 @@ VOID **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_X509_GET_TBS_CERT) ( +(EFIAPI *EDKII_CRYPTO_X509_GET_TBS_CERT)( IN CONST UINT8 *Cert, IN UINTN CertSize, OUT UINT8 **TBSCert, OUT UINTN *TBSCertSize ); - - -//===================================================================================== +// ===================================================================================== // Symmetric Cryptography Primitive -//===================================================================================== +// ===================================================================================== /** TDES is deprecated and unsupported any longer. @@ -2199,13 +2174,13 @@ BOOLEAN **/ typedef UINTN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE)( VOID ); typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_INIT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_INIT)( OUT VOID *TdesContext, IN CONST UINT8 *Key, IN UINTN KeyLength @@ -2213,7 +2188,7 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT)( IN VOID *TdesContext, IN CONST UINT8 *Input, IN UINTN InputSize, @@ -2222,7 +2197,7 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT)( IN VOID *TdesContext, IN CONST UINT8 *Input, IN UINTN InputSize, @@ -2231,7 +2206,7 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT)( IN VOID *TdesContext, IN CONST UINT8 *Input, IN UINTN InputSize, @@ -2241,7 +2216,7 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT)( IN VOID *TdesContext, IN CONST UINT8 *Input, IN UINTN InputSize, @@ -2260,7 +2235,7 @@ BOOLEAN **/ typedef UINTN -(EFIAPI *EDKII_CRYPTO_AES_GET_CONTEXT_SIZE) ( +(EFIAPI *EDKII_CRYPTO_AES_GET_CONTEXT_SIZE)( VOID ); @@ -2288,7 +2263,7 @@ UINTN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_AES_INIT) ( +(EFIAPI *EDKII_CRYPTO_AES_INIT)( OUT VOID *AesContext, IN CONST UINT8 *Key, IN UINTN KeyLength @@ -2301,7 +2276,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT)( IN VOID *AesContext, IN CONST UINT8 *Input, IN UINTN InputSize, @@ -2310,7 +2285,7 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT)( IN VOID *AesContext, IN CONST UINT8 *Input, IN UINTN InputSize, @@ -2348,7 +2323,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_AES_CBC_ENCRYPT) ( +(EFIAPI *EDKII_CRYPTO_AES_CBC_ENCRYPT)( IN VOID *AesContext, IN CONST UINT8 *Input, IN UINTN InputSize, @@ -2387,7 +2362,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EDKII_CRYPTO_AES_CBC_DECRYPT) ( +(EFIAPI *EDKII_CRYPTO_AES_CBC_DECRYPT)( IN VOID *AesContext, IN CONST UINT8 *Input, IN UINTN InputSize, @@ -2402,13 +2377,13 @@ BOOLEAN **/ typedef UINTN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE)( VOID ); typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_INIT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_INIT)( OUT VOID *Arc4Context, IN CONST UINT8 *Key, IN UINTN KeySize @@ -2416,7 +2391,7 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT)( IN OUT VOID *Arc4Context, IN CONST UINT8 *Input, IN UINTN InputSize, @@ -2425,7 +2400,7 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT)( IN OUT VOID *Arc4Context, IN UINT8 *Input, IN UINTN InputSize, @@ -2434,11 +2409,10 @@ BOOLEAN typedef BOOLEAN -(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_RESET) ( +(EFIAPI *DEPRECATED_EDKII_CRYPTO_ARC4_RESET)( IN OUT VOID *Arc4Context ); - /** Retrieves the size, in bytes, of the context buffer required for SM3 hash operations. @@ -2450,7 +2424,7 @@ BOOLEAN **/ typedef UINTN -(EFIAPI* EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE)( +(EFIAPI *EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE)( VOID ); @@ -2470,8 +2444,9 @@ UINTN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_SM3_INIT)( - OUT VOID *Sm3Context); +(EFIAPI *EDKII_CRYPTO_SM3_INIT)( + OUT VOID *Sm3Context + ); /** Makes a copy of an existing SM3 context. @@ -2490,10 +2465,10 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_SM3_DUPLICATE) ( - IN CONST VOID *Sm3Context, - OUT VOID *NewSm3Context); - +(EFIAPI *EDKII_CRYPTO_SM3_DUPLICATE)( + IN CONST VOID *Sm3Context, + OUT VOID *NewSm3Context + ); /** Digests the input data and updates SM3 context. @@ -2517,11 +2492,11 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_SM3_UPDATE)( - IN OUT VOID *Sm3Context, - IN CONST VOID *Data, - IN UINTN DataSize); - +(EFIAPI *EDKII_CRYPTO_SM3_UPDATE)( + IN OUT VOID *Sm3Context, + IN CONST VOID *Data, + IN UINTN DataSize + ); /** Completes computation of the SM3 digest value. @@ -2547,10 +2522,10 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_SM3_FINAL)( - IN OUT VOID *Sm3Context, - OUT UINT8 *HashValue); - +(EFIAPI *EDKII_CRYPTO_SM3_FINAL)( + IN OUT VOID *Sm3Context, + OUT UINT8 *HashValue + ); /** Computes the SM3 message digest of a input data buffer. @@ -2572,11 +2547,11 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_SM3_HASH_ALL)( - IN CONST VOID *Data, - IN UINTN DataSize, - OUT UINT8 *HashValue); - +(EFIAPI *EDKII_CRYPTO_SM3_HASH_ALL)( + IN CONST VOID *Data, + IN UINTN DataSize, + OUT UINT8 *HashValue + ); /** Derive key data using HMAC-SHA256 based KDF. @@ -2596,7 +2571,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND)( +(EFIAPI *EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND)( IN CONST UINT8 *Key, IN UINTN KeySize, IN CONST UINT8 *Salt, @@ -2620,7 +2595,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_TLS_INITIALIZE)( +(EFIAPI *EDKII_CRYPTO_TLS_INITIALIZE)( VOID ); @@ -2632,7 +2607,7 @@ BOOLEAN **/ typedef VOID -(EFIAPI* EDKII_CRYPTO_TLS_CTX_FREE)( +(EFIAPI *EDKII_CRYPTO_TLS_CTX_FREE)( IN VOID *TlsCtx ); @@ -2649,7 +2624,7 @@ VOID **/ typedef VOID * -(EFIAPI* EDKII_CRYPTO_TLS_CTX_NEW)( +(EFIAPI *EDKII_CRYPTO_TLS_CTX_NEW)( IN UINT8 MajorVer, IN UINT8 MinorVer ); @@ -2665,7 +2640,7 @@ VOID * **/ typedef VOID -(EFIAPI* EDKII_CRYPTO_TLS_FREE)( +(EFIAPI *EDKII_CRYPTO_TLS_FREE)( IN VOID *Tls ); @@ -2684,7 +2659,7 @@ VOID **/ typedef VOID * -(EFIAPI* EDKII_CRYPTO_TLS_NEW)( +(EFIAPI *EDKII_CRYPTO_TLS_NEW)( IN VOID *TlsCtx ); @@ -2701,7 +2676,7 @@ VOID * **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_TLS_IN_HANDSHAKE)( +(EFIAPI *EDKII_CRYPTO_TLS_IN_HANDSHAKE)( IN VOID *Tls ); @@ -2733,11 +2708,11 @@ BOOLEAN **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_DO_HANDSHAKE)( +(EFIAPI *EDKII_CRYPTO_TLS_DO_HANDSHAKE)( IN VOID *Tls, IN UINT8 *BufferIn OPTIONAL, IN UINTN BufferInSize OPTIONAL, - OUT UINT8 *BufferOut OPTIONAL, + OUT UINT8 *BufferOut OPTIONAL, IN OUT UINTN *BufferOutSize ); @@ -2768,11 +2743,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_HANDLE_ALERT)( +(EFIAPI *EDKII_CRYPTO_TLS_HANDLE_ALERT)( IN VOID *Tls, IN UINT8 *BufferIn OPTIONAL, IN UINTN BufferInSize OPTIONAL, - OUT UINT8 *BufferOut OPTIONAL, + OUT UINT8 *BufferOut OPTIONAL, IN OUT UINTN *BufferOutSize ); @@ -2796,7 +2771,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_CLOSE_NOTIFY)( +(EFIAPI *EDKII_CRYPTO_TLS_CLOSE_NOTIFY)( IN VOID *Tls, IN OUT UINT8 *Buffer, IN OUT UINTN *BufferSize @@ -2818,7 +2793,7 @@ EFI_STATUS **/ typedef INTN -(EFIAPI* EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT)( +(EFIAPI *EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT)( IN VOID *Tls, IN OUT VOID *Buffer, IN UINTN BufferSize @@ -2840,7 +2815,7 @@ INTN **/ typedef INTN -(EFIAPI* EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN)( +(EFIAPI *EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN)( IN VOID *Tls, IN VOID *Buffer, IN UINTN BufferSize @@ -2863,7 +2838,7 @@ INTN **/ typedef INTN -(EFIAPI* EDKII_CRYPTO_TLS_READ)( +(EFIAPI *EDKII_CRYPTO_TLS_READ)( IN VOID *Tls, IN OUT VOID *Buffer, IN UINTN BufferSize @@ -2886,7 +2861,7 @@ INTN **/ typedef INTN -(EFIAPI* EDKII_CRYPTO_TLS_WRITE)( +(EFIAPI *EDKII_CRYPTO_TLS_WRITE)( IN VOID *Tls, IN VOID *Buffer, IN UINTN BufferSize @@ -2908,7 +2883,7 @@ INTN **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_VERSION)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_VERSION)( IN VOID *Tls, IN UINT8 MajorVer, IN UINT8 MinorVer @@ -2929,7 +2904,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_CONNECTION_END)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_CONNECTION_END)( IN VOID *Tls, IN BOOLEAN IsServer ); @@ -2954,7 +2929,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_CIPHER_LIST)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_CIPHER_LIST)( IN VOID *Tls, IN UINT16 *CipherId, IN UINTN CipherNum @@ -2974,7 +2949,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD)( IN UINT8 CompMethod ); @@ -2989,7 +2964,7 @@ EFI_STATUS **/ typedef VOID -(EFIAPI* EDKII_CRYPTO_TLS_SET_VERIFY)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_VERIFY)( IN VOID *Tls, IN UINT32 VerifyMode ); @@ -3008,7 +2983,7 @@ VOID **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_VERIFY_HOST)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_VERIFY_HOST)( IN VOID *Tls, IN UINT32 Flags, IN CHAR8 *HostName @@ -3031,7 +3006,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_SESSIONID)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_SESSIONID)( IN VOID *Tls, IN UINT8 *SessionId, IN UINT16 SessionIdLen @@ -3056,7 +3031,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE)( IN VOID *Tls, IN VOID *Data, IN UINTN DataSize @@ -3081,7 +3056,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT)( IN VOID *Tls, IN VOID *Data, IN UINTN DataSize @@ -3105,7 +3080,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY)( IN VOID *Tls, IN VOID *Data, IN UINTN DataSize @@ -3127,7 +3102,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST)( +(EFIAPI *EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST)( IN VOID *Data, IN UINTN DataSize ); @@ -3147,7 +3122,7 @@ EFI_STATUS **/ typedef UINT16 -(EFIAPI* EDKII_CRYPTO_TLS_GET_VERSION)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_VERSION)( IN VOID *Tls ); @@ -3166,7 +3141,7 @@ UINT16 **/ typedef UINT8 -(EFIAPI* EDKII_CRYPTO_TLS_GET_CONNECTION_END)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_CONNECTION_END)( IN VOID *Tls ); @@ -3186,7 +3161,7 @@ UINT8 **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER)( IN VOID *Tls, IN OUT UINT16 *CipherId ); @@ -3209,7 +3184,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID)( IN VOID *Tls, IN OUT UINT8 *CompressionId ); @@ -3229,7 +3204,7 @@ EFI_STATUS **/ typedef UINT32 -(EFIAPI* EDKII_CRYPTO_TLS_GET_VERIFY)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_VERIFY)( IN VOID *Tls ); @@ -3250,7 +3225,7 @@ UINT32 **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_GET_SESSION_ID)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_SESSION_ID)( IN VOID *Tls, IN OUT UINT8 *SessionId, IN OUT UINT16 *SessionIdLen @@ -3269,7 +3244,7 @@ EFI_STATUS **/ typedef VOID -(EFIAPI* EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM)( IN VOID *Tls, IN OUT UINT8 *ClientRandom ); @@ -3287,7 +3262,7 @@ VOID **/ typedef VOID -(EFIAPI* EDKII_CRYPTO_TLS_GET_SERVER_RANDOM)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_SERVER_RANDOM)( IN VOID *Tls, IN OUT UINT8 *ServerRandom ); @@ -3308,7 +3283,7 @@ VOID **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_GET_KEY_MATERIAL)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_KEY_MATERIAL)( IN VOID *Tls, IN OUT UINT8 *KeyMaterial ); @@ -3331,7 +3306,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE)( IN VOID *Tls, OUT VOID *Data, IN OUT UINTN *DataSize @@ -3356,7 +3331,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT)( IN VOID *Tls, OUT VOID *Data, IN OUT UINTN *DataSize @@ -3380,7 +3355,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY)( IN VOID *Tls, OUT VOID *Data, IN OUT UINTN *DataSize @@ -3403,7 +3378,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI* EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST)( +(EFIAPI *EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST)( OUT VOID *DATA, IN OUT UINTN *DataSize ); @@ -3442,7 +3417,7 @@ EFI_STATUS **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_RSA_PSS_SIGN)( +(EFIAPI *EDKII_CRYPTO_RSA_PSS_SIGN)( IN VOID *RsaContext, IN CONST UINT8 *Message, IN UINTN MsgSize, @@ -3472,7 +3447,7 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI* EDKII_CRYPTO_RSA_PSS_VERIFY)( +(EFIAPI *EDKII_CRYPTO_RSA_PSS_VERIFY)( IN VOID *RsaContext, IN CONST UINT8 *Message, IN UINTN MsgSize, @@ -3482,197 +3457,195 @@ BOOLEAN IN UINT16 SaltLen ); - - /// /// EDK II Crypto Protocol /// struct _EDKII_CRYPTO_PROTOCOL { /// Version - EDKII_CRYPTO_GET_VERSION GetVersion; + EDKII_CRYPTO_GET_VERSION GetVersion; /// HMAC MD5 - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW DeprecatedHmacMd5New; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE DeprecatedHmacMd5Free; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY DeprecatedHmacMd5SetKey; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE DeprecatedHmacMd5Duplicate; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE DeprecatedHmacMd5Update; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL DeprecatedHmacMd5Final; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW DeprecatedHmacMd5New; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE DeprecatedHmacMd5Free; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY DeprecatedHmacMd5SetKey; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE DeprecatedHmacMd5Duplicate; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE DeprecatedHmacMd5Update; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL DeprecatedHmacMd5Final; /// HMAC SHA1 - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW DeprecatedHmacSha1New; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE DeprecatedHmacSha1Free; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY DeprecatedHmacSha1SetKey; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE DeprecatedHmacSha1Duplicate; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE DeprecatedHmacSha1Update; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL DeprecatedHmacSha1Final; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW DeprecatedHmacSha1New; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE DeprecatedHmacSha1Free; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY DeprecatedHmacSha1SetKey; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE DeprecatedHmacSha1Duplicate; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE DeprecatedHmacSha1Update; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL DeprecatedHmacSha1Final; /// HMAC SHA256 - EDKII_CRYPTO_HMAC_SHA256_NEW HmacSha256New; - EDKII_CRYPTO_HMAC_SHA256_FREE HmacSha256Free; - EDKII_CRYPTO_HMAC_SHA256_SET_KEY HmacSha256SetKey; - EDKII_CRYPTO_HMAC_SHA256_DUPLICATE HmacSha256Duplicate; - EDKII_CRYPTO_HMAC_SHA256_UPDATE HmacSha256Update; - EDKII_CRYPTO_HMAC_SHA256_FINAL HmacSha256Final; + EDKII_CRYPTO_HMAC_SHA256_NEW HmacSha256New; + EDKII_CRYPTO_HMAC_SHA256_FREE HmacSha256Free; + EDKII_CRYPTO_HMAC_SHA256_SET_KEY HmacSha256SetKey; + EDKII_CRYPTO_HMAC_SHA256_DUPLICATE HmacSha256Duplicate; + EDKII_CRYPTO_HMAC_SHA256_UPDATE HmacSha256Update; + EDKII_CRYPTO_HMAC_SHA256_FINAL HmacSha256Final; /// Md4 - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE DeprecatedMd4GetContextSize; - DEPRECATED_EDKII_CRYPTO_MD4_INIT DeprecatedMd4Init; - DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE DeprecatedMd4Duplicate; - DEPRECATED_EDKII_CRYPTO_MD4_UPDATE DeprecatedMd4Update; - DEPRECATED_EDKII_CRYPTO_MD4_FINAL DeprecatedMd4Final; - DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL DeprecatedMd4HashAll; + DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE DeprecatedMd4GetContextSize; + DEPRECATED_EDKII_CRYPTO_MD4_INIT DeprecatedMd4Init; + DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE DeprecatedMd4Duplicate; + DEPRECATED_EDKII_CRYPTO_MD4_UPDATE DeprecatedMd4Update; + DEPRECATED_EDKII_CRYPTO_MD4_FINAL DeprecatedMd4Final; + DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL DeprecatedMd4HashAll; /// Md5 - EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE Md5GetContextSize; - EDKII_CRYPTO_MD5_INIT Md5Init; - EDKII_CRYPTO_MD5_DUPLICATE Md5Duplicate; - EDKII_CRYPTO_MD5_UPDATE Md5Update; - EDKII_CRYPTO_MD5_FINAL Md5Final; - EDKII_CRYPTO_MD5_HASH_ALL Md5HashAll; + EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE Md5GetContextSize; + EDKII_CRYPTO_MD5_INIT Md5Init; + EDKII_CRYPTO_MD5_DUPLICATE Md5Duplicate; + EDKII_CRYPTO_MD5_UPDATE Md5Update; + EDKII_CRYPTO_MD5_FINAL Md5Final; + EDKII_CRYPTO_MD5_HASH_ALL Md5HashAll; /// Pkcs - EDKII_CRYPTO_PKCS1_ENCRYPT_V2 Pkcs1v2Encrypt; - EDKII_CRYPTO_PKCS5_PW_HASH Pkcs5HashPassword; - EDKII_CRYPTO_PKCS7_VERIFY Pkcs7Verify; - EDKII_CRYPTO_PKCS7_VERIFY_EKU VerifyEKUsInPkcs7Signature; - EDKII_CRYPTO_PKCS7_GET_SIGNERS Pkcs7GetSigners; - EDKII_CRYPTO_PKCS7_FREE_SIGNERS Pkcs7FreeSigners; - EDKII_CRYPTO_PKCS7_SIGN Pkcs7Sign; - EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT Pkcs7GetAttachedContent; - EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST Pkcs7GetCertificatesList; - EDKII_CRYPTO_AUTHENTICODE_VERIFY AuthenticodeVerify; - EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY ImageTimestampVerify; + EDKII_CRYPTO_PKCS1_ENCRYPT_V2 Pkcs1v2Encrypt; + EDKII_CRYPTO_PKCS5_PW_HASH Pkcs5HashPassword; + EDKII_CRYPTO_PKCS7_VERIFY Pkcs7Verify; + EDKII_CRYPTO_PKCS7_VERIFY_EKU VerifyEKUsInPkcs7Signature; + EDKII_CRYPTO_PKCS7_GET_SIGNERS Pkcs7GetSigners; + EDKII_CRYPTO_PKCS7_FREE_SIGNERS Pkcs7FreeSigners; + EDKII_CRYPTO_PKCS7_SIGN Pkcs7Sign; + EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT Pkcs7GetAttachedContent; + EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST Pkcs7GetCertificatesList; + EDKII_CRYPTO_AUTHENTICODE_VERIFY AuthenticodeVerify; + EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY ImageTimestampVerify; /// DH - EDKII_CRYPTO_DH_NEW DhNew; - EDKII_CRYPTO_DH_FREE DhFree; - EDKII_CRYPTO_DH_GENERATE_PARAMETER DhGenerateParameter; - EDKII_CRYPTO_DH_SET_PARAMETER DhSetParameter; - EDKII_CRYPTO_DH_GENERATE_KEY DhGenerateKey; - EDKII_CRYPTO_DH_COMPUTE_KEY DhComputeKey; + EDKII_CRYPTO_DH_NEW DhNew; + EDKII_CRYPTO_DH_FREE DhFree; + EDKII_CRYPTO_DH_GENERATE_PARAMETER DhGenerateParameter; + EDKII_CRYPTO_DH_SET_PARAMETER DhSetParameter; + EDKII_CRYPTO_DH_GENERATE_KEY DhGenerateKey; + EDKII_CRYPTO_DH_COMPUTE_KEY DhComputeKey; /// Random - EDKII_CRYPTO_RANDOM_SEED RandomSeed; - EDKII_CRYPTO_RANDOM_BYTES RandomBytes; + EDKII_CRYPTO_RANDOM_SEED RandomSeed; + EDKII_CRYPTO_RANDOM_BYTES RandomBytes; /// RSA - EDKII_CRYPTO_RSA_VERIFY_PKCS1 RsaVerifyPkcs1; - EDKII_CRYPTO_RSA_NEW RsaNew; - EDKII_CRYPTO_RSA_FREE RsaFree; - EDKII_CRYPTO_RSA_SET_KEY RsaSetKey; - EDKII_CRYPTO_RSA_GET_KEY RsaGetKey; - EDKII_CRYPTO_RSA_GENERATE_KEY RsaGenerateKey; - EDKII_CRYPTO_RSA_CHECK_KEY RsaCheckKey; - EDKII_CRYPTO_RSA_PKCS1_SIGN RsaPkcs1Sign; - EDKII_CRYPTO_RSA_PKCS1_VERIFY RsaPkcs1Verify; - EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM RsaGetPrivateKeyFromPem; - EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509 RsaGetPublicKeyFromX509; + EDKII_CRYPTO_RSA_VERIFY_PKCS1 RsaVerifyPkcs1; + EDKII_CRYPTO_RSA_NEW RsaNew; + EDKII_CRYPTO_RSA_FREE RsaFree; + EDKII_CRYPTO_RSA_SET_KEY RsaSetKey; + EDKII_CRYPTO_RSA_GET_KEY RsaGetKey; + EDKII_CRYPTO_RSA_GENERATE_KEY RsaGenerateKey; + EDKII_CRYPTO_RSA_CHECK_KEY RsaCheckKey; + EDKII_CRYPTO_RSA_PKCS1_SIGN RsaPkcs1Sign; + EDKII_CRYPTO_RSA_PKCS1_VERIFY RsaPkcs1Verify; + EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM RsaGetPrivateKeyFromPem; + EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509 RsaGetPublicKeyFromX509; /// Sha1 - EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE Sha1GetContextSize; - EDKII_CRYPTO_SHA1_INIT Sha1Init; - EDKII_CRYPTO_SHA1_DUPLICATE Sha1Duplicate; - EDKII_CRYPTO_SHA1_UPDATE Sha1Update; - EDKII_CRYPTO_SHA1_FINAL Sha1Final; - EDKII_CRYPTO_SHA1_HASH_ALL Sha1HashAll; + EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE Sha1GetContextSize; + EDKII_CRYPTO_SHA1_INIT Sha1Init; + EDKII_CRYPTO_SHA1_DUPLICATE Sha1Duplicate; + EDKII_CRYPTO_SHA1_UPDATE Sha1Update; + EDKII_CRYPTO_SHA1_FINAL Sha1Final; + EDKII_CRYPTO_SHA1_HASH_ALL Sha1HashAll; /// Sha256 - EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE Sha256GetContextSize; - EDKII_CRYPTO_SHA256_INIT Sha256Init; - EDKII_CRYPTO_SHA256_DUPLICATE Sha256Duplicate; - EDKII_CRYPTO_SHA256_UPDATE Sha256Update; - EDKII_CRYPTO_SHA256_FINAL Sha256Final; - EDKII_CRYPTO_SHA256_HASH_ALL Sha256HashAll; + EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE Sha256GetContextSize; + EDKII_CRYPTO_SHA256_INIT Sha256Init; + EDKII_CRYPTO_SHA256_DUPLICATE Sha256Duplicate; + EDKII_CRYPTO_SHA256_UPDATE Sha256Update; + EDKII_CRYPTO_SHA256_FINAL Sha256Final; + EDKII_CRYPTO_SHA256_HASH_ALL Sha256HashAll; /// Sha384 - EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE Sha384GetContextSize; - EDKII_CRYPTO_SHA384_INIT Sha384Init; - EDKII_CRYPTO_SHA384_DUPLICATE Sha384Duplicate; - EDKII_CRYPTO_SHA384_UPDATE Sha384Update; - EDKII_CRYPTO_SHA384_FINAL Sha384Final; - EDKII_CRYPTO_SHA384_HASH_ALL Sha384HashAll; + EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE Sha384GetContextSize; + EDKII_CRYPTO_SHA384_INIT Sha384Init; + EDKII_CRYPTO_SHA384_DUPLICATE Sha384Duplicate; + EDKII_CRYPTO_SHA384_UPDATE Sha384Update; + EDKII_CRYPTO_SHA384_FINAL Sha384Final; + EDKII_CRYPTO_SHA384_HASH_ALL Sha384HashAll; /// Sha512 - EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE Sha512GetContextSize; - EDKII_CRYPTO_SHA512_INIT Sha512Init; - EDKII_CRYPTO_SHA512_DUPLICATE Sha512Duplicate; - EDKII_CRYPTO_SHA512_UPDATE Sha512Update; - EDKII_CRYPTO_SHA512_FINAL Sha512Final; - EDKII_CRYPTO_SHA512_HASH_ALL Sha512HashAll; + EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE Sha512GetContextSize; + EDKII_CRYPTO_SHA512_INIT Sha512Init; + EDKII_CRYPTO_SHA512_DUPLICATE Sha512Duplicate; + EDKII_CRYPTO_SHA512_UPDATE Sha512Update; + EDKII_CRYPTO_SHA512_FINAL Sha512Final; + EDKII_CRYPTO_SHA512_HASH_ALL Sha512HashAll; /// X509 - EDKII_CRYPTO_X509_GET_SUBJECT_NAME X509GetSubjectName; - EDKII_CRYPTO_X509_GET_COMMON_NAME X509GetCommonName; - EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME X509GetOrganizationName; - EDKII_CRYPTO_X509_VERIFY_CERT X509VerifyCert; - EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE X509ConstructCertificate; - EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK X509ConstructCertificateStack; - EDKII_CRYPTO_X509_FREE X509Free; - EDKII_CRYPTO_X509_STACK_FREE X509StackFree; - EDKII_CRYPTO_X509_GET_TBS_CERT X509GetTBSCert; + EDKII_CRYPTO_X509_GET_SUBJECT_NAME X509GetSubjectName; + EDKII_CRYPTO_X509_GET_COMMON_NAME X509GetCommonName; + EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME X509GetOrganizationName; + EDKII_CRYPTO_X509_VERIFY_CERT X509VerifyCert; + EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE X509ConstructCertificate; + EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK X509ConstructCertificateStack; + EDKII_CRYPTO_X509_FREE X509Free; + EDKII_CRYPTO_X509_STACK_FREE X509StackFree; + EDKII_CRYPTO_X509_GET_TBS_CERT X509GetTBSCert; /// TDES - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE DeprecatedTdesGetContextSize; - DEPRECATED_EDKII_CRYPTO_TDES_INIT DeprecatedTdesInit; - DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT DeprecatedTdesEcbEncrypt; - DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT DeprecatedTdesEcbDecrypt; - DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT DeprecatedTdesCbcEncrypt; - DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT DeprecatedTdesCbcDecrypt; + DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE DeprecatedTdesGetContextSize; + DEPRECATED_EDKII_CRYPTO_TDES_INIT DeprecatedTdesInit; + DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT DeprecatedTdesEcbEncrypt; + DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT DeprecatedTdesEcbDecrypt; + DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT DeprecatedTdesCbcEncrypt; + DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT DeprecatedTdesCbcDecrypt; /// AES - ECB Mode is deprecated and unsupported - EDKII_CRYPTO_AES_GET_CONTEXT_SIZE AesGetContextSize; - EDKII_CRYPTO_AES_INIT AesInit; - DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT DeprecatedAesEcbEncrypt; - DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT DeprecatedAesEcbDecrypt; - EDKII_CRYPTO_AES_CBC_ENCRYPT AesCbcEncrypt; - EDKII_CRYPTO_AES_CBC_DECRYPT AesCbcDecrypt; + EDKII_CRYPTO_AES_GET_CONTEXT_SIZE AesGetContextSize; + EDKII_CRYPTO_AES_INIT AesInit; + DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT DeprecatedAesEcbEncrypt; + DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT DeprecatedAesEcbDecrypt; + EDKII_CRYPTO_AES_CBC_ENCRYPT AesCbcEncrypt; + EDKII_CRYPTO_AES_CBC_DECRYPT AesCbcDecrypt; /// Arc4 - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE DeprecatedArc4GetContextSize; - DEPRECATED_EDKII_CRYPTO_ARC4_INIT DeprecatedArc4Init; - DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT DeprecatedArc4Encrypt; - DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT DeprecatedArc4Decrypt; - DEPRECATED_EDKII_CRYPTO_ARC4_RESET DeprecatedArc4Reset; + DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE DeprecatedArc4GetContextSize; + DEPRECATED_EDKII_CRYPTO_ARC4_INIT DeprecatedArc4Init; + DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT DeprecatedArc4Encrypt; + DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT DeprecatedArc4Decrypt; + DEPRECATED_EDKII_CRYPTO_ARC4_RESET DeprecatedArc4Reset; /// SM3 - EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE Sm3GetContextSize; - EDKII_CRYPTO_SM3_INIT Sm3Init; - EDKII_CRYPTO_SM3_DUPLICATE Sm3Duplicate; - EDKII_CRYPTO_SM3_UPDATE Sm3Update; - EDKII_CRYPTO_SM3_FINAL Sm3Final; - EDKII_CRYPTO_SM3_HASH_ALL Sm3HashAll; + EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE Sm3GetContextSize; + EDKII_CRYPTO_SM3_INIT Sm3Init; + EDKII_CRYPTO_SM3_DUPLICATE Sm3Duplicate; + EDKII_CRYPTO_SM3_UPDATE Sm3Update; + EDKII_CRYPTO_SM3_FINAL Sm3Final; + EDKII_CRYPTO_SM3_HASH_ALL Sm3HashAll; /// HKDF - EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND HkdfSha256ExtractAndExpand; + EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND HkdfSha256ExtractAndExpand; /// X509 (Continued) - EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V X509ConstructCertificateStackV; + EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V X509ConstructCertificateStackV; /// TLS - EDKII_CRYPTO_TLS_INITIALIZE TlsInitialize; - EDKII_CRYPTO_TLS_CTX_FREE TlsCtxFree; - EDKII_CRYPTO_TLS_CTX_NEW TlsCtxNew; - EDKII_CRYPTO_TLS_FREE TlsFree; - EDKII_CRYPTO_TLS_NEW TlsNew; - EDKII_CRYPTO_TLS_IN_HANDSHAKE TlsInHandshake; - EDKII_CRYPTO_TLS_DO_HANDSHAKE TlsDoHandshake; - EDKII_CRYPTO_TLS_HANDLE_ALERT TlsHandleAlert; - EDKII_CRYPTO_TLS_CLOSE_NOTIFY TlsCloseNotify; - EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT TlsCtrlTrafficOut; - EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN TlsCtrlTrafficIn; - EDKII_CRYPTO_TLS_READ TlsRead; - EDKII_CRYPTO_TLS_WRITE TlsWrite; + EDKII_CRYPTO_TLS_INITIALIZE TlsInitialize; + EDKII_CRYPTO_TLS_CTX_FREE TlsCtxFree; + EDKII_CRYPTO_TLS_CTX_NEW TlsCtxNew; + EDKII_CRYPTO_TLS_FREE TlsFree; + EDKII_CRYPTO_TLS_NEW TlsNew; + EDKII_CRYPTO_TLS_IN_HANDSHAKE TlsInHandshake; + EDKII_CRYPTO_TLS_DO_HANDSHAKE TlsDoHandshake; + EDKII_CRYPTO_TLS_HANDLE_ALERT TlsHandleAlert; + EDKII_CRYPTO_TLS_CLOSE_NOTIFY TlsCloseNotify; + EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT TlsCtrlTrafficOut; + EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN TlsCtrlTrafficIn; + EDKII_CRYPTO_TLS_READ TlsRead; + EDKII_CRYPTO_TLS_WRITE TlsWrite; /// TLS Set - EDKII_CRYPTO_TLS_SET_VERSION TlsSetVersion; - EDKII_CRYPTO_TLS_SET_CONNECTION_END TlsSetConnectionEnd; - EDKII_CRYPTO_TLS_SET_CIPHER_LIST TlsSetCipherList; - EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD TlsSetCompressionMethod; - EDKII_CRYPTO_TLS_SET_VERIFY TlsSetVerify; - EDKII_CRYPTO_TLS_SET_VERIFY_HOST TlsSetVerifyHost; - EDKII_CRYPTO_TLS_SET_SESSIONID TlsSetSessionId; - EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE TlsSetCaCertificate; - EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT TlsSetHostPublicCert; - EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY TlsSetHostPrivateKey; - EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST TlsSetCertRevocationList; + EDKII_CRYPTO_TLS_SET_VERSION TlsSetVersion; + EDKII_CRYPTO_TLS_SET_CONNECTION_END TlsSetConnectionEnd; + EDKII_CRYPTO_TLS_SET_CIPHER_LIST TlsSetCipherList; + EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD TlsSetCompressionMethod; + EDKII_CRYPTO_TLS_SET_VERIFY TlsSetVerify; + EDKII_CRYPTO_TLS_SET_VERIFY_HOST TlsSetVerifyHost; + EDKII_CRYPTO_TLS_SET_SESSIONID TlsSetSessionId; + EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE TlsSetCaCertificate; + EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT TlsSetHostPublicCert; + EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY TlsSetHostPrivateKey; + EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST TlsSetCertRevocationList; /// TLS Get - EDKII_CRYPTO_TLS_GET_VERSION TlsGetVersion; - EDKII_CRYPTO_TLS_GET_CONNECTION_END TlsGetConnectionEnd; - EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER TlsGetCurrentCipher; - EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID TlsGetCurrentCompressionId; - EDKII_CRYPTO_TLS_GET_VERIFY TlsGetVerify; - EDKII_CRYPTO_TLS_GET_SESSION_ID TlsGetSessionId; - EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM TlsGetClientRandom; - EDKII_CRYPTO_TLS_GET_SERVER_RANDOM TlsGetServerRandom; - EDKII_CRYPTO_TLS_GET_KEY_MATERIAL TlsGetKeyMaterial; - EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE TlsGetCaCertificate; - EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT TlsGetHostPublicCert; - EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY TlsGetHostPrivateKey; - EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST TlsGetCertRevocationList; + EDKII_CRYPTO_TLS_GET_VERSION TlsGetVersion; + EDKII_CRYPTO_TLS_GET_CONNECTION_END TlsGetConnectionEnd; + EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER TlsGetCurrentCipher; + EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID TlsGetCurrentCompressionId; + EDKII_CRYPTO_TLS_GET_VERIFY TlsGetVerify; + EDKII_CRYPTO_TLS_GET_SESSION_ID TlsGetSessionId; + EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM TlsGetClientRandom; + EDKII_CRYPTO_TLS_GET_SERVER_RANDOM TlsGetServerRandom; + EDKII_CRYPTO_TLS_GET_KEY_MATERIAL TlsGetKeyMaterial; + EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE TlsGetCaCertificate; + EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT TlsGetHostPublicCert; + EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY TlsGetHostPrivateKey; + EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST TlsGetCertRevocationList; /// RSA PSS - EDKII_CRYPTO_RSA_PSS_SIGN RsaPssSign; - EDKII_CRYPTO_RSA_PSS_VERIFY RsaPssVerify; + EDKII_CRYPTO_RSA_PSS_SIGN RsaPssSign; + EDKII_CRYPTO_RSA_PSS_VERIFY RsaPssVerify; }; -extern GUID gEdkiiCryptoProtocolGuid; +extern GUID gEdkiiCryptoProtocolGuid; #endif diff --git a/CryptoPkg/Private/Protocol/SmmCrypto.h b/CryptoPkg/Private/Protocol/SmmCrypto.h index defdeccfe5..fec5a45523 100644 --- a/CryptoPkg/Private/Protocol/SmmCrypto.h +++ b/CryptoPkg/Private/Protocol/SmmCrypto.h @@ -16,6 +16,6 @@ /// typedef EDKII_CRYPTO_PROTOCOL EDKII_SMM_CRYPTO_PROTOCOL; -extern GUID gEdkiiSmmCryptoProtocolGuid; +extern GUID gEdkiiSmmCryptoProtocolGuid; #endif -- cgit v1.2.3