diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-09-01 12:23:55 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-09-01 12:23:55 -0700 |
| commit | 4aeff30337d7357a76425ab5c2c5a70af879c8ad (patch) | |
| tree | d120893d5e1d71e181909e024eb1b9bb5596d70e | |
| parent | 31b634bf7cb8e3de1dfa71418e348133c2365933 (diff) | |
| parent | 1922c650bac7ca4aed9c530faddb96cff73a0abc (diff) | |
| download | php-git-4aeff30337d7357a76425ab5c2c5a70af879c8ad.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix unit tests
| -rw-r--r-- | ext/hash/tests/hash_file_basic1.phpt | 2 | ||||
| -rw-r--r-- | ext/hash/tests/hash_hmac_basic.phpt | 2 | ||||
| -rw-r--r-- | ext/hash/tests/hash_hmac_file_basic.phpt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/hash/tests/hash_file_basic1.phpt b/ext/hash/tests/hash_file_basic1.phpt index 339d237f06..9a2bc01016 100644 --- a/ext/hash/tests/hash_file_basic1.phpt +++ b/ext/hash/tests/hash_file_basic1.phpt @@ -64,7 +64,7 @@ unlink($file); adler32: ff87222e crc32: 61664d33 gost: d9e65f0c0c2ef944e4f8a01f4a46365c4f33a2853756878182a7f03e1490a4cd -haval128,3: 8bb81269aca8b7f87829020d76a4e841 +haval128,3: c25962b13383c3ed9f13817c8f2ae7d6 md2: 70f791c0d8fa9edd7d08e32fcba8c354 md4: a9d034b16bb290c57a645afd6f14cd3b md5: 704bf818448f5bbb94061332d2c889aa diff --git a/ext/hash/tests/hash_hmac_basic.phpt b/ext/hash/tests/hash_hmac_basic.phpt index 9631aa52c0..a0a49533d5 100644 --- a/ext/hash/tests/hash_hmac_basic.phpt +++ b/ext/hash/tests/hash_hmac_basic.phpt @@ -45,7 +45,7 @@ echo "sha256(raw): " . bin2hex(hash_hmac('sha256', $content, $key, TRUE)) . "\n" adler32: 12c803f7 crc32: 96859101 gost: a4a3c80bdf3f8665bf07376a34dc9c1b11af7c813f4928f62e39f0c0dc564dad -haval128,3: 82cd0f4bd36729b5c80c33efa8c13ac5 +haval128,3: 4d1318607f0406bd1b7bd50907772672 md2: 6d111dab563025e4cb5f4425c991fa12 md4: 10cdbfe843000c623f8b8da0d5d20b0b md5: 2a632783e2812cf23de100d7d6a463ae diff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt index 858d673275..5c18fd6a2d 100644 --- a/ext/hash/tests/hash_hmac_file_basic.phpt +++ b/ext/hash/tests/hash_hmac_file_basic.phpt @@ -73,7 +73,7 @@ unlink($file); adler32: 0f8c02f9 crc32: f2a60b9c gost: 94c39a40d5db852a8dc3d24e37eebf2d53e3d711457c59cd02b614f792a9d918 -haval128,3: e8fcff647f1a675acb429130fb94a17e +haval128,3: f1cea637451097d790354a86de3f54a3 md2: a685475e600314bb549ab4f33c3b27cb md4: cbc6bff781f48f57378d3effa27553e4 md5: 8bddf39dd1c566c27acc7fa85ec36acf |