diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-14 17:30:38 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-26 10:57:47 +0100 |
| commit | a90606fb14adc0aa149a87528d4f1ce61d0250e9 (patch) | |
| tree | 314b9edadf1e00211a65578c6f913eb23ab8b44d /apps/files_encryption/ajax/changeRecoveryPassword.php | |
| parent | 266f1a2afa890a7e2750a51fa3d6da98240751fe (diff) | |
| download | nextcloud-server-a90606fb14adc0aa149a87528d4f1ce61d0250e9.tar.gz nextcloud-server-a90606fb14adc0aa149a87528d4f1ce61d0250e9.zip | |
change private/public key names for consistency reasons
Diffstat (limited to 'apps/files_encryption/ajax/changeRecoveryPassword.php')
| -rw-r--r-- | apps/files_encryption/ajax/changeRecoveryPassword.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php index bf647f2c8fa..01b76a969b6 100644 --- a/apps/files_encryption/ajax/changeRecoveryPassword.php +++ b/apps/files_encryption/ajax/changeRecoveryPassword.php @@ -55,16 +55,15 @@ $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; $keyId = $util->getRecoveryKeyId(); -$keyPath = '/owncloud_private_key/' . $keyId . '.private.key'; -$encryptedRecoveryKey = $view->file_get_contents($keyPath); -$decryptedRecoveryKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedRecoveryKey, $oldPassword); +$encryptedRecoveryKey = Encryption\Keymanager::getPrivateSystemKey($keyId); +$decryptedRecoveryKey = $encryptedRecoveryKey ? \OCA\Encryption\Crypt::decryptPrivateKey($encryptedRecoveryKey, $oldPassword) : false; if ($decryptedRecoveryKey) { $cipher = \OCA\Encryption\Helper::getCipher(); $encryptedKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($decryptedRecoveryKey, $newPassword, $cipher); if ($encryptedKey) { - \OCA\Encryption\Keymanager::setPrivateSystemKey($encryptedKey, $keyId . '.private.key'); + \OCA\Encryption\Keymanager::setPrivateSystemKey($encryptedKey, $keyId); $return = true; } } |