equal
deleted
inserted
replaced
221 // Output the handshake message. |
221 // Output the handshake message. |
222 cke.write(chc.handshakeOutput); |
222 cke.write(chc.handshakeOutput); |
223 chc.handshakeOutput.flush(); |
223 chc.handshakeOutput.flush(); |
224 |
224 |
225 // update the states |
225 // update the states |
226 SSLKeyExchange ke = |
226 SSLKeyExchange ke = SSLKeyExchange.valueOf( |
227 SSLKeyExchange.valueOf(chc.negotiatedCipherSuite.keyExchange); |
227 chc.negotiatedCipherSuite.keyExchange, |
|
228 chc.negotiatedProtocol); |
228 if (ke == null) { |
229 if (ke == null) { |
229 // unlikely |
230 // unlikely |
230 chc.conContext.fatal(Alert.INTERNAL_ERROR, |
231 chc.conContext.fatal(Alert.INTERNAL_ERROR, |
231 "Not supported key exchange type"); |
232 "Not supported key exchange type"); |
232 } else { |
233 } else { |
298 shc.conContext.fatal(Alert.ILLEGAL_PARAMETER, |
299 shc.conContext.fatal(Alert.ILLEGAL_PARAMETER, |
299 "Unsupported EC server cert for ECDH client key exchange"); |
300 "Unsupported EC server cert for ECDH client key exchange"); |
300 } |
301 } |
301 |
302 |
302 SSLKeyExchange ke = SSLKeyExchange.valueOf( |
303 SSLKeyExchange ke = SSLKeyExchange.valueOf( |
303 shc.negotiatedCipherSuite.keyExchange); |
304 shc.negotiatedCipherSuite.keyExchange, |
|
305 shc.negotiatedProtocol); |
304 if (ke == null) { |
306 if (ke == null) { |
305 // unlikely |
307 // unlikely |
306 shc.conContext.fatal(Alert.INTERNAL_ERROR, |
308 shc.conContext.fatal(Alert.INTERNAL_ERROR, |
307 "Not supported key exchange type"); |
309 "Not supported key exchange type"); |
308 return; // make the compiler happy |
310 return; // make the compiler happy |
403 // Output the handshake message. |
405 // Output the handshake message. |
404 cke.write(chc.handshakeOutput); |
406 cke.write(chc.handshakeOutput); |
405 chc.handshakeOutput.flush(); |
407 chc.handshakeOutput.flush(); |
406 |
408 |
407 // update the states |
409 // update the states |
408 SSLKeyExchange ke = |
410 SSLKeyExchange ke = SSLKeyExchange.valueOf( |
409 SSLKeyExchange.valueOf(chc.negotiatedCipherSuite.keyExchange); |
411 chc.negotiatedCipherSuite.keyExchange, |
|
412 chc.negotiatedProtocol); |
410 if (ke == null) { |
413 if (ke == null) { |
411 // unlikely |
414 // unlikely |
412 chc.conContext.fatal(Alert.INTERNAL_ERROR, |
415 chc.conContext.fatal(Alert.INTERNAL_ERROR, |
413 "Not supported key exchange type"); |
416 "Not supported key exchange type"); |
414 } else { |
417 } else { |
472 shc.conContext.fatal(Alert.ILLEGAL_PARAMETER, |
475 shc.conContext.fatal(Alert.ILLEGAL_PARAMETER, |
473 "Unsupported EC server cert for ECDHE client key exchange"); |
476 "Unsupported EC server cert for ECDHE client key exchange"); |
474 } |
477 } |
475 |
478 |
476 SSLKeyExchange ke = SSLKeyExchange.valueOf( |
479 SSLKeyExchange ke = SSLKeyExchange.valueOf( |
477 shc.negotiatedCipherSuite.keyExchange); |
480 shc.negotiatedCipherSuite.keyExchange, |
|
481 shc.negotiatedProtocol); |
478 if (ke == null) { |
482 if (ke == null) { |
479 // unlikely |
483 // unlikely |
480 shc.conContext.fatal(Alert.INTERNAL_ERROR, |
484 shc.conContext.fatal(Alert.INTERNAL_ERROR, |
481 "Not supported key exchange type"); |
485 "Not supported key exchange type"); |
482 return; // make the compiler happy |
486 return; // make the compiler happy |