LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

(fix) make sure to use crypt as the scheme for md5/sha256/sha512 (fixes #4137)

Browse source
This commit is contained in:
Ludovic Marcotte 2017-05-08 10:44:12 -04:00
parent 3f698447b9
commit c3121c50d5
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
SoObjects/SOGo/LDAPSource.m
View file

@ -606,6 +606,13 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
return nil;
}
if ([_userPasswordAlgorithm caseInsensitiveCompare: @"md5-crypt"] == NSOrderedSame ||
[_userPasswordAlgorithm caseInsensitiveCompare: @"sha256-crypt"] == NSOrderedSame ||
[_userPasswordAlgorithm caseInsensitiveCompare: @"sha512-crypt"] == NSOrderedSame)
{
_userPasswordAlgorithm = @"crypt";
}
return [NSString stringWithFormat: @"{%@}%@", _userPasswordAlgorithm, pass];
}

7
SoObjects/SOGo/SQLSource.m
View file

@ -197,6 +197,13 @@
return nil;
}
if ([_userPasswordAlgorithm caseInsensitiveCompare: @"md5-crypt"] == NSOrderedSame ||
[_userPasswordAlgorithm caseInsensitiveCompare: @"sha256-crypt"] == NSOrderedSame ||
[_userPasswordAlgorithm caseInsensitiveCompare: @"sha512-crypt"] == NSOrderedSame)
{
_userPasswordAlgorithm = @"crypt";
}
if (_prependPasswordScheme)
result = [NSString stringWithFormat: @"{%@}%@", _userPasswordAlgorithm, pass];
else