Fixed bug #63297 Phar fails to write an openssl based signature

Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.

diff --git a/NEWS b/NEWS
index bb3811caf9f8a3ebd72938ef47a2246622c7bcf7..18be193762d1c14c5ea8badb72a42616006a6afd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,10 @@ PHP                                                                        NEWS
   . Fixed bug #63240 (stream_get_line() return contains delimiter string).
     (Tjerk, Gustavo)
 
+- Phar:
+  . Fixed bug #63297 (Phar fails to write an openssl based signature).
+    (Anatoliy)
+
 18 Oct 2012, PHP 5.3.18
 
 - Core:

diff --git a/ext/phar/util.c b/ext/phar/util.c
index cc4457493b035c0fd646decac51fbd00e89ba06c..d456ee3b63ff97932bbc95b777b29a8bb0f68795 100644 (file)
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -2119,8 +2119,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
 #ifdef PHAR_HAVE_OPENSSL
                        BIO *in;
                        EVP_PKEY *key;
-                       EVP_MD *mdtype = (EVP_MD *) EVP_sha1();
-                       EVP_MD_CTX md_ctx;
+                       EVP_MD_CTX *md_ctx;
 
                        in = BIO_new_mem_buf(PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len));
 
@@ -2141,15 +2140,30 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
                                return FAILURE;
                        }
 
+                       md_ctx = EVP_MD_CTX_create();
+
                        siglen = EVP_PKEY_size(key);
                        sigbuf = emalloc(siglen + 1);
-                       EVP_SignInit(&md_ctx, mdtype);
+
+                       if (!EVP_SignInit(md_ctx, EVP_sha1())) {
+                               efree(sigbuf);
+                               if (error) {
+                                       spprintf(error, 0, "unable to initialize openssl signature for phar \"%s\"", phar->fname);
+                               }
+                               return FAILURE;
+                       }
 
                        while ((sig_len = php_stream_read(fp, (char*)buf, sizeof(buf))) > 0) {
-                               EVP_SignUpdate(&md_ctx, buf, sig_len);
+                               if (!EVP_SignUpdate(md_ctx, buf, sig_len)) {
+                                       efree(sigbuf);
+                                       if (error) {
+                                               spprintf(error, 0, "unable to to update the openssl signature for phar \"%s\"", phar->fname);
+                                       }
+                                       return FAILURE;
+                               }
                        }
 
-                       if (!EVP_SignFinal (&md_ctx, sigbuf,(unsigned int *)&siglen, key)) {
+                       if (!EVP_SignFinal (md_ctx, sigbuf,(unsigned int *)&siglen, key)) {
                                efree(sigbuf);
                                if (error) {
                                        spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
@@ -2158,7 +2172,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
                        }
 
                        sigbuf[siglen] = '\0';
-                       EVP_MD_CTX_cleanup(&md_ctx);
+                       EVP_MD_CTX_destroy(md_ctx);
 #else
                        sigbuf = NULL;
                        siglen = 0;