From b0e59f9ac99f56f3212660659a2e7b37d9afd4ad Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 27 Apr 2018 08:55:13 -0400 Subject: [PATCH] Revert "(fix) make sure to use crypt as the scheme for md5/sha256/sha512 (fixes #4137)" This reverts commit 63cb80142b1dcdb581ace018a5c715ed42a73eab. --- SoObjects/SOGo/LDAPSource.m | 7 ------- SoObjects/SOGo/SQLSource.m | 7 ------- 2 files changed, 14 deletions(-) diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index a55565d21..50086ab83 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/SoObjects/SOGo/LDAPSource.m @@ -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]; } diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m index cff7cc43a..6773a9fbd 100644 --- a/SoObjects/SOGo/SQLSource.m +++ b/SoObjects/SOGo/SQLSource.m @@ -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