corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1949394 - Part 1: Upgrade mls-platform-api to 5d88241b and mls-rs to b747d7ef (based on mls-rs 0.45.0). r=glandium,supply-chain-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D238923
This commit is contained in:
Benjamin Beurdouche
2025-02-21 11:20:33 +00:00
parent 7203f8f166
commit 1a446fa999
4 changed files with 76 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.cargo/config.toml.in
View File

@@ -15,14 +15,14 @@ git = "https://github.com/FirefoxGraphics/wpf-gpu-raster"
rev = "99979da091fd58fba8477e7fcdf5ec0727102916" rev = "99979da091fd58fba8477e7fcdf5ec0727102916"
replace-with = "vendored-sources" replace-with = "vendored-sources"
[source."git+https://github.com/beurdouche/mls-platform-api?rev=19c3f18b747d13354370ba84440bb0b963932634"] [source."git+https://github.com/beurdouche/mls-platform-api?rev=5d88241b9765cae3669aba21f0946bd3700f7db1"]
git = "https://github.com/beurdouche/mls-platform-api" git = "https://github.com/beurdouche/mls-platform-api"
rev = "19c3f18b747d13354370ba84440bb0b963932634" rev = "5d88241b9765cae3669aba21f0946bd3700f7db1"
replace-with = "vendored-sources" replace-with = "vendored-sources"
[source."git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c"] [source."git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3"]
git = "https://github.com/beurdouche/mls-rs" git = "https://github.com/beurdouche/mls-rs"
rev = "eedb37e50e3fca51863f460755afd632137da57c" rev = "b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
replace-with = "vendored-sources" replace-with = "vendored-sources"
[source."git+https://github.com/beurdouche/nss-gk-api?rev=e48a946811ffd64abc78de3ee284957d8d1c0d63"] [source."git+https://github.com/beurdouche/nss-gk-api?rev=e48a946811ffd64abc78de3ee284957d8d1c0d63"]

36
Cargo.lock generated
View File

