[DOC] implement full signature support for tar-based archives. By default, data archives do

not have a signature, but can have one set via setSignatureAlgorithm()

35 files changed, 315 insertions, 25 deletions

diff --git a/ext/phar/phar.phar b/ext/phar/phar.phar
index 06432e0579..834529deeb 100755
--- a/ext/phar/phar.phar
+++ b/ext/phar/phar.phar
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index cb7a20419b..f1c12a18df 100755
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -420,7 +420,7 @@ int phar_open_executed_filename(char *alias, int alias_len, char **error TSRMLS_
 int phar_free_alias(phar_archive_data *phar, char *alias, int alias_len TSRMLS_DC);
 int phar_get_archive(phar_archive_data **archive, char *fname, int fname_len, char *alias, int alias_len, char **error TSRMLS_DC);
 int phar_open_parsed_phar(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error TSRMLS_DC);
-int phar_verify_signature(php_stream *fp, size_t end_of_phar, int sig_type, char *sig, int sig_len, char *fname, char **signature, int *signature_len, char **error TSRMLS_DC);
+int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_type, char *sig, int sig_len, char *fname, char **signature, int *signature_len, char **error TSRMLS_DC);
 int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, int *signature_length, char **error TSRMLS_DC);
 
 /* utility functions */
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index c7801542c9..092162b955 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -2707,11 +2707,6 @@ PHP_METHOD(Phar, setSignatureAlgorithm)
 			"Cannot set signature algorithm, phar is read-only");
 		return;
 	}
-	if (phar_obj->arc.archive->is_tar) {
-		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC,
-			"Cannot set signature algorithm, not possible with tar-based phar archives");
-		return;
-	}
 	if (phar_obj->arc.archive->is_zip) {
 		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC,
 			"Cannot set signature algorithm, not possible with zip-based phar archives");
diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index 1cd5046aa0..bb79b1a46d 100644
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -243,6 +243,86 @@ int phar_parse_tarfile(php_stream* fp, char *fname, int fname_len, char *alias,
 		size = entry.uncompressed_filesize = entry.compressed_filesize =
 			phar_tar_number(hdr->size, sizeof(hdr->size));
 
+		if (((!old && hdr->prefix[0] == 0) || old) && strlen(hdr->name) == sizeof(".phar/signature.bin")-1 && !strncmp(hdr->name, ".phar/signature.bin", sizeof(".phar/signature.bin")-1)) {
+			size_t read;
+			if (size > 511) {
+				if (error) {
+					spprintf(error, 4096, "phar error: tar-based phar \"%s\" has signature that is larger than 511 bytes, cannot process", fname);
+				}
+bail:
+				php_stream_close(fp);
+				zend_hash_destroy(&myphar->manifest);
+				myphar->manifest.arBuckets = 0;
+				zend_hash_destroy(&myphar->mounted_dirs);
+				myphar->mounted_dirs.arBuckets = 0;
+				pefree(myphar, myphar->is_persistent);
+				return FAILURE;
+			}
+			read = php_stream_read(fp, buf, size);
+			if (read != size) {
+				if (error) {
+					spprintf(error, 4096, "phar error: tar-based phar \"%s\" signature cannot be read", fname);
+				}
+				goto bail;
+			}
+#ifdef WORDS_BIGENDIAN
+# define PHAR_GET_32(buffer) \
+	(((((unsigned char*)(buffer))[3]) << 24) \
+		| ((((unsigned char*)(buffer))[2]) << 16) \
+		| ((((unsigned char*)(buffer))[1]) <<  8) \
+		| (((unsigned char*)(buffer))[0]))
+#else
+# define PHAR_GET_32(buffer) (php_uint32) *(buffer)
+#endif
+			if (FAILURE == phar_verify_signature(fp, php_stream_tell(fp) - size - 512, PHAR_GET_32(buf), buf + 8, PHAR_GET_32(buf + 4), fname, &myphar->signature, &myphar->sig_len, error TSRMLS_CC)) {
+				if (error) {
+					char *save = *error;
+					spprintf(error, 4096, "phar error: tar-based phar \"%s\" signature cannot be verified: %s", fname, save);
+					efree(save);
+				}
+				goto bail;
+			}
+			/* signature checked out, let's ensure this is the last file in the phar */
+			size = ((size+511)&~511) + 512;
+			if (((hdr->typeflag == 0) || (hdr->typeflag == TAR_FILE)) && size > 0) {
+				/* this is not good enough - seek succeeds even on truncated tars */
+				php_stream_seek(fp, size, SEEK_CUR);
+				if ((uint)php_stream_tell(fp) > totalsize) {
+					if (error) {
+						spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);
+					}
+					php_stream_close(fp);
+					zend_hash_destroy(&myphar->manifest);
+					myphar->manifest.arBuckets = 0;
+					zend_hash_destroy(&myphar->mounted_dirs);
+					myphar->mounted_dirs.arBuckets = 0;
+					pefree(myphar, myphar->is_persistent);
+					return FAILURE;
+				}
+			}
+			read = php_stream_read(fp, buf, sizeof(buf));
+			if (read != sizeof(buf)) {
+				if (error) {
+					spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);
+				}
+				php_stream_close(fp);
+				zend_hash_destroy(&myphar->manifest);
+				myphar->manifest.arBuckets = 0;
+				zend_hash_destroy(&myphar->mounted_dirs);
+				myphar->mounted_dirs.arBuckets = 0;
+				pefree(myphar, myphar->is_persistent);
+				return FAILURE;
+			}
+			hdr = (tar_header*) buf;
+			sum1 = phar_tar_number(hdr->checksum, sizeof(hdr->checksum));
+			if (sum1 == 0 && phar_tar_checksum(buf, sizeof(buf)) == 0) {
+				break;
+			}
+			if (error) {
+				spprintf(error, 4096, "phar error: \"%s\" has entries after signature, invalid phar", fname);
+			}
+			goto bail;
+		}
 		if (!old && hdr->prefix[0] != 0) {
 			char name[256];
 
@@ -419,6 +499,21 @@ int phar_parse_tarfile(php_stream* fp, char *fname, int fname_len, char *alias,
 			return FAILURE;
 		}
 	} while (read != 0);
+
+	/* ensure signature set */
+	if (PHAR_G(require_hash) && !myphar->signature) {
+		php_stream_close(fp);
+		zend_hash_destroy(&myphar->manifest);
+		myphar->manifest.arBuckets = 0;
+		zend_hash_destroy(&myphar->mounted_dirs);
+		myphar->mounted_dirs.arBuckets = 0;
+		pefree(myphar, myphar->is_persistent);
+		if (error) {
+			spprintf(error, 0, "tar-based phar \"%s\" does not have a signature", fname);
+		}
+		return FAILURE;
+	}
+
 	myphar->fname = pestrndup(fname, fname_len, myphar->is_persistent);
 #ifdef PHP_WIN32
 	phar_unixify_path_separators(myphar->fname, fname_len);
@@ -712,9 +807,9 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
 	phar_entry_info entry = {0};
 	static const char newstub[] = "<?php // tar-based phar archive stub file\n__HALT_COMPILER();";
 	php_stream *oldfile, *newfile, *stubfile;
-	int closeoldfile, free_user_stub;
+	int closeoldfile, free_user_stub, signature_length;
 	struct _phar_pass_tar_info pass;
-	char *buf;
+	char *buf, *signature, sigbuf[8];
 
 	entry.flags = PHAR_ENT_PERM_DEF_FILE;
 	entry.timestamp = time(NULL);
@@ -734,7 +829,6 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
 		entry.filename = estrndup(".phar/alias.txt", sizeof(".phar/alias.txt")-1);
 		entry.filename_len = sizeof(".phar/alias.txt")-1;
 		entry.fp = php_stream_fopen_tmpfile();
