[jboss-cvs] Picketbox SVN: r206 - in tags/4.0.0.Beta1: security-spi/spi/src/main/java/org/jboss/security and 1 other directory.

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

Author: mmoyses
Date: 2011-04-20 16:29:55 -0400 (Wed, 20 Apr 2011)
New Revision: 206

Modified:
   tags/4.0.0.Beta1/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java
   tags/4.0.0.Beta1/security-spi/spi/src/main/java/org/jboss/security/JSSESecurityDomain.java
Log:
adding cipher suites and protocols attributes

Modified: tags/4.0.0.Beta1/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java
===================================================================
--- tags/4.0.0.Beta1/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java	2011-04-20 20:28:19 UTC (rev 205)
+++ tags/4.0.0.Beta1/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java	2011-04-20 20:29:55 UTC (rev 206)
@@ -100,6 +100,10 @@
    private boolean clientAuth;
 
    private char[] serviceAuthToken;
+   
+   private String[] cipherSuites;
+   
+   private String[] protocols;
 
    private String name;
 
@@ -342,7 +346,31 @@
    {
       loadKeyAndTrustStore();
    }
+   
+   @Override
+   public String[] getCipherSuites()
+   {
+      return cipherSuites;
+   }
+   
+   public void setCipherSuites(String cipherSuites)
+   {
+      String[] cs = cipherSuites.split(",");
+      this.cipherSuites = cs;
+   }
 
+   @Override
+   public String[] getProtocols()
+   {
+      return protocols;
+   }
+   
+   public void setProtocols(String protocols)
+   {
+      String[] p = protocols.split(",");
+      this.protocols = p;
+   }
+
    private URL validateStoreURL(String storeURL) throws IOException
    {
       URL url = null;

Modified: tags/4.0.0.Beta1/security-spi/spi/src/main/java/org/jboss/security/JSSESecurityDomain.java
===================================================================
--- tags/4.0.0.Beta1/security-spi/spi/src/main/java/org/jboss/security/JSSESecurityDomain.java	2011-04-20 20:28:19 UTC (rev 205)
+++ tags/4.0.0.Beta1/security-spi/spi/src/main/java/org/jboss/security/JSSESecurityDomain.java	2011-04-20 20:29:55 UTC (rev 206)
@@ -133,4 +133,18 @@
     */
    public Certificate getCertificate(String alias) throws Exception;
    
+   /**
+    * Returns the cipher suites that should be enabled on SSLSockets
+    * 
+    * @return array of cipher suite names
+    */
+   public String[] getCipherSuites();
+   
+   /**
+    * Returns the protocols that should be enabled on SSLSockets
+    * 
+    * @return array of protocol names
+    */
+   public String[] getProtocols();
+   
 }