Skip to content

Commit 6ca27a7

Browse files
committed
RTG-3333 Support X25519MLKEM768 by default, but don't sent it as client
X25519MLKEM768 is the standardised successor of the preliminary X25519Kyber768Draft00. Latest browsers have switched to X25519MLKEM768. Cloudflare supports both on the edge. We've had support for X25519MLKEM768 in this crate for a while, but didn't enable by default. We're now enabling serverside support by default. We also let clients advertise support when set to kx-client-pq-supported. We don't enable support by default yet for clients set to kx-client-pq-preferred, as that would cause an extra round-trip due to HelloRetryRequest if the server doesn't support X25519MLKEM768 yet. BoringSSL against which we build must support X25519MLKEM768, otherwise this will fail.
1 parent 796afe1 commit 6ca27a7

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

boring/src/ssl/mod.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2748,7 +2748,7 @@ impl SslRef {
27482748
if cfg!(feature = "kx-client-nist-required") {
27492749
"P-256:P-384:P-521:P256Kyber768Draft00"
27502750
} else {
2751-
"X25519:P-256:P-384:P-521:X25519Kyber768Draft00:P256Kyber768Draft00"
2751+
"X25519:P-256:P-384:P-521:X25519MLKEM768:X25519Kyber768Draft00:P256Kyber768Draft00"
27522752
}
27532753
} else {
27542754
if cfg!(feature = "kx-client-nist-required") {
@@ -2764,8 +2764,10 @@ impl SslRef {
27642764

27652765
#[cfg(feature = "kx-safe-default")]
27662766
fn server_set_default_curves_list(&mut self) {
2767-
self.set_curves_list("X25519Kyber768Draft00:P256Kyber768Draft00:X25519:P-256:P-384")
2768-
.expect("invalid default server curves list");
2767+
self.set_curves_list(
2768+
"X25519MLKEM768:X25519Kyber768Draft00:P256Kyber768Draft00:X25519:P-256:P-384",
2769+
)
2770+
.expect("invalid default server curves list");
27692771
}
27702772

27712773
/// Returns the [`SslCurve`] used for this `SslRef`.

0 commit comments

Comments
 (0)