diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-08-07 15:51:43 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-08-07 15:51:43 +0200 |
| commit | 854fd63ea907a870f1916d266e18aaba97820e32 (patch) | |
| tree | 8223f61c364316185d7b859b2bdb888fc7a421e1 /apps/encryption/controller | |
| parent | 62bc0e5264af50be48dbcbb720b7bd16e8d88df5 (diff) | |
| download | nextcloud-server-854fd63ea907a870f1916d266e18aaba97820e32.tar.gz nextcloud-server-854fd63ea907a870f1916d266e18aaba97820e32.zip | |
use uid as additional information for salt
Diffstat (limited to 'apps/encryption/controller')
| -rw-r--r-- | apps/encryption/controller/settingscontroller.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/encryption/controller/settingscontroller.php b/apps/encryption/controller/settingscontroller.php index dbd960bb784..2a668f7cd4a 100644 --- a/apps/encryption/controller/settingscontroller.php +++ b/apps/encryption/controller/settingscontroller.php @@ -100,10 +100,10 @@ class SettingsController extends Controller { if ($passwordCorrect !== false) { $encryptedKey = $this->keyManager->getPrivateKey($uid); - $decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword); + $decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid); if ($decryptedKey) { - $encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword); + $encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid); $header = $this->crypt->generateHeader(); if ($encryptedKey) { $this->keyManager->setPrivateKey($uid, $header . $encryptedKey); |