diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-04-15 19:37:03 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-04-16 14:15:04 +0200 |
| commit | 959665003b408ed837066307350fb76b83beaa52 (patch) | |
| tree | b95a3dbf9b91abe270732c1ae9874be488af8d16 /apps/encryption/lib/crypto | |
| parent | b25c06f5769fbcd90a780cbce90998a38c112043 (diff) | |
| download | nextcloud-server-959665003b408ed837066307350fb76b83beaa52.tar.gz nextcloud-server-959665003b408ed837066307350fb76b83beaa52.zip | |
decrypt private key for public shares correctly
Diffstat (limited to 'apps/encryption/lib/crypto')
| -rw-r--r-- | apps/encryption/lib/crypto/crypt.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php index c026aa6a90a..9ada9200551 100644 --- a/apps/encryption/lib/crypto/crypt.php +++ b/apps/encryption/lib/crypto/crypt.php @@ -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); |