Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-24 07:20:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Prevent KeeShare from merging database custom data

Browse source 
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:
Jonathan White 2024-04-28 23:22:01 -04:00
parent 43ca4e7dfe
commit 30d4e36a8b
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
9 changed files with 68 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/TestMerge.h
View file

@ -30,6 +30,7 @@ private slots:
void cleanup();
void testMergeIntoNew();
void testMergeNoChanges();
void testMergeCustomData();
void testResolveConflictNewer();
void testResolveConflictExisting();
void testResolveGroupConflictOlder();