nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 02:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #451 from magebarf/master

Browse Source 
Fix entropy calculation
This commit is contained in:
Michael Starke
2016-04-18 10:04:28 +02:00
parent 312fa40eae 1e3e3e141c
commit d91b56e7b3
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MacPass/NSString+MPPasswordCreation.m
View File

@@ -105,12 +105,17 @@ static NSString *mergeWithoutDuplicates(NSString* baseCharacters, NSString* cust
} }
- (CGFloat)entropyWhithPossibleCharacterSet:(MPPasswordCharacterFlags)allowedCharacters orCustomCharacters:(NSString *)customCharacters { - (CGFloat)entropyWhithPossibleCharacterSet:(MPPasswordCharacterFlags)allowedCharacters orCustomCharacters:(NSString *)customCharacters {
CGFloat alphabetCount = customCharacters.length; NSString *characters = nil;
if(nil == customCharacters) { if(nil == customCharacters) {
NSString *stringSet = allowedCharactersString(allowedCharacters); characters = allowedCharactersString(allowedCharacters);
alphabetCount = stringSet.length;
} }
CGFloat passwordLegnth = self.length; else {
return passwordLegnth * ( log10(alphabetCount) / log10(2) ); NSString *characters = mergeWithoutDuplicates(
allowedCharactersString(allowedCharacters),
customCharacters);
}
CGFloat alphabetCount = characters.length;
CGFloat passwordLength = self.length;
return passwordLength * ( log10(alphabetCount) / log10(2) );
} }
@end @end