|
|
|
@ -12,7 +12,6 @@ |
|
|
|
|
|
|
|
#ifdef PHP_WIN32 |
|
|
|
# include "win32/php_stdint.h" |
|
|
|
# include "win32/php_stdbool.h" |
|
|
|
# define __alignof__ __alignof |
|
|
|
# define alloca _alloca |
|
|
|
#else |
|
|
|
@ -21,7 +20,6 @@ |
|
|
|
# elif HAVE_STDINT_H |
|
|
|
# include <stdint.h> |
|
|
|
# endif |
|
|
|
# include <stdbool.h> |
|
|
|
#endif |
|
|
|
|
|
|
|
#include <stdio.h> |
|
|
|
@ -357,7 +355,7 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b |
|
|
|
char *s_bytes; |
|
|
|
/* Default number of rounds. */ |
|
|
|
size_t rounds = ROUNDS_DEFAULT; |
|
|
|
bool rounds_custom = false; |
|
|
|
zend_bool rounds_custom = 0; |
|
|
|
|
|
|
|
/* Find beginning of salt string. The prefix should normally always |
|
|
|
be present. Just in case it is not. */ |
|
|
|
@ -373,7 +371,7 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b |
|
|
|
if (*endp == '$') { |
|
|
|
salt = endp + 1; |
|
|
|
rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX)); |
|
|
|
rounds_custom = true; |
|
|
|
rounds_custom = 1; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|