scottmac Thu Dec 25 13:34:49 2008 UTC Modified files: /php-src/ext/hash config.m4 config.w32 hash.c php_hash.h Log: Enable salsa hashing algorithm http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.m4?r1=1.15&r2=1.16&diff_format=u Index: php-src/ext/hash/config.m4 diff -u php-src/ext/hash/config.m4:1.15 php-src/ext/hash/config.m4:1.16 --- php-src/ext/hash/config.m4:1.15 Sun Sep 7 13:13:52 2008 +++ php-src/ext/hash/config.m4 Thu Dec 25 13:34:49 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15 2008/09/07 13:13:52 lbarnaud Exp $ +dnl $Id: config.m4,v 1.16 2008/12/25 13:34:49 scottmac Exp $ dnl config.m4 for extension hash PHP_ARG_WITH(mhash, for mhash support, @@ -27,10 +27,11 @@ 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_crc32.c hash_salsa.c" 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_types.h" + php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_salsa.h \ + php_hash_types.h" PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, $ext_shared) ifdef([PHP_INSTALL_HEADERS], [ http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.w32?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/hash/config.w32 diff -u php-src/ext/hash/config.w32:1.11 php-src/ext/hash/config.w32:1.12 --- php-src/ext/hash/config.w32:1.11 Thu Nov 27 21:57:15 2008 +++ php-src/ext/hash/config.w32 Thu Dec 25 13:34:49 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.11 2008/11/27 21:57:15 pajoye Exp $ +// $Id: config.w32,v 1.12 2008/12/25 13:34:49 scottmac Exp $ // vim:ft=javascript ARG_ENABLE("hash", "enable hash support", "yes"); @@ -15,6 +15,6 @@ 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_adler32.c hash_crc32.c hash_salsa.c"); } http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.52&r2=1.53&diff_format=u Index: php-src/ext/hash/hash.c diff -u php-src/ext/hash/hash.c:1.52 php-src/ext/hash/hash.c:1.53 --- php-src/ext/hash/hash.c:1.52 Thu Nov 27 21:11:51 2008 +++ php-src/ext/hash/hash.c Thu Dec 25 13:34:49 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hash.c,v 1.52 2008/11/27 21:11:51 scottmac Exp $ */ +/* $Id: hash.c,v 1.53 2008/12/25 13:34:49 scottmac Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1010,6 +1010,8 @@ php_hash_register_algo("adler32", &php_hash_adler32_ops); php_hash_register_algo("crc32", &php_hash_crc32_ops); php_hash_register_algo("crc32b", &php_hash_crc32b_ops); + php_hash_register_algo("salsa10", &php_hash_salsa10_ops); + php_hash_register_algo("salsa20", &php_hash_salsa20_ops); PHP_HASH_HAVAL_REGISTER(3,128); PHP_HASH_HAVAL_REGISTER(3,160); http://cvs.php.net/viewvc.cgi/php-src/ext/hash/php_hash.h?r1=1.27&r2=1.28&diff_format=u Index: php-src/ext/hash/php_hash.h diff -u php-src/ext/hash/php_hash.h:1.27 php-src/ext/hash/php_hash.h:1.28 --- php-src/ext/hash/php_hash.h:1.27 Mon Jun 2 14:13:49 2008 +++ php-src/ext/hash/php_hash.h Thu Dec 25 13:34:49 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_hash.h,v 1.27 2008/06/02 14:13:49 scottmac Exp $ */ +/* $Id: php_hash.h,v 1.28 2008/12/25 13:34:49 scottmac Exp $ */ #ifndef PHP_HASH_H #define PHP_HASH_H @@ -82,6 +82,8 @@ extern const php_hash_ops php_hash_adler32_ops; extern const php_hash_ops php_hash_crc32_ops; extern const php_hash_ops php_hash_crc32b_ops; +extern const php_hash_ops php_hash_salsa10_ops; +extern const php_hash_ops php_hash_salsa20_ops; #define PHP_HASH_HAVAL_OPS(p,b) extern const php_hash_ops php_hash_##p##haval##b##_ops;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php