summaryrefslogtreecommitdiff
path: root/ext/hash/hash.c
diff options
context:
space:
mode:
authorAnthony Ferrara <ircmaxell@gmail.com>2012-06-12 14:32:21 -0400
committerAnthony Ferrara <ircmaxell@gmail.com>2012-06-12 14:32:21 -0400
commit43eb8dc04af1480b3caa62d252ede28dcb059c7b (patch)
tree1ab4dd428107e8dd29f7254fee4c6a902ca86f0a /ext/hash/hash.c
parentdf3d351cad7ecc2b6087e7f26edf6fa8b22cd960 (diff)
downloadphp-git-43eb8dc04af1480b3caa62d252ede28dcb059c7b.tar.gz
Remove un-needed memset, and replacing stray spaces
Diffstat (limited to 'ext/hash/hash.c')
-rw-r--r--ext/hash/hash.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 40023f75b8..74c86a8714 100644
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -652,7 +652,6 @@ PHP_FUNCTION(hash_pbkdf2)
temp = emalloc(ops->digest_size);
/* Setup Keys that will be used for all hmac rounds */
- memset(K2, 0, ops->block_size);
php_hash_hmac_prep_key(K1, ops, context, (unsigned char *) pass, pass_len);
/* Convert K1 to opad -- 0x6A = 0x36 ^ 0x5C */
php_hash_string_xor_char(K2, K1, 0x6A, ops->block_size);
@@ -661,7 +660,7 @@ PHP_FUNCTION(hash_pbkdf2)
if (length == 0) {
length = ops->digest_size;
}
- digest_length = length;
+ digest_length = length;
if (!raw_output) {
digest_length = (long) ceil((float) length / 2.0);
}