Update return FALSE to ASSERT() for code consistent.

[mirror_edk2.git] / CryptoPkg / Library / BaseCryptLib / Pk / CryptPkcs7.c

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