Enable salsa hashing algorithm

diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index dd4b275c6964d8bbd4cc28c2b6356910275b9b11..d8a26fd11f133714409c2ecae514f5b2dac65e64 100644 (file)
--- a/ext/hash/config.m4
+++ b/ext/hash/config.m4
@@ -27,10 +27,11 @@ if test "$PHP_HASH" != "no"; then
   
   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], [

diff --git a/ext/hash/config.w32 b/ext/hash/config.w32
index d854f12db2ca5d83456c69662db60d7b0b52057a..a880a4b0ccaa492a40fa24e057fcc8b27af2aaf0 100644 (file)
--- a/ext/hash/config.w32
+++ b/ext/hash/config.w32
@@ -15,6 +15,6 @@ if (PHP_HASH != "no") {
        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");
 }
 

diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index bcbb1bbd880f0549314531dde5eb493b95469676..603b2c4a7ee50889f32ecc9d7ae4c6cf5bbfd22f 100644 (file)
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -1010,6 +1010,8 @@ PHP_MINIT_FUNCTION(hash)
        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);

diff --git a/ext/hash/php_hash.h b/ext/hash/php_hash.h
index adfea3de122eae308b88f9bc28ad87f227706d21..02a6adae94ebd1b64cfbdced3b6126911a675e88 100644 (file)
--- a/ext/hash/php_hash.h
+++ b/ext/hash/php_hash.h
@@ -82,6 +82,8 @@ extern const php_hash_ops php_hash_gost_ops;
 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;