[15.x] Backport encryption improvements #312
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
* fix: prefer encryptionKey for encryption when possible * refactor: add test case
* chore: update browser-passworder * refactor: remove `updateVault` from `GenericEncryptor`
|
@Gudahtt we probably want to merge this without squashing to preserve the cherry-picked commits, but it is currently not allowed by the repo settings |
|
Just as a heads up, I've renamed the branch from |
mikesposito
changed the title
|
I think we'll want to regular merge when syncing this back into the main branch, after the next v15 release goes out. Merging here wouldn't have an advantage because commits are already unique to this branch, i.e. they already won't line up with the same commits on main |
Gudahtt
added a commit
that referenced
this pull request
Jan 9, 2024
* [15.x] Backport encryption improvements (#312) * Prefer cached `encryptionKey` for encryption when possible (#307) * fix: prefer encryptionKey for encryption when possible * refactor: add test case * Use encryptor `isVaultUpdated` (#310) * chore: update browser-passworder * refactor: remove `updateVault` from `GenericEncryptor` * 15.1.0 (#313) * 15.1.0 * edit changelog entries * rephrase changelog entry --------- Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Michele Esposito <michele@esposito.codes> --------- Co-authored-by: Michele Esposito <34438276+mikesposito@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Michele Esposito <michele@esposito.codes> Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
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.
Description
This PR backports the following commits to
15.x:Changes
isVaultUpdatedproperty toGenericEncryptortype@metamask/browser-passworderto^4.3.0isVaultUpdatedmethod, the latter is used to check if the vault is updated instead ofupdateVaultGenericEncryptor'supdateVaultproperty has been removed as no longer usedReferences
Checklist