# HG changeset patch # User xuelei # Date 1448933571 0 # Node ID 1599006b7f3a696c98d826e1f2caa83b844a2d84 # Parent 162c793224d1e62236413440b951a97061c27fec 8136442: Don't tie Certificate signature algorithms to ciphersuites Reviewed-by: mullan diff -r 162c793224d1 -r 1599006b7f3a jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java --- a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java Mon Nov 30 13:27:19 2015 -0800 +++ b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java Tue Dec 01 01:32:51 2015 +0000 @@ -1415,8 +1415,8 @@ } } - // need EC cert signed using EC - if (setupPrivateKeyAndChain("EC_EC") == false) { + // need EC cert + if (setupPrivateKeyAndChain("EC") == false) { return false; } if (setupEphemeralECDHKeys() == false) { @@ -1424,15 +1424,15 @@ } break; case K_ECDH_RSA: - // need EC cert signed using RSA - if (setupPrivateKeyAndChain("EC_RSA") == false) { + // need EC cert + if (setupPrivateKeyAndChain("EC") == false) { return false; } setupStaticECDHKeys(); break; case K_ECDH_ECDSA: - // need EC cert signed using EC - if (setupPrivateKeyAndChain("EC_EC") == false) { + // need EC cert + if (setupPrivateKeyAndChain("EC") == false) { return false; } setupStaticECDHKeys();