-		entry.crc32 = phar_tar_checksum(phar->alias, phar->alias_len);
 		if (phar->alias_len != (int)php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
 			if (error) {
 				spprintf(error, 0, "unable to set alias in tar-based phar \"%s\"", phar->fname);
@@ -926,6 +1020,62 @@ nostub:
 
 	zend_hash_apply_with_argument(&phar->manifest, (apply_func_arg_t) phar_tar_writeheaders, (void *) &pass TSRMLS_CC);
 
+	/* add signature for executable tars or tars explicitly set with setSignatureAlgorithm */
+	if (!phar->is_data || phar->sig_flags) {
+		if (FAILURE == phar_create_signature(phar, newfile, &signature, &signature_length, error TSRMLS_CC)) {
+			if (error) {
+				char *save = *error;
+				spprintf(error, 0, "phar error: unable to write signature to tar-based phar: %s", save);
+				efree(save);
+			}
+			if (closeoldfile) {
+				php_stream_close(oldfile);
+			}
+			php_stream_close(newfile);
+			return EOF;
+		}
+		entry.filename = ".phar/signature.bin";
+		entry.filename_len = sizeof(".phar/signature.bin")-1;
+		entry.fp = php_stream_fopen_tmpfile();
+
+#ifdef WORDS_BIGENDIAN
+# define PHAR_SET_32(var, buffer) \
+	*(php_uint32 *)(var) = (((((unsigned char*)(buffer))[3]) << 24) \
+		| ((((unsigned char*)(buffer))[2]) << 16) \
+		| ((((unsigned char*)(buffer))[1]) <<  8) \
+		| (((unsigned char*)(buffer))[0]))
+#else
+# define PHAR_SET_32(var, buffer) *(php_uint32 *)(var) = (php_uint32) (buffer)
+#endif
+		PHAR_SET_32(sigbuf, phar->sig_flags);
+		PHAR_SET_32(sigbuf + 4, signature_length);
+		if (8 != php_stream_write(entry.fp, sigbuf, 8) || signature_length != php_stream_write(entry.fp, signature, signature_length)) {
+			efree(signature);
+			if (error) {
+				spprintf(error, 0, "phar error: unable to write signature to tar-based phar %s", phar->fname);
+			}
+			if (closeoldfile) {
+				php_stream_close(oldfile);
+			}
+			php_stream_close(newfile);
+			return EOF;
+		}
+		efree(signature);
+
+		entry.uncompressed_filesize = entry.compressed_filesize = signature_length + 8;
+		/* throw out return value and write the signature */
+		entry.filename_len = phar_tar_writeheaders((void *)&entry, (void *)&pass);
+
+		if (error && *error) {
+			if (closeoldfile) {
+				php_stream_close(oldfile);
+			}
+			/* error is set by writeheaders */
+			php_stream_close(newfile);
+			return EOF;
+		}
+	} /* signature */
+
 	/* add final zero blocks */
 	buf = (char *) ecalloc(1024, 1);
 	php_stream_write(newfile, buf, 1024);
diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt
index c644424d25..ed3ae274b5 100644
--- a/ext/phar/tests/badparameters.phpt
+++ b/ext/phar/tests/badparameters.phpt
@@ -77,11 +77,6 @@ $a->setSignatureAlgorithm(Phar::MD5);
 echo $e->getMessage() . "\n";
 }
 try {
-$b->setSignatureAlgorithm(Phar::MD5);
-} catch (Exception $e) {
-echo $e->getMessage() . "\n";
-}
-try {
 $c->setSignatureAlgorithm(Phar::MD5);
 } catch (Exception $e) {
 echo $e->getMessage() . "\n";
@@ -165,7 +160,6 @@ A Phar stub cannot be set in a plain tar archive
 Warning: Phar::setDefaultStub() expects parameter 1 to be string, array given in %sbadparameters.php on line %d
 Cannot change stub: phar.readonly=1
 Cannot set signature algorithm, phar is read-only
-Cannot set signature algorithm, not possible with tar-based phar archives
 Cannot set signature algorithm, not possible with zip-based phar archives
 
 Warning: Phar::compress() expects parameter 1 to be long, array given in %sbadparameters.php on line %d
diff --git a/ext/phar/tests/phar_convert_again.phpt b/ext/phar/tests/phar_convert_again.phpt
index 4543a238d5..9485f1e6aa 100644
--- a/ext/phar/tests/phar_convert_again.phpt
+++ b/ext/phar/tests/phar_convert_again.phpt
@@ -140,12 +140,6 @@ $data->setDefaultStub();
 echo $e->getMessage() . "\n";
 }
 try {
-$data->setSignatureAlgorithm(Phar::MD5);
-} catch (Exception $e) {
-echo $e->getMessage() . "\n";
-}
-
-try {
 $tgz->convertToData(Phar::TAR, Phar::GZ, '.phar.tgz.oops');
 } catch (Exception $e) {
 echo $e->getMessage() . "\n";
@@ -211,7 +205,6 @@ Unknown compression specified, please pass one of Phar::GZ or Phar::BZ2
 A Phar stub cannot be set in a plain tar archive
 A Phar alias cannot be set in a plain tar archive
 A Phar stub cannot be set in a plain tar archive
-Cannot set signature algorithm, not possible with tar-based phar archives
 data phar "%sphar_convert_again2.phar.tgz.oops" has invalid extension phar.tgz.oops
 phar "%sphar_convert_again2.tgz.oops" has invalid extension tgz.oops
 data phar "%sphar_convert_again2.phar/.tgz.oops" has invalid extension phar/.tgz.oops
diff --git a/ext/phar/tests/phar_setsignaturealgo2.phpt b/ext/phar/tests/phar_setsignaturealgo2.phpt
index 57b16097e7..c7f5f9ecfc 100644
--- a/ext/phar/tests/phar_setsignaturealgo2.phpt
+++ b/ext/phar/tests/phar_setsignaturealgo2.phpt
@@ -10,7 +10,7 @@ phar.readonly=0
 --FILE--
 <?php
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar';
-$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar', 0, 'brandnewphar.phar');
+$p = new Phar($fname);
 $p['file1.txt'] = 'hi';
 var_dump($p->getSignature());
 $p->setSignatureAlgorithm(Phar::MD5);
@@ -42,7 +42,7 @@ echo $e->getMessage();
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/brandnewphar.phar');
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 ?>
 --EXPECTF--
 array(2) {
diff --git a/ext/phar/tests/stat2.phpt b/ext/phar/tests/stat2.phpt
index 6e911028ca..defda719f3 100644
--- a/ext/phar/tests/stat2.phpt
+++ b/ext/phar/tests/stat2.phpt
@@ -5,6 +5,7 @@ Phar: test stat function interceptions and is_file/is_link edge cases (PHP 5.2)
 <?php if (substr(phpversion(), 0, 3) != '5.2') die("skip PHP 5.2 required for this test");?>
 --INI--
 phar.readonly=0
+phar.require_hash=0
 --FILE--
 <?php
 Phar::interceptFileFuncs();
diff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt
index 58ca54a16a..aba2a6417d 100644
--- a/ext/phar/tests/stat2_5.3.phpt
+++ b/ext/phar/tests/stat2_5.3.phpt
@@ -5,6 +5,7 @@ Phar: test stat function interceptions and is_file/is_link edge cases (PHP 5.3+)
 <?php if (substr(phpversion(), 0, 3) == '5.2') die("skip PHP 5.3+ required for this test");?>
 --INI--
 phar.readonly=0
+phar.require_hash=0
 --FILE--
 <?php
 Phar::interceptFileFuncs();
diff --git a/ext/phar/tests/tar/bignames.phpt b/ext/phar/tests/tar/bignames.phpt
index 19d5f638e1..4b51e2a921 100644
--- a/ext/phar/tests/tar/bignames.phpt
+++ b/ext/phar/tests/tar/bignames.phpt
@@ -2,6 +2,8 @@
 Phar: tar with huge filenames
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.require_hash=0
 --FILE--
 <?php
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
diff --git a/ext/phar/tests/tar/files/frontcontroller.phar.tar b/ext/phar/tests/tar/files/frontcontroller.phar.tar
index 522d097845..02d8766dcc 100644
--- a/ext/phar/tests/tar/files/frontcontroller.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller10.phar.tar b/ext/phar/tests/tar/files/frontcontroller10.phar.tar
index d43ed916a1..574d7cd7c8 100644
--- a/ext/phar/tests/tar/files/frontcontroller10.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller10.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller11.phar.tar b/ext/phar/tests/tar/files/frontcontroller11.phar.tar
index c8f98a1e78..08cbdc1bfe 100644
--- a/ext/phar/tests/tar/files/frontcontroller11.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller11.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller12.phar.tar b/ext/phar/tests/tar/files/frontcontroller12.phar.tar
index 06e7e59b03..e0f22f5f45 100644
--- a/ext/phar/tests/tar/files/frontcontroller12.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller12.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller2.phar.tar b/ext/phar/tests/tar/files/frontcontroller2.phar.tar
index 857b116890..231e15ad32 100644
--- a/ext/phar/tests/tar/files/frontcontroller2.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller2.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller3.phar.tar b/ext/phar/tests/tar/files/frontcontroller3.phar.tar
index f733884d12..2df61c95ac 100644
--- a/ext/phar/tests/tar/files/frontcontroller3.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller3.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller4.phar.tar b/ext/phar/tests/tar/files/frontcontroller4.phar.tar
index 5d11af499c..4cd684d25c 100644
--- a/ext/phar/tests/tar/files/frontcontroller4.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller4.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller5.phar.tar b/ext/phar/tests/tar/files/frontcontroller5.phar.tar
index e6e9015bf8..6053eb2783 100644
--- a/ext/phar/tests/tar/files/frontcontroller5.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller5.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller6.phar.tar b/ext/phar/tests/tar/files/frontcontroller6.phar.tar
index d30b7ab9eb..e0cb2ff276 100644
--- a/ext/phar/tests/tar/files/frontcontroller6.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller6.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller7.phar.tar b/ext/phar/tests/tar/files/frontcontroller7.phar.tar
index c7ccc940c1..8327ae9816 100644
--- a/ext/phar/tests/tar/files/frontcontroller7.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller7.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller8.phar.tar b/ext/phar/tests/tar/files/frontcontroller8.phar.tar
index 98495717ce..3440a7f32a 100644
--- a/ext/phar/tests/tar/files/frontcontroller8.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller8.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller9.phar.tar b/ext/phar/tests/tar/files/frontcontroller9.phar.tar
index 481864c1cf..15e95b18f2 100644
--- a/ext/phar/tests/tar/files/frontcontroller9.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller9.phar.tar
diff --git a/ext/phar/tests/tar/links.phpt b/ext/phar/tests/tar/links.phpt
index 73e257b8be..d702cacc45 100644
--- a/ext/phar/tests/tar/links.phpt
+++ b/ext/phar/tests/tar/links.phpt
@@ -2,6 +2,8 @@
 Phar: tar with hard link and symbolic link
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.require_hash=0
 --FILE--
 <?php
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
diff --git a/ext/phar/tests/tar/links3.phpt b/ext/phar/tests/tar/links3.phpt
index 2241081660..def399e260 100644
--- a/ext/phar/tests/tar/links3.phpt
+++ b/ext/phar/tests/tar/links3.phpt
@@ -2,6 +2,8 @@
 Phar: tar with link to absolute path
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.require_hash=0
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/tar/links4.phpt b/ext/phar/tests/tar/links4.phpt
index d0783e84ac..1d658a72e9 100644
--- a/ext/phar/tests/tar/links4.phpt
+++ b/ext/phar/tests/tar/links4.phpt
@@ -2,6 +2,8 @@
 Phar: tar with link to root directory file from root directory file
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.require_hash=0
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/tar/links5.phpt b/ext/phar/tests/tar/links5.phpt
index 262d41d841..6d11d3eb85 100644
--- a/ext/phar/tests/tar/links5.phpt
+++ b/ext/phar/tests/tar/links5.phpt
@@ -2,6 +2,8 @@
 Phar: tar with relative link to subdirectory file from subdirectory file
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.require_hash=0
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
new file mode 100644
index 0000000000..e9cbdb4a5d
--- /dev/null
+++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
@@ -0,0 +1,84 @@
+--TEST--
+Phar::setSupportedSignatures() with hash, tar-based
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("hash")) die("skip extension hash required"); ?>
+<?php if (!extension_loaded("openssl")) die("skip extension openssl required"); ?>
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+<?php
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar';
+$p = new Phar($fname);
+$p['file1.txt'] = 'hi';
+var_dump($p->getSignature());
+$p->setSignatureAlgorithm(Phar::MD5);
+var_dump($p->getSignature());
+$p->setSignatureAlgorithm(Phar::SHA1);
+var_dump($p->getSignature());
+try {
+$p->setSignatureAlgorithm(Phar::SHA256);
+var_dump($p->getSignature());
+} catch (Exception $e) {
+echo $e->getMessage();
+}
+try {
+$p->setSignatureAlgorithm(Phar::SHA512);
+var_dump($p->getSignature());
+} catch (Exception $e) {
+echo $e->getMessage();
+}
+try {
+$private = openssl_get_privatekey(file_get_contents(dirname(dirname(__FILE__)) . '/files/private.pem'));
+$pkey = '';
+openssl_pkey_export($private, $pkey);
+$p->setSignatureAlgorithm(Phar::OPENSSL, $pkey);
+var_dump($p->getSignature());
+} catch (Exception $e) {
+echo $e->getMessage();
+}
+?>
+===DONE===
+--CLEAN--
+<?php
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
+?>
+--EXPECTF--
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
+  string(5) "SHA-1"
+}
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
+  string(3) "MD5"
+}
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
+  string(5) "SHA-1"
+}
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
+  string(7) "SHA-256"
+}
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
+  string(7) "SHA-512"
+}
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
+  string(7) "OpenSSL"
+}
+===DONE===
diff --git a/ext/phar/tests/tar/require_hash.phpt b/ext/phar/tests/tar/require_hash.phpt
new file mode 100644
index 0000000000..002931bba6
--- /dev/null
+++ b/ext/phar/tests/tar/require_hash.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Phar: tar-based phar, require_hash=1, no signature
+--SKIPIF--
+<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
+--INI--
+phar.readonly=1
+phar.require_hash=0
+--FILE--
+<?php
+ini_set('phar.require_hash', 1);
+include dirname(__FILE__) . '/files/tarmaker.php.inc';
+$fname = dirname(__FILE__) . '/tar_004.phar.tar';
+$alias = 'phar://' . $fname;
+$fname2 = dirname(__FILE__) . '/tar_004.tar';
+
+$tar = new tarmaker($fname, 'none');
+$tar->init();
+$tar->addFile('tar_004.php', '<?php var_dump(__FILE__);');
+$tar->addFile('internal/file/here', "hi there!\n");
+$tar->close();
+
+try {
+	$phar = new Phar($fname);
+	var_dump($phar->getStub());
+} catch (Exception $e) {
+	echo $e->getMessage()."\n";
+}
+ini_set('phar.require_hash', 0);
+try {
+	$phar = new PharData($fname2);
+	$phar['file'] = 'hi';
+	var_dump($phar->getSignature());
+	$phar->setSignatureAlgorithm(Phar::MD5);
+	var_dump($phar->getSignature());
+} catch (Exception $e) {
+	echo $e->getMessage()."\n";
+}
+
+?>
+===DONE===
+--CLEAN--
+<?php
+@unlink(dirname(__FILE__) . '/tar_004.phar.tar');
+@unlink(dirname(__FILE__) . '/tar_004.tar');
+?>
+--EXPECTF--
+tar-based phar "%star_004.phar.tar" does not have a signature
+bool(false)
+array(2) {
+  ["hash"]=>
+  string(32) "%s"
+  ["hash_type"]=>
+  string(3) "MD5"
+}
+===DONE===
diff --git a/ext/phar/tests/tar/tar_003.phpt b/ext/phar/tests/tar/tar_003.phpt
index b390805dc3..3dec341784 100644
--- a/ext/phar/tests/tar/tar_003.phpt
+++ b/ext/phar/tests/tar/tar_003.phpt
@@ -5,6 +5,7 @@ Phar: tar-based phar, valid 1
 <?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
