upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

decrypt private key for public shares correctly

Browse source
This commit is contained in:
Bjoern Schiessle 2015-04-15 19:37:03 +02:00
parent b25c06f576
commit 959665003b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/encryption/lib/crypto/crypt.php
View file

@ -231,7 +231,7 @@ class Crypt {
* @param string $password
* @return bool|string
*/
public function decryptPrivateKey($privateKey, $password) {
public function decryptPrivateKey($privateKey, $password = '') {
$header = $this->parseHeader($privateKey);
@ -273,7 +273,7 @@ class Crypt {
* @return string
* @throws DecryptionFailedException
*/
public function symmetricDecryptFileContent($keyFileContents, $passPhrase = '', $cipher = self::DEFAULT_CIPHER) {
public function symmetricDecryptFileContent($keyFileContents, $passPhrase, $cipher = self::DEFAULT_CIPHER) {
// Remove Padding
$noPadding = $this->removePadding($keyFileContents);

2
apps/encryption/lib/keymanager.php
View file

@ -337,7 +337,7 @@ class KeyManager {
$uid = $this->getPublicShareKeyId();
$shareKey = $this->getShareKey($path, $uid);
$privateKey = $this->keyStorage->getSystemUserKey($this->publicShareKeyId . '.privateKey');
$privateKey = $this->crypt->symmetricDecryptFileContent($privateKey);
$privateKey = $this->crypt->decryptPrivateKey($privateKey);
} else {
$shareKey = $this->getShareKey($path, $uid);
$privateKey = $this->session->getPrivateKey();

2
apps/encryption/tests/lib/KeyManagerTest.php
View file

@ -268,7 +268,7 @@ class KeyManagerTest extends TestCase {
->willReturn(true);
$this->cryptMock->expects($this->once())
->method('symmetricDecryptFileContent')
->method('decryptPrivateKey')
->willReturn(true);
$this->cryptMock->expects($this->once())