archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Fix GH-12936: hash() function hangs endlessly if using sha512 on strings >= 4GiB
This commit is contained in:
Niels Dossche 2023-12-12 19:57:47 +01:00
commit cd179171cc
7 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -14,6 +14,10 @@ PHP NEWS
. Fixed bug GH-12870 (Creating an xmlns attribute results in a DOMException). . Fixed bug GH-12870 (Creating an xmlns attribute results in a DOMException).
(nielsdos) (nielsdos)
- Hash:
. Fixed bug GH-12936 (hash() function hangs endlessly if using sha512 on
strings >= 4GiB). (nielsdos)
- Opcache: - Opcache:
. Fixed oss-fuzz #64727 (JIT undefined array key warning may overwrite DIM . Fixed oss-fuzz #64727 (JIT undefined array key warning may overwrite DIM
with NULL when DIM is the same var as result). (ilutov) with NULL when DIM is the same var as result). (ilutov)

4
ext/hash/hash_adler32.c
View file

@ -25,11 +25,11 @@ PHP_HASH_API void PHP_ADLER32Init(PHP_ADLER32_CTX *context, ZEND_ATTRIBUTE_UNUSE
PHP_HASH_API void PHP_ADLER32Update(PHP_ADLER32_CTX *context, const unsigned char *input, size_t len) PHP_HASH_API void PHP_ADLER32Update(PHP_ADLER32_CTX *context, const unsigned char *input, size_t len)
{ {
uint32_t i, s[2]; uint32_t s[2];
s[0] = context->state & 0xffff; s[0] = context->state & 0xffff;
s[1] = (context->state >> 16) & 0xffff; s[1] = (context->state >> 16) & 0xffff;
for (i = 0; i < len; ++i) { for (size_t i = 0; i < len; ++i) {
s[0] += input[i]; s[0] += input[i];
s[1] += s[0]; s[1] += s[0];
if (s[1]>=0x7fffffff) if (s[1]>=0x7fffffff)

5
ext/hash/hash_haval.c
View file

@ -280,7 +280,8 @@ PHP_HASH_HAVAL_INIT(5,256)
/* {{{ PHP_HAVALUpdate */ /* {{{ PHP_HAVALUpdate */
PHP_HASH_API void PHP_HAVALUpdate(PHP_HAVAL_CTX *context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_HAVALUpdate(PHP_HAVAL_CTX *context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 128 */ /* Compute number of bytes mod 128 */
index = (unsigned int) ((context->count[0] >> 3) & 0x7F); index = (unsigned int) ((context->count[0] >> 3) & 0x7F);
@ -288,7 +289,7 @@ PHP_HASH_API void PHP_HAVALUpdate(PHP_HAVAL_CTX *context, const unsigned char *i
if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) { if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) {
context->count[1]++; context->count[1]++;
} }
context->count[1] += ((uint32_t) inputLen >> 29); context->count[1] += (uint32_t) (inputLen >> 29);
partLen = 128 - index; partLen = 128 - index;

5
ext/hash/hash_md.c
View file

@ -204,7 +204,8 @@ PHP_HASH_API void PHP_MD4InitArgs(PHP_MD4_CTX * context, ZEND_ATTRIBUTE_UNUSED H
*/ */
PHP_HASH_API void PHP_MD4Update(PHP_MD4_CTX * context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_MD4Update(PHP_MD4_CTX * context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 64 */ /* Compute number of bytes mod 64 */
index = (unsigned int) ((context->count[0] >> 3) & 0x3F); index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
@ -213,7 +214,7 @@ PHP_HASH_API void PHP_MD4Update(PHP_MD4_CTX * context, const unsigned char *inpu
if ((context->count[0] += ((uint32_t) inputLen << 3)) if ((context->count[0] += ((uint32_t) inputLen << 3))
< ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3))
context->count[1]++; context->count[1]++;
context->count[1] += ((uint32_t) inputLen >> 29); context->count[1] += (uint32_t) (inputLen >> 29);
partLen = 64 - index; partLen = 64 - index;

20
ext/hash/hash_ripemd.c
View file

@ -271,7 +271,8 @@ static void RIPEMD128Transform(uint32_t state[4], const unsigned char block[64])
*/ */
PHP_HASH_API void PHP_RIPEMD128Update(PHP_RIPEMD128_CTX * context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_RIPEMD128Update(PHP_RIPEMD128_CTX * context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 64 */ /* Compute number of bytes mod 64 */
index = (unsigned int) ((context->count[0] >> 3) & 0x3F); index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
@ -280,7 +281,7 @@ PHP_HASH_API void PHP_RIPEMD128Update(PHP_RIPEMD128_CTX * context, const unsigne
if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) { if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) {
context->count[1]++; context->count[1]++;
} }
context->count[1] += ((uint32_t) inputLen >> 29); context->count[1] += (uint32_t) (inputLen >> 29);
partLen = 64 - index; partLen = 64 - index;
@ -369,7 +370,8 @@ static void RIPEMD256Transform(uint32_t state[8], const unsigned char block[64])
*/ */
PHP_HASH_API void PHP_RIPEMD256Update(PHP_RIPEMD256_CTX * context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_RIPEMD256Update(PHP_RIPEMD256_CTX * context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 64 */ /* Compute number of bytes mod 64 */
index = (unsigned int) ((context->count[0] >> 3) & 0x3F); index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
@ -378,7 +380,7 @@ PHP_HASH_API void PHP_RIPEMD256Update(PHP_RIPEMD256_CTX * context, const unsigne
if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) { if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) {
context->count[1]++; context->count[1]++;
} }
context->count[1] += ((uint32_t) inputLen >> 29); context->count[1] += (uint32_t) (inputLen >> 29);
partLen = 64 - index; partLen = 64 - index;
@ -468,7 +470,8 @@ static void RIPEMD160Transform(uint32_t state[5], const unsigned char block[64])
*/ */
PHP_HASH_API void PHP_RIPEMD160Update(PHP_RIPEMD160_CTX * context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_RIPEMD160Update(PHP_RIPEMD160_CTX * context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 64 */ /* Compute number of bytes mod 64 */
index = (unsigned int) ((context->count[0] >> 3) & 0x3F); index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
@ -477,7 +480,7 @@ PHP_HASH_API void PHP_RIPEMD160Update(PHP_RIPEMD160_CTX * context, const unsigne
if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) { if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) {
context->count[1]++; context->count[1]++;
} }
context->count[1] += ((uint32_t) inputLen >> 29); context->count[1] += (uint32_t) (inputLen >> 29);
partLen = 64 - index; partLen = 64 - index;
@ -576,7 +579,8 @@ static void RIPEMD320Transform(uint32_t state[10], const unsigned char block[64]
*/ */
PHP_HASH_API void PHP_RIPEMD320Update(PHP_RIPEMD320_CTX * context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_RIPEMD320Update(PHP_RIPEMD320_CTX * context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 64 */ /* Compute number of bytes mod 64 */
index = (unsigned int) ((context->count[0] >> 3) & 0x3F); index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
@ -585,7 +589,7 @@ PHP_HASH_API void PHP_RIPEMD320Update(PHP_RIPEMD320_CTX * context, const unsigne
if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) { if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) {
context->count[1]++; context->count[1]++;
} }
context->count[1] += ((uint32_t) inputLen >> 29); context->count[1] += (uint32_t) (inputLen >> 29);
partLen = 64 - index; partLen = 64 - index;

20
ext/hash/hash_sha.c
View file

@ -222,7 +222,8 @@ PHP_HASH_API void PHP_SHA224InitArgs(PHP_SHA224_CTX * context, ZEND_ATTRIBUTE_UN
*/ */
PHP_HASH_API void PHP_SHA224Update(PHP_SHA224_CTX * context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_SHA224Update(PHP_SHA224_CTX * context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 64 */ /* Compute number of bytes mod 64 */
index = (unsigned int) ((context->count[0] >> 3) & 0x3F); index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
@ -231,7 +232,7 @@ PHP_HASH_API void PHP_SHA224Update(PHP_SHA224_CTX * context, const unsigned char
if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) { if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) {
context->count[1]++; context->count[1]++;
} }
context->count[1] += ((uint32_t) inputLen >> 29); context->count[1] += (uint32_t) (inputLen >> 29);
partLen = 64 - index; partLen = 64 - index;
@ -299,7 +300,8 @@ PHP_HASH_API void PHP_SHA224Final(unsigned char digest[28], PHP_SHA224_CTX * con
*/ */
PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX * context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX * context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 64 */ /* Compute number of bytes mod 64 */
index = (unsigned int) ((context->count[0] >> 3) & 0x3F); index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
@ -308,7 +310,7 @@ PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX * context, const unsigned char
if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) { if ((context->count[0] += ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3)) {
context->count[1]++; context->count[1]++;
} }
context->count[1] += ((uint32_t) inputLen >> 29); context->count[1] += (uint32_t) (inputLen >> 29);
partLen = 64 - index; partLen = 64 - index;
@ -513,7 +515,8 @@ static void SHA512Transform(uint64_t state[8], const unsigned char block[128])
*/ */
PHP_HASH_API void PHP_SHA384Update(PHP_SHA384_CTX * context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_SHA384Update(PHP_SHA384_CTX * context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i = 0, index, partLen; unsigned int index, partLen;
size_t i = 0;
/* Compute number of bytes mod 128 */ /* Compute number of bytes mod 128 */
index = (unsigned int) ((context->count[0] >> 3) & 0x7F); index = (unsigned int) ((context->count[0] >> 3) & 0x7F);
@ -522,7 +525,7 @@ PHP_HASH_API void PHP_SHA384Update(PHP_SHA384_CTX * context, const unsigned char
if ((context->count[0] += ((uint64_t) inputLen << 3)) < ((uint64_t) inputLen << 3)) { if ((context->count[0] += ((uint64_t) inputLen << 3)) < ((uint64_t) inputLen << 3)) {
context->count[1]++; context->count[1]++;
} }
context->count[1] += ((uint64_t) inputLen >> 61); context->count[1] += (uint64_t) (inputLen >> 61);
partLen = 128 - index; partLen = 128 - index;
@ -666,7 +669,8 @@ PHP_HASH_API void PHP_SHA512_224InitArgs(PHP_SHA512_CTX * context, ZEND_ATTRIBUT
*/ */
PHP_HASH_API void PHP_SHA512Update(PHP_SHA512_CTX * context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_SHA512Update(PHP_SHA512_CTX * context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 128 */ /* Compute number of bytes mod 128 */
index = (unsigned int) ((context->count[0] >> 3) & 0x7F); index = (unsigned int) ((context->count[0] >> 3) & 0x7F);
@ -675,7 +679,7 @@ PHP_HASH_API void PHP_SHA512Update(PHP_SHA512_CTX * context, const unsigned char
if ((context->count[0] += ((uint64_t) inputLen << 3)) < ((uint64_t) inputLen << 3)) { if ((context->count[0] += ((uint64_t) inputLen << 3)) < ((uint64_t) inputLen << 3)) {
context->count[1]++; context->count[1]++;
} }
context->count[1] += ((uint64_t) inputLen >> 61); context->count[1] += (uint64_t) (inputLen >> 61);
partLen = 128 - index; partLen = 128 - index;

5
ext/standard/sha1.c
View file

@ -173,7 +173,8 @@ PHPAPI void PHP_SHA1InitArgs(PHP_SHA1_CTX * context, ZEND_ATTRIBUTE_UNUSED HashT
PHPAPI void PHP_SHA1Update(PHP_SHA1_CTX * context, const unsigned char *input, PHPAPI void PHP_SHA1Update(PHP_SHA1_CTX * context, const unsigned char *input,
size_t inputLen) size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int index, partLen;
size_t i;
/* Compute number of bytes mod 64 */ /* Compute number of bytes mod 64 */
index = (unsigned int) ((context->count[0] >> 3) & 0x3F); index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
@ -182,7 +183,7 @@ PHPAPI void PHP_SHA1Update(PHP_SHA1_CTX * context, const unsigned char *input,
if ((context->count[0] += ((uint32_t) inputLen << 3)) if ((context->count[0] += ((uint32_t) inputLen << 3))
< ((uint32_t) inputLen << 3)) < ((uint32_t) inputLen << 3))
context->count[1]++; context->count[1]++;
context->count[1] += ((uint32_t) inputLen >> 29); context->count[1] += (uint32_t) (inputLen >> 29);
partLen = 64 - index; partLen = 64 - index;