Author: markt
Date: Sat Aug 27 21:32:48 2016
New Revision: 1758072
URL: http://svn.apache.org/viewvc?rev=1758072&view=rev
Log:
Revert incorrect fix for failing Gump tests
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=1758072&r1=1758071&r2=1758072&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
Sat Aug 27 21:32:48 2016
@@ -421,10 +421,6 @@ public class OpenSSLCipherConfigurationP
List<Cipher> allCiphersList = Arrays.asList(Cipher.values());
Collections.reverse(allCiphersList);
LinkedHashSet<Cipher> allCiphers = defaultSort(new
LinkedHashSet<>(allCiphersList));
- // OpenSSL has disabled 3DES by default so remove it from the set of
- // known ciphers
- allCiphers.removeAll(filterByEncryption(allCiphers,
Collections.singleton(Encryption.TRIPLE_DES)));
-
addListAlias(eNULL, filterByEncryption(allCiphers,
Collections.singleton(Encryption.eNULL)));
LinkedHashSet<Cipher> all = new LinkedHashSet<>(allCiphers);
remove(all, eNULL);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
