Changeset 29384 for branches/3.9

Timestamp:

08/06/2014 05:41:12 AM (10 years ago)

Author:

nacin

Message:

Constant time for wp_verify_nonce().

Merges [29382] to the 3.9 branch.

Adds a second copy of hash_equals() to pluggable.php in case compat.php is not copied over in an update. (The general goal is no cross-file dependencies for minor releases.)

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-includes/compat.php (modified) (1 diff)
• src/wp-includes/pluggable.php (modified) (3 diffs)

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

@@ -95 +95 @@
     }
 }
+
+if ( ! function_exists( 'hash_equals' ) ) :
+/**
+ * Compare two strings in constant time.
+ *
+ * This function was added in PHP 5.6.
+ * It can leak the length of a string.
+ *
+ * @since 3.9.2
+ *
+ * @param string $a Expected string.
+ * @param string $b Actual string.
+ * @return bool Whether strings are equal.
+ */
+function hash_equals( $a, $b ) {
+    $a_length = strlen( $a );
+    if ( $a_length !== strlen( $b ) ) {
+        return false;
+    }
+    $result = 0;
+
+    // Do not attempt to "optimize" this.
+    for ( $i = 0; $i < $a_length; $i++ ) {
+        $result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
+    }
+
+    return $result === 0;
+}
+endif;

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

@@ -648 +648 @@
     $hash = hash_hmac('md5', $username . '|' . $expiration, $key);
 
-    if ( hash_hmac( 'md5', $hmac, $key ) !== hash_hmac( 'md5', $hash, $key ) ) {
+    if ( ! hash_equals( $hash, $hmac ) ) {
         /**
          * Fires if a bad authentication cookie hash is encountered.
@@ -1659 +1659 @@
 
     // Nonce generated 0-12 hours ago
-    if ( substr(wp_hash($i . $action . $uid, 'nonce'), -12, 10) === $nonce )
+    $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 ( substr(wp_hash(($i - 1) . $action . $uid, 'nonce'), -12, 10) === $nonce )
+    $expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
+    if ( hash_equals( $expected, $nonce ) ) {
         return 2;
+    }
+
     // Invalid nonce
     return false;
@@ -2201 +2207 @@
 endif;
 
+if ( ! function_exists( 'hash_equals' ) ) :
+/**
+ * Compare two strings in constant time.
+ *
+ * This function is NOT pluggable. It is in this file (in addition to
+ * compat.php) to prevent errors if, during an update, pluggable.php
+ * copies over but compat.php does not.
+ *
+ * This function was added in PHP 5.6.
+ * It can leak the length of a string.
+ *
+ * @since 3.9.2
+ *
+ * @param string $a Expected string.
+ * @param string $b Actual string.
+ * @return bool Whether strings are equal.
+ */
+function hash_equals( $a, $b ) {
+    $a_length = strlen( $a );
+    if ( $a_length !== strlen( $b ) ) {
+        return false;
+    }
+    $result = 0;
+
+    // Do not attempt to "optimize" this.
+    for ( $i = 0; $i < $a_length; $i++ ) {
+        $result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
+    }
+
+    return $result === 0;
+}
+endif;