Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java,v diff -u -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java 17 Sep 2006 06:14:24 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java 20 Sep 2006 02:36:59 -0000 1.3 @@ -23,8 +23,6 @@ package org.lamsfoundation.lams.integration.security; -import java.security.NoSuchAlgorithmException; - import org.lamsfoundation.lams.integration.ExtServerOrgMap; import org.lamsfoundation.lams.util.HashUtil; @@ -59,13 +57,9 @@ } private static void checkHash(String plaintext, String hashValue) throws AuthenticationException { - try{ if(!hashValue.equals(HashUtil.sha1(plaintext))){ throw new AuthenticationException("Authentication failed!"); } - }catch(NoSuchAlgorithmException e){ - throw new AuthenticationException("The system does not support the required algorithm to do authentication!"); - } } } Index: lams_common/src/java/org/lamsfoundation/lams/util/HashUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/HashUtil.java,v diff -u -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/util/HashUtil.java 17 Sep 2006 06:14:16 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/util/HashUtil.java 20 Sep 2006 02:41:57 -0000 1.3 @@ -40,14 +40,22 @@ */ public class HashUtil { - public static String sha1(String plaintext) throws NoSuchAlgorithmException{ - MessageDigest md = MessageDigest.getInstance("SHA1"); - return new String(Hex.encodeHex(md.digest(plaintext.getBytes()))); + public static String sha1(String plaintext){ + try { + MessageDigest md = MessageDigest.getInstance("SHA1"); + return new String(Hex.encodeHex(md.digest(plaintext.getBytes()))); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } } - public static String md5(String plaintext) throws NoSuchAlgorithmException{ - MessageDigest md = MessageDigest.getInstance("MD5"); - return new String(Hex.encodeHex(md.digest(plaintext.getBytes()))); + public static String md5(String plaintext){ + try { + MessageDigest md = MessageDigest.getInstance("MD5"); + return new String(Hex.encodeHex(md.digest(plaintext.getBytes()))); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } } }