Re: [PATCH 1/1] CryptoPkg/BaseCryptLib: Update pHkdfCtx to PHkdfCtx


Zhang, Shenglei
 

Jian,

Yes, you are right.
According to CCS_2_1_Draft, 4.3.3.3, Pointer variables may optionally be prefixed with a 'p'.
So please skip this change.

Thanks,
Shenglei

-----Original Message-----
From: Wang, Jian J
Sent: Thursday, August 15, 2019 5:01 PM
To: Zhang, Shenglei <shenglei.zhang@intel.com>; devel@edk2.groups.io
Cc: Ye, Ting <ting.ye@intel.com>
Subject: RE: [PATCH 1/1] CryptoPkg/BaseCryptLib: Update pHkdfCtx to
PHkdfCtx

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@edk2.groups.io
Cc: Wang, Jian J <jian.j.wang@intel.com>; Ye, Ting <ting.ye@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@intel.com>
Cc: Ting Ye <ting.ye@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@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

Join devel@edk2.groups.io to automatically receive all group messages.