com php-src: Always use ZEND_SECURE_ZERO() when cle aning up data: ext/hash/hash_sha3.c ext/hash/ha sh_snefru.c ext/mcrypt/mcrypt.c
ext/standard/php_cr ypt_r.c ext/standard/sha1.c
| From: | Stanislav Malyshev | Date: | Sun, 07 Apr 2019 01:15:42 +0000 |
| Subject: | com php-src: Always use ZEND_SECURE_ZERO() when cle aning up data: ext/hash/hash_sha3.c ext/hash/ha sh_snefru.c ext/mcrypt/mcrypt.c ext/standard/php_cr ypt_r.c ext/standard/sha1.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105543@lists.php.net to get a copy of this message | ||
Commit: 588db7cecf6cf8b351de0fecdfc7de70f54bf1b1
Author: Stanislav Malyshev <stas@php.net> Sat, 6 Apr 2019 18:15:42 -0700
Parents: 731eeb8decf3cf0197e7fd6989b5fd2befcdb3e5
Branches: PHP-7.1 PHP-7.2 PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=588db7cecf6cf8b351de0fecdfc7de70f54bf1b1
Log:
Always use ZEND_SECURE_ZERO() when cleaning up data
Optimizing compilers have an annoying tendency to throw out
memsets over data that they think aren't used anymore. Apply secure
zero-out in cases where this has potential to happen.
Changed paths:
M ext/hash/hash_sha3.c
M ext/hash/hash_snefru.c
M ext/mcrypt/mcrypt.c
M ext/standard/php_crypt_r..c
M ext/standard/sha1.c
Diff:
diff --git a/ext/hash/hash_sha3.c b/ext/hash/hash_sha3.c
index 3866854..472cd9a 100644
--- a/ext/hash/hash_sha3.c
+++ b/ext/hash/hash_sha3.c
@@ -191,7 +191,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 931c318..c36d279 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)
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 94a5c45..e38b9c5 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -605,6 +605,8 @@ PHP_FUNCTION(mcrypt_generic_init)
}
RETVAL_LONG(result);
+ ZEND_SECURE_ZERO(key_s, key_len);
+ ZEND_SECURE_ZERO(iv_s, iv_len);
efree(iv_s);
efree(key_s);
}
diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c
index f8c1843..a3b348c 100644
--- a/ext/standard/php_crypt_r.c
+++ b/ext/standard/php_crypt_r.c
@@ -364,7 +364,7 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out)
PHP_MD5Update(&ctx, final, (unsigned int)(pl > 16 ? 16 : pl));
/* Don't leave anything around in vm they could use. */
- memset(final, 0, sizeof(final));
+ ZEND_SECURE_ZERO(final, sizeof(final));
/* Then something really weird... */
for (i = pwl; i != 0; i >>= 1)
diff --git a/ext/standard/sha1.c b/ext/standard/sha1.c
index 392523d..7571875 100644
--- a/ext/standard/sha1.c
+++ b/ext/standard/sha1.c
@@ -245,7 +245,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));
}
/* }}} */
@@ -356,7 +356,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));
}
/* }}} */