Fix several issues in BaseCryptLib:

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

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c
index 11472ebf3b27669186765d4038294352258216dd..25865910f69b072eb9cafce1e0596ee8add26836 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c
@@ -92,12 +92,21 @@ Pkcs7Sign (
     return Status;\r
   }\r
 \r
+  Status = FALSE;\r
+\r
   //\r
   // Register & Initialize necessary digest algorithms and PRNG for PKCS#7 Handling\r
   //\r
-  EVP_add_digest (EVP_md5());\r
-  EVP_add_digest (EVP_sha1());\r
-  EVP_add_digest (EVP_sha256());\r
+  if (EVP_add_digest (EVP_md5 ()) == 0) {\r
+    goto _Exit;\r
+  }\r
+  if (EVP_add_digest (EVP_sha1 ()) == 0) {\r
+    goto _Exit;\r
+  }\r
+  if (EVP_add_digest (EVP_sha256 ()) == 0) {\r
+    goto _Exit;\r
+  }\r
+\r
   RandomSeed (NULL, 0);\r
 \r
   //\r
@@ -105,7 +114,6 @@ Pkcs7Sign (
   //\r
   Key = EVP_PKEY_new ();\r
   if (Key == NULL) {\r
-    Status = FALSE;\r
     goto _Exit;\r
   }\r
   Key->save_type = EVP_PKEY_RSA;\r
@@ -129,7 +137,6 @@ Pkcs7Sign (
             PKCS7_BINARY | PKCS7_NOATTR | PKCS7_DETACHED\r
             );\r
   if (Pkcs7 == NULL) {\r
-    Status = FALSE;\r
     goto _Exit;\r
   }\r
 \r
@@ -138,13 +145,11 @@ Pkcs7Sign (
   //\r
   P7DataSize = i2d_PKCS7 (Pkcs7, NULL);\r
   if (P7DataSize <= 19) {\r
-    Status = FALSE;\r
     goto _Exit;\r
   }\r
 \r
   P7Data     = malloc (P7DataSize);\r
   if (P7Data == NULL) {\r
-    Status = FALSE;\r
     goto _Exit;\r
   }\r
 \r
@@ -158,7 +163,6 @@ Pkcs7Sign (
   *SignedDataSize = P7DataSize - 19;\r
   *SignedData     = malloc (*SignedDataSize);\r
   if (*SignedData == NULL) {\r
-    Status = FALSE;\r
     OPENSSL_free (P7Data);\r
     goto _Exit;\r
   }\r