Author: norman
Date: Tue Nov 16 11:34:36 2010
New Revision: 1035592

URL: http://svn.apache.org/viewvc?rev=1035592&view=rev
Log:
Allow to specify which ciphers are allowed for TLS. See PROTOCOLS-10

Modified:
    
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSSLAwareChannelPipelineFactory.java

Modified: 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSSLAwareChannelPipelineFactory.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSSLAwareChannelPipelineFactory.java?rev=1035592&r1=1035591&r2=1035592&view=diff
==============================================================================
--- 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSSLAwareChannelPipelineFactory.java
 (original)
+++ 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSSLAwareChannelPipelineFactory.java
 Tue Nov 16 11:34:36 2010
@@ -33,11 +33,20 @@ import org.jboss.netty.handler.ssl.SslHa
 public abstract class AbstractSSLAwareChannelPipelineFactory extends 
AbstractChannelPipelineFactory{
 
     
+    private String[] enabledCipherSuites = null;
+
     public AbstractSSLAwareChannelPipelineFactory(int timeout,
             int maxConnections, int maxConnectsPerIp, ChannelGroup group) {
         super(timeout, maxConnections, maxConnectsPerIp, group);
     }
 
+    public AbstractSSLAwareChannelPipelineFactory(int timeout,
+            int maxConnections, int maxConnectsPerIp, ChannelGroup group, 
String[] enabledCipherSuites) {
+        this(timeout, maxConnections, maxConnectsPerIp, group);
+        this.enabledCipherSuites  = enabledCipherSuites;
+    }
+
+    
     @Override
     public ChannelPipeline getPipeline() throws Exception {
         ChannelPipeline pipeline =  super.getPipeline();
@@ -47,6 +56,9 @@ public abstract class AbstractSSLAwareCh
             // See https://issues.apache.org/jira/browse/JAMES-1025
             SSLEngine engine = getSSLContext().createSSLEngine();
             engine.setUseClientMode(false);
+            if (enabledCipherSuites != null && enabledCipherSuites.length > 0) 
{
+                engine.setEnabledCipherSuites(enabledCipherSuites);
+            }
             pipeline.addFirst("sslHandler", new SslHandler(engine));
         }
         return pipeline;



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to