[jboss-cvs] JBossAS SVN: r78644 - in branches/JBPAPP_4_2_0_GA_CP: testsuite/src/resources/test-configs/tomcat-ssl/deploy and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2008-09-17 10:31:43 -0400 (Wed, 17 Sep 2008)
New Revision: 78644

Modified:
   branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
   branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/plugins/JaasSecurityDomainMBean.java
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml
Log:
JBPAPP-1191: fixed encryption for the truststore password

Modified: branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2008-09-17 13:22:29 UTC (rev 78643)
+++ branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2008-09-17 14:31:43 UTC (rev 78644)
@@ -245,9 +245,9 @@
       this.trustStoreType = type;
    }
 
-   public void setTrustStorePass(String password)
+   public void setTrustStorePass(String password) throws Exception
    {
-      this.trustStorePassword = password.toCharArray();
+      this.trustStorePassword = Util.loadPassword(password);
    }
 
    public String getTrustStoreURL()

Modified: branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/plugins/JaasSecurityDomainMBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/plugins/JaasSecurityDomainMBean.java	2008-09-17 13:22:29 UTC (rev 78643)
+++ branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/plugins/JaasSecurityDomainMBean.java	2008-09-17 14:31:43 UTC (rev 78644)
@@ -64,7 +64,7 @@
    public void setTrustStoreType(String type);
    /** Set the credential string for the trust store.
    */
-   public void setTrustStorePass(String password);   
+   public void setTrustStorePass(String password) throws Exception;   
    /** Get the trust store database URL string.
     */
    public String getTrustStoreURL();

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml	2008-09-17 13:22:29 UTC (rev 78643)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml	2008-09-17 14:31:43 UTC (rev 78644)
@@ -15,6 +15,8 @@
       </constructor>
       <attribute name="KeyStoreURL">resource:localhost.keystore</attribute>
       <attribute name="KeyStorePass">{CLASS}org.jboss.security.plugins.FilePassword:${jboss.server.home.dir}/deploy/keystore.password</attribute>
+      <attribute name="TrustStoreURL">resource:localhost.keystore</attribute>
+ 		<attribute name="TrustStorePass">{CLASS}org.jboss.security.plugins.FilePassword:${jboss.server.home.dir}/deploy/keystore.password</attribute>
       <attribute name="Salt">welcometojboss</attribute>
       <attribute name="IterationCount">13</attribute>
    </mbean>