aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-01-13 19:41:34 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2018-01-13 19:41:34 +0100
commitdffa922c0b3c84394b955caeabac004381e604ac (patch)
treea8fc5f1c90b5cfc23263516fed5bd8c58ecdd46b
parent1faef0c459a51a025f73f7eee46e5607ee6eedf5 (diff)
downloadnextcloud-server-dffa922c0b3c84394b955caeabac004381e604ac.tar.gz
nextcloud-server-dffa922c0b3c84394b955caeabac004381e604ac.zip
Remove deprecated functions for OCP\Util
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r--apps/files_external/lib/config.php2
-rw-r--r--apps/user_ldap/tests/Group_LDAPTest.php2
-rw-r--r--lib/public/Util.php26
3 files changed, 2 insertions, 28 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 13960dde684..ae04daf4f31 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -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));
}
diff --git a/apps/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php
index e758bc9bd02..03fd73f261f 100644
--- a/apps/user_ldap/tests/Group_LDAPTest.php
+++ b/apps/user_ldap/tests/Group_LDAPTest.php
@@ -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);
diff --git a/lib/public/Util.php b/lib/public/Util.php
index 5127beaf505..2fb6bdf491d 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -245,21 +245,6 @@ class Util {
}
/**
- * 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
*
@@ -657,17 +642,6 @@ class Util {
}
/**
- * 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
* @param string $b second string to compare