diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-04-02 11:56:12 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-04-03 14:03:39 +0200 |
| commit | 00e26c1d17fb9044f8cbc0a168eab1edef70ba8a (patch) | |
| tree | 97e61f1aad74b6bf49f3b1b7d4559addf7960000 | |
| parent | 261888bc17023095fea48aa27543748449864436 (diff) | |
| download | mullvadvpn-00e26c1d17fb9044f8cbc0a168eab1edef70ba8a.tar.xz mullvadvpn-00e26c1d17fb9044f8cbc0a168eab1edef70ba8a.zip | |
Rename deserialize_and_verify to deserialize_and_verify_with_keys
| -rw-r--r-- | mullvad-api/src/version.rs | 2 | ||||
| -rw-r--r-- | mullvad-update/meta/src/platform.rs | 2 | ||||
| -rw-r--r-- | mullvad-update/src/client/api.rs | 2 | ||||
| -rw-r--r-- | mullvad-update/src/format/deserializer.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-api/src/version.rs b/mullvad-api/src/version.rs index 8218b94701..0fd070910b 100644 --- a/mullvad-api/src/version.rs +++ b/mullvad-api/src/version.rs @@ -66,7 +66,7 @@ impl AppVersionProxy { let response = service.request(request).await?; let bytes = response.body_with_max_size(Self::SIZE_LIMIT).await?; - let response = mullvad_update::format::SignedResponse::deserialize_and_verify( + let response = mullvad_update::format::SignedResponse::deserialize_and_verify_with_keys( &mullvad_update::keys::TRUSTED_METADATA_SIGNING_PUBKEYS, &bytes, lowest_metadata_version, diff --git a/mullvad-update/meta/src/platform.rs b/mullvad-update/meta/src/platform.rs index 2368c643d1..9d47825bc2 100644 --- a/mullvad-update/meta/src/platform.rs +++ b/mullvad-update/meta/src/platform.rs @@ -231,7 +231,7 @@ impl Platform { println!("Verifying signature of {}...", signed_path.display()); let bytes = fs::read(signed_path).await.context("Failed to read file")?; - format::SignedResponse::deserialize_and_verify( + format::SignedResponse::deserialize_and_verify_with_keys( &mullvad_update::keys::TRUSTED_METADATA_SIGNING_PUBKEYS, &bytes, crate::MIN_VERIFY_METADATA_VERSION, diff --git a/mullvad-update/src/client/api.rs b/mullvad-update/src/client/api.rs index b3428854ab..7811dee275 100644 --- a/mullvad-update/src/client/api.rs +++ b/mullvad-update/src/client/api.rs @@ -41,7 +41,7 @@ impl HttpVersionInfoProvider { lowest_metadata_version: usize, ) -> anyhow::Result<format::SignedResponse> { let raw_json = Self::get(&self.url, self.pinned_certificate.clone()).await?; - let response = format::SignedResponse::deserialize_and_verify( + let response = format::SignedResponse::deserialize_and_verify_with_keys( &self.verifying_keys, &raw_json, lowest_metadata_version, diff --git a/mullvad-update/src/format/deserializer.rs b/mullvad-update/src/format/deserializer.rs index c47de65fe3..980fd52ca6 100644 --- a/mullvad-update/src/format/deserializer.rs +++ b/mullvad-update/src/format/deserializer.rs @@ -10,7 +10,7 @@ use super::{PartialSignedResponse, ResponseSignature, SignedResponse}; impl SignedResponse { /// Deserialize some bytes to JSON, and verify them, including signature and expiry. /// If successful, the deserialized data is returned. - pub fn deserialize_and_verify( + pub fn deserialize_and_verify_with_keys( keys: &Vec1<VerifyingKey>, bytes: &[u8], min_metadata_version: usize, |