Author: markt
Date: Thu Jun 27 19:57:28 2013
New Revision: 1497538
URL: http://svn.apache.org/r1497538
Log:
Fix regression in r1459346
Thanks to Brian Burch for spotting this and kkolinko for the fix.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1497538&r1=1497537&r2=1497538&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Thu Jun 27
19:57:28 2013
@@ -1553,9 +1553,9 @@ public class JNDIRealm extends RealmBase
password = password.substring(5);
md.reset();
md.update(credentials.getBytes(B2CConverter.ISO_8859_1));
- byte[] decoded = Base64.decodeBase64(md.digest());
+ byte[] encoded = Base64.encodeBase64(md.digest());
String digestedPassword =
- new String(decoded, B2CConverter.ISO_8859_1);
+ new String(encoded, B2CConverter.ISO_8859_1);
validated = password.equals(digestedPassword);
}
} else if (password.startsWith("{SSHA}")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]