Revision: 18358
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18358&view=rev
Author: hofman
Date: 2012-01-03 13:18:25 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
no separate method for hashed password, do hashing in place
Modified Paths:
--------------
trunk/bibdesk/BDSKPasswordController.h
trunk/bibdesk/BDSKPasswordController.m
trunk/bibdesk/BDSKSharingClient.m
trunk/bibdesk/BDSKSharingServer.m
Modified: trunk/bibdesk/BDSKPasswordController.h
===================================================================
--- trunk/bibdesk/BDSKPasswordController.h 2012-01-03 12:27:07 UTC (rev
18357)
+++ trunk/bibdesk/BDSKPasswordController.h 2012-01-03 13:18:25 UTC (rev
18358)
@@ -47,7 +47,6 @@
}
+ (NSData *)passwordForKeychainServiceName:(NSString *)name;
-+ (NSData *)passwordHashedForKeychainServiceName:(NSString *)name;
+ (BOOL)addOrModifyPassword:(NSString *)password name:(NSString *)name
userName:(NSString *)userName;
Modified: trunk/bibdesk/BDSKPasswordController.m
===================================================================
--- trunk/bibdesk/BDSKPasswordController.m 2012-01-03 12:27:07 UTC (rev
18357)
+++ trunk/bibdesk/BDSKPasswordController.m 2012-01-03 13:18:25 UTC (rev
18358)
@@ -62,11 +62,6 @@
return pwData;
}
-// hash it for comparison, since we hash before putting it in the TXT
-+ (NSData *)passwordHashedForKeychainServiceName:(NSString *)name {
- return [[self passwordForKeychainServiceName:name] sha1Signature];
-}
-
+ (BOOL)addOrModifyPassword:(NSString *)password name:(NSString *)name
userName:(NSString *)userName {
// default is to use current user's username
const char *userNameCString = userName == nil ? [NSUserName() UTF8String]
: [userName UTF8String];
Modified: trunk/bibdesk/BDSKSharingClient.m
===================================================================
--- trunk/bibdesk/BDSKSharingClient.m 2012-01-03 12:27:07 UTC (rev 18357)
+++ trunk/bibdesk/BDSKSharingClient.m 2012-01-03 13:18:25 UTC (rev 18358)
@@ -394,7 +394,7 @@
OSMemoryBarrier();
if(flags.authenticationFailed == 0)
- password = [BDSKPasswordController
passwordHashedForKeychainServiceName:[[self class]
keychainServiceNameWithComputerName:[service name]]];
+ password = [[BDSKPasswordController
passwordForKeychainServiceName:[[self class]
keychainServiceNameWithComputerName:[service name]]] sha1Signature];
if(password == nil && [self shouldKeepRunning]){
Modified: trunk/bibdesk/BDSKSharingServer.m
===================================================================
--- trunk/bibdesk/BDSKSharingServer.m 2012-01-03 12:27:07 UTC (rev 18357)
+++ trunk/bibdesk/BDSKSharingServer.m 2012-01-03 13:18:25 UTC (rev 18358)
@@ -681,7 +681,7 @@
{
BOOL status = YES;
if([[NSUserDefaults standardUserDefaults]
boolForKey:BDSKSharingRequiresPasswordKey]){
- NSData *myPasswordHashed = [BDSKPasswordController
passwordHashedForKeychainServiceName:BDSKServiceNameForKeychain];
+ NSData *myPasswordHashed = [[BDSKPasswordController
passwordForKeychainServiceName:BDSKServiceNameForKeychain] sha1Signature];
status = [authenticationData isEqual:myPasswordHashed];
}
return status;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
