Author: violetagg Date: Wed Sep 17 18:38:05 2014 New Revision: 1625733 URL: http://svn.apache.org/r1625733 Log: Merged revision 1623685 from tomcat/trunk: Move MessageDigest utility classes from o.a.catalina.util to o.a.tomcat.util.security so they are more widely available.
Added: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java - copied, changed from r1623685, tomcat/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/MD5Encoder.java - copied, changed from r1623685, tomcat/trunk/java/org/apache/tomcat/util/security/MD5Encoder.java Removed: tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ConcurrentMessageDigest.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/MD5Encoder.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1623685 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1625733&r1=1625732&r2=1625733&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java Wed Sep 17 18:38:05 2014 @@ -35,12 +35,12 @@ import org.apache.catalina.LifecycleExce import org.apache.catalina.Realm; import org.apache.catalina.connector.Request; import org.apache.catalina.deploy.LoginConfig; -import org.apache.catalina.util.ConcurrentMessageDigest; -import org.apache.catalina.util.MD5Encoder; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.buf.B2CConverter; import org.apache.tomcat.util.http.parser.HttpParser; +import org.apache.tomcat.util.security.ConcurrentMessageDigest; +import org.apache.tomcat.util.security.MD5Encoder; Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1625733&r1=1625732&r2=1625733&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Wed Sep 17 18:38:05 2014 @@ -47,7 +47,6 @@ import org.apache.catalina.deploy.Securi import org.apache.catalina.deploy.SecurityConstraint; import org.apache.catalina.mbeans.MBeanUtils; import org.apache.catalina.util.LifecycleMBeanBase; -import org.apache.catalina.util.MD5Encoder; import org.apache.catalina.util.SessionConfig; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -55,6 +54,7 @@ import org.apache.tomcat.util.buf.B2CCon import org.apache.tomcat.util.buf.HexUtils; import org.apache.tomcat.util.codec.binary.Base64; import org.apache.tomcat.util.res.StringManager; +import org.apache.tomcat.util.security.MD5Encoder; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1625733&r1=1625732&r2=1625733&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Wed Sep 17 18:38:05 2014 @@ -51,13 +51,13 @@ import javax.xml.parsers.DocumentBuilder import javax.xml.parsers.ParserConfigurationException; import org.apache.catalina.util.DOMWriter; -import org.apache.catalina.util.MD5Encoder; import org.apache.catalina.util.XMLWriter; import org.apache.naming.resources.CacheEntry; import org.apache.naming.resources.Resource; import org.apache.naming.resources.ResourceAttributes; import org.apache.tomcat.util.http.FastHttpDateFormat; import org.apache.tomcat.util.http.RequestUtil; +import org.apache.tomcat.util.security.MD5Encoder; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; Copied: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java (from r1623685, tomcat/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java) URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java?p2=tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java&p1=tomcat/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java&r1=1623685&r2=1625733&rev=1625733&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java Wed Sep 17 18:38:05 2014 @@ -33,7 +33,7 @@ public class ConcurrentMessageDigest { private static final String MD5 = "MD5"; private static final Map<String,Queue<MessageDigest>> queues = - new HashMap<>(); + new HashMap<String,Queue<MessageDigest>>(); private ConcurrentMessageDigest() { @@ -93,7 +93,8 @@ public class ConcurrentMessageDigest { synchronized (queues) { if (!queues.containsKey(algorithm)) { MessageDigest md = MessageDigest.getInstance(algorithm); - Queue<MessageDigest> queue = new ConcurrentLinkedQueue<>(); + Queue<MessageDigest> queue = + new ConcurrentLinkedQueue<MessageDigest>(); queue.add(md); queues.put(algorithm, queue); } Copied: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/MD5Encoder.java (from r1623685, tomcat/trunk/java/org/apache/tomcat/util/security/MD5Encoder.java) URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/MD5Encoder.java?p2=tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/MD5Encoder.java&p1=tomcat/trunk/java/org/apache/tomcat/util/security/MD5Encoder.java&r1=1623685&r2=1625733&rev=1625733&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/security/MD5Encoder.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/MD5Encoder.java Wed Sep 17 18:38:05 2014 @@ -5,17 +5,20 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ + + package org.apache.tomcat.util.security; + /** * Encode an MD5 digest into a String. * <p> @@ -25,26 +28,36 @@ package org.apache.tomcat.util.security; * * @author Remy Maucherat */ + public final class MD5Encoder { - private MD5Encoder() { - // Hide default constructor for utility class + /** + * @deprecated Will be made private in Tomcat 8.0.x + */ + @Deprecated + public MD5Encoder() { + // NOOP } + // ----------------------------------------------------- Instance Variables - private static final char[] hexadecimal = {'0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; + + private static final char[] hexadecimal = + {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + 'a', 'b', 'c', 'd', 'e', 'f'}; + + + // --------------------------------------------------------- Public Methods /** * Encodes the 128 bit (16 bytes) MD5 into a 32 character String. * * @param binaryData Array containing the digest - * * @return Encoded MD5, or null if encoding failed */ - public static String encode(byte[] binaryData) { + public static String encode( byte[] binaryData ) { if (binaryData.length != 16) return null; @@ -59,6 +72,9 @@ public final class MD5Encoder { } return new String(buffer); + } + + } Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1625733&r1=1625732&r2=1625733&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java Wed Sep 17 18:38:05 2014 @@ -40,9 +40,9 @@ 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; +import org.apache.tomcat.util.security.ConcurrentMessageDigest; +import org.apache.tomcat.util.security.MD5Encoder; public class TestDigestAuthenticator extends TomcatBaseTest { Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java?rev=1625733&r1=1625732&r2=1625733&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java Wed Sep 17 18:38:05 2014 @@ -33,9 +33,9 @@ import org.apache.catalina.deploy.Securi 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; +import org.apache.tomcat.util.security.ConcurrentMessageDigest; +import org.apache.tomcat.util.security.MD5Encoder; /** * Test DigestAuthenticator and NonLoginAuthenticator when a Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java?rev=1625733&r1=1625732&r2=1625733&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java Wed Sep 17 18:38:05 2014 @@ -32,8 +32,8 @@ import org.apache.catalina.core.Standard import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.filters.TesterHttpServletResponse; import org.apache.catalina.startup.TestTomcat.MapRealm; -import org.apache.catalina.util.ConcurrentMessageDigest; -import org.apache.catalina.util.MD5Encoder; +import org.apache.tomcat.util.security.ConcurrentMessageDigest; +import org.apache.tomcat.util.security.MD5Encoder; public class TesterDigestAuthenticatorPerformance { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org