From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: shenglei.zhang@intel.com) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by groups.io with SMTP; Thu, 15 Aug 2019 01:49:23 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Aug 2019 01:49:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,388,1559545200"; d="scan'208";a="181820471" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 15 Aug 2019 01:49:21 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Jian Wang , Ting Ye Subject: [PATCH 1/1] CryptoPkg/BaseCryptLib: Update pHkdfCtx to PHkdfCtx Date: Thu, 15 Aug 2019 16:49:20 +0800 Message-Id: <20190815084920.20856-1-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 Update pHkdfCtx to PHkdfCtx, to follow the variable naming rule. Cc: Jian Wang Cc: Ting Ye Signed-off-by: Shenglei Zhang --- .../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