make MAC check robust against unpadded vs padded base64 differences #1378
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
t3chguy
reviewed
May 15, 2020
| @@ -167,7 +167,7 @@ export class SecretStorage extends EventEmitter { | |||
| if (info.algorithm === SECRET_STORAGE_ALGORITHM_V1_AES) { | |||
| if (info.mac) { | |||
| const {mac} = await SecretStorage._calculateKeyCheck(key, info.iv); | |||
| return info.mac === mac; | |||
| return info.mac.replace(/=+$/g, '') === mac.replace(/=+$/g, ''); | |||
There was a problem hiding this comment.
is info mac one mac or multiple, one per line? just wondering about the point of the g modifier
There was a problem hiding this comment.
Just one. The g probably isn't needed (but shouldn't be harmful either). It was just copied from encodeUnpaddedBase64 in src/crypto/olmlib.js
t3chguy
approved these changes
May 16, 2020
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.
No description provided.