Updated MineKeepassLib to current release

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

View File

@@ -125,23 +125,8 @@ NSString *const MPDidLoadDatabaseNotification = @"DidLoadDataBaseNotification";
return NO; return NO;
} }
- (KdbPassword *)passwordHash { - (KdbPassword *)passwordHash {
return [[KdbPassword alloc] initWithPassword:self.password passwordEncoding:NSUTF8StringEncoding keyFile:[self.key path]];
// 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;
} }
@end @end

View File

@@ -21,7 +21,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>41B</string> <string>421</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string> <string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>