summaryrefslogtreecommitdiffstats
path: root/apps/settings/lib/Controller
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-08-19 20:42:34 +0200
committerGitHub <noreply@github.com>2020-08-19 20:42:34 +0200
commitda584462d121fcb6cba05b9bb33aae87cdc7a96e (patch)
treef8c78a1f5c76e6397421c8df4caa799d42813dfd /apps/settings/lib/Controller
parentb604d5232ea24af43e13daa61a3d5867cc029b64 (diff)
parent5a064ec28b05ab1976543a9a68a699fba5eb4af2 (diff)
downloadnextcloud-server-da584462d121fcb6cba05b9bb33aae87cdc7a96e.tar.gz
nextcloud-server-da584462d121fcb6cba05b9bb33aae87cdc7a96e.zip
Merge pull request #22018 from nextcloud/bugfix/noid/harden-key-generation
Harden SSE key generation
Diffstat (limited to 'apps/settings/lib/Controller')
-rw-r--r--apps/settings/lib/Controller/ChangePasswordController.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php
index 3006e89318f..668b0e49e66 100644
--- a/apps/settings/lib/Controller/ChangePasswordController.php
+++ b/apps/settings/lib/Controller/ChangePasswordController.php
@@ -188,7 +188,9 @@ class ChangePasswordController extends Controller {
\OC::$server->getUserSession(),
new \OCA\Encryption\Session(\OC::$server->getSession()),
\OC::$server->getLogger(),
- $util);
+ $util,
+ \OC::$server->getLockingProvider()
+ );
$recovery = new \OCA\Encryption\Recovery(
\OC::$server->getUserSession(),
$crypt,