See ChangeLog

Monotone-Parent: baa6f9af328e12270813b11beac4250ab90005b0
Monotone-Revision: 659def76b8868bdc540986987d61b39410737054

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-02-02T01:58:56
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/NSString+Utilities.h

@@ -68,7 +68,7 @@
 
 - (id) objectFromJSONString;
 
-- (NSString *) asCryptString;
+- (NSString *) asCryptStringUsingSalt: (NSString *) theSalt;
 - (NSString *) asMD5String;
 - (NSString *) asSHA1String;
 

SoObjects/SOGo/NSString+Utilities.m

@@ -545,13 +545,13 @@ static NSMutableCharacterSet *safeLDIFStartChars = nil;
   return object;
 }
 
-- (NSString *) asCryptString
+- (NSString *) asCryptStringUsingSalt: (NSString *) theSalt
 {
   char *buf;
   
   // The salt is weak here, but who cares anyway, crypt should not
   // be used anymore
-  buf = (char *)crypt([self UTF8String], [self UTF8String]);
+  buf = (char *)crypt([self UTF8String], [theSalt UTF8String]);
   return [NSString stringWithUTF8String: buf];
 }
 

SoObjects/SOGo/SQLSource.m

@@ -139,7 +139,7 @@
     }
   else if ([_userPasswordAlgorithm caseInsensitiveCompare: @"crypt"] == NSOrderedSame)
     {
-      return [[plainPassword asCryptString] isEqualToString: encryptedPassword];
+      return [[plainPassword asCryptStringUsingSalt: encryptedPassword] isEqualToString: encryptedPassword];
     }
   else if ([_userPasswordAlgorithm caseInsensitiveCompare: @"md5"] == NSOrderedSame)
     {