nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-24 18:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added enforce character group usage

Browse Source
This commit is contained in:
Michael Starke
2019-01-29 16:57:52 +01:00
parent dd54a980ed
commit 6068260abb
5 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MacPass/NSString+MPPasswordCreation.m
View File

@@ -71,7 +71,8 @@ static NSString *mergeWithoutDuplicates(NSString* baseCharacters, NSString* cust
}
+ (NSString *)passwordWithCharactersets:(MPPasswordCharacterFlags)allowedCharacters
withCustomCharacters:(NSString*)customCharacters
withCustomCharacters:(NSString *)customCharacters
ensureOccurence:(BOOL)ensureOccurence
length:(NSUInteger)length {
NSMutableString *password = [NSMutableString stringWithCapacity:length];
NSString *characters = mergeWithoutDuplicates(
@@ -99,9 +100,7 @@ static NSString *mergeWithoutDuplicates(NSString* baseCharacters, NSString* cust
if(useCustomString && customString.length > 0) {
return [customString passwordWithLength:passwordLength];
}
return [NSString passwordWithCharactersets:characterFlags
withCustomCharacters:@""
length:passwordLength];
return [NSString passwordWithCharactersets:characterFlags withCustomCharacters:@"" ensureOccurence:NO length:passwordLength];
}
- (NSString *)passwordWithLength:(NSUInteger)length {
@@ -112,7 +111,7 @@ static NSString *mergeWithoutDuplicates(NSString* baseCharacters, NSString* cust
if(self.length == 0) {
return nil;
}
return [self composedCharacterAtIndex:arc4random_uniform((int)self.length)];
return [self composedCharacterAtIndex:arc4random_uniform((int)self.composedCharacterLength)];
}
- (CGFloat)entropyWhithPossibleCharacterSet:(MPPasswordCharacterFlags)allowedCharacters orCustomCharacters:(NSString *)customCharacters {
@@ -127,4 +126,17 @@ static NSString *mergeWithoutDuplicates(NSString* baseCharacters, NSString* cust
CGFloat passwordLength = self.composedCharacterLength;
return passwordLength * ( log10(alphabetCount) / log10(2) );
}
- (NSString *)shuffledString {
NSMutableArray *characters = [self.composedCharacters mutableCopy];
NSMutableString *shuffled = [[NSMutableString alloc] init];
while(characters.count > 0) {
NSUInteger index = arc4random_uniform((int)characters.count);
[shuffled appendString:characters[index]];
[characters removeObjectAtIndex:index];
}
return [shuffled copy];
}
@end