Merge pull request #7184 from freedomofpress/backport-7178

[2.9.0] Bump sequoia-openpgp to 1.20.0
freedomofpress · Jun 13, 2024 · e9155ee · e9155ee
2 parents d03d5c3 + 84bddcf
commit e9155ee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 76 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
@@ -478,6 +478,13 @@ start = "2022-11-18"
 end = "2024-04-10"
 notes = "Sequoia developer"
 
+[[trusted.sequoia-openpgp]]
+criteria = "safe-to-deploy"
+user-id = 33711 # Justus Winter (teythoon)
+start = "2019-03-14"
+end = "2024-12-12"
+notes = "Sequoia developer"
+
 [[trusted.sha1collisiondetection]]
 criteria = "safe-to-deploy"
 user-id = 33886 # Neal H. Walfield (nwalfield)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
@@ -226,11 +226,11 @@ user-login = "Amanieu"
 user-name = "Amanieu d'Antras"
 
 [[publisher.sequoia-openpgp]]
-version = "1.17.0"
-when = "2023-10-27"
-user-id = 33886
-user-login = "nwalfield"
-user-name = "Neal H. Walfield"
+version = "1.20.0"
+when = "2024-04-11"
+user-id = 33711
+user-login = "teythoon"
+user-name = "Justus Winter"
 
 [[publisher.sha1collisiondetection]]
 version = "0.3.1"
@@ -584,30 +584,6 @@ criteria = "safe-to-run"
 version = "0.3.26"
 aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"
 
-[[audits.google.audits.ppv-lite86]]
-who = "Android Legacy"
-criteria = "safe-to-run"
-version = "0.2.10"
-aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"
-
-[[audits.google.audits.rand]]
-who = "Android Legacy"
-criteria = "safe-to-run"
-version = "0.8.3"
-aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"
-
-[[audits.google.audits.rand_chacha]]
-who = "Android Legacy"
-criteria = "safe-to-run"
-version = "0.3.1"
-aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"
-
-[[audits.google.audits.rand_core]]
-who = "Android Legacy"
-criteria = "safe-to-run"
-version = "0.6.4"
-aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"
-
 [[audits.google.audits.smallvec]]
 who = "Android Legacy"
 criteria = "safe-to-run"
@@ -759,6 +735,12 @@ criteria = "safe-to-deploy"
 delta = "1.9.0 -> 2.0.0"
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
+[[audits.mozilla.audits.idna]]
+who = "Valentin Gosu <valentin.gosu@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.4.0 -> 0.5.0"
+aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+
 [[audits.mozilla.audits.libc]]
 who = "Mike Hommey <mh+mozilla@glandium.org>"
 criteria = "safe-to-deploy"
@@ -772,12 +754,6 @@ version = "1.0.4"
 notes = "This is a trivial crate."
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
-[[audits.mozilla.audits.ppv-lite86]]
-who = "Mike Hommey <mh+mozilla@glandium.org>"
-criteria = "safe-to-deploy"
-delta = "0.2.16 -> 0.2.17"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
 [[audits.mozilla.audits.precomputed-hash]]
 who = "Bobby Holley <bobbyholley@gmail.com>"
 criteria = "safe-to-deploy"