changeset 10440:10f117ccae1d

8068052: Correct the merge of 8u31 jdk source into 8u40 Reviewed-by: coffeys
author asaha
date Mon, 22 Dec 2014 09:13:38 -0800
parents 70d86f72df5b
children 4e88f2c2d94d
files src/share/classes/sun/security/ssl/Handshaker.java
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/ssl/Handshaker.java	Wed Dec 17 12:50:15 2014 -0800
+++ b/src/share/classes/sun/security/ssl/Handshaker.java	Mon Dec 22 09:13:38 2014 -0800
@@ -681,6 +681,16 @@
             boolean enabledSSL20Hello = false;
             ArrayList<ProtocolVersion> protocols = new ArrayList<>(4);
             for (ProtocolVersion protocol : enabledProtocols.collection()) {
+                if (!algorithmConstraints.permits(
+                        EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                        protocol.name, null)) {
+                    if (debug != null && Debug.isOn("verbose")) {
+                        System.out.println(
+                            "Ignoring disabled protocol: " + protocol);
+                    }
+
+                    continue;
+                }
                 // Need not to check the SSL20Hello protocol.
                 if (protocol.v == ProtocolVersion.SSL20Hello.v) {
                     enabledSSL20Hello = true;