Update return FALSE to ASSERT() for code consistent.

Signed-off-by: tye
Reviewed-by: jyao1
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12659 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
index ed53b2dcbf738ee9ec288054ebad55593eeb9e05..0b37adc33e81ab6c9716c791762dd394dabb716e 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
@@ -84,10 +84,7 @@ RsaGetPrivateKeyFromPem (
   //\r
   ASSERT (PemData    != NULL);\r
   ASSERT (RsaContext != NULL);\r
-\r
-  if (PemSize > INT_MAX) {\r
-    return FALSE;\r
-  }\r
+  ASSERT (PemSize    <= INT_MAX);\r
 \r
   Status = FALSE;\r
   PemBio = NULL;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
index 0370fd77a5de077d560fd4951e6436040bc87317..0321b203499fa678b39129881edf8466f5df00a7 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
@@ -60,14 +60,11 @@ AuthenticodeVerify (
   UINTN        ContentSize;\r
 \r
   //\r
-  // ASSERT if Authenticode Signature Data or PE Image Hash is NULL\r
+  // ASSERT if Authenticode Signature Data or PE Image Hash is NULL.\r
   //\r
   ASSERT (AuthData  != NULL);\r
   ASSERT (ImageHash != NULL);\r
-\r
-  if (DataSize > INT_MAX) {\r
-    return FALSE;\r
-  }\r
+  ASSERT (DataSize  <= INT_MAX);\r
 \r
   Status       = FALSE;\r
   Pkcs7        = NULL;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7.c
index c00d3bb03391976ed63cfb81cd5958a34bce98be..47bab1004b7d053d69178e4d1363d03fc72a827d 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7.c
@@ -150,17 +150,13 @@ Pkcs7Sign (
   //\r
   // Check input parameters.\r
   //\r
-  if ((PrivateKey == NULL) || (KeyPassword == NULL) || (InData == NULL)) {\r
-    return FALSE;\r
-  }\r
-  \r
-  if ((SignCert == NULL) || (SignedData == NULL) || (SignedDataSize == NULL)) {\r
-    return FALSE;\r
-  }\r
-\r
-  if (InDataSize > INT_MAX) {\r
-    return FALSE;\r
-  }\r
+  ASSERT (PrivateKey     != NULL);\r
+  ASSERT (KeyPassword    != NULL);\r
+  ASSERT (InData         != NULL);\r
+  ASSERT (SignCert       != NULL);\r
+  ASSERT (SignedData     != NULL);\r
+  ASSERT (SignedDataSize != NULL);\r
+  ASSERT (InDataSize     <= INT_MAX);\r
 \r
   RsaContext = NULL;\r
   Key        = NULL;\r
@@ -311,13 +307,14 @@ Pkcs7Verify (
   BOOLEAN     Wrapped;\r
 \r
   //\r
-  // ASSERT if P7Data is NULL or P7Length is not larger than 19 bytes.\r
+  // ASSERT if any input parameter is invalid.\r
   //\r
-  ASSERT ((P7Data != NULL) || (P7Length <= 19));\r
-\r
-  if ((CertLength > INT_MAX) || (DataLength > INT_MAX)) {\r
-    return FALSE;\r
-  }\r
+  ASSERT (P7Data      != NULL);\r
+  ASSERT (TrustedCert != NULL);\r
+  ASSERT (InData      != NULL);\r
+  ASSERT (P7Length    <= INT_MAX);\r
+  ASSERT (CertLength  <= INT_MAX);\r
+  ASSERT (DataLength  <= INT_MAX);\r
 \r
   Status    = FALSE;\r
   Pkcs7     = NULL;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
index 88c21369b6de0d5481bfbf0300cd167c1a9ffcfe..3a5485e002c7c4e60d1a8539359d2cd87fe458c8 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
@@ -45,12 +45,9 @@ X509ConstructCertificate (
   //\r
   // ASSERT if Cert is NULL or SingleX509Cert is NULL.\r
   //\r
-  ASSERT (Cert != NULL);\r
+  ASSERT (Cert           != NULL);\r
   ASSERT (SingleX509Cert != NULL);\r
-\r
-  if (CertSize > INT_MAX) {\r
-    return FALSE;\r
-  }\r
+  ASSERT (CertSize       <= INT_MAX);\r
 \r
   Status = FALSE;\r
 \r