From 8785301cb0bcd9e4b15b96eadad5fd6e5374bc80 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Huynh Date: Thu, 10 Dec 2015 10:02:01 +0000 Subject: [PATCH] Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 119075 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0) 117375 gjames: Fixing a compilation error after the merge for AuthenticationTest Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 117260 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud ) 114674 gjames: BCRYPT MNT-14892 RA-604, Handling MD4 hashing as default git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/security/authentication/AuthenticationTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java b/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java index 2375880f67..ec471e218c 100644 --- a/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java +++ b/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java @@ -486,8 +486,7 @@ public class AuthenticationTest extends TestCase { String hashedPassword = dao.getMD4HashedPassword(userName); assertNotNull(hashedPassword); - UserDetails userDetails = (UserDetails) dao.loadUserByUsername(userName); - assertEquals(compositePasswordEncoder.encodePassword(password, dao.getSalt(userDetails)), hashedPassword); + assertEquals(compositePasswordEncoder.encode("md4",password, null), hashedPassword); } public void testCreateAndyUserAndOtherCRUD() throws NoSuchAlgorithmException, UnsupportedEncodingException