From 1f5f8129deb692ec28c24ac593e861faae623e95 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Thu, 28 Jun 2018 02:39:07 +0000
Subject: [PATCH] Security: Harden the random aspect of the hash used for user
 profile and admin email address changes.

Props BjornW

Fixes #43771

Merges [43367] to the 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@43368


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43196 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/misc.php | 2 +-
 wp-includes/user.php       | 2 +-
 wp-includes/version.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index d03c1df57b..887c4e2561 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -1158,7 +1158,7 @@ function update_option_new_admin_email( $old_value, $value ) {
 		return;
 	}
 
-	$hash = md5( $value . time() . mt_rand() );
+	$hash = md5( $value . time() . wp_rand() );
 	$new_admin_email = array(
 		'hash'     => $hash,
 		'newemail' => $value,
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 703d2bcf0f..fa4ea7a7ba 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -2650,7 +2650,7 @@ function send_confirmation_on_profile_email() {
 			return;
 		}
 
-		$hash           = md5( $_POST['email'] . time() . mt_rand() );
+		$hash           = md5( $_POST['email'] . time() . wp_rand() );
 		$new_user_email = array(
 			'hash'     => $hash,
 			'newemail' => $_POST['email'],
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ac3699b3e6..124840a43a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9.7-alpha-43366';
+$wp_version = '4.9.7-alpha-43368';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.