merged changes for bug #63297 from 5.3

diff --git a/NEWS b/NEWS
index a0396154a5d291a65d2ceb754889ac19624c9b1d..8a322a9963308cc329b340ccbf6d635ef692f31f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,10 @@ PHP                                                                        NEWS
     (Dmitry, Laruence)
   . Fixed bug #63284 (Upgrade PCRE to 8.31). (Anatoliy)
 
+- Phar:
+  . Fixed bug #63297 (Phar fails to write an openssl based signature).
+    (Anatoliy)
+
 18 Oct 2012, PHP 5.4.8
 
 - CLI server:

diff --git a/ext/phar/util.c b/ext/phar/util.c
index 5fcb2b6573d50c252254e5d46d96b9ba7a80a308..f674bca4fbde9b113415c053767e8394d807b77c 100644 (file)
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -2118,8 +2118,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));
 
@@ -2140,15 +2139,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 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);
@@ -2157,7 +2171,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;