Author: markt
Date: Tue Jan 5 23:00:17 2016
New Revision: 1723196
URL: http://svn.apache.org/viewvc?rev=1723196&view=rev
Log:
Be specific about the type of cipher list.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1723196&r1=1723195&r2=1723196&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Tue Jan 5 23:00:17 2016
@@ -67,10 +67,10 @@ public class OpenSSLContext implements o
private final List<String> negotiableProtocols;
- private List<String> ciphers = new ArrayList<>();
+ private List<String> jsseCipherNames = new ArrayList<>();
- public List<String> getCiphers() {
- return ciphers;
+ public List<String> getJsseCipherNames() {
+ return jsseCipherNames;
}
private String enabledProtocol;
@@ -298,7 +298,7 @@ public class OpenSSLContext implements o
// List the ciphers that the client is permitted to negotiate
String opensslCipherConfig = sslHostConfig.getCiphers();
- this.ciphers =
OpenSSLCipherConfigurationParser.parseExpression(opensslCipherConfig);
+ this.jsseCipherNames =
OpenSSLCipherConfigurationParser.parseExpression(opensslCipherConfig);
SSLContext.setCipherSuite(ctx, opensslCipherConfig);
// Load Server key and certificate
if (certificate.getCertificateFile() != null) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java?rev=1723196&r1=1723195&r2=1723196&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java Tue
Jan 5 23:00:17 2016
@@ -85,7 +85,7 @@ public class OpenSSLUtil implements SSLU
@Override
public String[] getEnableableCiphers(SSLContext context) {
if (enabledCiphers == null) {
- List<String> enabledCiphersList = ((OpenSSLContext)
context).getCiphers();
+ List<String> enabledCiphersList = ((OpenSSLContext)
context).getJsseCipherNames();
enabledCiphers = enabledCiphersList.toArray(new
String[enabledCiphersList.size()]);
}
return enabledCiphers;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
