From: "Wang, Jian J" <jian.j.wang@intel.com>
To: "Gao, Zhichao" <zhichao.gao@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Ye, Ting" <ting.ye@intel.com>
Subject: Re: [PATCH] CryptoPkg/BaseCryptLib: Use cmp-operator for non-Boolean comparisons
Date: Tue, 30 Jul 2019 01:55:21 +0000 [thread overview]
Message-ID: <D827630B58408649ACB04F44C51000362594F0CF@SHSMSX107.ccr.corp.intel.com> (raw)
In-Reply-To: <20190730014745.20264-1-zhichao.gao@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
> -----Original Message-----
> From: Gao, Zhichao
> Sent: Tuesday, July 30, 2019 9:48 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Ye, Ting <ting.ye@intel.com>
> Subject: [PATCH] CryptoPkg/BaseCryptLib: Use cmp-operator for non-
> Boolean comparisons
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2027
>
> Refer to CSS_2_1 5.7.2.1 "Non-Boolean comparisons must use a
> compare operator (==, !=, >, < >=, <=).", use compare operator
> for the non-boolean comparisons.
>
> Cc: Jian Wang <jian.j.wang@intel.com>
> Cc: Ting Ye <ting.ye@intel.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
> .../BaseCryptLib/Pk/CryptPkcs7VerifyEku.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
> b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
> index a0ea3f85eb..229c244b26 100644
> --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
> +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
> @@ -111,7 +111,7 @@ Exit:
> //
> // Release Resources
> //
> - if (Signers) {
> + if (Signers != NULL) {
> sk_X509_free (Signers);
> }
>
> @@ -230,11 +230,11 @@ Exit:
> //
> // Release Resources
> //
> - if (ClonedCert) {
> + if (ClonedCert != NULL) {
> X509_free (ClonedCert);
> }
>
> - if (Eku) {
> + if (Eku != NULL) {
> sk_ASN1_OBJECT_pop_free (Eku, ASN1_OBJECT_free);
> }
>
> @@ -281,13 +281,13 @@ CheckEKUs(
> //
> // Finding required EKU in cert.
> //
> - if (Asn1ToFind) {
> + if (Asn1ToFind != NULL) {
> ASN1_OBJECT_free(Asn1ToFind);
> Asn1ToFind = NULL;
> }
>
> Asn1ToFind = OBJ_txt2obj (RequiredEKUs[Index], 0);
> - if (!Asn1ToFind) {
> + if (Asn1ToFind == NULL) {
> //
> // Fail to convert required EKU to ASN1.
> //
> @@ -313,7 +313,7 @@ CheckEKUs(
>
> Exit:
>
> - if (Asn1ToFind) {
> + if (Asn1ToFind != NULL) {
> ASN1_OBJECT_free(Asn1ToFind);
> }
>
> @@ -508,11 +508,11 @@ Exit:
> free (SignedData);
> }
>
> - if (SignerCert) {
> + if (SignerCert != NULL) {
> X509_free (SignerCert);
> }
>
> - if (Pkcs7) {
> + if (Pkcs7 != NULL) {
> PKCS7_free (Pkcs7);
> }
>
> --
> 2.21.0.windows.1
next prev parent reply other threads:[~2019-07-30 1:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 1:47 [PATCH] CryptoPkg/BaseCryptLib: Use cmp-operator for non-Boolean comparisons Gao, Zhichao
2019-07-30 1:55 ` Wang, Jian J [this message]
[not found] ` <15B60C8E2C30DA7D.4832@groups.io>
2019-07-31 1:21 ` [edk2-devel] " Wang, Jian J
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D827630B58408649ACB04F44C51000362594F0CF@SHSMSX107.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox