diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-01-13 11:28:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 11:28:43 +0100 |
| commit | 622101f2dd43f618fa278976e38df8541f145bb6 (patch) | |
| tree | 4e16e7c1839079b46334767659e3f4cf841b17cd /apps/encryption/lib/KeyManager.php | |
| parent | 00c3f807db59f69cac37429f1b4be424720371e3 (diff) | |
| parent | fcda3a20f455795b898161ec4ada0aeb500b9218 (diff) | |
| download | nextcloud-server-622101f2dd43f618fa278976e38df8541f145bb6.tar.gz nextcloud-server-622101f2dd43f618fa278976e38df8541f145bb6.zip | |
Merge pull request #2918 from nextcloud/encryption-recovery-improvements
create new encryption keys on password reset and backup the old one
Diffstat (limited to 'apps/encryption/lib/KeyManager.php')
| -rw-r--r-- | apps/encryption/lib/KeyManager.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php index 26f023ed8f9..caae154b2d3 100644 --- a/apps/encryption/lib/KeyManager.php +++ b/apps/encryption/lib/KeyManager.php @@ -560,11 +560,10 @@ class KeyManager { /** * @param string $purpose - * @param bool $timestamp - * @param bool $includeUserKeys + * @param string $uid */ - public function backupAllKeys($purpose, $timestamp = true, $includeUserKeys = true) { -// $backupDir = $this->keyStorage->; + public function backupUserKeys($purpose, $uid) { + $this->keyStorage->backupUserKeys(Encryption::ID, $purpose, $uid); } /** @@ -573,7 +572,6 @@ class KeyManager { * @param string $uid */ public function deleteUserKeys($uid) { - $this->backupAllKeys('password_reset'); $this->deletePublicKey($uid); $this->deletePrivateKey($uid); } |