mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1' into PHP-7.2

Browse Source 
* PHP-7.1:
  Always use ZEND_SECURE_ZERO() when cleaning up data
  bump versions after release
This commit is contained in:
Stanislav Malyshev 2019-04-06 19:05:37 -07:00
commit d1d692abe7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/hash/hash_sha3.c
View File

@ -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));
}
// ==========================================================================

2
ext/hash/hash_snefru.c
View File

@ -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)

4
ext/standard/sha1.c
View File

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