summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/hash/hash.c6
-rw-r--r--ext/hash/hash_fnv.c8
-rw-r--r--ext/hash/hash_joaat.c2
-rw-r--r--ext/hash/hash_md.c10
-rw-r--r--ext/hash/hash_ripemd.c8
-rw-r--r--ext/hash/hash_sha.c14
-rw-r--r--ext/hash/hash_sha3.c6
-rw-r--r--ext/hash/hash_snefru.c4
-rw-r--r--ext/hash/php_hash.h6
-rw-r--r--ext/hash/php_hash_fnv.h8
-rw-r--r--ext/hash/php_hash_gost.h2
-rw-r--r--ext/hash/php_hash_joaat.h2
-rw-r--r--ext/hash/php_hash_md.h6
-rw-r--r--ext/hash/php_hash_ripemd.h8
-rw-r--r--ext/hash/php_hash_sha.h10
-rw-r--r--ext/hash/php_hash_sha3.h8
-rw-r--r--ext/hash/php_hash_tiger.h2
17 files changed, 52 insertions, 58 deletions
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 2f4bf013db..e92185c4d5 100644
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -276,7 +276,7 @@ static void php_hash_do_hash_hmac(INTERNAL_FUNCTION_PARAMETERS, int isfilename,
if (isfilename) {
char buf[1024];
- int n;
+ size_t n;
ops->hash_init(context);
ops->hash_update(context, K, ops->block_size);
while ((n = php_stream_read(stream, buf, sizeof(buf))) > 0) {
@@ -671,7 +671,7 @@ PHP_FUNCTION(hash_hkdf)
// Expand
returnval = zend_string_alloc(length, 0);
digest = emalloc(ops->digest_size);
- for (i = 1, rounds = (length - 1) / ops->digest_size + 1; i <= rounds; i++) {
+ for (i = 1, rounds = (int) (length - 1) / ops->digest_size + 1; i <= rounds; i++) {
// chr(i)
unsigned char c[1];
c[0] = (i & 0xFF);
@@ -831,7 +831,7 @@ PHP_FUNCTION(hash_pbkdf2)
if (raw_output) {
memcpy(ZSTR_VAL(returnval), result, length);
} else {
- php_hash_bin2hex(ZSTR_VAL(returnval), result, digest_length);
+ php_hash_bin2hex(ZSTR_VAL(returnval), result, (int) digest_length);
}
ZSTR_VAL(returnval)[length] = 0;
efree(result);
diff --git a/ext/hash/hash_fnv.c b/ext/hash/hash_fnv.c
index aa6e9549aa..2aa47cbd47 100644
--- a/ext/hash/hash_fnv.c
+++ b/ext/hash/hash_fnv.c
@@ -76,13 +76,13 @@ PHP_HASH_API void PHP_FNV132Init(PHP_FNV132_CTX *context)
/* }}} */
PHP_HASH_API void PHP_FNV132Update(PHP_FNV132_CTX *context, const unsigned char *input,
- unsigned int inputLen)
+ size_t inputLen)
{
context->state = fnv_32_buf((void *)input, inputLen, context->state, 0);
}
PHP_HASH_API void PHP_FNV1a32Update(PHP_FNV132_CTX *context, const unsigned char *input,
- unsigned int inputLen)
+ size_t inputLen)
{
context->state = fnv_32_buf((void *)input, inputLen, context->state, 1);
}
@@ -111,13 +111,13 @@ PHP_HASH_API void PHP_FNV164Init(PHP_FNV164_CTX *context)
/* }}} */
PHP_HASH_API void PHP_FNV164Update(PHP_FNV164_CTX *context, const unsigned char *input,
- unsigned int inputLen)
+ size_t inputLen)
{
context->state = fnv_64_buf((void *)input, inputLen, context->state, 0);
}
PHP_HASH_API void PHP_FNV1a64Update(PHP_FNV164_CTX *context, const unsigned char *input,
- unsigned int inputLen)
+ size_t inputLen)
{
context->state = fnv_64_buf((void *)input, inputLen, context->state, 1);
}
diff --git a/ext/hash/hash_joaat.c b/ext/hash/hash_joaat.c
index bd38fe993c..de6bc088bc 100644
--- a/ext/hash/hash_joaat.c
+++ b/ext/hash/hash_joaat.c
@@ -39,7 +39,7 @@ PHP_HASH_API void PHP_JOAATInit(PHP_JOAAT_CTX *context)
context->state = 0;
}
-PHP_HASH_API void PHP_JOAATUpdate(PHP_JOAAT_CTX *context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_JOAATUpdate(PHP_JOAAT_CTX *context, const unsigned char *input, size_t inputLen)
{
context->state = joaat_buf((void *)input, inputLen, context->state);
}
diff --git a/ext/hash/hash_md.c b/ext/hash/hash_md.c
index 3cbd00a215..b94b3ecf04 100644
--- a/ext/hash/hash_md.c
+++ b/ext/hash/hash_md.c
@@ -280,7 +280,7 @@ PHP_HASH_API void PHP_MD5Init(PHP_MD5_CTX * context)
context.
*/
PHP_HASH_API void PHP_MD5Update(PHP_MD5_CTX * context, const unsigned char *input,
- unsigned int inputLen)
+ size_t inputLen)
{
unsigned int i, index, partLen;
@@ -539,7 +539,7 @@ PHP_HASH_API void PHP_MD4Init(PHP_MD4_CTX * context)
operation, processing another message block, and updating the
context.
*/
-PHP_HASH_API void PHP_MD4Update(PHP_MD4_CTX * context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_MD4Update(PHP_MD4_CTX * context, const unsigned char *input, size_t inputLen)
{
unsigned int i, index, partLen;
@@ -652,7 +652,7 @@ static void MD2_Transform(PHP_MD2_CTX *context, const unsigned char *block)
}
}
-PHP_HASH_API void PHP_MD2Update(PHP_MD2_CTX *context, const unsigned char *buf, unsigned int len)
+PHP_HASH_API void PHP_MD2Update(PHP_MD2_CTX *context, const unsigned char *buf, size_t len)
{
const unsigned char *p = buf, *e = buf + len;
@@ -660,7 +660,7 @@ PHP_HASH_API void PHP_MD2Update(PHP_MD2_CTX *context, const unsigned char *buf,
if (context->in_buffer + len < 16) {
/* Not enough for block, just pass into buffer */
memcpy(context->buffer + context->in_buffer, p, len);
- context->in_buffer += len;
+ context->in_buffer += (char) len;
return;
}
/* Put buffered data together with inbound for a single block */
@@ -679,7 +679,7 @@ PHP_HASH_API void PHP_MD2Update(PHP_MD2_CTX *context, const unsigned char *buf,
/* Copy remaining data to buffer */
if (p < e) {
memcpy(context->buffer, p, e - p);
- context->in_buffer = e - p;
+ context->in_buffer = (char) (e - p);
}
}
diff --git a/ext/hash/hash_ripemd.c b/ext/hash/hash_ripemd.c
index 03aff00676..f8c0e70daa 100644
--- a/ext/hash/hash_ripemd.c
+++ b/ext/hash/hash_ripemd.c
@@ -255,7 +255,7 @@ static void RIPEMD128Transform(uint32_t state[4], const unsigned char block[64])
operation, processing another message block, and updating the
context.
*/
-PHP_HASH_API void PHP_RIPEMD128Update(PHP_RIPEMD128_CTX * context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_RIPEMD128Update(PHP_RIPEMD128_CTX * context, const unsigned char *input, size_t inputLen)
{
unsigned int i, index, partLen;
@@ -353,7 +353,7 @@ static void RIPEMD256Transform(uint32_t state[8], const unsigned char block[64])
operation, processing another message block, and updating the
context.
*/
-PHP_HASH_API void PHP_RIPEMD256Update(PHP_RIPEMD256_CTX * context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_RIPEMD256Update(PHP_RIPEMD256_CTX * context, const unsigned char *input, size_t inputLen)
{
unsigned int i, index, partLen;
@@ -452,7 +452,7 @@ static void RIPEMD160Transform(uint32_t state[5], const unsigned char block[64])
operation, processing another message block, and updating the
context.
*/
-PHP_HASH_API void PHP_RIPEMD160Update(PHP_RIPEMD160_CTX * context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_RIPEMD160Update(PHP_RIPEMD160_CTX * context, const unsigned char *input, size_t inputLen)
{
unsigned int i, index, partLen;
@@ -560,7 +560,7 @@ static void RIPEMD320Transform(uint32_t state[10], const unsigned char block[64]
operation, processing another message block, and updating the
context.
*/
-PHP_HASH_API void PHP_RIPEMD320Update(PHP_RIPEMD320_CTX * context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_RIPEMD320Update(PHP_RIPEMD320_CTX * context, const unsigned char *input, size_t inputLen)
{
unsigned int i, index, partLen;
diff --git a/ext/hash/hash_sha.c b/ext/hash/hash_sha.c
index 4758c2fa38..99ec36845f 100644
--- a/ext/hash/hash_sha.c
+++ b/ext/hash/hash_sha.c
@@ -327,7 +327,7 @@ static void SHA1Transform(uint32_t state[5], const unsigned char block[64])
context.
*/
PHP_HASH_API void PHP_SHA1Update(PHP_SHA1_CTX * context, const unsigned char *input,
- unsigned int inputLen)
+ size_t inputLen)
{
unsigned int i, index, partLen;
@@ -537,7 +537,7 @@ PHP_HASH_API void PHP_SHA224Init(PHP_SHA224_CTX * context)
operation, processing another message block, and updating the
context.
*/
-PHP_HASH_API void PHP_SHA224Update(PHP_SHA224_CTX * context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_SHA224Update(PHP_SHA224_CTX * context, const unsigned char *input, size_t inputLen)
{
unsigned int i, index, partLen;
@@ -614,7 +614,7 @@ PHP_HASH_API void PHP_SHA224Final(unsigned char digest[28], PHP_SHA224_CTX * con
operation, processing another message block, and updating the
context.
*/
-PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX * context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX * context, const unsigned char *input, size_t inputLen)
{
unsigned int i, index, partLen;
@@ -828,9 +828,9 @@ static void SHA512Transform(uint64_t state[8], const unsigned char block[128])
operation, processing another message block, and updating the
context.
*/
-PHP_HASH_API void PHP_SHA384Update(PHP_SHA384_CTX * context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_SHA384Update(PHP_SHA384_CTX * context, const unsigned char *input, size_t inputLen)
{
- unsigned int i, index, partLen;
+ unsigned int i = 0, index, partLen;
/* Compute number of bytes mod 128 */
index = (unsigned int) ((context->count[0] >> 3) & 0x7F);
@@ -854,8 +854,6 @@ PHP_HASH_API void PHP_SHA384Update(PHP_SHA384_CTX * context, const unsigned char
}
index = 0;
- } else {
- i = 0;
}
/* Buffer remaining input */
@@ -979,7 +977,7 @@ PHP_HASH_API void PHP_SHA512_224Init(PHP_SHA512_CTX * context)
operation, processing another message block, and updating the
context.
*/
-PHP_HASH_API void PHP_SHA512Update(PHP_SHA512_CTX * context, const unsigned char *input, unsigned int inputLen)
+PHP_HASH_API void PHP_SHA512Update(PHP_SHA512_CTX * context, const unsigned char *input, size_t inputLen)
{
unsigned int i, index, partLen;
diff --git a/ext/hash/hash_sha3.c b/ext/hash/hash_sha3.c
index 86cfabe934..52d98d80d7 100644
--- a/ext/hash/hash_sha3.c
+++ b/ext/hash/hash_sha3.c
@@ -156,7 +156,7 @@ static void PHP_SHA3_Init(PHP_SHA3_CTX* ctx,
static void PHP_SHA3_Update(PHP_SHA3_CTX* ctx,
const unsigned char* buf,
- unsigned int count,
+ size_t count,
size_t block_size) {
while (count > 0) {
unsigned int len = block_size - ctx->pos;
@@ -205,7 +205,7 @@ void PHP_SHA3##bits##Init(PHP_SHA3_##bits##_CTX* ctx) { \
} \
void PHP_SHA3##bits##Update(PHP_SHA3_##bits##_CTX* ctx, \
const unsigned char* input, \
- unsigned int inputLen) { \
+ size_t inputLen) { \
PHP_SHA3_Update(ctx, input, inputLen, \
(1600 - (2 * bits)) >> 3); \
} \
@@ -251,7 +251,7 @@ void PHP_SHA3##bits##Init(PHP_SHA3_##bits##_CTX* ctx) { \
} \
void PHP_SHA3##bits##Update(PHP_SHA3_##bits##_CTX* ctx, \
const unsigned char* input, \
- unsigned int inputLen) { \
+ size_t inputLen) { \
Keccak_HashUpdate((Keccak_HashInstance *)ctx->hashinstance, input, inputLen * 8); \
} \
void PHP_SHA3##bits##Final(unsigned char* digest, \
diff --git a/ext/hash/hash_snefru.c b/ext/hash/hash_snefru.c
index bab15c505a..6eff4984d0 100644
--- a/ext/hash/hash_snefru.c
+++ b/ext/hash/hash_snefru.c
@@ -142,9 +142,9 @@ PHP_HASH_API void PHP_SNEFRUUpdate(PHP_SNEFRU_CTX *context, const unsigned char
if ((MAX32 - context->count[1]) < (len * 8)) {
context->count[0]++;
context->count[1] = MAX32 - context->count[1];
- context->count[1] = (len * 8) - context->count[1];
+ context->count[1] = ((uint32_t) len * 8) - context->count[1];
} else {
- context->count[1] += len * 8;
+ context->count[1] += (uint32_t) len * 8;
}
if (context->length + len < 32) {
diff --git a/ext/hash/php_hash.h b/ext/hash/php_hash.h
index cba2967a0a..b2d9e26377 100644
--- a/ext/hash/php_hash.h
+++ b/ext/hash/php_hash.h
@@ -30,7 +30,7 @@
#define L64 INT64_C
typedef void (*php_hash_init_func_t)(void *context);
-typedef void (*php_hash_update_func_t)(void *context, const unsigned char *buf, unsigned int count);
+typedef void (*php_hash_update_func_t)(void *context, const unsigned char *buf, size_t count);
typedef void (*php_hash_final_func_t)(unsigned char *digest, void *context);
typedef int (*php_hash_copy_func_t)(const void *ops, void *orig_context, void *dest_context);
@@ -128,10 +128,6 @@ extern zend_module_entry hash_module_entry;
# define PHP_HASH_API
#endif
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
PHP_FUNCTION(hash);
PHP_FUNCTION(hash_file);
PHP_FUNCTION(hash_hkdf);
diff --git a/ext/hash/php_hash_fnv.h b/ext/hash/php_hash_fnv.h
index 8166c7b481..67a94f8c0b 100644
--- a/ext/hash/php_hash_fnv.h
+++ b/ext/hash/php_hash_fnv.h
@@ -53,13 +53,13 @@ typedef struct {
PHP_HASH_API void PHP_FNV132Init(PHP_FNV132_CTX *context);
-PHP_HASH_API void PHP_FNV132Update(PHP_FNV132_CTX *context, const unsigned char *input, unsigned int inputLen);
-PHP_HASH_API void PHP_FNV1a32Update(PHP_FNV132_CTX *context, const unsigned char *input, unsigned int inputLen);
+PHP_HASH_API void PHP_FNV132Update(PHP_FNV132_CTX *context, const unsigned char *input, size_t inputLen);
+PHP_HASH_API void PHP_FNV1a32Update(PHP_FNV132_CTX *context, const unsigned char *input, size_t inputLen);
PHP_HASH_API void PHP_FNV132Final(unsigned char digest[16], PHP_FNV132_CTX * context);
PHP_HASH_API void PHP_FNV164Init(PHP_FNV164_CTX *context);
-PHP_HASH_API void PHP_FNV164Update(PHP_FNV164_CTX *context, const unsigned char *input, unsigned int inputLen);
-PHP_HASH_API void PHP_FNV1a64Update(PHP_FNV164_CTX *context, const unsigned char *input, unsigned int inputLen);
+PHP_HASH_API void PHP_FNV164Update(PHP_FNV164_CTX *context, const unsigned char *input, size_t inputLen);
+PHP_HASH_API void PHP_FNV1a64Update(PHP_FNV164_CTX *context, const unsigned char *input, size_t inputLen);
PHP_HASH_API void PHP_FNV164Final(unsigned char digest[16], PHP_FNV164_CTX * context);
static uint32_t fnv_32_buf(void *buf, size_t len, uint32_t hval, int alternate);
diff --git a/ext/hash/php_hash_gost.h b/ext/hash/php_hash_gost.h
index 53679537e5..5d547334de 100644
--- a/ext/hash/php_hash_gost.h
+++ b/ext/hash/php_hash_gost.h
@@ -24,7 +24,7 @@
/* GOST context */
typedef struct {
uint32_t state[16];
- uint32_t count[2];
+ size_t count[2];
unsigned char length;
unsigned char buffer[32];
const uint32_t (*tables)[4][256];
diff --git a/ext/hash/php_hash_joaat.h b/ext/hash/php_hash_joaat.h
index 5232bf5555..c8c1e183b2 100644
--- a/ext/hash/php_hash_joaat.h
+++ b/ext/hash/php_hash_joaat.h
@@ -24,7 +24,7 @@ typedef struct {
} PHP_JOAAT_CTX;
PHP_HASH_API void PHP_JOAATInit(PHP_JOAAT_CTX *context);
-PHP_HASH_API void PHP_JOAATUpdate(PHP_JOAAT_CTX *context, const unsigned char *input, unsigned int inputLen);
+PHP_HASH_API void PHP_JOAATUpdate(PHP_JOAAT_CTX *context, const unsigned char *input, size_t inputLen);
PHP_HASH_API void PHP_JOAATFinal(unsigned char digest[16], PHP_JOAAT_CTX * context);
static uint32_t joaat_buf(void *buf, size_t len, uint32_t hval);
diff --git a/ext/hash/php_hash_md.h b/ext/hash/php_hash_md.h
index 819f507ab6..7fe170aabc 100644
--- a/ext/hash/php_hash_md.h
+++ b/ext/hash/php_hash_md.h
@@ -65,7 +65,7 @@ typedef struct {
PHP_HASH_API void make_digest(char *md5str, unsigned char *digest);
PHP_HASH_API void PHP_MD5Init(PHP_MD5_CTX *);
-PHP_HASH_API void PHP_MD5Update(PHP_MD5_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_MD5Update(PHP_MD5_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_MD5Final(unsigned char[16], PHP_MD5_CTX *);
PHP_NAMED_FUNCTION(php_if_md5);
@@ -80,7 +80,7 @@ typedef struct {
} PHP_MD4_CTX;
PHP_HASH_API void PHP_MD4Init(PHP_MD4_CTX *);
-PHP_HASH_API void PHP_MD4Update(PHP_MD4_CTX *context, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_MD4Update(PHP_MD4_CTX *context, const unsigned char *, size_t);
PHP_HASH_API void PHP_MD4Final(unsigned char[16], PHP_MD4_CTX *);
/* MD2 context */
@@ -92,7 +92,7 @@ typedef struct {
} PHP_MD2_CTX;
PHP_HASH_API void PHP_MD2Init(PHP_MD2_CTX *context);
-PHP_HASH_API void PHP_MD2Update(PHP_MD2_CTX *context, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_MD2Update(PHP_MD2_CTX *context, const unsigned char *, size_t);
PHP_HASH_API void PHP_MD2Final(unsigned char[16], PHP_MD2_CTX *);
#endif
diff --git a/ext/hash/php_hash_ripemd.h b/ext/hash/php_hash_ripemd.h
index 4747d68ea8..47d720e179 100644
--- a/ext/hash/php_hash_ripemd.h
+++ b/ext/hash/php_hash_ripemd.h
@@ -46,19 +46,19 @@ typedef struct {
} PHP_RIPEMD320_CTX;
PHP_HASH_API void PHP_RIPEMD128Init(PHP_RIPEMD128_CTX *);
-PHP_HASH_API void PHP_RIPEMD128Update(PHP_RIPEMD128_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_RIPEMD128Update(PHP_RIPEMD128_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_RIPEMD128Final(unsigned char[16], PHP_RIPEMD128_CTX *);
PHP_HASH_API void PHP_RIPEMD160Init(PHP_RIPEMD160_CTX *);
-PHP_HASH_API void PHP_RIPEMD160Update(PHP_RIPEMD160_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_RIPEMD160Update(PHP_RIPEMD160_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_RIPEMD160Final(unsigned char[20], PHP_RIPEMD160_CTX *);
PHP_HASH_API void PHP_RIPEMD256Init(PHP_RIPEMD256_CTX *);
-PHP_HASH_API void PHP_RIPEMD256Update(PHP_RIPEMD256_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_RIPEMD256Update(PHP_RIPEMD256_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_RIPEMD256Final(unsigned char[32], PHP_RIPEMD256_CTX *);
PHP_HASH_API void PHP_RIPEMD320Init(PHP_RIPEMD320_CTX *);
-PHP_HASH_API void PHP_RIPEMD320Update(PHP_RIPEMD320_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_RIPEMD320Update(PHP_RIPEMD320_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_RIPEMD320Final(unsigned char[40], PHP_RIPEMD320_CTX *);
#endif /* PHP_HASH_RIPEMD_H */
diff --git a/ext/hash/php_hash_sha.h b/ext/hash/php_hash_sha.h
index 9844ddeb7d..4132bac9fa 100644
--- a/ext/hash/php_hash_sha.h
+++ b/ext/hash/php_hash_sha.h
@@ -40,7 +40,7 @@ typedef struct {
} PHP_SHA1_CTX;
PHP_HASH_API void PHP_SHA1Init(PHP_SHA1_CTX *);
-PHP_HASH_API void PHP_SHA1Update(PHP_SHA1_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_SHA1Update(PHP_SHA1_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_SHA1Final(unsigned char[20], PHP_SHA1_CTX *);
PHP_FUNCTION(sha1);
@@ -56,7 +56,7 @@ typedef struct {
} PHP_SHA224_CTX;
PHP_HASH_API void PHP_SHA224Init(PHP_SHA224_CTX *);
-PHP_HASH_API void PHP_SHA224Update(PHP_SHA224_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_SHA224Update(PHP_SHA224_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_SHA224Final(unsigned char[28], PHP_SHA224_CTX *);
/* SHA256 context. */
@@ -67,7 +67,7 @@ typedef struct {
} PHP_SHA256_CTX;
PHP_HASH_API void PHP_SHA256Init(PHP_SHA256_CTX *);
-PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_SHA256Final(unsigned char[32], PHP_SHA256_CTX *);
/* SHA384 context */
@@ -78,7 +78,7 @@ typedef struct {
} PHP_SHA384_CTX;
PHP_HASH_API void PHP_SHA384Init(PHP_SHA384_CTX *);
-PHP_HASH_API void PHP_SHA384Update(PHP_SHA384_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_SHA384Update(PHP_SHA384_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_SHA384Final(unsigned char[48], PHP_SHA384_CTX *);
/* SHA512 context */
@@ -89,7 +89,7 @@ typedef struct {
} PHP_SHA512_CTX;
PHP_HASH_API void PHP_SHA512Init(PHP_SHA512_CTX *);
-PHP_HASH_API void PHP_SHA512Update(PHP_SHA512_CTX *, const unsigned char *, unsigned int);
+PHP_HASH_API void PHP_SHA512Update(PHP_SHA512_CTX *, const unsigned char *, size_t);
PHP_HASH_API void PHP_SHA512Final(unsigned char[64], PHP_SHA512_CTX *);
PHP_HASH_API void PHP_SHA512_256Init(PHP_SHA512_CTX *);
diff --git a/ext/hash/php_hash_sha3.h b/ext/hash/php_hash_sha3.h
index 56ff450987..0c53899c48 100644
--- a/ext/hash/php_hash_sha3.h
+++ b/ext/hash/php_hash_sha3.h
@@ -36,19 +36,19 @@ typedef PHP_SHA3_CTX PHP_SHA3_384_CTX;
typedef PHP_SHA3_CTX PHP_SHA3_512_CTX;
PHP_HASH_API void PHP_SHA3224Init(PHP_SHA3_224_CTX*);
-PHP_HASH_API void PHP_SHA3224Update(PHP_SHA3_224_CTX*, const unsigned char*, unsigned int);
+PHP_HASH_API void PHP_SHA3224Update(PHP_SHA3_224_CTX*, const unsigned char*, size_t);
PHP_HASH_API void PHP_SAH3224Final(unsigned char[32], PHP_SHA3_224_CTX*);
PHP_HASH_API void PHP_SHA3256Init(PHP_SHA3_256_CTX*);
-PHP_HASH_API void PHP_SHA3256Update(PHP_SHA3_256_CTX*, const unsigned char*, unsigned int);
+PHP_HASH_API void PHP_SHA3256Update(PHP_SHA3_256_CTX*, const unsigned char*, size_t);
PHP_HASH_API void PHP_SAH3256Final(unsigned char[32], PHP_SHA3_256_CTX*);
PHP_HASH_API void PHP_SHA3384Init(PHP_SHA3_384_CTX*);
-PHP_HASH_API void PHP_SHA3384Update(PHP_SHA3_384_CTX*, const unsigned char*, unsigned int);
+PHP_HASH_API void PHP_SHA3384Update(PHP_SHA3_384_CTX*, const unsigned char*, size_t);
PHP_HASH_API void PHP_SAH3384Final(unsigned char[32], PHP_SHA3_384_CTX*);
PHP_HASH_API void PHP_SHA3512Init(PHP_SHA3_512_CTX*);
-PHP_HASH_API void PHP_SHA3512Update(PHP_SHA3_512_CTX*, const unsigned char*, unsigned int);
+PHP_HASH_API void PHP_SHA3512Update(PHP_SHA3_512_CTX*, const unsigned char*, size_t);
PHP_HASH_API void PHP_SAH3512Final(unsigned char[32], PHP_SHA3_512_CTX*);
#endif
diff --git a/ext/hash/php_hash_tiger.h b/ext/hash/php_hash_tiger.h
index ca60dd4eae..9f8bce7042 100644
--- a/ext/hash/php_hash_tiger.h
+++ b/ext/hash/php_hash_tiger.h
@@ -25,7 +25,7 @@ typedef struct {
uint64_t passed;
unsigned char buffer[64];
unsigned int passes:1;
- unsigned int length:7;
+ size_t length;
} PHP_TIGER_CTX;
PHP_HASH_API void PHP_3TIGERInit(PHP_TIGER_CTX *context);
View Lorry Controller Status