summaryrefslogtreecommitdiff
path: root/ext/hash/hash.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/hash/hash.c')
-rw-r--r--ext/hash/hash.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 945d2033d4..41c7a70d2b 100644
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -609,16 +609,15 @@ Generate a PBKDF2 hash of the given password and salt
Returns lowercase hexits by default */
PHP_FUNCTION(hash_pbkdf2)
{
- char *returnval, *algo, *salt, *pass = NULL;
- unsigned char *computed_salt, *digest, *temp, *result, *K1, *K2 = NULL;
- long loops, i, j, algo_len, pass_len, iterations, length, digest_length = 0;
- int argc, salt_len = 0;
+ char *returnval, *algo, *salt, *pass;
+ unsigned char *computed_salt, *digest, *temp, *result, *K1, *K2;
+ long loops, i, j, iterations, length = 0, digest_length;
+ int algo_len, pass_len, salt_len;
zend_bool raw_output = 0;
const php_hash_ops *ops;
void *context;
- argc = ZEND_NUM_ARGS();
- if (zend_parse_parameters(argc TSRMLS_CC, "sssl|lb", &algo, &algo_len, &pass, &pass_len, &salt, &salt_len, &iterations, &length, &raw_output) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssl|lb", &algo, &algo_len, &pass, &pass_len, &salt, &salt_len, &iterations, &length, &raw_output) == FAILURE) {
return;
}