From: Zhichao Gao <zhichao.gao@intel.com>
Date: Tue, 30 Jul 2019 01:14:57 +0000 (+0800)
Subject: CryptoPkg/BaseCryptLib: Use cmp-operator for non-Boolean comparisons
X-Git-Tag: edk2-stable201908~187
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=b3d00df69c78fa0e12986a7ff334689a76f4578a

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>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
---

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);
   }