Use proper RNG generator

OC_Util::generateRandomBytes() only returns lowercase alphanumeric values.
We should use the new RNG which has a broader characterset.

3 files changed, 3 insertions, 3 deletions

diff --git a/lib/private/user.php b/lib/private/user.php
index 509a7c71209..a79fc2ce834 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -428,7 +428,7 @@ class OC_User {
 	 * generates a password
 	 */
 	public static function generatePassword() {
-		return OC_Util::generateRandomBytes(30);
+		return \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(30);
 	}
 
 	/**
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 11938db5076..5517e08a25d 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -234,7 +234,7 @@ class Session implements IUserSession, Emitter {
 		}
 		// replace successfully used token with a new one
 		\OC_Preferences::deleteKey($uid, 'login_token', $currentToken);
-		$newToken = \OC_Util::generateRandomBytes(32);
+		$newToken = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(32);
 		\OC_Preferences::setValue($uid, 'login_token', $newToken, time());
 		$this->setMagicInCookie($user->getUID(), $newToken);
 
diff --git a/lib/private/util.php b/lib/private/util.php
index bc20b7bcd56..94508e502e4 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -940,7 +940,7 @@ class OC_Util {
 		// Check if a token exists
 		if (!\OC::$server->getSession()->exists('requesttoken')) {
 			// No valid token found, generate a new one.
-			$requestToken = self::generateRandomBytes(20);
+			$requestToken = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(30);
 			\OC::$server->getSession()->set('requesttoken', $requestToken);
 		} else {
 			// Valid token already exists, send it