@@ -3996,7 +3996,7 @@ dependencies = [
[[package]] [[package]]
name = "mls-platform-api" name = "mls-platform-api"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/beurdouche/mls-platform-api?rev=19c3f18b747d13354370ba84440bb0b963932634#19c3f18b747d13354370ba84440bb0b963932634" source = "git+https://github.com/beurdouche/mls-platform-api?rev=5d88241b9765cae3669aba21f0946bd3700f7db1#5d88241b9765cae3669aba21f0946bd3700f7db1"
dependencies = [ dependencies = [
"bincode", "bincode",
"hex", "hex",
@@ -4011,8 +4011,8 @@ dependencies = [
[[package]] [[package]]
name = "mls-rs" name = "mls-rs"
version = "0.39.1" version = "0.45.0"
source = "git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c#eedb37e50e3fca51863f460755afd632137da57c" source = "git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3#b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"cfg-if", "cfg-if",
@@ -4036,8 +4036,8 @@ dependencies = [
[[package]] [[package]]
name = "mls-rs-codec" name = "mls-rs-codec"
version = "0.5.3" version = "0.6.0"
source = "git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c#eedb37e50e3fca51863f460755afd632137da57c" source = "git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3#b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
dependencies = [ dependencies = [
"mls-rs-codec-derive", "mls-rs-codec-derive",
"thiserror 1.999.999", "thiserror 1.999.999",
@@ -4046,8 +4046,8 @@ dependencies = [
[[package]] [[package]]
name = "mls-rs-codec-derive" name = "mls-rs-codec-derive"
version = "0.1.1" version = "0.2.0"
source = "git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c#eedb37e50e3fca51863f460755afd632137da57c" source = "git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3#b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@@ -4057,8 +4057,8 @@ dependencies = [
[[package]] [[package]]
name = "mls-rs-core" name = "mls-rs-core"
version = "0.18.0" version = "0.21.0"
source = "git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c#eedb37e50e3fca51863f460755afd632137da57c" source = "git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3#b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"hex", "hex",
@@ -4073,8 +4073,8 @@ dependencies = [
[[package]] [[package]]
name = "mls-rs-crypto-hpke" name = "mls-rs-crypto-hpke"
version = "0.9.0" version = "0.14.0"
source = "git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c#eedb37e50e3fca51863f460755afd632137da57c" source = "git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3#b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"cfg-if", "cfg-if",
@@ -4088,7 +4088,7 @@ dependencies = [
[[package]] [[package]]
name = "mls-rs-crypto-nss" name = "mls-rs-crypto-nss"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c#eedb37e50e3fca51863f460755afd632137da57c" source = "git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3#b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
dependencies = [ dependencies = [
"getrandom", "getrandom",
"hex", "hex",
@@ -4105,8 +4105,8 @@ dependencies = [
[[package]] [[package]]
name = "mls-rs-crypto-traits" name = "mls-rs-crypto-traits"
version = "0.10.0" version = "0.15.0"
source = "git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c#eedb37e50e3fca51863f460755afd632137da57c" source = "git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3#b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"maybe-async", "maybe-async",
@@ -4115,8 +4115,8 @@ dependencies = [
[[package]] [[package]]
name = "mls-rs-identity-x509" name = "mls-rs-identity-x509"
version = "0.11.0" version = "0.15.0"
source = "git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c#eedb37e50e3fca51863f460755afd632137da57c" source = "git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3#b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"maybe-async", "maybe-async",
@@ -4127,8 +4127,8 @@ dependencies = [
[[package]] [[package]]
name = "mls-rs-provider-sqlite" name = "mls-rs-provider-sqlite"
version = "0.11.0" version = "0.15.0"
source = "git+https://github.com/beurdouche/mls-rs?rev=eedb37e50e3fca51863f460755afd632137da57c#eedb37e50e3fca51863f460755afd632137da57c" source = "git+https://github.com/beurdouche/mls-rs?rev=b747d7efb85a776b97ad8afa8d1b32893fa5efa3#b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"hex", "hex",

2
security/mls/mls_gk/Cargo.toml
View File

@@ -12,7 +12,7 @@ nsstring = { path = "../../../xpcom/rust/nsstring" }
xpcom = { path = "../../../xpcom/rust/xpcom" } xpcom = { path = "../../../xpcom/rust/xpcom" }
static_prefs = { path = "../../../modules/libpref/init/static_prefs" } static_prefs = { path = "../../../modules/libpref/init/static_prefs" }
mls-platform-api = { git = "https://github.com/beurdouche/mls-platform-api", rev="19c3f18b747d13354370ba84440bb0b963932634", features = ["gecko"] } mls-platform-api = { git = "https://github.com/beurdouche/mls-platform-api", rev="5d88241b9765cae3669aba21f0946bd3700f7db1", features = ["gecko"] }
nss-gk-api = { git = "https://github.com/beurdouche/nss-gk-api", rev = "e48a946811ffd64abc78de3ee284957d8d1c0d63", default-features = false } nss-gk-api = { git = "https://github.com/beurdouche/nss-gk-api", rev = "e48a946811ffd64abc78de3ee284957d8d1c0d63", default-features = false }
thin-vec = { version = "^0.2.12", features = ["gecko-ffi"] } thin-vec = { version = "^0.2.12", features = ["gecko-ffi"] }
hex = "^0.4.3" hex = "^0.4.3"

61
supply-chain/audits.toml
View File

@@ -3312,7 +3312,12 @@ version = "0.39.1"
[[audits.mls-rs]] [[audits.mls-rs]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>" who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
delta = "0.39.1 -> 0.39.1@git:eedb37e50e3fca51863f460755afd632137da57c" delta = "0.39.1 -> 0.45.0"
[[audits.mls-rs]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.45.0 -> 0.45.0@git:b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
importable = false importable = false
[[audits.mls-rs-codec]] [[audits.mls-rs-codec]]
@@ -3323,7 +3328,12 @@ version = "0.5.3"
[[audits.mls-rs-codec]] [[audits.mls-rs-codec]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>" who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
delta = "0.5.3 -> 0.5.3@git:eedb37e50e3fca51863f460755afd632137da57c" delta = "0.5.3 -> 0.6.0"
[[audits.mls-rs-codec]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.6.0 -> 0.6.0@git:b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
importable = false importable = false
[[audits.mls-rs-codec-derive]] [[audits.mls-rs-codec-derive]]
@@ -3335,7 +3345,12 @@ notes = "No unsafe code"
[[audits.mls-rs-codec-derive]] [[audits.mls-rs-codec-derive]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>" who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
delta = "0.1.1 -> 0.1.1@git:eedb37e50e3fca51863f460755afd632137da57c" delta = "0.1.1 -> 0.2.0"
[[audits.mls-rs-codec-derive]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.2.0 -> 0.2.0@git:b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
importable = false importable = false
[[audits.mls-rs-core]] [[audits.mls-rs-core]]
@@ -3346,7 +3361,12 @@ version = "0.18.0"
[[audits.mls-rs-core]] [[audits.mls-rs-core]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>" who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
delta = "0.18.0 -> 0.18.0@git:eedb37e50e3fca51863f460755afd632137da57c" delta = "0.18.0 -> 0.21.0"
[[audits.mls-rs-core]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.21.0 -> 0.21.0@git:b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
importable = false importable = false
[[audits.mls-rs-crypto-hpke]] [[audits.mls-rs-crypto-hpke]]
@@ -3357,7 +3377,17 @@ version = "0.9.0"
[[audits.mls-rs-crypto-hpke]] [[audits.mls-rs-crypto-hpke]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>" who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
delta = "0.9.0 -> 0.9.0@git:eedb37e50e3fca51863f460755afd632137da57c" delta = "0.9.0 -> 0.14.0"
[[audits.mls-rs-crypto-hpke]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.9.0 -> 0.14.0"
[[audits.mls-rs-crypto-hpke]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.14.0 -> 0.14.0@git:b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
importable = false importable = false
[[audits.mls-rs-crypto-traits]] [[audits.mls-rs-crypto-traits]]
@@ -3368,7 +3398,12 @@ version = "0.10.0"
[[audits.mls-rs-crypto-traits]] [[audits.mls-rs-crypto-traits]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>" who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
delta = "0.10.0 -> 0.10.0@git:eedb37e50e3fca51863f460755afd632137da57c" delta = "0.10.0 -> 0.15.0"
[[audits.mls-rs-crypto-traits]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.15.0 -> 0.15.0@git:b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
importable = false importable = false
[[audits.mls-rs-identity-x509]] [[audits.mls-rs-identity-x509]]
@@ -3379,7 +3414,12 @@ version = "0.11.0"
[[audits.mls-rs-identity-x509]] [[audits.mls-rs-identity-x509]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>" who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
delta = "0.11.0 -> 0.11.0@git:eedb37e50e3fca51863f460755afd632137da57c" delta = "0.11.0 -> 0.15.0"
[[audits.mls-rs-identity-x509]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.15.0 -> 0.15.0@git:b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
importable = false importable = false
[[audits.mls-rs-provider-sqlite]] [[audits.mls-rs-provider-sqlite]]
@@ -3390,7 +3430,12 @@ version = "0.11.0"
[[audits.mls-rs-provider-sqlite]] [[audits.mls-rs-provider-sqlite]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>" who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
delta = "0.11.0 -> 0.11.0@git:eedb37e50e3fca51863f460755afd632137da57c" delta = "0.11.0 -> 0.15.0"
[[audits.mls-rs-provider-sqlite]]
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.15.0 -> 0.15.0@git:b747d7efb85a776b97ad8afa8d1b32893fa5efa3"
importable = false importable = false
[[audits.moz_cbor]] [[audits.moz_cbor]]