Update hash tests for consistency in their titles and remove the skipif sections (except for the mhash related tests)

ext/hash/tests/adler32.phpt

@@ -1,7 +1,5 @@
 --TEST--
-ADLER32
+Hash: ADLER32 algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 echo hash('adler32', ''), "\n";

ext/hash/tests/bug52240.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #52240 (hash_copy() does not copy the HMAC key, causes wrong results and PHP crashes)
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 

ext/hash/tests/bug64745.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Bug #64745 hash_pbkdf2() truncates data when using default length and hex output
+Bug #64745 (hash_pbkdf2() truncates data when using default length and hex output)
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 $hash = hash_pbkdf2('sha1', 'password', 'salt', 1, 0);

ext/hash/tests/bug70312.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Bug #70312 HAVAL gives wrong hashes in specific cases
+Bug #70312 (HAVAL gives wrong hashes in specific cases)
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 var_dump(hash('haval128,5', '1234567890123456789012345678901234567890123456789012345678901234'));

ext/hash/tests/bug73127.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #73127 (gost-crypto hash incorrect if input data contains long 0xFF sequence)
---SKIPIF--
-<?php if(!extension_loaded('hash')) die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 

ext/hash/tests/crc32.phpt

@@ -1,7 +1,5 @@
 --TEST--
-CRC32
+Hash: CRC32 algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 echo hash('crc32', ''), "\n";

ext/hash/tests/fnv132.phpt

@@ -1,7 +1,5 @@
 --TEST--
-FNV
+Hash: FNV132 algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
 --FILE--
 <?php
 

ext/hash/tests/fnv164.phpt

@@ -1,7 +1,5 @@
 --TEST--
-FNV
+Hash: FNV164 algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
 --FILE--
 <?php
 

ext/hash/tests/fnv1a32.phpt

@@ -1,7 +1,5 @@
 --TEST--
-FNV
+Hash: FNV1a32 algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
 --FILE--
 <?php
 

ext/hash/tests/fnv1a64.phpt

@@ -1,7 +1,5 @@
 --TEST--
-FNV
+Hash: FNV1a64 algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
 --FILE--
 <?php
 

ext/hash/tests/gost.phpt

@@ -1,7 +1,5 @@
 --TEST--
-gost
+Hash: gost algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 echo hash('gost', ''), "\n";

ext/hash/tests/hash-clone.phpt

@@ -1,7 +1,5 @@
 --TEST--
-hash_copy() via clone
+Hash: hash_copy() via clone
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_algos.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_algos() function : basic functionality 
+Hash: hash_algos() function : basic functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_copy_001.phpt

@@ -1,7 +1,5 @@
 --TEST--
-hash_copy() basic tests
+Hash: hash_copy() basic tests
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_copy_002.phpt

@@ -1,7 +1,5 @@
 --TEST--
-hash_copy() errors
+Hash: hash_copy() errors
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_equals.phpt

@@ -1,7 +1,5 @@
 --TEST--
-hash_equals() function
+Hash: hash_equals() test
---SKIPIF--
-<?php if(!extension_loaded('hash')) die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 var_dump(hash_equals("same", "same"));

ext/hash/tests/hash_error.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash() function : error conditions 
+Hash: hash() function : error conditions 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_file_basic.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
+Hash: hash_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--

ext/hash/tests/hash_file_basic1.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
+Hash: hash_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_file_error.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : error conditions 
+Hash: hash_file() function : error conditions 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--

