scottmac Tue Jun 30 13:21:54 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/hash hash_adler32.c
/php-src/ext/hash/tests adler32.phpt hash_copy_001.phpt
hash_file_basic1.phpt hash_hmac_basic.phpt
hash_hmac_file_basic.phpt
Log:
MFH Fix bug #48284 - adler32 is in the wrong order. Changed to match what
zlib produces.
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash_adler32.c?r1=1.3.2.4.2.2.2.3&r2=1.3.2.4.2.2.2.4&diff_format=u
Index: php-src/ext/hash/hash_adler32.c
diff -u php-src/ext/hash/hash_adler32.c:1.3.2.4.2.2.2.3
php-src/ext/hash/hash_adler32.c:1.3.2.4.2.2.2.4
--- php-src/ext/hash/hash_adler32.c:1.3.2.4.2.2.2.3 Wed Dec 31 11:15:37 2008
+++ php-src/ext/hash/hash_adler32.c Tue Jun 30 13:21:53 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hash_adler32.c,v 1.3.2.4.2.2.2.3 2008/12/31 11:15:37 sebastian Exp $ */
+/* $Id: hash_adler32.c,v 1.3.2.4.2.2.2.4 2009/06/30 13:21:53 scottmac Exp $ */
#include "php_hash.h"
#include "php_hash_adler32.h"
@@ -42,10 +42,10 @@
PHP_HASH_API void PHP_ADLER32Final(unsigned char digest[4], PHP_ADLER32_CTX
*context)
{
- digest[3] = (unsigned char) ((context->state >> 24) & 0xff);
- digest[2] = (unsigned char) ((context->state >> 16) & 0xff);
- digest[1] = (unsigned char) ((context->state >> 8) & 0xff);
- digest[0] = (unsigned char) (context->state & 0xff);
+ digest[0] = (unsigned char) ((context->state >> 24) & 0xff);
+ digest[1] = (unsigned char) ((context->state >> 16) & 0xff);
+ digest[2] = (unsigned char) ((context->state >> 8) & 0xff);
+ digest[3] = (unsigned char) (context->state & 0xff);
context->state = 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/adler32.phpt?r1=1.1.2.1&r2=1.1.2.1.4.1&diff_format=u
Index: php-src/ext/hash/tests/adler32.phpt
diff -u php-src/ext/hash/tests/adler32.phpt:1.1.2.1
php-src/ext/hash/tests/adler32.phpt:1.1.2.1.4.1
--- php-src/ext/hash/tests/adler32.phpt:1.1.2.1 Sat Dec 3 10:31:01 2005
+++ php-src/ext/hash/tests/adler32.phpt Tue Jun 30 13:21:53 2009
@@ -13,10 +13,10 @@
echo hash('adler32',
'12345678901234567890123456789012345678901234567890123456789012345678901234567890'),
"\n";
?>
--EXPECT--
-01000000
-62006200
-27014d02
-86057529
-200b8690
-0c15db8a
-6910b697
+00000001
+00620062
+024d0127
+29750586
+90860b20
+8adb150c
+97b61069
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_copy_001.phpt?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/hash/tests/hash_copy_001.phpt
diff -u php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.5
php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.6
--- php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.5 Sat Dec 27 01:05:07 2008
+++ php-src/ext/hash/tests/hash_copy_001.phpt Tue Jun 30 13:21:53 2009
@@ -71,8 +71,8 @@
string(64) "fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26"
string(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5"
string(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5"
-string(8) "28097c6f"
-string(8) "28097c6f"
+string(8) "6f7c0928"
+string(8) "6f7c0928"
string(8) "e5cfc160"
string(8) "e5cfc160"
string(8) "69147a4e"
@@ -155,8 +155,8 @@
string(64) "614ca924864fa0e8fa309aa0944e047d5edbfd4964a35858f4d8ec66a0fb88b0"
string(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5"
string(64) "a00961e371287c71c527a41c14564f13b6ed12ac7cd9d5f5dfb3542a25e28d3b"
-string(8) "28097c6f"
-string(8) "471714d9"
+string(8) "6f7c0928"
+string(8) "d9141747"
string(8) "e5cfc160"
string(8) "59f8d3d2"
string(8) "69147a4e"
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_file_basic1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/hash/tests/hash_file_basic1.phpt
diff -u php-src/ext/hash/tests/hash_file_basic1.phpt:1.1.2.2
php-src/ext/hash/tests/hash_file_basic1.phpt:1.1.2.3
--- php-src/ext/hash/tests/hash_file_basic1.phpt:1.1.2.2 Wed Jan 7
14:32:46 2009
+++ php-src/ext/hash/tests/hash_file_basic1.phpt Tue Jun 30 13:21:53 2009
@@ -61,7 +61,7 @@
===Done===
--EXPECTF--
*** Testing hash_file() : basic functionality ***
-adler32: 2e2287ff
+adler32: ff87222e
crc32: 61664d33
gost: d9e65f0c0c2ef944e4f8a01f4a46365c4f33a2853756878182a7f03e1490a4cd
haval128,3: 8bb81269aca8b7f87829020d76a4e841
@@ -79,7 +79,7 @@
snefru: d414b2345d3e7fa1a31c044cf334bfc1fec24d89e464411998d579d24663895f
tiger192,3: c6fa75a0be4ecf7afa3cafb4e2a08efc3a40534c0e46b971
whirlpool:
4248b149e000477269a4a5f1a84d97cfc3d0199b7aaf505913e6f010a6f83276029d11a9ad545374bc710eb59c7d958985023ab886ffa9ec9a23852844c764ec
-adler32(raw): 2e2287ff
+adler32(raw): ff87222e
md5(raw): 704bf818448f5bbb94061332d2c889aa
sha256(raw): a0f5702fa5d3670b80033d668e8732b70550392abb53841355447f8bb0f72245
-===Done===
\ No newline at end of file
+===Done===
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_hmac_basic.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/hash/tests/hash_hmac_basic.phpt
diff -u php-src/ext/hash/tests/hash_hmac_basic.phpt:1.1.2.2
php-src/ext/hash/tests/hash_hmac_basic.phpt:1.1.2.3
--- php-src/ext/hash/tests/hash_hmac_basic.phpt:1.1.2.2 Wed Jan 7 14:32:46 2009
+++ php-src/ext/hash/tests/hash_hmac_basic.phpt Tue Jun 30 13:21:53 2009
@@ -42,7 +42,7 @@
===Done===
--EXPECTF--
*** Testing hash_hmac() : basic functionality ***
-adler32: 9e033311
+adler32: 12c803f7
crc32: 96859101
gost: a4a3c80bdf3f8665bf07376a34dc9c1b11af7c813f4928f62e39f0c0dc564dad
haval128,3: 82cd0f4bd36729b5c80c33efa8c13ac5
@@ -60,7 +60,7 @@
snefru: 67af483046f9cf16fe19f9087929ccfc6ad176ade3290b4d33f43e0ddb07e711
tiger192,3: 82779797cdc439e886884953ba21fa38e35679041e95ee27
whirlpool:
4a0f1582b21b7aff59bfba7f9c29131c69741b2ce80acdc7d314040f3b768cf5a17e30b74cceb86fbc6b34b1692e0addd5bfd7cfc043d40c0621f1b97e26fa49
-adler32(raw): 9e033311
+adler32(raw): 12c803f7
md5(raw): 2a632783e2812cf23de100d7d6a463ae
sha256(raw): 49bde3496b9510a17d0edd8a4b0ac70148e32a1d51e881ec76faa96534125838
-===Done===
\ No newline at end of file
+===Done===
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_hmac_file_basic.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/hash/tests/hash_hmac_file_basic.phpt
diff -u php-src/ext/hash/tests/hash_hmac_file_basic.phpt:1.1.2.2
php-src/ext/hash/tests/hash_hmac_file_basic.phpt:1.1.2.3
--- php-src/ext/hash/tests/hash_hmac_file_basic.phpt:1.1.2.2 Wed Jan 7
14:32:46 2009
+++ php-src/ext/hash/tests/hash_hmac_file_basic.phpt Tue Jun 30 13:21:53 2009
@@ -70,7 +70,7 @@
===Done===
--EXPECTF--
*** Testing hash_hmac_file() : basic functionality ***
-adler32: 9f037811
+adler32: 0f8c02f9
crc32: f2a60b9c
gost: 94c39a40d5db852a8dc3d24e37eebf2d53e3d711457c59cd02b614f792a9d918
haval128,3: e8fcff647f1a675acb429130fb94a17e
@@ -88,7 +88,7 @@
snefru: 7b79787e1c1d926b6cc98327f05c5d04ba6227ab51c1398661861196016ef34c
tiger192,3: 5577f21e2af269fff41e023db30e2b01bfd8b8f669177929
whirlpool:
37a0fbb90547690d5e5e11c046f6654ffdb7bab15e16d9d79c7d85765cc4bdcbfd9df8db7a3ce9558f3f244fead00ca29cf05297f75596555195a0683f15d69f
-adler32(raw): 9f037811
+adler32(raw): 0f8c02f9
md5(raw): 8bddf39dd1c566c27acc7fa85ec36acf
sha256(raw): 9135286ca4c84dec711e4b831f6cd39e672e5ff93d011321274eb76733cc1e40
Error cases:
@@ -98,4 +98,4 @@
Warning: hash_hmac_file() expects at least 3 parameters, 2 given in %s on line
%d
Warning: hash_hmac_file() expects at most 4 parameters, 5 given in %s on line
%d
-===Done===
\ No newline at end of file
+===Done===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
