mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-12-04 15:39:34 +01:00
Prevent KeeShare from merging database custom data
This issue previously caused parent databases to be marked as modified on unlock. This was because of the new protections against byte-by-byte side channel attacks adds a randomized string to the database custom data. We should never be merging database custom data with keeshare or imports since we are merging groups only. Also prevent overwrite of auto-generated custom data fields, Last Modified and Random Slug.
This commit is contained in:
@@ -30,6 +30,7 @@ private slots:
|
||||
void cleanup();
|
||||
void testMergeIntoNew();
|
||||
void testMergeNoChanges();
|
||||
void testMergeCustomData();
|
||||
void testResolveConflictNewer();
|
||||
void testResolveConflictExisting();
|
||||
void testResolveGroupConflictOlder();
|
||||
|
||||
Reference in New Issue
Block a user