diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-03-06 17:40:25 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-03-07 10:21:26 +0100 |
| commit | a2bb3a2bfee997ca657906ec391a576327d07dfe (patch) | |
| tree | 6c803656b48dfae82efb397cd8c9614aa101b694 /mullvad-update/meta | |
| parent | 2dc82d54771bcb4111b0611072f9d9321fd899dc (diff) | |
| download | mullvadvpn-a2bb3a2bfee997ca657906ec391a576327d07dfe.tar.xz mullvadvpn-a2bb3a2bfee997ca657906ec391a576327d07dfe.zip | |
Support multiple verifying keys in mullvad-update
Diffstat (limited to 'mullvad-update/meta')
| -rw-r--r-- | mullvad-update/meta/Cargo.toml | 1 | ||||
| -rw-r--r-- | mullvad-update/meta/src/platform.rs | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mullvad-update/meta/Cargo.toml b/mullvad-update/meta/Cargo.toml index 7eba726e95..932b5780b2 100644 --- a/mullvad-update/meta/Cargo.toml +++ b/mullvad-update/meta/Cargo.toml @@ -22,6 +22,7 @@ serde = { workspace = true } sha2 = "0.10" tokio = { version = "1", features = ["full"] } toml = "0.8" +vec1 = { workspace = true } mullvad-version = { path = "../../mullvad-version", features = ["serde"] } mullvad-update = { path = "../", features = ["client", "sign"] } diff --git a/mullvad-update/meta/src/platform.rs b/mullvad-update/meta/src/platform.rs index bc6c5bec2d..1fb3ef6dda 100644 --- a/mullvad-update/meta/src/platform.rs +++ b/mullvad-update/meta/src/platform.rs @@ -12,6 +12,7 @@ use std::{ str::FromStr, }; use tokio::{fs, io}; +use vec1::vec1; use crate::{ artifacts, @@ -128,7 +129,7 @@ impl Platform { // TODO: pin pinned_certificate: None, url, - verifying_key, + verifying_keys: vec1![verifying_key], }; let response = version_provider .get_versions(crate::MIN_VERIFY_METADATA_VERSION) @@ -234,7 +235,7 @@ impl Platform { key::VerifyingKey::from_hex(include_str!("../../test-pubkey")).expect("Invalid pubkey"); format::SignedResponse::deserialize_and_verify( - &public_key, + &vec1![public_key], &bytes, crate::MIN_VERIFY_METADATA_VERSION, ) |