diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-04-15 20:28:58 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-04-15 20:28:58 +0200 |
| commit | 8653da6c16597959c7bd0f0b202747ff96204575 (patch) | |
| tree | a7f6bd0c18fdc10dd4af405c84553e7bb79fbadb /apps/encryption/lib/keymanager.php | |
| parent | 512558c8277541c24a20b7e16bc1e94780b47ae1 (diff) | |
| parent | 389a101de657046fa4ba522019173e6f94d4a105 (diff) | |
| download | nextcloud-server-8653da6c16597959c7bd0f0b202747ff96204575.tar.gz nextcloud-server-8653da6c16597959c7bd0f0b202747ff96204575.zip | |
Merge pull request #15654 from owncloud/enc2_header_system_keys
make sure that encrypted private keys always have a header
Diffstat (limited to 'apps/encryption/lib/keymanager.php')
| -rw-r--r-- | apps/encryption/lib/keymanager.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php index a280ea9bde3..87adf75c924 100644 --- a/apps/encryption/lib/keymanager.php +++ b/apps/encryption/lib/keymanager.php @@ -140,7 +140,8 @@ class KeyManager { // Encrypt private key empty passphrase $encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'], ''); - $this->keyStorage->setSystemUserKey($this->publicShareKeyId . '.privateKey', $encryptedKey); + $header = $this->crypt->generateHeader(); + $this->setSystemPrivateKey($this->publicShareKeyId, $header . $encryptedKey); } $this->keyId = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false; |