ext/hash/tests/hash_hkdf_basic.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: basic functionality
+Hash: hash_hkdf() function: basic functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_hkdf_edges.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: edge cases
+Hash: hash_hkdf() function: edge cases
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_hkdf_error.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: error conditions
+Hash: hash_hkdf() function: error conditions
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_hkdf_rfc5869.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: RFC 5869 test vectors
+Hash: hash_hkdf() function: RFC 5869 test vectors
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_hmac_algos.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac_algos() function : basic functionality 
+Hash: hash_hmac_algos() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_hmac_basic.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
+Hash: hash_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_hmac_error.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac() function : basic functionality 
+Hash: hash_hmac() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 /*

ext/hash/tests/hash_hmac_file_basic.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac_file() function : basic functionality 
+Hash: hash_hmac_file() function : basic functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_hmac_file_error.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac_file() function : basic functionality 
+Hash: hash_hmac_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_init_error.phpt

@@ -1,9 +1,5 @@
 --TEST--
-hash_init() function - errors test
+Hash: hash_init() function - errors test
---SKIPIF--
-<?php
-if (!extension_loaded('hash')) die('skip hash extension not available');
-?>
 --FILE--
 <?php
 echo "*** Testing hash_init(): error conditions ***\n";

ext/hash/tests/hash_pbkdf2_basic.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_pbkdf2() function : basic functionality
+Hash: hash_pbkdf2() function : basic functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_pbkdf2_error.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Test hash_pbkdf2() function : error functionality
+Hash: Test hash_pbkdf2() function : error functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
 <?php
 

ext/hash/tests/hash_update_file.phpt

@@ -1,11 +1,7 @@
 --TEST--
-hash_update_file() function - basic test
+Hash: hash_update_file() test
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
---SKIPIF--
-<?php
-if (!extension_loaded('hash')) die('skip hash extension not available');
-?>
 --FILE--
 <?php
 $filePath = __DIR__ . DIRECTORY_SEPARATOR . 'hash_update_stream.txt';

ext/hash/tests/hash_update_stream.phpt

@@ -1,11 +1,7 @@
 --TEST--
-int hash_update_stream ( resource $context , resource $handle [, int $length = -1 ] );
+Hash: hash_update_stream() test
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
---SKIPIF--
-<?php
-if (!extension_loaded('hash')) die('skip hash extension not available');
-?>
 --FILE--
 <?php
 $fp = tmpfile();

ext/hash/tests/haval.phpt

@@ -1,7 +1,5 @@
 --TEST--
-haval algorithm (multi-vector, multi-pass, multi-width)
+Hash: haval algorithm (multi-vector, multi-pass, multi-width)
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo "Empty String\n";

ext/hash/tests/hmac-md5.phpt

@@ -1,7 +1,5 @@
 --TEST--
-hmac-md5 algorithm
+Hash: hmac-md5 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 /* Test Vectors from RFC 2104 */