+phar.require_hash=0
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/tarmaker.php.inc';
diff --git a/ext/phar/tests/tar/tar_004.phpt b/ext/phar/tests/tar/tar_004.phpt
index 2dd7ba169f..0125aecfa7 100644
--- a/ext/phar/tests/tar/tar_004.phpt
+++ b/ext/phar/tests/tar/tar_004.phpt
@@ -5,6 +5,7 @@ Phar: tar-based phar, tar phar with stub, mapPhar()
 <?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
+phar.require_hash=0
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/tarmaker.php.inc';
diff --git a/ext/phar/tests/tar/tar_bz2.phpt b/ext/phar/tests/tar/tar_bz2.phpt
index ad14541431..c18314e5ff 100644
--- a/ext/phar/tests/tar/tar_bz2.phpt
+++ b/ext/phar/tests/tar/tar_bz2.phpt
@@ -6,6 +6,7 @@ Phar: tar-based phar, bzipped tar
 <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?>
 --INI--
 phar.readonly=0
+phar.require_hash=0
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/tarmaker.php.inc';
diff --git a/ext/phar/tests/tar/tar_gzip.phpt b/ext/phar/tests/tar/tar_gzip.phpt
index 8287ee7f06..3e52b96f3a 100644
--- a/ext/phar/tests/tar/tar_gzip.phpt
+++ b/ext/phar/tests/tar/tar_gzip.phpt
@@ -7,6 +7,7 @@ Phar: tar-based phar, gzipped tar
 <?php if (version_compare(phpversion(), '5.2.6', '<')) die("skip zlib is buggy in PHP < 5.2.6"); ?>
 --INI--
 phar.readonly=0
