Author: markt
Date: Thu Sep 25 19:34:00 2014
New Revision: 1627617
URL: http://svn.apache.org/r1627617
Log:
s/PBE/SecretKey/
Added:
tomcat/trunk/java/org/apache/catalina/realm/SecretKeyCredentialHandler.java
(contents, props changed)
- copied, changed from r1627616,
tomcat/trunk/java/org/apache/catalina/realm/PBECredentialHandler.java
Removed:
tomcat/trunk/java/org/apache/catalina/realm/PBECredentialHandler.java
Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/test/org/apache/catalina/realm/TestPBECredentialHandler.java
tomcat/trunk/webapps/docs/config/credentialhandler.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1627617&r1=1627616&r2=1627617&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Sep 25
19:34:00 2014
@@ -81,7 +81,7 @@ public abstract class RealmBase extends
static {
credentialHandlerClasses.add(MessageDigestCredentialHandler.class);
- credentialHandlerClasses.add(PBECredentialHandler.class);
+ credentialHandlerClasses.add(SecretKeyCredentialHandler.class);
}
// ----------------------------------------------------- Instance Variables
Copied:
tomcat/trunk/java/org/apache/catalina/realm/SecretKeyCredentialHandler.java
(from r1627616,
tomcat/trunk/java/org/apache/catalina/realm/PBECredentialHandler.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/SecretKeyCredentialHandler.java?p2=tomcat/trunk/java/org/apache/catalina/realm/SecretKeyCredentialHandler.java&p1=tomcat/trunk/java/org/apache/catalina/realm/PBECredentialHandler.java&r1=1627616&r2=1627617&rev=1627617&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/PBECredentialHandler.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/SecretKeyCredentialHandler.java
Thu Sep 25 19:34:00 2014
@@ -27,9 +27,9 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.HexUtils;
-public class PBECredentialHandler extends DigestCredentialHandlerBase {
+public class SecretKeyCredentialHandler extends DigestCredentialHandlerBase {
- private static final Log log =
LogFactory.getLog(PBECredentialHandler.class);
+ private static final Log log =
LogFactory.getLog(SecretKeyCredentialHandler.class);
public static final String DEFAULT_ALGORITHM = "PBKDF2WithHmacSHA1";
public static final int DEFAULT_KEY_LENGTH = 160;
@@ -40,7 +40,7 @@ public class PBECredentialHandler extend
private int keyLength = DEFAULT_KEY_LENGTH;
- public PBECredentialHandler() throws NoSuchAlgorithmException {
+ public SecretKeyCredentialHandler() throws NoSuchAlgorithmException {
setAlgorithm(DEFAULT_ALGORITHM);
}
Propchange:
tomcat/trunk/java/org/apache/catalina/realm/SecretKeyCredentialHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomcat/trunk/test/org/apache/catalina/realm/TestPBECredentialHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/realm/TestPBECredentialHandler.java?rev=1627617&r1=1627616&r2=1627617&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/realm/TestPBECredentialHandler.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/realm/TestPBECredentialHandler.java
Thu Sep 25 19:34:00 2014
@@ -39,7 +39,7 @@ public class TestPBECredentialHandler {
}
private void doTest(String digest, int saltLength, int iterations) throws
NoSuchAlgorithmException {
- PBECredentialHandler pbech = new PBECredentialHandler();
+ SecretKeyCredentialHandler pbech = new SecretKeyCredentialHandler();
pbech.setAlgorithm(digest);
pbech.setIterations(iterations);
pbech.setSaltLength(saltLength);
Modified: tomcat/trunk/webapps/docs/config/credentialhandler.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/credentialhandler.xml?rev=1627617&r1=1627616&r2=1627617&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/credentialhandler.xml (original)
+++ tomcat/trunk/webapps/docs/config/credentialhandler.xml Thu Sep 25 19:34:00
2014
@@ -148,11 +148,11 @@
</subsection>
- <subsection name="PBECredentialHandler">
+ <subsection name="SecretKeyCredentialHandler">
- <p>The <strong>PBECredentialHandler</strong> is used when stored passwords
- are built using password based encrytpion. This credential handler supports
- the following forms of stored passwords:</p>
+ <p>The <strong>SecretKeyCredentialHandler</strong> is used when stored
+ passwords are built using <code>javax.crypto.SecretKeyFactory</code>. This
+ credential handler supports the following forms of stored passwords:</p>
<ul>
<li><strong>salt$iterationCount$encodedCredential</strong> - a hex
encoded
salt, iteration code and a hex encoded credential, each separated by
@@ -168,9 +168,9 @@
<attributes>
<attribute name="algorithm" required="false">
- <p>The name of the password based encryption algorithm used
- to encode user passwords stored in the database. If not specified, a
- default of <code>PBKDF2WithHmacSHA1</code> is used.</p>
+ <p>The name of the secret key algorithm used to encode user passwords
+ stored in the database. If not specified, a default of
+ <code>PBKDF2WithHmacSHA1</code> is used.</p>
</attribute>
<attribute name="keyLength" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