ext/hash/tests/joaat.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Jenkins's one-at-a-time
+Hash: Jenkins's one-at-a-time
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
 --FILE--
 <?php
 $tests = array(

ext/hash/tests/md2.phpt

@@ -1,7 +1,5 @@
 --TEST--
-md2 algorithm
+Hash: md2 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('md2', '') . "\n";

ext/hash/tests/md4.phpt

@@ -1,7 +1,5 @@
 --TEST--
-md4 algorithm
+Hash: md4 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 /* RFC 1320 vectors */

ext/hash/tests/md5.phpt

@@ -1,7 +1,5 @@
 --TEST--
-md5 algorithm
+Hash: md5 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('md5', '') . "\n";

ext/hash/tests/mhash_001.phpt

@@ -1,9 +1,7 @@
 --TEST--
-mhash() test
+MHash: mhash() test
 --SKIPIF--
-<?php
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
-	include "skip_mhash.inc";
-?>
 --FILE--
 <?php
 

ext/hash/tests/mhash_002.phpt

@@ -1,9 +1,7 @@
 --TEST--
-mhash_get_block_size() & mhash_get_hash_name() test
+MHash: mhash_get_block_size() & mhash_get_hash_name() test
 --SKIPIF--
-<?php
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
-	include "skip_mhash.inc";
-?>
 --FILE--
 <?php
 $supported_hash_al = array(

ext/hash/tests/mhash_003.phpt

@@ -1,9 +1,7 @@
 --TEST--
-mhash_keygen_s2k() test
+MHash: mhash_keygen_s2k() test
 --SKIPIF--
-<?php
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
-	include "skip_mhash.inc";
-?>
 --FILE--
 <?php
 

ext/hash/tests/mhash_004.phpt

@@ -1,9 +1,7 @@
 --TEST--
-mhash() modifying algorithm parameter
+MHash: mhash() modifying algorithm parameter
 --SKIPIF--
-<?php
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
-	include "skip_mhash.inc";
-?>
 --FILE--
 <?php
 

ext/hash/tests/new-context.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Attempt to instantiate a HashContext directly
+Hash: Attempt to instantiate a HashContext directly
 --SKIPIF--
 <?php if (!extension_loaded('hash')) echo 'skip';
 --FILE--

ext/hash/tests/reuse.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Attempt to reuse a closed hash context
+Hash: Attempt to reuse a closed hash context
 --SKIPIF--
 <?php if (!extension_loaded('hash')) echo 'skip';
 --FILE--

ext/hash/tests/ripemd128.phpt

@@ -1,7 +1,5 @@
 --TEST--
-ripemd128 algorithm
+Hash: ripemd128 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('ripemd128', '') . "\n";

ext/hash/tests/ripemd160.phpt

@@ -1,7 +1,5 @@
 --TEST--
-ripemd160 algorithm
+Hash: ripemd160 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('ripemd160', '') . "\n";

ext/hash/tests/ripemd256.phpt

@@ -1,7 +1,5 @@
 --TEST--
-ripemd256 algorithm
+Hash: ripemd256 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('ripemd256', '') . "\n";

ext/hash/tests/ripemd320.phpt

@@ -1,7 +1,5 @@
 --TEST--
-ripemd320 algorithm
+Hash: ripemd320 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('ripemd320', '') . "\n";

ext/hash/tests/serialize-context.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Serialize a context
+Hash: Context serialization
---SKIPIF--
-<?php if (!extension_loaded('hash')) echo 'skip';
 --FILE--
 <?php
 

ext/hash/tests/sha1.phpt

@@ -1,7 +1,5 @@
 --TEST--
-sha1 algorithm
+Hash: sha1 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('sha1', '') . "\n";

ext/hash/tests/sha224.phpt

@@ -1,7 +1,5 @@
 --TEST--
-sha224 algorithm
+Hash: sha224 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('sha224', '') . "\n";

ext/hash/tests/sha256.phpt

@@ -1,7 +1,5 @@
 --TEST--
-sha256 algorithm
+Hash: sha256 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('sha256', '') . "\n";

ext/hash/tests/sha3.phpt

@@ -1,7 +1,5 @@
 --TEST--
-sha3 algorithm
+Hash: sha3 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 

ext/hash/tests/sha384.phpt

@@ -1,7 +1,5 @@
 --TEST--
-sha384 algorithm
+Hash: sha384 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('sha384', '') . "\n";

ext/hash/tests/sha512-224.phpt

@@ -1,7 +1,5 @@
 --TEST--
-sha512/224 algorithm
+Hash: sha512/224 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('sha512/224', '') . "\n";

ext/hash/tests/sha512-256.phpt

@@ -1,7 +1,5 @@
 --TEST--
-sha512/256 algorithm
+Hash: sha512/256 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('sha512/256', '') . "\n";

ext/hash/tests/sha512.phpt

@@ -1,7 +1,5 @@
 --TEST--
-sha512 algorithm
+Hash: sha512 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
 --FILE--
 <?php
 echo hash('sha512', '') . "\n";

ext/hash/tests/skip_mhash.inc

@@ -1,5 +0,0 @@
-<?php
-if (!function_exists("mhash")) {
-	die("skip mhash extension is not available");
-}
-?>

ext/hash/tests/snefru.phpt

@@ -1,7 +1,5 @@
 --TEST--
-snefru
+Hash: snefru algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 echo hash('snefru', ''), "\n";

ext/hash/tests/tiger.phpt

@@ -1,7 +1,5 @@
 --TEST--
-tiger
+Hash: tiger algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 echo hash('tiger192,3', ''),"\n";

ext/hash/tests/whirlpool.phpt

@@ -1,7 +1,5 @@
 --TEST--
-whirlpool
+Hash: whirlpool algorithm
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 echo hash('whirlpool', ''), "\n";