diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-04-08 14:19:11 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-04-08 14:26:00 +0200 |
| commit | 4ce5669419c344de561f627592349773765b064c (patch) | |
| tree | 05d796cf5175c30e995ca44a0c1f90e24b813f22 /apps/encryption/lib/keymanager.php | |
| parent | dfc0a26e57effbb9c53f383b0c7a5f55323bf810 (diff) | |
| download | nextcloud-server-4ce5669419c344de561f627592349773765b064c.tar.gz nextcloud-server-4ce5669419c344de561f627592349773765b064c.zip | |
read cipher from key header and always write a key header if a new private key is stored
Diffstat (limited to 'apps/encryption/lib/keymanager.php')
| -rw-r--r-- | apps/encryption/lib/keymanager.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php index 81bc082042d..a280ea9bde3 100644 --- a/apps/encryption/lib/keymanager.php +++ b/apps/encryption/lib/keymanager.php @@ -200,9 +200,10 @@ class KeyManager { $encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'], $password); + $header = $this->crypt->generateHeader(); if ($encryptedKey) { - $this->setPrivateKey($uid, $encryptedKey); + $this->setPrivateKey($uid, $header . $encryptedKey); return true; } return false; @@ -219,9 +220,10 @@ class KeyManager { $encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'], $password); + $header = $this->crypt->generateHeader(); if ($encryptedKey) { - $this->setSystemPrivateKey($this->getRecoveryKeyId(), $encryptedKey); + $this->setSystemPrivateKey($this->getRecoveryKeyId(), $header . $encryptedKey); return true; } return false; |