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

Remove DMSplitView as it's never used

Browse Source 
Updated Readme to reflect new modules
Added CocoaHTTPServer submodule
Fixed SettingsWindow, works now with multiple tabs
Added ServerSettings tab
This commit is contained in:
michael starke
2013-06-17 01:29:29 +02:00
parent 32b45c0006
commit 236e7036bc
32 changed files with 918 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MacPass/NSString+MPPasswordCreation.m
View File

@@ -13,35 +13,18 @@ NSString *const kMPLowercaseLetterCharacters = @"abcdefghijklmnopqrstuvw";
NSString *const kMPNumberCharacters = @"1234567890";
NSString *const kMPSymbolCharacters = @"!$%&\\|/<>(){}[]=?*'+#-_.:,;";
static NSUInteger randomInteger(NSUInteger minimum, NSUInteger maximum) {
NSInteger delta = maximum - minimum;
if( delta == 0) {
return maximum;
}
if( delta < 0 ) {
minimum -= delta;
delta = -delta;
}
NSUInteger randomByteSize = floor(log2(delta));
NSData *randomData = [NSData dataWithRandomBytes:randomByteSize];
NSNumber *number = [NSNumber numberWithUnsignedChar:(unsigned char)[randomData bytes]];
NSUInteger randomNumber = [number integerValue];
return minimum + (randomNumber % delta);
}
static NSString *allowedCharactersString(MPPasswordCharacterFlags flags) {
NSMutableString *characterString = [NSMutableString stringWithCapacity:30];
if( 0 != (flags & MPPasswordCharactersLowerCase) ) {
if(flags & MPPasswordCharactersLowerCase) {
[characterString appendString:kMPLowercaseLetterCharacters];
}
if( 0 != (flags & MPPasswordCharactersUpperCase) ) {
if(flags & MPPasswordCharactersUpperCase) {
[characterString appendString:[kMPLowercaseLetterCharacters uppercaseString]];
}
if(0 != (flags & MPPasswordCharactersNumbers) ) {
if(flags & MPPasswordCharactersNumbers) {
[characterString appendString:kMPNumberCharacters];
}
if(0 != (flags & MPPasswordCharactersSymbols) ){
if(flags & MPPasswordCharactersSymbols){
[characterString appendString:kMPSymbolCharacters];
}
return characterString;
@@ -83,11 +66,10 @@ static NSString *allowedCharactersString(MPPasswordCharacterFlags flags) {
}
- (NSString *)randomCharacter {
NSUInteger randomIndex = randomInteger(0, [self length] - 1);
if(randomIndex >= [self length]) {
return nil;
}
return [self substringWithRange:NSMakeRange(randomIndex, 1)];
NSData *data = [NSData dataWithRandomBytes:sizeof(unsigned long)];
NSUInteger randomIndex;
[data getBytes:&randomIndex length:[data length]];
return [self substringWithRange:NSMakeRange(randomIndex % [self length], 1)];
}
@end