com php-src: zero sensitive data more secure way: ext/standard/ crypt_sha256.c

Commit: 4722d85c1ea3d8dfb9852f1f5cbb7310543e0779 Author: Anatol Belski <ab@php.net> Thu, 18 Sep 2014 22:18:27 +0200 Parents: bb89ac8408d6139feef9aa318b69e4ac5ee31106 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4722d85c1ea3d8dfb9852f1f5cbb7310543e0779 Log: zero sensitive data more secure way Changed paths: M ext/standard/crypt_sha256.c Diff: diff --git a/ext/standard/crypt_sha256.c b/ext/standard/crypt_sha256.c index e53f488...bf07eaa 100644 --- a/ext/standard/crypt_sha256.c +++ b/ext/standard/crypt_sha256.c @@ -571,6 +571,20 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b inside the SHA256 implementation as well. */ sha256_init_ctx(&ctx); sha256_finish_ctx(&ctx, alt_result); +#ifdef PHP_WIN32 + RtlSecureZeroMemory(temp_result, sizeof(temp_result)); + RtlSecureZeroMemory(p_bytes, key_len); + RtlSecureZeroMemory(s_bytes, salt_len); + RtlSecureZeroMemory(&ctx, sizeof(ctx)); + RtlSecureZeroMemory(&alt_ctx, sizeof(alt_ctx)); + + if (copied_key != NULL) { + RtlSecureZeroMemory(copied_key, key_len); + } + if (copied_salt != NULL) { + RtlSecureZeroMemory(copied_salt, salt_len); + } +#else memset(temp_result, '\0', sizeof(temp_result)); memset(p_bytes, '\0', key_len); memset(s_bytes, '\0', salt_len); @@ -579,11 +593,11 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b if (copied_key != NULL) { memset(copied_key, '\0', key_len); - } if (copied_salt != NULL) { memset(copied_salt, '\0', salt_len); } +#endif return buffer; }