Changeset 29382 for trunk/src/wp-includes/pluggable.php

Timestamp:

08/06/2014 05:25:03 AM (12 years ago)

Author:

nacin

Message:

Constant time for wp_verify_nonce().

File:

• trunk/src/wp-includes/pluggable.php (modified) (2 diffs)

trunk/src/wp-includes/pluggable.php

@@ -672 +672 @@
         $hash = hash_hmac( 'sha256', $username . '|' . $expiration . '|' . $token, $key );
 
-        if ( hash_hmac( 'sha256', $hmac, $key ) !== hash_hmac( 'sha256', $hash, $key ) ) {
+        if ( ! hash_equals( $hash, $hmac ) ) {
                 /**
                  * Fires if a bad authentication cookie hash is encountered.
@@ -1712 +1712 @@
 
         // Nonce generated 0-12 hours ago
-        if ( $nonce === substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce'), -12, 10 ) ) {
+        $expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce'), -12, 10 );
+        if ( hash_equals( $expected, $nonce ) ) {
                 return 1;
         }
 
         // Nonce generated 12-24 hours ago
-        if ( $nonce === substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 ) ) {
+        $expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
+        if ( hash_equals( $expected, $nonce ) ) {
                 return 2;
         }