+phar.require_hash=0
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/tarmaker.php.inc';
diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt
index a107a37deb..0036662c38 100644
--- a/ext/phar/tests/tar/tar_nostub.phpt
+++ b/ext/phar/tests/tar/tar_nostub.phpt
@@ -5,6 +5,7 @@ Phar: tar-based phar, third-party tar with no stub, Phar->getStub()
 <?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=1
+phar.require_hash=0
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/tarmaker.php.inc';
diff --git a/ext/phar/tests/zf_test.phpt b/ext/phar/tests/zf_test.phpt
index 0e0da1fcc9..c5d587dc9c 100644
--- a/ext/phar/tests/zf_test.phpt
+++ b/ext/phar/tests/zf_test.phpt
@@ -5,6 +5,7 @@ Phar: test broken app
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
+phar.require_hash=0
 --FILE--
 <?php
 
diff --git a/ext/phar/util.c b/ext/phar/util.c
index 8103bf307d..de3eda8942 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -1466,7 +1466,7 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t end,
 }
 #endif /* #ifndef PHAR_HAVE_OPENSSL */
 
-int phar_verify_signature(php_stream *fp, size_t end_of_phar, int sig_type, char *sig, int sig_len, char *fname, char **signature, int *signature_len, char **error TSRMLS_DC) /* {{{ */
+int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_type, char *sig, int sig_len, char *fname, char **signature, int *signature_len, char **error TSRMLS_DC) /* {{{ */
 {
 	int read_size, len;
 	off_t read_len;