Changeset 11921

Timestamp:

09/12/2009 10:03:14 PM (17 years ago)

Author:

westi

Message:

Correct key padding and add support for raw_output in hash_hmac. Fixes #10284 props mdawaffe.

File:

• trunk/wp-includes/compat.php (modified) (1 diff)

trunk/wp-includes/compat.php

@@ -73 +73 @@
         if (strlen($key) > 64)
                 $key = pack($pack, $algo($key));
-        else if (strlen($key) < 64)
-                $key = str_pad($key, 64, chr(0));
+
+        $key = str_pad($key, 64, chr(0));
 
         $ipad = (substr($key, 0, 64) ^ str_repeat(chr(0x36), 64));
         $opad = (substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64));
 
-        return $algo($opad . pack($pack, $algo($ipad . $data)));
+        $hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
+
+        if ( $raw_output )
+                return pack( $pack, $hmac );
+        return $hmac;
 }