diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-08-07 14:04:17 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-08-07 15:21:08 +0200 |
| commit | 62bc0e5264af50be48dbcbb720b7bd16e8d88df5 (patch) | |
| tree | ad0c95913483a7ed2d866066af4ed3d5c00bab6c /apps/encryption/lib/keymanager.php | |
| parent | 43888bb9bf46928acfe79084377b96133609ef6c (diff) | |
| download | nextcloud-server-62bc0e5264af50be48dbcbb720b7bd16e8d88df5.tar.gz nextcloud-server-62bc0e5264af50be48dbcbb720b7bd16e8d88df5.zip | |
use password hash instead of the plain password to encrypt the private key
Diffstat (limited to 'apps/encryption/lib/keymanager.php')
| -rw-r--r-- | apps/encryption/lib/keymanager.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php index 8c8c1f8fd78..47a8e7d391f 100644 --- a/apps/encryption/lib/keymanager.php +++ b/apps/encryption/lib/keymanager.php @@ -146,7 +146,7 @@ class KeyManager { Encryption::ID); // Encrypt private key empty passphrase - $encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'], ''); + $encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], ''); $header = $this->crypt->generateHeader(); $this->setSystemPrivateKey($this->publicShareKeyId, $header . $encryptedKey); } @@ -203,8 +203,8 @@ class KeyManager { // Save Public Key $this->setPublicKey($uid, $keyPair['publicKey']); - $encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'], - $password); + $encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $password); + $header = $this->crypt->generateHeader(); if ($encryptedKey) { @@ -226,8 +226,7 @@ class KeyManager { $keyPair['publicKey'], Encryption::ID); - $encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'], - $password); + $encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $password); $header = $this->crypt->generateHeader(); if ($encryptedKey) { |