Created
October 2, 2018 19:54
-
-
Save KalleZ/4e400a1430a81e73dc6fb44c4748ca89 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ext/hash/config.m4 b/ext/hash/config.m4 | |
index 070a78102a..947031a0d5 100644 | |
--- a/ext/hash/config.m4 | |
+++ b/ext/hash/config.m4 | |
@@ -3,9 +3,6 @@ dnl config.m4 for extension hash | |
PHP_ARG_WITH(mhash, for mhash support, | |
[ --with-mhash[=DIR] Include mhash support]) | |
-PHP_ARG_ENABLE(hash, whether to enable hash support, | |
-[ --disable-hash Disable hash support], yes) | |
- | |
if test "$PHP_MHASH" != "no"; then | |
if test "$PHP_HASH" = "no"; then | |
PHP_HASH="yes" | |
@@ -14,44 +11,42 @@ if test "$PHP_MHASH" != "no"; then | |
AC_DEFINE(PHP_MHASH_BC, 1, [ ]) | |
fi | |
-if test "$PHP_HASH" != "no"; then | |
- AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension]) | |
- | |
- PHP_C_BIGENDIAN | |
- | |
- AC_CHECK_SIZEOF(short, 2) | |
- AC_CHECK_SIZEOF(int, 4) | |
- AC_CHECK_SIZEOF(long, 4) | |
- AC_CHECK_SIZEOF(long long, 8) | |
- | |
- if test $ac_cv_c_bigendian_php = yes; then | |
- EXT_HASH_SHA3_SOURCES="hash_sha3.c" | |
- AC_DEFINE(HAVE_SLOW_HASH3, 1, [Define is hash3 algo is available]) | |
- AC_MSG_WARN("Use SHA3 slow implementation on bigendian") | |
- else | |
- PHP_CHECK_64BIT([ | |
- SHA3_DIR="sha3/generic32lc" | |
- SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-inplace32BI.c" | |
- ],[ | |
- SHA3_DIR="sha3/generic64lc" | |
- SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c" | |
- ]) | |
- EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c" | |
- PHP_HASH_CFLAGS="-I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded" | |
- | |
- PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1) | |
- fi | |
- | |
- EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \ | |
- hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \ | |
- hash_crc32.c hash_fnv.c hash_joaat.c $EXT_HASH_SHA3_SOURCES" | |
- EXT_HASH_HEADERS="php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \ | |
- php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \ | |
- php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h \ | |
- php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h" | |
- | |
- PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, $ext_shared,,$PHP_HASH_CFLAGS) | |
- ifdef([PHP_INSTALL_HEADERS], [ | |
- PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS) | |
+AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension]) | |
+ | |
+PHP_C_BIGENDIAN | |
+ | |
+AC_CHECK_SIZEOF(short, 2) | |
+AC_CHECK_SIZEOF(int, 4) | |
+AC_CHECK_SIZEOF(long, 4) | |
+AC_CHECK_SIZEOF(long long, 8) | |
+ | |
+if test $ac_cv_c_bigendian_php = yes; then | |
+ EXT_HASH_SHA3_SOURCES="hash_sha3.c" | |
+ AC_DEFINE(HAVE_SLOW_HASH3, 1, [Define is hash3 algo is available]) | |
+ AC_MSG_WARN("Use SHA3 slow implementation on bigendian") | |
+else | |
+ PHP_CHECK_64BIT([ | |
+ SHA3_DIR="sha3/generic32lc" | |
+ SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-inplace32BI.c" | |
+ ],[ | |
+ SHA3_DIR="sha3/generic64lc" | |
+ SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c" | |
]) | |
+ EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c" | |
+ PHP_HASH_CFLAGS="-I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded" | |
+ | |
+ PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1) | |
fi | |
+ | |
+EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \ | |
+ hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \ | |
+ hash_crc32.c hash_fnv.c hash_joaat.c $EXT_HASH_SHA3_SOURCES" | |
+EXT_HASH_HEADERS="php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \ | |
+ php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \ | |
+ php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h \ | |
+ php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h" | |
+ | |
+PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, $ext_shared,,$PHP_HASH_CFLAGS) | |
+ifdef([PHP_INSTALL_HEADERS], [ | |
+ PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS) | |
+]) | |
diff --git a/ext/hash/config.w32 b/ext/hash/config.w32 | |
index 545c8673ff..db7d3b58e8 100644 | |
--- a/ext/hash/config.w32 | |
+++ b/ext/hash/config.w32 | |
@@ -1,34 +1,36 @@ | |
// vim:ft=javascript | |
-ARG_ENABLE("hash", "enable hash support", "yes"); | |
-ARG_WITH("mhash", "mhash support", "no"); | |
+ARG_WITH('mhash', 'mhash support (BC via hash)', 'no'); | |
-if (PHP_MHASH != "no") { | |
- if (PHP_HASH == "no") { | |
- PHP_HASH = "yes"; | |
- } | |
+if (PHP_MHASH != 'no') { | |
AC_DEFINE('PHP_MHASH_BC', 1); | |
} | |
-if (PHP_HASH != "no") { | |
- var sha3_arch_dir = "sha3/" + (X64 ? "generic64lc" : "generic32lc"); | |
- var sha3_dir = "ext/hash/" + sha3_arch_dir; | |
- if (CHECK_HEADER_ADD_INCLUDE("KeccakHash.h", "CFLAGS_HASH", PHP_HASH + ";" + sha3_dir)) { | |
- AC_DEFINE('HAVE_HASH_EXT', 1); | |
- EXTENSION("hash", "hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c " | |
- + "hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c " | |
- + "hash_adler32.c hash_crc32.c hash_joaat.c hash_fnv.c hash_sha3.c"); | |
- | |
- ADD_SOURCES(sha3_dir, "KeccakHash.c KeccakSponge.c " + (X64 ? "KeccakP-1600-opt64.c" : "KeccakP-1600-inplace32BI.c"), | |
- "hash"); | |
- ADD_FLAG("CFLAGS_HASH", "/DKeccakP200_excluded /DKeccakP400_excluded /DKeccakP800_excluded"); | |
- | |
- | |
- PHP_INSTALL_HEADERS("ext/hash/", "php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h " + | |
- "php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h " + | |
- "php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_sha3.h "); | |
- } else { | |
- WARNING("hash not enabled; libraries and headers not found"); | |
- } | |
+AC_DEFINE('HAVE_HASH_EXT', 1); | |
+ | |
+PHP_HASH = 'yes'; | |
+ | |
+EXTENSION('hash', 'hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c ' + | |
+ 'hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c ' + | |
+ 'hash_adler32.c hash_crc32.c hash_joaat.c hash_fnv.c ' + | |
+ 'hash_sha3.c', false); | |
+ | |
+var hash_sha3_dir = 'ext/hash/sha3/generic' + (X64 ? '64' : '32') + 'lc'; | |
+ | |
+if(X64) { | |
+ ADD_SOURCES(hash_sha3_dir, 'KeccakHash.c KeccakSponge.c KeccakP-1600-opt64.c', 'hash'); | |
+} else { | |
+ ADD_SOURCES(hash_sha3_dir, 'KeccakHash.c KeccakSponge.c KeccakP-1600-inplace32BI.c', 'hash'); | |
} | |
+if (!CHECK_HEADER_ADD_INCLUDE('KeccakHash.h', 'CFLAGS_HASH', hash_sha3_dir)) { | |
+ // Should NEVER happen | |
+ ERROR('Unable to locate SHA3 headers'); | |
+} | |
+ | |
+ADD_FLAG('CFLAGS_HASH', '/DKeccakP200_excluded /DKeccakP400_excluded /DKeccakP800_excluded'); | |
+ | |
+PHP_INSTALL_HEADERS('ext/hash/', 'php_hash.h php_hash_md.h php_hash_sha.h ' + | |
+ 'php_hash_ripemd.h php_hash_haval.h php_hash_tiger.h ' + | |
+ 'php_hash_gost.h php_hash_snefru.h php_hash_whirlpool.h ' + | |
+ 'php_hash_adler32.h php_hash_crc32.h php_hash_sha3.h'); | |
diff --git a/ext/hash/tests/adler32.phpt b/ext/hash/tests/adler32.phpt | |
index eab2a3f1fd..5b822b63a6 100644 | |
--- a/ext/hash/tests/adler32.phpt | |
+++ b/ext/hash/tests/adler32.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-ADLER32 | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Hash: ADLER32 algorithm | |
--FILE-- | |
<?php | |
echo hash('adler32', ''), "\n"; | |
diff --git a/ext/hash/tests/bug52240.phpt b/ext/hash/tests/bug52240.phpt | |
index 6e0c8f650d..911912bf04 100644 | |
--- a/ext/hash/tests/bug52240.phpt | |
+++ b/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 | |
diff --git a/ext/hash/tests/bug64745.phpt b/ext/hash/tests/bug64745.phpt | |
index 427f89b728..2bed29e6dd 100644 | |
--- a/ext/hash/tests/bug64745.phpt | |
+++ b/ext/hash/tests/bug64745.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Bug #64745 hash_pbkdf2() truncates data when using default length and hex output | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Bug #64745 (hash_pbkdf2() truncates data when using default length and hex output) | |
--FILE-- | |
<?php | |
$hash = hash_pbkdf2('sha1', 'password', 'salt', 1, 0); | |
diff --git a/ext/hash/tests/bug70312.phpt b/ext/hash/tests/bug70312.phpt | |
index 6978feb65b..87d72eb6aa 100644 | |
--- a/ext/hash/tests/bug70312.phpt | |
+++ b/ext/hash/tests/bug70312.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Bug #70312 HAVAL gives wrong hashes in specific cases | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Bug #70312 (HAVAL gives wrong hashes in specific cases) | |
--FILE-- | |
<?php | |
var_dump(hash('haval128,5', '1234567890123456789012345678901234567890123456789012345678901234')); | |
@@ -15,4 +13,4 @@ string(32) "f3f0d23819b87228b4b70ee350afaa9d" | |
string(40) "aded6485e137f11d7292212ba3fa961714df0564" | |
string(48) "e53da2b16269fe732e9a898a96707a9f28404d7333b02286" | |
string(56) "c574fb307f0817b514b9bb2e7c4bfaffb7ad667aca3c8b523fefcf10" | |
-string(64) "fb73c19300b14d5cb393d929bf005e6c2d459a4c9c009e9813af1d2d3637ee8f" | |
\ No newline at end of file | |
+string(64) "fb73c19300b14d5cb393d929bf005e6c2d459a4c9c009e9813af1d2d3637ee8f" | |
diff --git a/ext/hash/tests/bug73127.phpt b/ext/hash/tests/bug73127.phpt | |
index 78113de7ec..4b1578a6bc 100644 | |
--- a/ext/hash/tests/bug73127.phpt | |
+++ b/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 | |
diff --git a/ext/hash/tests/crc32.phpt b/ext/hash/tests/crc32.phpt | |
index 3862fb17a6..80c6bb0286 100644 | |
--- a/ext/hash/tests/crc32.phpt | |
+++ b/ext/hash/tests/crc32.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-CRC32 | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Hash: CRC32 algorithm | |
--FILE-- | |
<?php | |
echo hash('crc32', ''), "\n"; | |
diff --git a/ext/hash/tests/fnv132.phpt b/ext/hash/tests/fnv132.phpt | |
index 051386ab75..914ce46f35 100644 | |
--- a/ext/hash/tests/fnv132.phpt | |
+++ b/ext/hash/tests/fnv132.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-FNV | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?> | |
+Hash: FNV132 algorithm | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/fnv164.phpt b/ext/hash/tests/fnv164.phpt | |
index b5e69420a6..8ff7304a7b 100644 | |
--- a/ext/hash/tests/fnv164.phpt | |
+++ b/ext/hash/tests/fnv164.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-FNV | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?> | |
+Hash: FNV164 algorithm | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/fnv1a32.phpt b/ext/hash/tests/fnv1a32.phpt | |
index 8297c7b920..d2e01f7998 100644 | |
--- a/ext/hash/tests/fnv1a32.phpt | |
+++ b/ext/hash/tests/fnv1a32.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-FNV | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?> | |
+Hash: FNV1a32 algorithm | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/fnv1a64.phpt b/ext/hash/tests/fnv1a64.phpt | |
index 8fd206ada4..870c6ced0c 100644 | |
--- a/ext/hash/tests/fnv1a64.phpt | |
+++ b/ext/hash/tests/fnv1a64.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-FNV | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?> | |
+Hash: FNV1a64 algorithm | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/gost.phpt b/ext/hash/tests/gost.phpt | |
index 6ce00242b1..1913574817 100644 | |
--- a/ext/hash/tests/gost.phpt | |
+++ b/ext/hash/tests/gost.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-gost | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Hash: gost algorithm | |
--FILE-- | |
<?php | |
echo hash('gost', ''), "\n"; | |
diff --git a/ext/hash/tests/hash-clone.phpt b/ext/hash/tests/hash-clone.phpt | |
index 9a067d73ae..7229b2a23e 100644 | |
--- a/ext/hash/tests/hash-clone.phpt | |
+++ b/ext/hash/tests/hash-clone.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-hash_copy() via clone | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Hash: hash_copy() via clone | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_algos.phpt b/ext/hash/tests/hash_algos.phpt | |
index 0014f95b1d..be8b3fde4c 100644 | |
--- a/ext/hash/tests/hash_algos.phpt | |
+++ b/ext/hash/tests/hash_algos.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_algos() function : basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_algos() function : basic functionality | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_copy_001.phpt b/ext/hash/tests/hash_copy_001.phpt | |
index 411b5d033d..3811771dfc 100644 | |
--- a/ext/hash/tests/hash_copy_001.phpt | |
+++ b/ext/hash/tests/hash_copy_001.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-hash_copy() basic tests | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Hash: hash_copy() basic tests | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_copy_002.phpt b/ext/hash/tests/hash_copy_002.phpt | |
index 5fbbf5b4d8..81f8020452 100644 | |
--- a/ext/hash/tests/hash_copy_002.phpt | |
+++ b/ext/hash/tests/hash_copy_002.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-hash_copy() errors | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Hash: hash_copy() errors | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_equals.phpt b/ext/hash/tests/hash_equals.phpt | |
index 8fdf22967e..0c8ab42f93 100644 | |
--- a/ext/hash/tests/hash_equals.phpt | |
+++ b/ext/hash/tests/hash_equals.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-hash_equals() function | |
---SKIPIF-- | |
-<?php if(!extension_loaded('hash')) die('skip hash extension not loaded'); ?> | |
+Hash: hash_equals() test | |
--FILE-- | |
<?php | |
var_dump(hash_equals("same", "same")); | |
diff --git a/ext/hash/tests/hash_error.phpt b/ext/hash/tests/hash_error.phpt | |
index 8317a56e14..ca5d03abb8 100644 | |
--- a/ext/hash/tests/hash_error.phpt | |
+++ b/ext/hash/tests/hash_error.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash() function : error conditions | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash() function : error conditions | |
--FILE-- | |
<?php | |
@@ -45,4 +43,4 @@ NULL | |
Warning: hash(): Unknown hashing algorithm: foo in %s on line %d | |
bool(false) | |
-===Done=== | |
\ No newline at end of file | |
+===Done=== | |
diff --git a/ext/hash/tests/hash_file_basic.phpt b/ext/hash/tests/hash_file_basic.phpt | |
index f655421904..0ee48c6d10 100644 | |
--- a/ext/hash/tests/hash_file_basic.phpt | |
+++ b/ext/hash/tests/hash_file_basic.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_file() function : basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_file() function : basic functionality | |
--CREDITS-- | |
Felix De Vliegher <felix.devliegher@gmail.com> | |
--FILE-- | |
diff --git a/ext/hash/tests/hash_file_basic1.phpt b/ext/hash/tests/hash_file_basic1.phpt | |
index 2e088cebe6..474410c782 100644 | |
--- a/ext/hash/tests/hash_file_basic1.phpt | |
+++ b/ext/hash/tests/hash_file_basic1.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_file() function : basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_file() function : basic functionality | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt | |
index 96c41e6432..e41d951366 100644 | |
--- a/ext/hash/tests/hash_file_error.phpt | |
+++ b/ext/hash/tests/hash_file_error.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_file() function : error conditions | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_file() function : error conditions | |
--CREDITS-- | |
Felix De Vliegher <felix.devliegher@gmail.com> | |
--FILE-- | |
diff --git a/ext/hash/tests/hash_hkdf_basic.phpt b/ext/hash/tests/hash_hkdf_basic.phpt | |
index 06b5dac2cd..7cd5f7e22e 100644 | |
--- a/ext/hash/tests/hash_hkdf_basic.phpt | |
+++ b/ext/hash/tests/hash_hkdf_basic.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_hkdf() function: basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_hkdf() function: basic functionality | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_hkdf_edges.phpt b/ext/hash/tests/hash_hkdf_edges.phpt | |
index 633efa4301..82acdbab04 100644 | |
--- a/ext/hash/tests/hash_hkdf_edges.phpt | |
+++ b/ext/hash/tests/hash_hkdf_edges.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_hkdf() function: edge cases | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_hkdf() function: edge cases | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_hkdf_error.phpt b/ext/hash/tests/hash_hkdf_error.phpt | |
index ddda8df43b..b833054e80 100644 | |
--- a/ext/hash/tests/hash_hkdf_error.phpt | |
+++ b/ext/hash/tests/hash_hkdf_error.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_hkdf() function: error conditions | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_hkdf() function: error conditions | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_hkdf_rfc5869.phpt b/ext/hash/tests/hash_hkdf_rfc5869.phpt | |
index d1ad9961f4..5652bff5ef 100644 | |
--- a/ext/hash/tests/hash_hkdf_rfc5869.phpt | |
+++ b/ext/hash/tests/hash_hkdf_rfc5869.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_hkdf() function: RFC 5869 test vectors | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_hkdf() function: RFC 5869 test vectors | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_hmac_algos.phpt b/ext/hash/tests/hash_hmac_algos.phpt | |
index 89877b7c12..481aad792f 100644 | |
--- a/ext/hash/tests/hash_hmac_algos.phpt | |
+++ b/ext/hash/tests/hash_hmac_algos.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_hmac_algos() function : basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_hmac_algos() function : basic functionality | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_hmac_basic.phpt b/ext/hash/tests/hash_hmac_basic.phpt | |
index 327cb58281..f4606be989 100644 | |
--- a/ext/hash/tests/hash_hmac_basic.phpt | |
+++ b/ext/hash/tests/hash_hmac_basic.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_file() function : basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_file() function : basic functionality | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_hmac_error.phpt b/ext/hash/tests/hash_hmac_error.phpt | |
index bff478a55e..e03527f442 100644 | |
--- a/ext/hash/tests/hash_hmac_error.phpt | |
+++ b/ext/hash/tests/hash_hmac_error.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_hmac() function : basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_hmac() function : basic functionality | |
--FILE-- | |
<?php | |
/* | |
diff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt | |
index 8ac248756c..c4d38b4689 100644 | |
--- a/ext/hash/tests/hash_hmac_file_basic.phpt | |
+++ b/ext/hash/tests/hash_hmac_file_basic.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_hmac_file() function : basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_hmac_file() function : basic functionality | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_hmac_file_error.phpt b/ext/hash/tests/hash_hmac_file_error.phpt | |
index 29adbddba8..504e264599 100644 | |
--- a/ext/hash/tests/hash_hmac_file_error.phpt | |
+++ b/ext/hash/tests/hash_hmac_file_error.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_hmac_file() function : basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_hmac_file() function : basic functionality | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_init_error.phpt b/ext/hash/tests/hash_init_error.phpt | |
index 95c67dad60..e941aabca5 100644 | |
--- a/ext/hash/tests/hash_init_error.phpt | |
+++ b/ext/hash/tests/hash_init_error.phpt | |
@@ -1,9 +1,5 @@ | |
--TEST-- | |
-hash_init() function - errors test | |
---SKIPIF-- | |
-<?php | |
-if (!extension_loaded('hash')) die('skip hash extension not available'); | |
-?> | |
+Hash: hash_init() function - errors test | |
--FILE-- | |
<?php | |
echo "*** Testing hash_init(): error conditions ***\n"; | |
diff --git a/ext/hash/tests/hash_pbkdf2_basic.phpt b/ext/hash/tests/hash_pbkdf2_basic.phpt | |
index 17610dfedc..71187a0fdd 100644 | |
--- a/ext/hash/tests/hash_pbkdf2_basic.phpt | |
+++ b/ext/hash/tests/hash_pbkdf2_basic.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_pbkdf2() function : basic functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: hash_pbkdf2() function : basic functionality | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_pbkdf2_error.phpt b/ext/hash/tests/hash_pbkdf2_error.phpt | |
index 5636a532a4..c0a76e17b4 100644 | |
--- a/ext/hash/tests/hash_pbkdf2_error.phpt | |
+++ b/ext/hash/tests/hash_pbkdf2_error.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Test hash_pbkdf2() function : error functionality | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?> | |
+Hash: Test hash_pbkdf2() function : error functionality | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/hash_update_file.phpt b/ext/hash/tests/hash_update_file.phpt | |
index 488be47411..bedaa73879 100644 | |
--- a/ext/hash/tests/hash_update_file.phpt | |
+++ b/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'; | |
diff --git a/ext/hash/tests/hash_update_stream.phpt b/ext/hash/tests/hash_update_stream.phpt | |
index 86d69b1f24..fd5f776539 100644 | |
--- a/ext/hash/tests/hash_update_stream.phpt | |
+++ b/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(); | |
diff --git a/ext/hash/tests/haval.phpt b/ext/hash/tests/haval.phpt | |
index 16db2fa694..f8c5c67df1 100644 | |
--- a/ext/hash/tests/haval.phpt | |
+++ b/ext/hash/tests/haval.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-haval algorithm (multi-vector, multi-pass, multi-width) | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: haval algorithm (multi-vector, multi-pass, multi-width) | |
--FILE-- | |
<?php | |
echo "Empty String\n"; | |
diff --git a/ext/hash/tests/hmac-md5.phpt b/ext/hash/tests/hmac-md5.phpt | |
index 283285a544..38f204a356 100644 | |
--- a/ext/hash/tests/hmac-md5.phpt | |
+++ b/ext/hash/tests/hmac-md5.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-hmac-md5 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: hmac-md5 algorithm | |
--FILE-- | |
<?php | |
/* Test Vectors from RFC 2104 */ | |
diff --git a/ext/hash/tests/joaat.phpt b/ext/hash/tests/joaat.phpt | |
index fa310a96e2..a8a5566aba 100644 | |
--- a/ext/hash/tests/joaat.phpt | |
+++ b/ext/hash/tests/joaat.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Jenkins's one-at-a-time | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?> | |
+Hash: Jenkins's one-at-a-time | |
--FILE-- | |
<?php | |
$tests = array( | |
diff --git a/ext/hash/tests/md2.phpt b/ext/hash/tests/md2.phpt | |
index c98ad34054..8ee023c1cb 100644 | |
--- a/ext/hash/tests/md2.phpt | |
+++ b/ext/hash/tests/md2.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-md2 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: md2 algorithm | |
--FILE-- | |
<?php | |
echo hash('md2', '') . "\n"; | |
diff --git a/ext/hash/tests/md4.phpt b/ext/hash/tests/md4.phpt | |
index 8d90429076..ee9d60d240 100644 | |
--- a/ext/hash/tests/md4.phpt | |
+++ b/ext/hash/tests/md4.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-md4 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: md4 algorithm | |
--FILE-- | |
<?php | |
/* RFC 1320 vectors */ | |
diff --git a/ext/hash/tests/md5.phpt b/ext/hash/tests/md5.phpt | |
index d56f0b91a0..b51273f9c7 100644 | |
--- a/ext/hash/tests/md5.phpt | |
+++ b/ext/hash/tests/md5.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-md5 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: md5 algorithm | |
--FILE-- | |
<?php | |
echo hash('md5', '') . "\n"; | |
diff --git a/ext/hash/tests/mhash_001.phpt b/ext/hash/tests/mhash_001.phpt | |
index e8aac9b5e0..71d6d20df6 100644 | |
--- a/ext/hash/tests/mhash_001.phpt | |
+++ b/ext/hash/tests/mhash_001.phpt | |
@@ -1,9 +1,7 @@ | |
--TEST-- | |
-mhash() test | |
+MHash: mhash() test | |
--SKIPIF-- | |
-<?php | |
- include "skip_mhash.inc"; | |
-?> | |
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?> | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/mhash_002.phpt b/ext/hash/tests/mhash_002.phpt | |
index 45cf09fb77..7d8a71a0a4 100644 | |
--- a/ext/hash/tests/mhash_002.phpt | |
+++ b/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 | |
- include "skip_mhash.inc"; | |
-?> | |
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?> | |
--FILE-- | |
<?php | |
$supported_hash_al = array( | |
diff --git a/ext/hash/tests/mhash_003.phpt b/ext/hash/tests/mhash_003.phpt | |
index 38d1a8b5f0..a4d43eb8d5 100644 | |
--- a/ext/hash/tests/mhash_003.phpt | |
+++ b/ext/hash/tests/mhash_003.phpt | |
@@ -1,9 +1,7 @@ | |
--TEST-- | |
-mhash_keygen_s2k() test | |
+MHash: mhash_keygen_s2k() test | |
--SKIPIF-- | |
-<?php | |
- include "skip_mhash.inc"; | |
-?> | |
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?> | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/mhash_004.phpt b/ext/hash/tests/mhash_004.phpt | |
index b928a794b1..f3c5e34ee3 100644 | |
--- a/ext/hash/tests/mhash_004.phpt | |
+++ b/ext/hash/tests/mhash_004.phpt | |
@@ -1,9 +1,7 @@ | |
--TEST-- | |
-mhash() modifying algorithm parameter | |
+MHash: mhash() modifying algorithm parameter | |
--SKIPIF-- | |
-<?php | |
- include "skip_mhash.inc"; | |
-?> | |
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?> | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/new-context.phpt b/ext/hash/tests/new-context.phpt | |
index b4ddf64a0f..b8ada08357 100644 | |
--- a/ext/hash/tests/new-context.phpt | |
+++ b/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-- | |
diff --git a/ext/hash/tests/reuse.phpt b/ext/hash/tests/reuse.phpt | |
index 481a6cfe0f..2955aac2c8 100644 | |
--- a/ext/hash/tests/reuse.phpt | |
+++ b/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-- | |
diff --git a/ext/hash/tests/ripemd128.phpt b/ext/hash/tests/ripemd128.phpt | |
index e7473e316c..e896d35be0 100644 | |
--- a/ext/hash/tests/ripemd128.phpt | |
+++ b/ext/hash/tests/ripemd128.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-ripemd128 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: ripemd128 algorithm | |
--FILE-- | |
<?php | |
echo hash('ripemd128', '') . "\n"; | |
diff --git a/ext/hash/tests/ripemd160.phpt b/ext/hash/tests/ripemd160.phpt | |
index 8fe7b05296..40dd82db29 100644 | |
--- a/ext/hash/tests/ripemd160.phpt | |
+++ b/ext/hash/tests/ripemd160.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-ripemd160 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: ripemd160 algorithm | |
--FILE-- | |
<?php | |
echo hash('ripemd160', '') . "\n"; | |
diff --git a/ext/hash/tests/ripemd256.phpt b/ext/hash/tests/ripemd256.phpt | |
index 6fc23794a5..92b5160186 100644 | |
--- a/ext/hash/tests/ripemd256.phpt | |
+++ b/ext/hash/tests/ripemd256.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-ripemd256 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: ripemd256 algorithm | |
--FILE-- | |
<?php | |
echo hash('ripemd256', '') . "\n"; | |
diff --git a/ext/hash/tests/ripemd320.phpt b/ext/hash/tests/ripemd320.phpt | |
index 152c922d5d..37930a4a0c 100644 | |
--- a/ext/hash/tests/ripemd320.phpt | |
+++ b/ext/hash/tests/ripemd320.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-ripemd320 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: ripemd320 algorithm | |
--FILE-- | |
<?php | |
echo hash('ripemd320', '') . "\n"; | |
diff --git a/ext/hash/tests/serialize-context.phpt b/ext/hash/tests/serialize-context.phpt | |
index 78177cda50..32aa0ab806 100644 | |
--- a/ext/hash/tests/serialize-context.phpt | |
+++ b/ext/hash/tests/serialize-context.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-Serialize a context | |
---SKIPIF-- | |
-<?php if (!extension_loaded('hash')) echo 'skip'; | |
+Hash: Context serialization | |
--FILE-- | |
<?php | |
@@ -12,4 +10,4 @@ try { | |
echo "Exception: {$e->getMessage()}\n"; | |
} | |
--EXPECT-- | |
-Exception: Serialization of 'HashContext' is not allowed | |
\ No newline at end of file | |
+Exception: Serialization of 'HashContext' is not allowed | |
diff --git a/ext/hash/tests/sha1.phpt b/ext/hash/tests/sha1.phpt | |
index b193781653..82a9703734 100644 | |
--- a/ext/hash/tests/sha1.phpt | |
+++ b/ext/hash/tests/sha1.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-sha1 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: sha1 algorithm | |
--FILE-- | |
<?php | |
echo hash('sha1', '') . "\n"; | |
diff --git a/ext/hash/tests/sha224.phpt b/ext/hash/tests/sha224.phpt | |
index ab2bd6d55f..468e272fee 100644 | |
--- a/ext/hash/tests/sha224.phpt | |
+++ b/ext/hash/tests/sha224.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-sha224 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: sha224 algorithm | |
--FILE-- | |
<?php | |
echo hash('sha224', '') . "\n"; | |
diff --git a/ext/hash/tests/sha256.phpt b/ext/hash/tests/sha256.phpt | |
index 04b1c11abd..cf3f4069fd 100644 | |
--- a/ext/hash/tests/sha256.phpt | |
+++ b/ext/hash/tests/sha256.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-sha256 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: sha256 algorithm | |
--FILE-- | |
<?php | |
echo hash('sha256', '') . "\n"; | |
diff --git a/ext/hash/tests/sha3.phpt b/ext/hash/tests/sha3.phpt | |
index 67fb22f988..0ba6af9c3e 100644 | |
--- a/ext/hash/tests/sha3.phpt | |
+++ b/ext/hash/tests/sha3.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-sha3 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: sha3 algorithm | |
--FILE-- | |
<?php | |
diff --git a/ext/hash/tests/sha384.phpt b/ext/hash/tests/sha384.phpt | |
index e5be2ab274..03b873c079 100644 | |
--- a/ext/hash/tests/sha384.phpt | |
+++ b/ext/hash/tests/sha384.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-sha384 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: sha384 algorithm | |
--FILE-- | |
<?php | |
echo hash('sha384', '') . "\n"; | |
diff --git a/ext/hash/tests/sha512-224.phpt b/ext/hash/tests/sha512-224.phpt | |
index 3769832ee6..6a3ae32c8e 100644 | |
--- a/ext/hash/tests/sha512-224.phpt | |
+++ b/ext/hash/tests/sha512-224.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-sha512/224 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: sha512/224 algorithm | |
--FILE-- | |
<?php | |
echo hash('sha512/224', '') . "\n"; | |
diff --git a/ext/hash/tests/sha512-256.phpt b/ext/hash/tests/sha512-256.phpt | |
index 33ae5f1770..3bcfd34254 100644 | |
--- a/ext/hash/tests/sha512-256.phpt | |
+++ b/ext/hash/tests/sha512-256.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-sha512/256 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: sha512/256 algorithm | |
--FILE-- | |
<?php | |
echo hash('sha512/256', '') . "\n"; | |
diff --git a/ext/hash/tests/sha512.phpt b/ext/hash/tests/sha512.phpt | |
index 93fbb20d63..1fa420b143 100644 | |
--- a/ext/hash/tests/sha512.phpt | |
+++ b/ext/hash/tests/sha512.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-sha512 algorithm | |
---SKIPIF-- | |
-<?php if(!extension_loaded("hash")) print "skip"; ?> | |
+Hash: sha512 algorithm | |
--FILE-- | |
<?php | |
echo hash('sha512', '') . "\n"; | |
diff --git a/ext/hash/tests/skip_mhash.inc b/ext/hash/tests/skip_mhash.inc | |
deleted file mode 100644 | |
index 608b557b28..0000000000 | |
--- a/ext/hash/tests/skip_mhash.inc | |
+++ /dev/null | |
@@ -1,5 +0,0 @@ | |
-<?php | |
-if (!function_exists("mhash")) { | |
- die("skip mhash extension is not available"); | |
-} | |
-?> | |
diff --git a/ext/hash/tests/snefru.phpt b/ext/hash/tests/snefru.phpt | |
index 1b0dfa70fe..3d4694e6ba 100644 | |
--- a/ext/hash/tests/snefru.phpt | |
+++ b/ext/hash/tests/snefru.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-snefru | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Hash: snefru algorithm | |
--FILE-- | |
<?php | |
echo hash('snefru', ''), "\n"; | |
diff --git a/ext/hash/tests/tiger.phpt b/ext/hash/tests/tiger.phpt | |
index 468fc8f699..609e96f769 100644 | |
--- a/ext/hash/tests/tiger.phpt | |
+++ b/ext/hash/tests/tiger.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-tiger | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Hash: tiger algorithm | |
--FILE-- | |
<?php | |
echo hash('tiger192,3', ''),"\n"; | |
diff --git a/ext/hash/tests/whirlpool.phpt b/ext/hash/tests/whirlpool.phpt | |
index 5f9dd164de..267bc8084b 100644 | |
--- a/ext/hash/tests/whirlpool.phpt | |
+++ b/ext/hash/tests/whirlpool.phpt | |
@@ -1,7 +1,5 @@ | |
--TEST-- | |
-whirlpool | |
---SKIPIF-- | |
-<?php extension_loaded('hash') or die('skip'); ?> | |
+Hash: whirlpool algorithm | |
--FILE-- | |
<?php | |
echo hash('whirlpool', ''), "\n"; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment