Skip to content

Remove deprecated functions for OCP\Util #7843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Jan 14, 2018
Merged

Remove deprecated functions for OCP\Util #7843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files_external/lib/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ public static function decryptPasswords($options) {
*/
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));
}
Expand Down
2 changes: 1 addition & 1 deletion apps/user_ldap/tests/Group_LDAPTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public function testCountWithSearchString() {
$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);
Expand Down
26 changes: 0 additions & 26 deletions lib/public/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,21 +244,6 @@ public static function addHeader($tag, $attributes, $text=null) {
\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
Expand Down Expand Up @@ -656,17 +641,6 @@ public static function isValidFileName($file) {
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
Expand Down