[stable14] check for empty string #11783
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@schiessle @rullzer as requested the backport of #10778 to stable14 |
rullzer
approved these changes
Oct 11, 2018
MorrisJobke
reviewed
Oct 15, 2018
apps/encryption/lib/Crypto/Crypt.php
Outdated
| @@ -457,6 +457,10 @@ protected function isValidPrivateKey($plainKey) { | |||
| * @throws DecryptionFailedException | |||
| */ | |||
| public function symmetricDecryptFileContent($keyFileContents, $passPhrase, $cipher = self::DEFAULT_CIPHER, $version = 0, $position = 0) { | |||
| if ($keyFileContents == '') { | |||
| return ''; | |||
| } | |||
There was a problem hiding this comment.
Could you fix the indentation? Then this is good to go in 👍
|
I took the liberty of fixing the indentation @MorrisJobke pleae review |
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>
ChristophWurst
requested changes
Oct 24, 2018
ChristophWurst
added
4. to release
Merged
MorrisJobke
changed the title
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adding a check to see if keyFileContents is empty:
for encryption is empty
this is necessary in addition to turning the signature check off
Backport of #10778