- fix a couple of warnings

- export php_hash_fetch_ops() and php_hash_register_ops()

diff --git a/ext/hash/hash_haval.c b/ext/hash/hash_haval.c
index 62d4a2990d18d75c93444a09c80ac88821779a21..5a1127438c489a64d5705c83cfb2193c4c40b5b0 100644 (file)
--- a/ext/hash/hash_haval.c
+++ b/ext/hash/hash_haval.c
@@ -250,7 +250,11 @@ static void PHP_5HAVALTransform(php_uint32 state[8], const unsigned char block[1
 /* }}} */
 
 #define PHP_HASH_HAVAL_INIT(p,b) \
-php_hash_ops php_hash_##p##haval##b##_ops = { PHP_##p##HAVAL##b##Init, PHP_HAVALUpdate, PHP_HAVAL##b##Final, ((b) / 8), 128, sizeof(PHP_HAVAL_CTX) }; \
+php_hash_ops php_hash_##p##haval##b##_ops = { \
+       (php_hash_init_func_t) PHP_##p##HAVAL##b##Init, \
+       (php_hash_update_func_t) PHP_HAVALUpdate, \
+       (php_hash_final_func_t) PHP_HAVAL##b##Final, \
+       ((b) / 8), 128, sizeof(PHP_HAVAL_CTX) }; \
 PHP_HASH_API void PHP_##p##HAVAL##b##Init(PHP_HAVAL_CTX *context) \
 {      int i; context->count[0] =      context->count[1] =     0; \
        for(i = 0; i < 8; i++) context->state[i] = D0[i]; \

diff --git a/ext/hash/hash_md.c b/ext/hash/hash_md.c
index 2641919934f364b777f38b14138a3d734fc7f01c..dbcf532dc7049ef77bbd0bb330a91d7b43d0d9d6 100644 (file)
--- a/ext/hash/hash_md.c
+++ b/ext/hash/hash_md.c
@@ -22,9 +22,9 @@
 #include "php_hash_md.h"
 
 php_hash_ops php_hash_md5_ops = {
-       PHP_MD5Init,
-       PHP_MD5Update,
-       PHP_MD5Final,
+       (php_hash_init_func_t) PHP_MD5Init,
+       (php_hash_update_func_t) PHP_MD5Update,
+       (php_hash_final_func_t) PHP_MD5Final,
        16,
        64,
        sizeof(PHP_MD5_CTX)

diff --git a/ext/hash/hash_ripemd.c b/ext/hash/hash_ripemd.c
index 0efa62fc58ba350230bda2396ade0e66d573a9a9..8c9d313cb46b6b5c6ea4009cd5f48ce3496dee41 100644 (file)
--- a/ext/hash/hash_ripemd.c
+++ b/ext/hash/hash_ripemd.c
@@ -26,18 +26,18 @@
 #include "php_hash_ripemd.h"
 
 php_hash_ops php_hash_ripemd128_ops = {
-       PHP_RIPEMD128Init,
-       PHP_RIPEMD128Update,
-       PHP_RIPEMD128Final,
+       (php_hash_init_func_t) PHP_RIPEMD128Init,
+       (php_hash_update_func_t) PHP_RIPEMD128Update,
+       (php_hash_final_func_t) PHP_RIPEMD128Final,
        16,
        64,
        sizeof(PHP_RIPEMD128_CTX)
 };
 
 php_hash_ops php_hash_ripemd160_ops = {
-       PHP_RIPEMD160Init,
-       PHP_RIPEMD160Update,
-       PHP_RIPEMD160Final,
+       (php_hash_init_func_t) PHP_RIPEMD160Init,
+       (php_hash_update_func_t) PHP_RIPEMD160Update,
+       (php_hash_final_func_t) PHP_RIPEMD160Final,
        20,
        64,
        sizeof(PHP_RIPEMD160_CTX)

diff --git a/ext/hash/hash_sha.c b/ext/hash/hash_sha.c
index ba8cfb3ffe15dae2d98c2071cb5283b1d77f3a58..09734acb7f4420da02d67bccd31fedd07b391fbb 100644 (file)
--- a/ext/hash/hash_sha.c
+++ b/ext/hash/hash_sha.c
@@ -77,9 +77,9 @@ static void SHADecode32(php_uint32 *output, const unsigned char *input, unsigned
 /* }}} */
 
 php_hash_ops php_hash_sha1_ops = {
-       PHP_SHA1Init,
-       PHP_SHA1Update,
-       PHP_SHA1Final,
+       (php_hash_init_func_t) PHP_SHA1Init,
+       (php_hash_update_func_t) PHP_SHA1Update,
+       (php_hash_final_func_t) PHP_SHA1Final,
        20,
        64,
        sizeof(PHP_SHA1_CTX)
@@ -424,9 +424,9 @@ PHP_HASH_API void PHP_SHA1Final(unsigned char digest[20], PHP_SHA1_CTX * context
 /* sha256 */
 
 php_hash_ops php_hash_sha256_ops = {
-       PHP_SHA256Init,
-       PHP_SHA256Update,
-       PHP_SHA256Final,
+       (php_hash_init_func_t) PHP_SHA256Init,
+       (php_hash_update_func_t) PHP_SHA256Update,
+       (php_hash_final_func_t) PHP_SHA256Final,
        32,
        64,
        sizeof(PHP_SHA256_CTX)
@@ -819,9 +819,9 @@ PHP_HASH_API void PHP_SHA384Final(unsigned char digest[48], PHP_SHA384_CTX * con
 /* }}} */
 
 php_hash_ops php_hash_sha384_ops = {
-       PHP_SHA384Init,
-       PHP_SHA384Update,
-       PHP_SHA384Final,
+       (php_hash_init_func_t) PHP_SHA384Init,
+       (php_hash_update_func_t) PHP_SHA384Update,
+       (php_hash_final_func_t) PHP_SHA384Final,
        48,
        128,
        sizeof(PHP_SHA384_CTX)
@@ -932,9 +932,9 @@ PHP_HASH_API void PHP_SHA512Final(unsigned char digest[48], PHP_SHA512_CTX * con
 /* }}} */
 
 php_hash_ops php_hash_sha512_ops = {
-       PHP_SHA512Init,
-       PHP_SHA512Update,
-       PHP_SHA512Final,
+       (php_hash_init_func_t) PHP_SHA512Init,
+       (php_hash_update_func_t) PHP_SHA512Update,
+       (php_hash_final_func_t) PHP_SHA512Final,
        64,
        128,
        sizeof(PHP_SHA512_CTX)

diff --git a/ext/hash/php_hash.h b/ext/hash/php_hash.h
index 76ce694830405ef99c07e945aa260c5dd7ba657f..0b50c3c084c457fc85b93e7a5d7d2ba3e4e5bee8 100644 (file)
--- a/ext/hash/php_hash.h
+++ b/ext/hash/php_hash.h
@@ -29,10 +29,14 @@
 
 #define PHP_HASH_HMAC          0x0001
 
+typedef int (*php_hash_init_func_t)(void *context);
+typedef int (*php_hash_update_func_t)(void *context, const unsigned char *buf, unsigned int count);
+typedef int (*php_hash_final_func_t)(unsigned char *digest, void *context);
+
 typedef struct _php_hash_ops {
-       int (*hash_init)(void *context);
-       int (*hash_update)(void *context, const unsigned char *buf, unsigned int count);
-       int (*hash_final)(unsigned char *digest, void *context);
+       php_hash_init_func_t hash_init;
+       php_hash_update_func_t hash_update;
+       php_hash_final_func_t hash_final;
 
        int digest_size;
        int block_size;
@@ -88,6 +92,9 @@ extern zend_module_entry hash_module_entry;
 #include "TSRM.h"
 #endif
 
+PHP_HASH_API php_hash_ops *php_hash_fetch_ops(const char *algo, int algo_len);
+PHP_HASH_API void php_hash_register_algo(const char *algo, php_hash_ops *ops);
+
 #endif /* PHP_HASH_H */