feat(events): Add cipher suite to TLS Session in the TlsExporterReady event #2070
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
camshaft
reviewed
Dec 12, 2023
quic/s2n-quic-tls/src/session.rs
Outdated
| @@ -88,6 +88,14 @@ impl tls::TlsSession for Session { | |||
| .tls_exporter(label, context, output) | |||
| .map_err(|_| tls::TlsExportError::failure()) | |||
| } | |||
|
|
|||
| fn cipher_suite(&self) -> CipherSuite { | |||
| if let Ok(cipher_suite) = self.connection.cipher_suite() { | |||
There was a problem hiding this comment.
seems better to store the expected cipher suite on the session state, rather than parsing it from the connection?
There was a problem hiding this comment.
just to make sure I'm understanding, that would be done inside of on_secret in callback.rs by changing fn get_algo_type to also return the cipher suite?
There was a problem hiding this comment.
yeah that's what i was thinking
| @@ -40,6 +43,8 @@ pub trait TlsSession: Send { | |||
| context: &[u8], | |||
| output: &mut [u8], | |||
| ) -> Result<(), TlsExportError>; | |||
|
|
|||
| fn cipher_suite(&self) -> CipherSuite; | |||
There was a problem hiding this comment.
makes sense to return Unknown rather than an error
camshaft
approved these changes
Dec 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
#1984 added the ability to export symmetric keys negotiated during the QUIC handshake by adding an
on_tls_exporter_readyevent. This change addscipher_suite()to the TLS session exposed as part of the event for use when using the exported keys.Call-outs:
I use
CipherSuite::Unknownin place of returning an error, it seemed a little more user friendly and I wasn't sure the error would be usefulTesting:
Updated the exporter integration test to confirm the client and server ciphersuites are the same and neither of them are unknown
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.