skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Allow migration of redacted state & show URL.

Browse Source
This commit is contained in:
Maarten Billemont
2017-08-07 18:57:10 -04:00
parent c044ae79cd
commit b26f5a82d7
2 changed files with 64 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/c/mpw-marshall.c
View File

@@ -622,13 +622,13 @@ static MPMarshalledUser *mpw_marshall_read_json(
json_object *json_sites = mpw_get_json_section( json_file, "sites" );
json_object_object_foreachC( json_sites, json_site ) {
const char *siteName = json_site.key;
value = mpw_get_json_int( json_site.val, "algorithm", (int)user->algorithm );
value = mpw_get_json_int( json_site.val, "algorithm", user->algorithm );
if (value < MPAlgorithmVersionFirst || value > MPAlgorithmVersionLast) {
*error = (MPMarshallError){ MPMarshallErrorIllegal, mpw_str( "Invalid site algorithm version: %s: %d", siteName, value ) };
return NULL;
}
MPAlgorithmVersion siteAlgorithm = (MPAlgorithmVersion)value;
MPPasswordType siteType = (MPPasswordType)mpw_get_json_int( json_site.val, "type", (int)user->defaultType );
MPPasswordType siteType = (MPPasswordType)mpw_get_json_int( json_site.val, "type", user->defaultType );
if (!mpw_nameForType( siteType )) {
*error = (MPMarshallError){ MPMarshallErrorIllegal, mpw_str( "Invalid site type: %s: %u", siteName, siteType ) };
return NULL;