Commit:    43eb8dc04af1480b3caa62d252ede28dcb059c7b
Author:    Anthony Ferrara <ircmax...@gmail.com>         Tue, 12 Jun 2012 
14:32:21 -0400
Parents:   df3d351cad7ecc2b6087e7f26edf6fa8b22cd960
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=43eb8dc04af1480b3caa62d252ede28dcb059c7b

Log:
Remove un-needed memset, and replacing stray spaces

Changed paths:
  M  ext/hash/hash.c


Diff:
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 40023f7..74c86a8 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);
        }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to