Merge
authormullan
Tue, 14 Mar 2017 08:35:52 -0400
changeset 44250 af577b8d7b2f
parent 44249 0462723a58ef (diff)
parent 44248 90d510618f6c (current diff)
child 44251 321026ad5f1a
Merge
--- a/jdk/src/java.base/share/conf/security/java.security	Tue Mar 14 20:24:22 2017 +0800
+++ b/jdk/src/java.base/share/conf/security/java.security	Tue Mar 14 08:35:52 2017 -0400
@@ -598,8 +598,8 @@
 #   jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
 #
 #
-jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
-    DSA keySize < 1024, EC keySize < 224
+jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \
+    RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224
 
 #
 # Algorithm restrictions for signed JAR files