skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fixes to V0 algorithm debug log output.

Browse Source
This commit is contained in:
Maarten Billemont 2014-09-16 00:45:39 -04:00
parent c97546a232
commit 06c62f70ed
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MasterPassword/ObjC/MPAlgorithmV0.m
View File

@ -367,9 +367,9 @@
uint32_t ncounter = htonl( counter ), nnameLength = htonl( name.length ); uint32_t ncounter = htonl( counter ), nnameLength = htonl( name.length );
NSData *counterBytes = [NSData dataWithBytes:&ncounter length:sizeof( ncounter )]; NSData *counterBytes = [NSData dataWithBytes:&ncounter length:sizeof( ncounter )];
NSData *nameLengthBytes = [NSData dataWithBytes:&nnameLength length:sizeof( nnameLength )]; NSData *nameLengthBytes = [NSData dataWithBytes:&nnameLength length:sizeof( nnameLength )];
NSString *scope = [self scopeForVariant:variant];; NSString *scope = [self scopeForVariant:variant];
trc( @"seed from: hmac-sha256(%@, %@ | %@ | %@ | %@)", trc( @"seed from: hmac-sha256(%@, %@ | %@ | %@ | %@)",
[key.keyData encodeBase64], scope, [nameLengthBytes encodeHex], name, [counterBytes encodeHex] ); [[key keyID] encodeHex], scope, [nameLengthBytes encodeHex], name, [counterBytes encodeHex] );
NSData *seed = [[NSData dataByConcatenatingDatas: NSData *seed = [[NSData dataByConcatenatingDatas:
[scope dataUsingEncoding:NSUTF8StringEncoding], [scope dataUsingEncoding:NSUTF8StringEncoding],
nameLengthBytes, nameLengthBytes,
@ -377,14 +377,14 @@
counterBytes, counterBytes,
nil] nil]
hmacWith:PearlHashSHA256 key:key.keyData]; hmacWith:PearlHashSHA256 key:key.keyData];
trc( @"seed is: %@", [seed encodeBase64] ); trc( @"seed is: %@", [seed encodeHex] );
const char *seedBytes = seed.bytes; const char *seedBytes = seed.bytes;
// Determine the cipher from the first seed byte. // Determine the cipher from the first seed byte.
NSAssert( [seed length], @"Missing seed." ); NSAssert( [seed length], @"Missing seed." );
NSArray *typeCiphers = [self ciphersForType:type]; NSArray *typeCiphers = [self ciphersForType:type];
NSString *cipher = typeCiphers[htons( seedBytes[0] ) % [typeCiphers count]]; NSString *cipher = typeCiphers[htons( seedBytes[0] ) % [typeCiphers count]];
trc( @"type %@, ciphers: %@, selected: %@", [self nameOfType:type], typeCiphers, cipher ); trc( @"type %@ (%lu), ciphers: %@, selected: %@", [self nameOfType:type], (unsigned long)type, typeCiphers, cipher );
// Encode the content, character by character, using subsequent seed bytes and the cipher. // Encode the content, character by character, using subsequent seed bytes and the cipher.
NSAssert( [seed length] >= [cipher length] + 1, @"Insufficient seed bytes to encode cipher." ); NSAssert( [seed length] >= [cipher length] + 1, @"Insufficient seed bytes to encode cipher." );

2
MasterPassword/ObjC/MPAlgorithmV1.m
View File

@ -69,7 +69,7 @@
NSAssert( [seed length], @"Missing seed." ); NSAssert( [seed length], @"Missing seed." );
NSArray *typeCiphers = [self ciphersForType:type]; NSArray *typeCiphers = [self ciphersForType:type];
NSString *cipher = typeCiphers[seedBytes[0] % [typeCiphers count]]; NSString *cipher = typeCiphers[seedBytes[0] % [typeCiphers count]];
trc( @"type %@ (%d), ciphers: %@, selected: %@", [self nameOfType:type], type, typeCiphers, cipher ); trc( @"type %@ (%lu), ciphers: %@, selected: %@", [self nameOfType:type], (unsigned long)type, typeCiphers, cipher );
// Encode the content, character by character, using subsequent seed bytes and the cipher. // Encode the content, character by character, using subsequent seed bytes and the cipher.
NSAssert( [seed length] >= [cipher length] + 1, @"Insufficient seed bytes to encode cipher." ); NSAssert( [seed length] >= [cipher length] + 1, @"Insufficient seed bytes to encode cipher." );