[edk2-devel] [PATCH 1/1] CryptoPkg/BaseCryptLib: Update pHkdfCtx to PHkdfCtx

Wang, Jian J jian.j.wang at intel.com
Thu Aug 15 09:01:27 UTC 2019


Shenglei,

I remember the edk2 coding style allows prefix 'p' (optional) to represent a pointer variable.

Regards,
Jian


> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Thursday, August 15, 2019 4:49 PM
> To: devel at edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang at intel.com>; Ye, Ting <ting.ye at intel.com>
> Subject: [PATCH 1/1] CryptoPkg/BaseCryptLib: Update pHkdfCtx to
> PHkdfCtx
> 
> Update pHkdfCtx to PHkdfCtx, to follow the variable naming
> rule.
> 
> Cc: Jian Wang <jian.j.wang at intel.com>
> Cc: Ting Ye <ting.ye at intel.com>
> Signed-off-by: Shenglei Zhang <shenglei.zhang at intel.com>
> ---
>  .../Library/BaseCryptLib/Kdf/CryptHkdf.c      | 22 +++++++++----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/CryptoPkg/Library/BaseCryptLib/Kdf/CryptHkdf.c
> b/CryptoPkg/Library/BaseCryptLib/Kdf/CryptHkdf.c
> index f0fcef211d3f..488346a38b8c 100644
> --- a/CryptoPkg/Library/BaseCryptLib/Kdf/CryptHkdf.c
> +++ b/CryptoPkg/Library/BaseCryptLib/Kdf/CryptHkdf.c
> @@ -39,7 +39,7 @@ HkdfSha256ExtractAndExpand (
>    IN   UINTN        OutSize
>    )
>  {
> -  EVP_PKEY_CTX *pHkdfCtx;
> +  EVP_PKEY_CTX *PHkdfCtx;
>    BOOLEAN Result;
> 
>    if (Key == NULL || Salt == NULL || Info == NULL || Out == NULL ||
> @@ -47,29 +47,29 @@ HkdfSha256ExtractAndExpand (
>      return FALSE;
>    }
> 
> -  pHkdfCtx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
> -  if (pHkdfCtx == NULL) {
> +  PHkdfCtx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
> +  if (PHkdfCtx == NULL) {
>      return FALSE;
>    }
> 
> -  Result = EVP_PKEY_derive_init(pHkdfCtx) > 0;
> +  Result = EVP_PKEY_derive_init(PHkdfCtx) > 0;
>    if (Result) {
> -    Result = EVP_PKEY_CTX_set_hkdf_md(pHkdfCtx, EVP_sha256()) > 0;
> +    Result = EVP_PKEY_CTX_set_hkdf_md(PHkdfCtx, EVP_sha256()) > 0;
>    }
>    if (Result) {
> -    Result = EVP_PKEY_CTX_set1_hkdf_salt(pHkdfCtx, Salt,
> (UINT32)SaltSize) > 0;
> +    Result = EVP_PKEY_CTX_set1_hkdf_salt(PHkdfCtx, Salt,
> (UINT32)SaltSize) > 0;
>    }
>    if (Result) {
> -    Result = EVP_PKEY_CTX_set1_hkdf_key(pHkdfCtx, Key,
> (UINT32)KeySize) > 0;
> +    Result = EVP_PKEY_CTX_set1_hkdf_key(PHkdfCtx, Key,
> (UINT32)KeySize) > 0;
>    }
>    if (Result) {
> -    Result = EVP_PKEY_CTX_add1_hkdf_info(pHkdfCtx, Info,
> (UINT32)InfoSize) > 0;
> +    Result = EVP_PKEY_CTX_add1_hkdf_info(PHkdfCtx, Info,
> (UINT32)InfoSize) > 0;
>    }
>    if (Result) {
> -    Result = EVP_PKEY_derive(pHkdfCtx, Out, &OutSize) > 0;
> +    Result = EVP_PKEY_derive(PHkdfCtx, Out, &OutSize) > 0;
>    }
> 
> -  EVP_PKEY_CTX_free(pHkdfCtx);
> -  pHkdfCtx = NULL;
> +  EVP_PKEY_CTX_free(PHkdfCtx);
> +  PHkdfCtx = NULL;
>    return Result;
>  }
> --
> 2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#45706): https://edk2.groups.io/g/devel/message/45706
Mute This Topic: https://groups.io/mt/32884778/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-





More information about the edk2-devel-archive mailing list