equal
deleted
inserted
replaced
419 if (chc.handshakeSession.isRejoinable()) { |
419 if (chc.handshakeSession.isRejoinable()) { |
420 ((SSLSessionContextImpl)chc.sslContext. |
420 ((SSLSessionContextImpl)chc.sslContext. |
421 engineGetClientSessionContext()).put( |
421 engineGetClientSessionContext()).put( |
422 chc.handshakeSession); |
422 chc.handshakeSession); |
423 } |
423 } |
424 chc.conContext.conSession = chc.handshakeSession; |
424 chc.conContext.conSession = chc.handshakeSession.finish(); |
425 chc.conContext.protocolVersion = chc.negotiatedProtocol; |
425 chc.conContext.protocolVersion = chc.negotiatedProtocol; |
426 |
426 |
427 // handshake context cleanup. |
427 // handshake context cleanup. |
428 chc.handshakeFinished = true; |
428 chc.handshakeFinished = true; |
429 |
429 |
474 if (shc.handshakeSession.isRejoinable()) { |
474 if (shc.handshakeSession.isRejoinable()) { |
475 ((SSLSessionContextImpl)shc.sslContext. |
475 ((SSLSessionContextImpl)shc.sslContext. |
476 engineGetServerSessionContext()).put( |
476 engineGetServerSessionContext()).put( |
477 shc.handshakeSession); |
477 shc.handshakeSession); |
478 } |
478 } |
479 shc.conContext.conSession = shc.handshakeSession; |
479 shc.conContext.conSession = shc.handshakeSession.finish(); |
480 shc.conContext.protocolVersion = shc.negotiatedProtocol; |
480 shc.conContext.protocolVersion = shc.negotiatedProtocol; |
481 |
481 |
482 // handshake context cleanup. |
482 // handshake context cleanup. |
483 shc.handshakeFinished = true; |
483 shc.handshakeFinished = true; |
484 |
484 |
542 if (chc.handshakeSession.isRejoinable()) { |
542 if (chc.handshakeSession.isRejoinable()) { |
543 ((SSLSessionContextImpl)chc.sslContext. |
543 ((SSLSessionContextImpl)chc.sslContext. |
544 engineGetClientSessionContext()).put( |
544 engineGetClientSessionContext()).put( |
545 chc.handshakeSession); |
545 chc.handshakeSession); |
546 } |
546 } |
547 chc.conContext.conSession = chc.handshakeSession; |
547 chc.conContext.conSession = chc.handshakeSession.finish(); |
548 chc.conContext.protocolVersion = chc.negotiatedProtocol; |
548 chc.conContext.protocolVersion = chc.negotiatedProtocol; |
549 |
549 |
550 // handshake context cleanup. |
550 // handshake context cleanup. |
551 chc.handshakeFinished = true; |
551 chc.handshakeFinished = true; |
552 |
552 |
591 if (shc.handshakeSession.isRejoinable()) { |
591 if (shc.handshakeSession.isRejoinable()) { |
592 ((SSLSessionContextImpl)shc.sslContext. |
592 ((SSLSessionContextImpl)shc.sslContext. |
593 engineGetServerSessionContext()).put( |
593 engineGetServerSessionContext()).put( |
594 shc.handshakeSession); |
594 shc.handshakeSession); |
595 } |
595 } |
596 shc.conContext.conSession = shc.handshakeSession; |
596 shc.conContext.conSession = shc.handshakeSession.finish(); |
597 shc.conContext.protocolVersion = shc.negotiatedProtocol; |
597 shc.conContext.protocolVersion = shc.negotiatedProtocol; |
598 |
598 |
599 // handshake context cleanup. |
599 // handshake context cleanup. |
600 shc.handshakeFinished = true; |
600 shc.handshakeFinished = true; |
601 |
601 |
723 SSLSecretDerivation sd = ((SSLSecretDerivation) kd).forContext(chc); |
723 SSLSecretDerivation sd = ((SSLSecretDerivation) kd).forContext(chc); |
724 SecretKey resumptionMasterSecret = sd.deriveKey( |
724 SecretKey resumptionMasterSecret = sd.deriveKey( |
725 "TlsResumptionMasterSecret", null); |
725 "TlsResumptionMasterSecret", null); |
726 chc.handshakeSession.setResumptionMasterSecret(resumptionMasterSecret); |
726 chc.handshakeSession.setResumptionMasterSecret(resumptionMasterSecret); |
727 |
727 |
728 chc.conContext.conSession = chc.handshakeSession; |
728 chc.conContext.conSession = chc.handshakeSession.finish(); |
729 chc.conContext.protocolVersion = chc.negotiatedProtocol; |
729 chc.conContext.protocolVersion = chc.negotiatedProtocol; |
730 |
730 |
731 // handshake context cleanup. |
731 // handshake context cleanup. |
732 chc.handshakeFinished = true; |
732 chc.handshakeFinished = true; |
733 chc.conContext.finishHandshake(); |
733 chc.conContext.finishHandshake(); |
1056 "Failure to derive application secrets", gse); |
1056 "Failure to derive application secrets", gse); |
1057 return; // make the compiler happy |
1057 return; // make the compiler happy |
1058 } |
1058 } |
1059 |
1059 |
1060 // update connection context |
1060 // update connection context |
1061 shc.conContext.conSession = shc.handshakeSession; |
1061 shc.conContext.conSession = shc.handshakeSession.finish(); |
1062 shc.conContext.protocolVersion = shc.negotiatedProtocol; |
1062 shc.conContext.protocolVersion = shc.negotiatedProtocol; |
1063 |
1063 |
1064 // handshake context cleanup. |
1064 // handshake context cleanup. |
1065 shc.handshakeFinished = true; |
1065 shc.handshakeFinished = true; |
1066 |
1066 |