Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypto: expose negotiated_cipher_suite in the hadshake data #2001

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

crypto: expose negotiated_cipher_suite in the hadshake data #2001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions quinn-proto/src/crypto/rustls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ impl crypto::Session for TlsSession {
Connection::Client(_) => None,
Connection::Server(ref session) => session.server_name().map(|x| x.into()),
},
negotiated_cipher_suite: self
.inner
.negotiated_cipher_suite()
.expect("cipher is negotiated")
.suite(),
}))
}

Expand Down Expand Up @@ -256,6 +261,9 @@ pub struct HandshakeData {
///
/// Always `None` for outgoing connections
pub server_name: Option<String>,

/// The ciphersuite negotiated with the peer.
pub negotiated_cipher_suite: CipherSuite,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might be better to avoid using a rustls-specific type here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, but on the other hand why not? :D

This is rustls.rs module, which already depends on rustls specific (and quinn re-export rustls as well)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But if we're going to have a rustls-specific type, why not SupportedCipherSuite instead of CipherSuite?

@Ralith have opinions on this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SupportedCipherSuite also contains the implementation.

I thought the scope of this crypto::rustls::HandshakeData for quinn is just give the information about the negotiated cipher and implementation is not needed (reducing overhead of the struct); that's why I went for CipherSuite instead.

Anyway lemme know what do you prefer

}

/// A QUIC-compatible TLS client configuration
Expand Down