skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

API update, user export.

Browse Source
This commit is contained in:
Maarten Billemont 2019-06-23 12:59:15 -04:00
parent 38b3dcdba0
commit eb1e23311e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
View File

@ -3918,7 +3918,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = "/bin/sh -e"; shellPath = "/bin/sh -e";
shellScript = "exec Scripts/updatePlist"; shellScript = "exec Scripts/updatePlist\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
DA8D88E019DA412A00B189D0 /* Run Script: genassets */ = { DA8D88E019DA412A00B189D0 /* Run Script: genassets */ = {

2
platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
View File

@ -2688,7 +2688,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = "/bin/sh -e"; shellPath = "/bin/sh -e";
shellScript = "exec Scripts/updatePlist"; shellScript = "exec Scripts/updatePlist\n";
}; };
DAD3125D155288AA00A3F9ED /* Run Script: Fabric */ = { DAD3125D155288AA00A3F9ED /* Run Script: Fabric */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;

12
platform-darwin/Source/MPAlgorithmV0.m
View File

@ -128,7 +128,7 @@ static NSOperationQueue *_mpwQueue = nil;
__block NSData *keyData; __block NSData *keyData;
[self mpw_perform:^{ [self mpw_perform:^{
NSDate *start = [NSDate date]; NSDate *start = [NSDate date];
MPMasterKey masterKey = mpw_masterKey( fullName.UTF8String, masterPassword.UTF8String, [self version] ); MPMasterKey masterKey = mpw_master_key( fullName.UTF8String, masterPassword.UTF8String, [self version] );
if (masterKey) { if (masterKey) {
keyData = [NSData dataWithBytes:masterKey length:MPMasterKeySize]; keyData = [NSData dataWithBytes:masterKey length:MPMasterKeySize];
trc( @"User: %@, password: %@ derives to key ID: %@ (took %0.2fs)", // trc( @"User: %@, password: %@ derives to key ID: %@ (took %0.2fs)", //
@ -365,7 +365,7 @@ static NSOperationQueue *_mpwQueue = nil;
__block NSString *result = nil; __block NSString *result = nil;
[self mpw_perform:^{ [self mpw_perform:^{
NSData *masterKey = [key keyForAlgorithm:self]; NSData *masterKey = [key keyForAlgorithm:self];
char const *resultBytes = mpw_siteResult( masterKey.bytes, name.UTF8String, char const *resultBytes = mpw_site_result( masterKey.bytes, name.UTF8String,
counter, purpose, context.UTF8String, type, parameter.UTF8String, [self version] ); counter, purpose, context.UTF8String, type, parameter.UTF8String, [self version] );
if (resultBytes) { if (resultBytes) {
result = [NSString stringWithCString:resultBytes encoding:NSUTF8StringEncoding]; result = [NSString stringWithCString:resultBytes encoding:NSUTF8StringEncoding];
@ -394,7 +394,7 @@ static NSOperationQueue *_mpwQueue = nil;
if (plainText) if (plainText)
[self mpw_perform:^{ [self mpw_perform:^{
NSData *masterKey = [key keyForAlgorithm:self]; NSData *masterKey = [key keyForAlgorithm:self];
char const *stateBytes = mpw_siteState( masterKey.bytes, site.name.UTF8String, char const *stateBytes = mpw_site_state( masterKey.bytes, site.name.UTF8String,
MPCounterValueInitial, MPKeyPurposeAuthentication, NULL, site.type, plainText.UTF8String, [self version] ); MPCounterValueInitial, MPKeyPurposeAuthentication, NULL, site.type, plainText.UTF8String, [self version] );
if (stateBytes) { if (stateBytes) {
state = [[NSString stringWithCString:stateBytes encoding:NSUTF8StringEncoding] decodeBase64]; state = [[NSString stringWithCString:stateBytes encoding:NSUTF8StringEncoding] decodeBase64];
@ -612,7 +612,7 @@ static NSOperationQueue *_mpwQueue = nil;
if (!(type & MPResultTypeClassTemplate)) if (!(type & MPResultTypeClassTemplate))
return NO; return NO;
size_t count = 0; size_t count = 0;
const char **templates = mpw_templatesForType( type, &count ); const char **templates = mpw_type_templates( type, &count );
if (!templates) if (!templates)
return NO; return NO;
@ -623,7 +623,7 @@ static NSOperationQueue *_mpwQueue = nil;
for (NSUInteger c = 0; c < strlen( template ); ++c) for (NSUInteger c = 0; c < strlen( template ); ++c)
templatePermutations = [templatePermutations decimalNumberByMultiplyingBy: templatePermutations = [templatePermutations decimalNumberByMultiplyingBy:
(id)[[NSDecimalNumber alloc] initWithUnsignedLong:strlen( mpw_charactersInClass( template[c] ) )]]; (id)[[NSDecimalNumber alloc] initWithUnsignedLong:strlen( mpw_class_characters( template[c] ) )]];
permutations = [permutations decimalNumberByAdding:templatePermutations]; permutations = [permutations decimalNumberByAdding:templatePermutations];
} }
@ -641,7 +641,7 @@ static NSOperationQueue *_mpwQueue = nil;
unsigned long characterEntropy = 0; unsigned long characterEntropy = 0;
for (NSString *characterClass in @[ @"v", @"c", @"a", @"x" ]) { for (NSString *characterClass in @[ @"v", @"c", @"a", @"x" ]) {
char const *charactersForClass = mpw_charactersInClass( characterClass.UTF8String[0] ); char const *charactersForClass = mpw_class_characters( characterClass.UTF8String[0] );
if (strchr( charactersForClass, passwordCharacter )) { if (strchr( charactersForClass, passwordCharacter )) {
// Found class for password character. // Found class for password character.