Author: markt
Date: Mon Feb 16 11:45:48 2015
New Revision: 1660075
URL: http://svn.apache.org/r1660075
Log:
Fixes for OpenSSL 1.0.2 which implements 24 new DH ciphers.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 11:45:48 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984,1660060
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984,1660060,1660074
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660075&r1=1660074&r2=1660075&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 11:45:48 2015
@@ -92,14 +92,6 @@ public class TestCipher {
if (openSSLAlias.contains("GOST")) {
continue;
}
- // OpenSSL does not implement any DH-DSS or DH-RSA algorithms so
- // exclude them from the expected list
- if (openSSLAlias.startsWith("DH-DSS") ||
openSSLAlias.startsWith("EXP-DH-DSS")) {
- continue;
- }
- if (openSSLAlias.startsWith("DH-RSA") ||
openSSLAlias.startsWith("EXP-DH-RSA")) {
- continue;
- }
// OpenSSL does not enable the experimental EXP1024 and
// DHE-DSS-RC4-SHA cipher suites unless the source is explicitly
// patched so exclude them from the expected list
@@ -403,6 +395,10 @@ public class TestCipher {
*
http://www-01.ibm.com/support/knowledgecenter/SSYKE2_7.0.0/com.ibm.java.security.component.71.doc/security-component/jsse2Docs/ciphersuites.html?lang=en
* on 29th July 2014.
* <br>
+ * As of 16 February 2015 the list for IBM Java 7 was identical to that for
+ * IBM Java 8
+ *
http://www-01.ibm.com/support/knowledgecenter/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-component/jsse2Docs/ciphersuites.html?lang=en
+ * <br>
* Note that IBM cipher suites names can begin with TLS or SSL.
*/
private static final Set<String> CIPHER_SUITE_STANDARD_NAMES_IBM;
@@ -535,12 +531,36 @@ public class TestCipher {
"CAMELLIA256-SHA+SSLv3",
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
+ "DH-DSS-AES128-GCM-SHA256+TLSv1.2",
+ "DH-DSS-AES256-GCM-SHA384+TLSv1.2",
+ "DH-DSS-AES128-SHA+SSLv3",
+ "DH-DSS-AES128-SHA256+TLSv1.2",
+ "DH-DSS-AES256-SHA+SSLv3",
+ "DH-DSS-AES256-SHA256+TLSv1.2",
+ "DH-DSS-CAMELLIA128-SHA+SSLv3",
+ "DH-DSS-CAMELLIA256-SHA+SSLv3",
+ "DH-DSS-DES-CBC-SHA+SSLv3",
+ "DH-DSS-DES-CBC3-SHA+SSLv3",
+ "DH-DSS-SEED-SHA+SSLv3",
+ "DH-RSA-AES128-GCM-SHA256+TLSv1.2",
+ "DH-RSA-AES256-GCM-SHA384+TLSv1.2",
+ "DH-RSA-AES128-SHA+SSLv3",
+ "DH-RSA-AES128-SHA256+TLSv1.2",
+ "DH-RSA-AES256-SHA+SSLv3",
+ "DH-RSA-AES256-SHA256+TLSv1.2",
+ "DH-RSA-CAMELLIA128-SHA+SSLv3",
+ "DH-RSA-CAMELLIA256-SHA+SSLv3",
+ "DH-RSA-DES-CBC-SHA+SSLv3",
+ "DH-RSA-DES-CBC3-SHA+SSLv3",
+ "DH-RSA-SEED-SHA+SSLv3",
"DHE-DSS-CAMELLIA128-SHA+SSLv3",
"DHE-DSS-CAMELLIA256-SHA+SSLv3",
"DHE-DSS-SEED-SHA+SSLv3",
"DHE-RSA-CAMELLIA128-SHA+SSLv3",
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
"DHE-RSA-SEED-SHA+SSLv3",
+ "EXP-DH-DSS-DES-CBC-SHA+SSLv3",
+ "EXP-DH-RSA-DES-CBC-SHA+SSLv3",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1660075&r1=1660074&r2=1660075&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Mon Feb 16 11:45:48 2015
@@ -34,30 +34,6 @@ public class TesterOpenSSL {
public static final Set<Cipher> OPENSSL_UNIMPLEMENTED_CIPHERS =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
- Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA,
- Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
- Cipher.TLS_DH_DSS_WITH_AES_256_GCM_SHA384,
- Cipher.TLS_DH_RSA_WITH_AES_256_GCM_SHA384,
- Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA256,
- Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA256,
- Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA,
- Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA,
- Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
- Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
- Cipher.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA,
- Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA,
- Cipher.TLS_DH_DSS_WITH_AES_128_GCM_SHA256,
- Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256,
- Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256,
- Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
- Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
- Cipher.TLS_DH_RSA_WITH_AES_128_GCM_SHA256,
- Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA,
- Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA,
- Cipher.TLS_DH_RSA_WITH_DES_CBC_SHA,
- Cipher.TLS_DH_DSS_WITH_DES_CBC_SHA,
- Cipher.TLS_DH_RSA_WITH_SEED_CBC_SHA,
- Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA,
Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA,
Cipher.SSL_CK_RC2_128_CBC_WITH_MD5,
Cipher.SSL_FORTEZZA_DMS_WITH_NULL_SHA,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
