diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-03-21 20:58:34 +0000 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-03-25 08:30:20 +0100 |
| commit | 078a07a46a88b8ec22f65db7aba1eabb38a112e2 (patch) | |
| tree | 4a5e5bfd2e1d4e1fac0707093ca8fc9bc094cd9e /officecfg | |
| parent | ccad7357b983294ba2f0d8e18f3c2955d7a6d41d (diff) | |
make hash encoding match decoding
Seeing as old versions of the hash may be in the users config, add a
StorageVersion field to the office config Passwords section which
defaults to 0 to indicate the old hash is in use.
Try the old varient when StorageVersion is 0. When a new encoded master
password it set write StorageVersion of 1 to indicate a new hash is in
use and use the new style when StorageVersion is 1.
Change-Id: I3174c37a5891bfc849984e0ec5c2c392b9c6e7b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132041
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index dac495521742..a7e5adf6a78f 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -943,6 +943,12 @@ </info> <value>false</value> </prop> + <prop oor:name="StorageVersion" oor:type="xs:int" oor:nillable="false"> + <info> + <desc>Specifies what version of encoding scheme the password container uses.</desc> + </info> + <value>0</value> + </prop> <prop oor:name="HasMaster" oor:type="xs:boolean" oor:nillable="false"> <info> <desc>Specifies if there is a valid master password.</desc> |