From 385e1ac0d165d56d77e1cb08591246bdd327b742 Mon Sep 17 00:00:00 2001 From: James Guo Date: Tue, 6 Nov 2018 20:13:57 +0000 Subject: [PATCH] [C8-19] Re-enable a legacy/disabled cipher suite to pass two TCK tests that would otherwise fail. --- src/jdk/src/share/lib/security/java.security-aix | 2 +- src/jdk/src/share/lib/security/java.security-linux | 2 +- src/jdk/src/share/lib/security/java.security-macosx | 2 +- src/jdk/src/share/lib/security/java.security-solaris | 2 +- src/jdk/src/share/lib/security/java.security-windows | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jdk/src/share/lib/security/java.security-aix b/src/jdk/src/share/lib/security/java.security-aix index 13abdd6c491..1b89a0de376 100644 --- a/src/jdk/src/share/lib/security/java.security-aix +++ b/src/jdk/src/share/lib/security/java.security-aix @@ -620,7 +620,7 @@ jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, DSA keySize < 1024 # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, \ - EC keySize < 224, 3DES_EDE_CBC, anon, NULL + EC keySize < 224, anon, NULL # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. diff --git a/src/jdk/src/share/lib/security/java.security-linux b/src/jdk/src/share/lib/security/java.security-linux index c730d500cf0..d9ae5d1f719 100644 --- a/src/jdk/src/share/lib/security/java.security-linux +++ b/src/jdk/src/share/lib/security/java.security-linux @@ -620,7 +620,7 @@ jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, DSA keySize < 1024 # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, \ - EC keySize < 224, 3DES_EDE_CBC, anon, NULL + EC keySize < 224, anon, NULL # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. diff --git a/src/jdk/src/share/lib/security/java.security-macosx b/src/jdk/src/share/lib/security/java.security-macosx index 2ac463791b4..505f3364a35 100644 --- a/src/jdk/src/share/lib/security/java.security-macosx +++ b/src/jdk/src/share/lib/security/java.security-macosx @@ -623,7 +623,7 @@ jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, DSA keySize < 1024 # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, \ - EC keySize < 224, 3DES_EDE_CBC, anon, NULL + EC keySize < 224, anon, NULL # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. diff --git a/src/jdk/src/share/lib/security/java.security-solaris b/src/jdk/src/share/lib/security/java.security-solaris index a5c4d865966..a965b19bc24 100644 --- a/src/jdk/src/share/lib/security/java.security-solaris +++ b/src/jdk/src/share/lib/security/java.security-solaris @@ -622,7 +622,7 @@ jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, DSA keySize < 1024 # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, \ - EC keySize < 224, 3DES_EDE_CBC, anon, NULL + EC keySize < 224, anon, NULL # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. diff --git a/src/jdk/src/share/lib/security/java.security-windows b/src/jdk/src/share/lib/security/java.security-windows index a0ce655dcc3..813df4ada09 100644 --- a/src/jdk/src/share/lib/security/java.security-windows +++ b/src/jdk/src/share/lib/security/java.security-windows @@ -623,7 +623,7 @@ jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, DSA keySize < 1024 # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, \ - EC keySize < 224, 3DES_EDE_CBC, anon, NULL + EC keySize < 224, anon, NULL # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation.