View | Details | Raw Unified | Return to bug 60597
Collapse All | Expand All

(-)java/org/apache/tomcat/websocket/Constants.java (+7 lines)
Lines 53-58 Link Here
53
     */
53
     */
54
    public static final String SSL_PROTOCOLS_PROPERTY =
54
    public static final String SSL_PROTOCOLS_PROPERTY =
55
            "org.apache.tomcat.websocket.SSL_PROTOCOLS";
55
            "org.apache.tomcat.websocket.SSL_PROTOCOLS";
56
    /**
57
     * Property name to set to configure the value that is passed to
58
     * {@link javax.net.ssl.SSLEngine#setEnabledCipherSuites(String[])}. The
59
     * value should be a comma separated string.
60
     */
61
    public static final String SSL_CIPHER_SUITES_PROPERTY =
62
            "org.apache.tomcat.websocket.SSL_CIPHER_SUITES";
56
    public static final String SSL_TRUSTSTORE_PROPERTY =
63
    public static final String SSL_TRUSTSTORE_PROPERTY =
57
            "org.apache.tomcat.websocket.SSL_TRUSTSTORE";
64
            "org.apache.tomcat.websocket.SSL_TRUSTSTORE";
58
    public static final String SSL_TRUSTSTORE_PWD_PROPERTY =
65
    public static final String SSL_TRUSTSTORE_PWD_PROPERTY =
(-)java/org/apache/tomcat/websocket/WsWebSocketContainer.java (+6 lines)
Lines 803-808 Link Here
803
                engine.setEnabledProtocols(sslProtocolsValue.split(","));
803
                engine.setEnabledProtocols(sslProtocolsValue.split(","));
804
            }
804
            }
805
805
806
            String sslCipherSuitesValue =
807
                    (String) userProperties.get(Constants.SSL_CIPHER_SUITES_PROPERTY);
808
            if (sslCipherSuitesValue != null) {
809
                engine.setEnabledCipherSuites(sslCipherSuitesValue.split(","));
810
            }
811
806
            engine.setUseClientMode(true);
812
            engine.setUseClientMode(true);
807
813
808
            return engine;
814
            return engine;
(-)webapps/docs/web-socket-howto.xml (+1 lines)
Lines 106-111 Link Here
106
   <ul>
106
   <ul>
107
     <li><code>org.apache.tomcat.websocket.SSL_CONTEXT</code></li>
107
     <li><code>org.apache.tomcat.websocket.SSL_CONTEXT</code></li>
108
     <li><code>org.apache.tomcat.websocket.SSL_PROTOCOLS</code></li>
108
     <li><code>org.apache.tomcat.websocket.SSL_PROTOCOLS</code></li>
109
     <li><code>org.apache.tomcat.websocket.SSL_CIPHER_SUITES</code></li>
109
     <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE</code></li>
110
     <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE</code></li>
110
     <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE_PWD</code></li>
111
     <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE_PWD</code></li>
111
   </ul>
112
   </ul>

Return to bug 60597