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

Updated MineKeepassLib to current release

Browse Source
This commit is contained in:
michael starke
2013-03-07 01:17:54 +01:00
parent a90c46f7cd
commit 0236128df4
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MacPass/MPDatabaseDocument.m
View File

@@ -125,23 +125,8 @@ NSString *const MPDidLoadDatabaseNotification = @"DidLoadDataBaseNotification";
return NO;
}
- (KdbPassword *)passwordHash {
// Create the password for the given parameters
if( self.password && self.key) {
return [[[KdbPassword alloc] initWithPassword:self.password encoding:NSUTF8StringEncoding keyfile:[self.key path]] autorelease];
}
if( self.password ) {
return [[[KdbPassword alloc] initWithPassword:self.password encoding:NSUTF8StringEncoding] autorelease];
}
if( self.key ) {
return [[[KdbPassword alloc] initWithKeyfile:[self.key path]] autorelease];
}
NSLog(@"Error: No password or keyfile given!");
return nil;
- (KdbPassword *)passwordHash {
return [[KdbPassword alloc] initWithPassword:self.password passwordEncoding:NSUTF8StringEncoding keyFile:[self.key path]];
}
@end