diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-04-06 19:05:37 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2019-04-06 19:05:37 -0700 |
| commit | d1d692abe71b04177747758237249253b175b8c2 (patch) | |
| tree | 55a577dc479dcdf562c166dfcd9612e4579c6cd0 /ext/hash | |
| parent | a2b8a62abf905f02504c81d7dd868ac83dfc7207 (diff) | |
| parent | 588db7cecf6cf8b351de0fecdfc7de70f54bf1b1 (diff) | |
| download | php-git-d1d692abe71b04177747758237249253b175b8c2.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Always use ZEND_SECURE_ZERO() when cleaning up data
bump versions after release
Diffstat (limited to 'ext/hash')
| -rw-r--r-- | ext/hash/hash_sha3.c | 2 | ||||
| -rw-r--r-- | ext/hash/hash_snefru.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/hash/hash_sha3.c b/ext/hash/hash_sha3.c index 86cfabe934..cde7a43e3f 100644 --- a/ext/hash/hash_sha3.c +++ b/ext/hash/hash_sha3.c @@ -194,7 +194,7 @@ static void PHP_SHA3_Final(unsigned char* digest, } // Zero out context - memset(ctx, 0, sizeof(PHP_SHA3_CTX)); + ZEND_SECURE_ZERO(ctx, sizeof(PHP_SHA3_CTX)); } // ========================================================================== diff --git a/ext/hash/hash_snefru.c b/ext/hash/hash_snefru.c index f4bd77771d..8a16715553 100644 --- a/ext/hash/hash_snefru.c +++ b/ext/hash/hash_snefru.c @@ -129,7 +129,7 @@ static inline void SnefruTransform(PHP_SNEFRU_CTX *context, const unsigned char ((input[i+2] & 0xff) << 8) | (input[i+3] & 0xff); } Snefru(context->state); - memset(&context->state[8], 0, sizeof(uint32_t) * 8); + ZEND_SECURE_ZERO(&context->state[8], sizeof(uint32_t) * 8); } PHP_HASH_API void PHP_SNEFRUInit(PHP_SNEFRU_CTX *context) |