svn commit: r1714535 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

[markt]

Author: markt
Date: Mon Nov 16 10:18:09 2015
New Revision: 1714535

URL: http://svn.apache.org/viewvc?rev=1714535&view=rev
Log:
OpenSSL now differentiations between TLSv1 (alias for SSLv3) and TLSv1.0 
(ciphers that require TLS 1.0)
Modified:
    
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1714535&r1=1714534&r2=1714535&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 Mon Nov 16 10:18:09 2015
@@ -446,9 +446,9 @@ public class OpenSSLCipherConfigurationP
         addListAlias(eFZA, filterByEncryption(allCiphers, 
Collections.singleton(Encryption.FZA)));
         addListAlias(FZA, filter(allCiphers, null, 
Collections.singleton(KeyExchange.FZA), 
Collections.singleton(Authentication.FZA), 
Collections.singleton(Encryption.FZA), null, null));
         addListAlias(Constants.SSL_PROTO_TLSv1_2, filterByProtocol(allCiphers, 
Collections.singleton(Protocol.TLSv1_2)));
-        addListAlias(Constants.SSL_PROTO_TLSv1_1, filterByProtocol(allCiphers, 
Collections.singleton(Protocol.SSLv3)));
-        addListAlias(Constants.SSL_PROTO_TLSv1, filterByProtocol(allCiphers, 
new HashSet<>(Arrays.asList(Protocol.TLSv1, Protocol.SSLv3))));
-        aliases.put(Constants.SSL_PROTO_SSLv3, 
aliases.get(Constants.SSL_PROTO_TLSv1));
+        addListAlias(Constants.SSL_PROTO_TLSv1_0, filterByProtocol(allCiphers, 
Collections.singleton(Protocol.TLSv1)));
+        addListAlias(Constants.SSL_PROTO_SSLv3, filterByProtocol(allCiphers, 
Collections.singleton(Protocol.SSLv3)));
+        aliases.put(Constants.SSL_PROTO_TLSv1, 
aliases.get(Constants.SSL_PROTO_SSLv3));
         addListAlias(Constants.SSL_PROTO_SSLv2, filterByProtocol(allCiphers, 
Collections.singleton(Protocol.SSLv2)));
         addListAlias(DH, filterByKeyExchange(allCiphers, new 
HashSet<>(Arrays.asList(KeyExchange.DHr, KeyExchange.DHd, KeyExchange.EDH))));
         Set<Cipher> adh = filterByKeyExchange(allCiphers, 
Collections.singleton(KeyExchange.EDH));



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org