archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source 
* PHP-7.3:
  Always use ZEND_SECURE_ZERO() when cleaning up data
  bump versions after release
This commit is contained in:
Stanislav Malyshev 2019-04-06 19:06:21 -07:00
commit 3eae4f677a
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/hash/hash_sha3.c
View file

@ -200,7 +200,7 @@ static void PHP_SHA3_Final(unsigned char* digest,
} }
// Zero out context // Zero out context
memset(ctx, 0, sizeof(PHP_SHA3_CTX)); ZEND_SECURE_ZERO(ctx, sizeof(PHP_SHA3_CTX));
} }
// ========================================================================== // ==========================================================================

2
ext/hash/hash_snefru.c
View file

@ -127,7 +127,7 @@ static inline void SnefruTransform(PHP_SNEFRU_CTX *context, const unsigned char
((input[i+2] & 0xff) << 8) | (input[i+3] & 0xff); ((input[i+2] & 0xff) << 8) | (input[i+3] & 0xff);
} }
Snefru(context->state); 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) PHP_HASH_API void PHP_SNEFRUInit(PHP_SNEFRU_CTX *context)

4
ext/standard/sha1.c
View file

@ -244,7 +244,7 @@ PHPAPI void PHP_SHA1Final(unsigned char digest[20], PHP_SHA1_CTX * context)
/* Zeroize sensitive information. /* Zeroize sensitive information.
*/ */
memset((unsigned char*) context, 0, sizeof(*context)); ZEND_SECURE_ZERO((unsigned char*) context, sizeof(*context));
} }
/* }}} */ /* }}} */
@ -355,7 +355,7 @@ const unsigned char block[64];
state[4] += e; state[4] += e;
/* Zeroize sensitive information. */ /* Zeroize sensitive information. */
memset((unsigned char*) x, 0, sizeof(x)); ZEND_SECURE_ZERO((unsigned char*) x, sizeof(x));
} }
/* }}} */ /* }}} */