upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-13 00:51:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #11783 from suntorytimed/stable14

Browse source 
[stable14] backport of #10778
This commit is contained in:
Morris Jobke 2018-10-24 13:32:52 +02:00 committed by GitHub
commit cdca81b966
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/encryption/lib/Crypto/Crypt.php
View file

@ -457,6 +457,10 @@ class Crypt {
* @throws DecryptionFailedException
*/
public function symmetricDecryptFileContent($keyFileContents, $passPhrase, $cipher = self::DEFAULT_CIPHER, $version = 0, $position = 0) {
if ($keyFileContents == '') {
return '';
}
$catFile = $this->splitMetaData($keyFileContents, $cipher);
if ($catFile['signature'] !== false) {