Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 04:41:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1918532 - replace xyber768d00 with mlkem768x25519 in neqo_glue. r=kershaw,necko-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D222041
This commit is contained in:
John Schanck 2024-10-10 16:48:17 +00:00
parent 49d00f22dd
commit 809de792a0
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netwerk/socket/neqo_glue/src/lib.rs
View File

@ -274,7 +274,7 @@ impl NeqoHttp3Conn {
{
// These operations are infallible when conn.state == State::Init.
let _ = conn.set_groups(&[
neqo_crypto::TLS_GRP_KEM_XYBER768D00,
neqo_crypto::TLS_GRP_KEM_MLKEM768X25519,
neqo_crypto::TLS_GRP_EC_X25519,
neqo_crypto::TLS_GRP_EC_SECP256R1,
neqo_crypto::TLS_GRP_EC_SECP384R1,
@ -282,9 +282,9 @@ impl NeqoHttp3Conn {
]);
additional_shares += 1;
}
// If additional_shares == 2, send Xyber768D00, X25519, and P-256.
// If additional_shares == 1, send {Xyber768D00, X25519} or {X25519, P-256}.
// If additional_shares == 0, send X25519.
// If additional_shares == 2, send mlkem768x25519, x25519, and p256.
// If additional_shares == 1, send {mlkem768x25519, x25519} or {x25519, p256}.
// If additional_shares == 0, send x25519.
let _ = conn.send_additional_key_shares(additional_shares);
let mut conn = Http3Client::new_with_conn(conn, http3_settings);

6
netwerk/test/unit/test_http3_kyber.js
View File

@ -62,11 +62,7 @@ function makeChan(uri) {
add_task(async function test_kyber_success() {
let listener = new Http3Listener();
// Bug 1918532: change this from x25519 to mlkem768x25519.
// neqo_glue currently tries to negotiate xyber768d00, which is
// disabled by NSS policy. As such we expect to receive x25519
// here.
listener.expectedKeaGroup = "x25519";
listener.expectedKeaGroup = "mlkem768x25519";
let chan = makeChan("https://foo.example.com");
await chanPromise(chan, listener);
});