changeset 11269:4fd63bab0035

8136442: Don't tie Certificate signature algorithms to ciphersuites Reviewed-by: mullan
author xuelei
date Tue, 01 Dec 2015 01:32:51 +0000
parents ce19e0ef1e10
children e963ffbf2500
files src/share/classes/sun/security/ssl/ServerHandshaker.java
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/ssl/ServerHandshaker.java	Tue Jan 12 12:02:45 2016 +0300
+++ b/src/share/classes/sun/security/ssl/ServerHandshaker.java	Tue Dec 01 01:32:51 2015 +0000
@@ -1233,8 +1233,8 @@
                 }
             }
 
-            // need EC cert signed using EC
-            if (setupPrivateKeyAndChain("EC_EC") == false) {
+            // need EC cert
+            if (setupPrivateKeyAndChain("EC") == false) {
                 return false;
             }
             if (setupEphemeralECDHKeys() == false) {
@@ -1242,15 +1242,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();