E2EE: directly encrypt/decrypt #3802
Open
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
ezaquarii
reviewed
Mar 30, 2019
| @@ -201,7 +200,7 @@ protected RemoteOperationResult run(OwnCloudClient client) { | |||
| .get(mFile.getEncryptedFileName()).getAuthenticationTag()); | |||
|
|
|||
| try { | |||
| byte[] decryptedBytes = EncryptionUtils.decryptFile(tmpFile, key, iv, authenticationTag); | |||
| // byte[] decryptedBytes = EncryptionUtils.decryptFile(tmpFile, key, iv, authenticationTag); | |||
There was a problem hiding this comment.
Is this dead code needed here?
| @@ -519,7 +519,9 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare | |||
| // IV, always generate new one | |||
| byte[] iv = EncryptionUtils.randomBytes(EncryptionUtils.ivLength); | |||
|
|
|||
| EncryptionUtils.EncryptedFile encryptedFile = EncryptionUtils.encryptFile(mFile, key, iv); | |||
| // EncryptionUtils.EncryptedFile encryptedFile = EncryptionUtils.encryptFile(mFile, key, iv); | |||
There was a problem hiding this comment.
Do we need this dead line?
| // check authentication tag | ||
| byte[] extractedAuthenticationTag = Arrays.copyOfRange(fileBytes, | ||
| fileBytes.length - (128 / 8), fileBytes.length); | ||
| FileOutputStream fileOutputStream1 = new FileOutputStream(output); |
There was a problem hiding this comment.
This name looks like autogenerated by some bad generator. I'm sure we can avoid names like someVar7.
There was a problem hiding this comment.
Thanks for your first review, however this is in dev by me and I mainly opened a PR to not forget about it ;-)
I'll enhance this prior setting it to "2. to review".
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.
Previously it was first reading complete file into memory.
Signed-off-by: tobiasKaminsky tobias@kaminsky.me