mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7843 from nextcloud/dep_util 

Remove deprecated functions for OCP\Util
This commit is contained in:
Morris Jobke 2018-01-14 14:56:38 +01:00 committed by GitHub
parent a2678d56aa dffa922c0b
commit 3adda336a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_external/lib/config.php
View File

@ -361,7 +361,7 @@ class OC_Mount_Config {
*/
private static function encryptPassword($password) {
$cipher = self::getCipher();
$iv = \OCP\Util::generateRandomBytes(16);
$iv = \OC::$server->getSecureRandom()->generate(16);
$cipher->setIV($iv);
return base64_encode($iv . $cipher->encrypt($password));
}

2
apps/user_ldap/tests/Group_LDAPTest.php
View File

@ -150,7 +150,7 @@ class Group_LDAPTest extends \Test\TestCase {
$access->expects($this->any())
->method('dn2username')
->will($this->returnCallback(function() {
return 'foobar' . \OCP\Util::generateRandomBytes(7);
return 'foobar' . \OC::$server->getSecureRandom()->generate(7);
}));
$groupBackend = new GroupLDAP($access,$pluginManager);

26
lib/public/Util.php
View File

@ -244,21 +244,6 @@ class Util {
\OC_Util::addHeader($tag, $attributes, $text);
}
/**
* formats a timestamp in the "right" way
* @param int $timestamp $timestamp
* @param bool $dateOnly option to omit time from the result
* @param DateTimeZone|string $timeZone where the given timestamp shall be converted to
* @return string timestamp
*
* @deprecated 8.0.0 Use \OC::$server->query('DateTimeFormatter') instead
* @since 4.0.0
* @suppress PhanDeprecatedFunction
*/
public static function formatDate($timestamp, $dateOnly=false, $timeZone = null) {
return \OC_Util::formatDate($timestamp, $dateOnly, $timeZone);
}
/**
* check if some encrypted files are stored
* @return bool
@ -656,17 +641,6 @@ class Util {
return \OC_Util::isValidFileName($file);
}
/**
* Generates a cryptographic secure pseudo-random string
* @param int $length of the random string
* @return string
* @deprecated 8.0.0 Use \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate($length); instead
* @since 7.0.0
*/
public static function generateRandomBytes($length = 30) {
return \OC::$server->getSecureRandom()->generate($length, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
}
/**
* Compare two strings to provide a natural sort
* @param string $a first string to compare