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

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

This reverts commit 63cb80142b.
pull/241/head
Ludovic Marcotte 2018-04-27 08:55:13 -04:00
parent 3ac952fd58
commit b0e59f9ac9
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SoObjects/SOGo/LDAPSource.m
View File

@ -603,13 +603,6 @@ 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

@ -213,13 +213,6 @@
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