# HG changeset patch
# User xuelei
# Date 1463612135 0
# Node ID 5201cc2ca81dcc0703699ef93fefe6557c7f4ef4
# Parent  85a39dd50bb5a3dfa1e722b500276af6f75e9a96
8151856: Note that disabledAlgorithms override the same algorithms of legacyAlgorithms
Reviewed-by: mullan, weijun

diff -r 85a39dd50bb5 -r 5201cc2ca81d jdk/src/java.base/share/conf/security/java.security
--- a/jdk/src/java.base/share/conf/security/java.security	Wed May 18 21:00:33 2016 +0200
+++ b/jdk/src/java.base/share/conf/security/java.security	Wed May 18 22:55:35 2016 +0000
@@ -713,6 +713,12 @@
 # See SSL/TLS specifications and "Java Cryptography Architecture Standard
 # Algorithm Name Documentation" for information about the algorithm names.
 #
+# Note: If a legacy algorithm is also restricted through the
+# jdk.tls.disabledAlgorithms property or the
+# java.security.AlgorithmConstraints API (See
+# javax.net.ssl.SSLParameters.setAlgorithmConstraints()),
+# then the algorithm is completely disabled and will not be negotiated.
+#
 # Note: This property is currently used by Oracle's JSSE implementation.
 # It is not guaranteed to be examined and used by other implementations.
 # There is no guarantee the property will continue to exist or be of the