Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D990D636 for ; Mon, 27 Aug 2012 20:22:09 +0000 (UTC) Received: (qmail 89176 invoked by uid 500); 27 Aug 2012 20:22:08 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 89106 invoked by uid 500); 27 Aug 2012 20:22:08 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 89095 invoked by uid 99); 27 Aug 2012 20:22:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Aug 2012 20:22:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Aug 2012 20:22:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5C3812388A33 for ; Mon, 27 Aug 2012 20:21:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1377824 - /tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java Date: Mon, 27 Aug 2012 20:21:22 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120827202122.5C3812388A33@eris.apache.org> Author: markt Date: Mon Aug 27 20:21:21 2012 New Revision: 1377824 URL: http://svn.apache.org/viewvc?rev=1377824&view=rev Log: Take advantage of new ConcurrentMessageDigest Modified: tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java Modified: tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1377824&r1=1377823&r2=1377824&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java (original) +++ tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java Mon Aug 27 20:21:21 2012 @@ -16,8 +16,6 @@ */ package org.apache.catalina.authenticator; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -36,6 +34,7 @@ import org.apache.catalina.startup.TestT import org.apache.catalina.startup.TesterServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; +import org.apache.catalina.util.ConcurrentMessageDigest; import org.apache.catalina.util.MD5Encoder; import org.apache.tomcat.util.buf.ByteChunk; @@ -310,7 +309,7 @@ public class TestDigestAuthenticator ext */ private static String buildDigestResponse(String user, String pwd, String uri, String realm, String nonce, String opaque, String nc, - String cnonce, String qop) throws NoSuchAlgorithmException { + String cnonce, String qop) { String a1 = user + ":" + realm + ":" + pwd; String a2 = "GET:" + uri; @@ -361,11 +360,8 @@ public class TestDigestAuthenticator ext return auth.toString(); } - private static String digest(String input) throws NoSuchAlgorithmException { - // This is slow but should be OK as this is only a test - MessageDigest md5 = MessageDigest.getInstance("MD5"); - - md5.update(input.getBytes()); - return MD5Encoder.encode(md5.digest()); + private static String digest(String input) { + return MD5Encoder.encode( + ConcurrentMessageDigest.digestMD5(input.getBytes())); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org