]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: feb8a79) | patch
backport of #10778 11783/head
authorStefan Weiberg <sweiberg@suse.com>
Thu, 11 Oct 2018 18:24:36 +0000 (20:24 +0200)
committerRoeland Jago Douma <roeland@famdouma.nl>
Wed, 24 Oct 2018 07:08:03 +0000 (09:08 +0200)
commite8db4017b8640762880212197dc489b5ff4389bc
tree942b3730fff53e6731e92338eae52c0ef9ed9246tree | snapshot
parentfeb8a795ea92bdf544e987a17b800d3a3809c232commit | diff
backport of #10778

Adding a check to see if keyFileContents is empty:

* this fixes a download error and an exception if the data content
  for encryption is empty
* #3958: for recovering encrypted files with a damaged signature
  this is necessary in addition to turning the signature check off

Signed-off-by: Stefan Weiberg <sweiberg@suse.com>
apps/encryption/lib/Crypto/Crypt.php diff | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server