diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-24 23:22:24 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-24 23:22:24 +0100 |
| commit | f678b0eae2766a91e3a9e680b3d71befe7e4879c (patch) | |
| tree | 106198433b6c710208498a92b1aec221da458070 /ext/hash | |
| parent | 0ceedea2ccd39215b805c76a27ea857a1dc71222 (diff) | |
| parent | eac8166bd468a3c7c00b5163f6f86804911b660d (diff) | |
| download | php-git-f678b0eae2766a91e3a9e680b3d71befe7e4879c.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/hash')
| -rw-r--r-- | ext/hash/hash_gost.c | 5 | ||||
| -rw-r--r-- | ext/hash/tests/bug73127.phpt | 27 |
2 files changed, 29 insertions, 3 deletions
diff --git a/ext/hash/hash_gost.c b/ext/hash/hash_gost.c index 7961fc6c3a..95c61a9399 100644 --- a/ext/hash/hash_gost.c +++ b/ext/hash/hash_gost.c @@ -227,14 +227,13 @@ static inline void Gost(PHP_GOST_CTX *context, uint32_t data[8]) static inline void GostTransform(PHP_GOST_CTX *context, const unsigned char input[32]) { int i, j; - uint32_t data[8], temp = 0, save = 0; + uint32_t data[8], temp = 0; for (i = 0, j = 0; i < 8; ++i, j += 4) { data[i] = ((uint32_t) input[j]) | (((uint32_t) input[j + 1]) << 8) | (((uint32_t) input[j + 2]) << 16) | (((uint32_t) input[j + 3]) << 24); - save = context->state[i + 8]; context->state[i + 8] += data[i] + temp; - temp = ((context->state[i + 8] < data[i]) || (context->state[i + 8] < save)) ? 1 : 0; + temp = context->state[i + 8] < data[i] ? 1 : (context->state[i + 8] == data[i] ? temp : 0); } Gost(context, data); diff --git a/ext/hash/tests/bug73127.phpt b/ext/hash/tests/bug73127.phpt new file mode 100644 index 0000000000..d9f1f7dca1 --- /dev/null +++ b/ext/hash/tests/bug73127.phpt @@ -0,0 +1,27 @@ +--TEST-- +Bug #73127 (gost-crypto hash incorrect if input data contains long 0xFF sequence) +--FILE-- +<?php // $Id$ + +$test1 = str_repeat("\xFF", 40); +$test2 = str_repeat("\x00", 40); +echo hash('gost-crypto', $test1), + "\n", + hash('gost', $test1), + "\n", + hash('gost-crypto', $test2), + "\n", + hash('gost', $test2), + "\n", + hash('gost-crypto', ''), + "\n", + hash('gost', '') + ; +?> +--EXPECT-- +231d8bb980d3faa30fee6ec475df5669cf6c24bbce22f46d6737470043a99f8e +9eaf96ba62f90fae6707f1d4274d1a9d6680f5a121d4387815aa3a6ec42439c5 +bbf1f3179409c853cd3e396d67b0e10a266c218a4fd19f149c39aa4f6d37a007 +a0be0b90fea5a5b50c90c9429d07bb98fa0c06f0c30210e94c7d80c3125c67ac +981e5f3ca30c841487830f84fb433e13ac1101569b9c13584ac483234cd656c0 +ce85b99cc46752fffee35cab9a7b0278abb4c2d2055cff685af4912c49490f8d |