cvs: php-src(PHP_5_3) / NEWS /ext/hash hash_crc32.c /ext/hash/tests crc32.phpt hash_copy_001.phpt

tony2001 Mon Aug 18 14:29:58 2008 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /php-src/ext/hash hash_crc32.c /php-src/ext/hash/tests crc32.phpt hash_copy_001.phpt Log: MFH: fix bug #45028 (CRC32 output endianness is different between crc32() and hash()) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.276&r2=1.2027.2.547.2.965.2.277&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.276 php-src/NEWS:1.2027.2.547.2.965.2.277 --- php-src/NEWS:1.2027.2.547.2.965.2.276 Sun Aug 17 21:55:26 2008 +++ php-src/NEWS Mon Aug 18 14:29:53 2008 @@ -37,6 +37,8 @@ - Fixed bug #45384 (parse_ini_file will result in parse error with no trailing newline). (Arnaud) - Fixed bug #45044 (relative paths not resolved correctly). (Dmitry) +- Fixed bug #45028 (CRC32 output endianness is different between crc32() + and hash()). (Tony) - Fixed bug #44925 (preg_grep() modifies input array). (Nuno) - Fixed bug #44842 (parse_ini_file keys that start/end with underscore). (Arnaud) http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash_crc32.c?r1=1.2.2.3.2.2.2.2&r2=1.2.2.3.2.2.2.3&diff_format=u Index: php-src/ext/hash/hash_crc32.c diff -u php-src/ext/hash/hash_crc32.c:1.2.2.3.2.2.2.2 php-src/ext/hash/hash_crc32.c:1.2.2.3.2.2.2.3 --- php-src/ext/hash/hash_crc32.c:1.2.2.3.2.2.2.2 Mon Apr 21 15:37:46 2008 +++ php-src/ext/hash/hash_crc32.c Mon Aug 18 14:29:54 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hash_crc32.c,v 1.2.2.3.2.2.2.2 2008/04/21 15:37:46 tony2001 Exp $ */ +/* $Id: hash_crc32.c,v 1.2.2.3.2.2.2.3 2008/08/18 14:29:54 tony2001 Exp $ */ #include "php_hash.h" #include "php_hash_crc32.h" @@ -56,6 +56,16 @@ context->state = 0; } +PHP_HASH_API void PHP_CRC32BFinal(unsigned char digest[4], PHP_CRC32_CTX *context) +{ + context->state=~context->state; + 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; +} + PHP_HASH_API int PHP_CRC32Copy(const php_hash_ops *ops, PHP_CRC32_CTX *orig_context, PHP_CRC32_CTX *copy_context) { copy_context->state = orig_context->state; @@ -75,7 +85,7 @@ const php_hash_ops php_hash_crc32b_ops = { (php_hash_init_func_t) PHP_CRC32Init, (php_hash_update_func_t) PHP_CRC32BUpdate, - (php_hash_final_func_t) PHP_CRC32Final, + (php_hash_final_func_t) PHP_CRC32BFinal, (php_hash_copy_func_t) PHP_CRC32Copy, 4, /* what to say here? */ 4, http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/crc32.phpt?r1=1.1.2.2&r2=1.1.2.2.4.1&diff_format=u Index: php-src/ext/hash/tests/crc32.phpt diff -u php-src/ext/hash/tests/crc32.phpt:1.1.2.2 php-src/ext/hash/tests/crc32.phpt:1.1.2.2.4.1 --- php-src/ext/hash/tests/crc32.phpt:1.1.2.2 Sat Dec 3 10:18:38 2005 +++ php-src/ext/hash/tests/crc32.phpt Mon Aug 18 14:29:55 2008 @@ -28,9 +28,9 @@ 882174a0 96790816 00000000 -43beb7e8 -c2412435 -7f9d1520 -bd50274c -d2e6c21f -724aa97c +e8b7be43 +352441c2 +20159d7f +4c2750bd +1fc2e6d2 +7ca94a72 http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_copy_001.phpt?r1=1.1.2.3&r2=1.1.2.4&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.3 php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.4 --- php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.3 Wed Jun 4 07:38:10 2008 +++ php-src/ext/hash/tests/hash_copy_001.phpt Mon Aug 18 14:29:55 2008 @@ -75,8 +75,8 @@ string(8) "28097c6f" string(8) "e5cfc160" string(8) "e5cfc160" -string(8) "4e7a1469" -string(8) "4e7a1469" +string(8) "69147a4e" +string(8) "69147a4e" string(32) "86362472c8895e68e223ef8b3711d8d9" string(32) "86362472c8895e68e223ef8b3711d8d9" string(40) "fabdf6905f3ba18a3c93d6a16b91e31f7222a7a4" @@ -155,8 +155,8 @@ string(8) "471714d9" string(8) "e5cfc160" string(8) "59f8d3d2" -string(8) "4e7a1469" -string(8) "9939e63e" +string(8) "69147a4e" +string(8) "3ee63999" string(32) "86362472c8895e68e223ef8b3711d8d9" string(32) "ebeeeb05c18af1e53d2d127b561d5e0d" string(40) "fabdf6905f3ba18a3c93d6a16b91e31f7222a7a4"