com php-src: more appropriate var name: win32/winutil.c
| From: | Anatol Belski | Date: | Tue, 21 Feb 2017 13:37:42 +0000 |
| Subject: | com php-src: more appropriate var name: win32/winutil.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97146@lists.php.net to get a copy of this message | ||
Commit: 41d2944b0a6c0916ff644e76febc05c7431406d7
Author: Anatol Belski <ab@php.net> Tue, 21 Feb 2017 14:37:42 +0100
Parents: 42a8f0755c0319ecbe3be2e2c5bbf319743daba1
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=41d2944b0a6c0916ff644e76febc05c7431406d7
Log:
more appropriate var name
Changed paths:
M win32/winutil.c
Diff:
diff --git a/win32/winutil.c b/win32/winutil.c
index 469fc91..569cc0a 100644
--- a/win32/winutil.c
+++ b/win32/winutil.c
@@ -53,7 +53,7 @@ int php_win32_check_trailing_space(const char * path, const int path_len)
}/*}}}*/
static BCRYPT_ALG_HANDLE bcrypt_algo;
-static BOOL has_crypto_ctx = 0;
+static BOOL has_bcrypt_algo = 0;
#define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0)
@@ -62,9 +62,9 @@ BOOL php_win32_shutdown_random_bytes(void)
{/*{{{*/
BOOL ret = TRUE;
- if (has_crypto_ctx) {
+ if (has_bcrypt_algo) {
ret = NT_SUCCESS(BCryptCloseAlgorithmProvider(bcrypt_algo, 0));
- has_crypto_ctx = 0;
+ has_bcrypt_algo = 0;
}
return ret;
@@ -72,13 +72,13 @@ BOOL php_win32_shutdown_random_bytes(void)
BOOL php_win32_init_random_bytes(void)
{/*{{{*/
- if (has_crypto_ctx) {
+ if (has_bcrypt_algo) {
return TRUE;
}
- has_crypto_ctx = NT_SUCCESS(BCryptOpenAlgorithmProvider(&bcrypt_algo, BCRYPT_RNG_ALGORITHM,
NULL, 0));
+ has_bcrypt_algo = NT_SUCCESS(BCryptOpenAlgorithmProvider(&bcrypt_algo, BCRYPT_RNG_ALGORITHM,
NULL, 0));
- return has_crypto_ctx;
+ return has_bcrypt_algo;
}/*}}}*/
#endif
@@ -91,7 +91,7 @@ PHP_WINUTIL_API int php_win32_get_random_bytes(unsigned char *buf, size_t size)
/* Currently we fail on startup, with CNG API it shows no regressions so far and is secure.
Should switch on and try to reinit, if it fails too often on startup. This means also
bringing locks back. */
- if (has_crypto_ctx == 0) {
+ if (has_bcrypt_algo == 0) {
return FAILURE;
}
#endif