skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

iPad fixes & log initial start-up crashes.

Browse Source
This commit is contained in:
Maarten Billemont
2020-05-11 21:28:27 -04:00
parent 3fa7e1e8a1
commit 3bac8d9e0a
11 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform-darwin/Source/MPAppDelegate_Store.m
View File

@@ -713,8 +713,14 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
MPMarshalledFile *exportFile = NULL;
@try {
inf( @"Exporting sites, %@, for user: %@", revealPasswords? @"revealing passwords": @"omitting passwords", user.userID );
NSString *masterPassword = askExportPassword( user.name );
if (!masterPassword) {
inf( @"Export cancelled." );
return nil;
}
exportUser = mpw_marshal_user( user.name.UTF8String,
mpw_masterKeyProvider_str( askExportPassword( user.name ).UTF8String ), user.algorithm.version );
mpw_masterKeyProvider_str( masterPassword.UTF8String ), user.algorithm.version );
exportUser->redacted = !revealPasswords;
exportUser->avatar = (unsigned int)user.avatar;
exportUser->keyID = mpw_strdup( [user.keyID encodeHex].UTF8String );