Changeset 29408

Timestamp:

08/06/2014 05:52:49 PM (12 years ago)

Author:

nacin

Message:

Use delimiters when building nonce hashes. Part two of [29384].

File:

• branches/3.9/src/wp-includes/pluggable.php (modified) (3 diffs)

branches/3.9/src/wp-includes/pluggable.php

@@ -1659 +1659 @@
 
         // Nonce generated 0-12 hours ago
-        $expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce'), -12, 10 );
+        $expected = substr( wp_hash( $i . '|' . $action . '|' . $uid, 'nonce'), -12, 10 );
         if ( hash_equals( $expected, $nonce ) ) {
                 return 1;
@@ -1665 +1665 @@
 
         // Nonce generated 12-24 hours ago
-        $expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
+        $expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid, 'nonce' ), -12, 10 );
         if ( hash_equals( $expected, $nonce ) ) {
                 return 2;
@@ -1694 +1694 @@
         $i = wp_nonce_tick();
 
-        return substr(wp_hash($i . $action . $uid, 'nonce'), -12, 10);
+        return substr(wp_hash($i . '|' . $action . '|' . $uid, 'nonce'), -12, 10);
 }
 endif;