Fix a bug in OpensslLib that PKCS7_verify will use over 8k stack space.

Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting  <ting.ye@intel.com>
Reviewed-by: Dong Guo <guo.dong@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13858 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8w.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8w.patch
index daeb36079d17defbb63a91ae41df893c1bc98ac9..a2ba8aeb43e2c2ebeaa1e769c8368f79f878e63a 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8w.patch
+++ b/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8w.patch
@@ -182,6 +182,45 @@ Index: crypto/pkcs7/pk7_smime.c
                PKCS7err(PKCS7_F_PKCS7_SIGN,PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR);\r
                goto err;\r
        }\r
+@@ -173,7 +176,8 @@\r
+       STACK_OF(PKCS7_SIGNER_INFO) *sinfos;\r
+       PKCS7_SIGNER_INFO *si;\r
+       X509_STORE_CTX cert_ctx;\r
+-      char buf[4096];\r
++      char *buf = NULL;\r
++      int bufsiz;\r
+       int i, j=0, k, ret = 0;\r
+       BIO *p7bio;\r
+       BIO *tmpin, *tmpout;\r
+@@ -284,10 +288,16 @@\r
+               BIO_set_mem_eof_return(tmpout, 0);\r
+       } else tmpout = out;\r
+ \r
++      bufsiz = 4096;\r
++      buf = OPENSSL_malloc (bufsiz);\r
++              if (buf == NULL) {\r
++                      goto err;\r
++      }\r
++\r
+       /* We now have to 'read' from p7bio to calculate digests etc. */\r
+       for (;;)\r
+       {\r
+-              i=BIO_read(p7bio,buf,sizeof(buf));\r
++              i=BIO_read(p7bio,buf,bufsiz);\r
+               if (i <= 0) break;\r
+               if (tmpout) BIO_write(tmpout, buf, i);\r
+       }\r
+@@ -326,6 +336,10 @@\r
+ \r
+       sk_X509_free(signers);\r
+ \r
++      if (buf != NULL) {\r
++              OPENSSL_free (buf);\r
++      }\r
++\r
+       return ret;\r
+ }\r
+ \r
 Index: crypto/rand/rand_egd.c\r
 ===================================================================\r
 --- crypto/rand/rand_egd.c     (revision 1)\r