summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-03-27 15:12:11 +0100
committerDavid Lönnhager <david.l@mullvad.net>2025-04-01 09:01:19 +0200
commitc76fd4b39cb6514bba2e01179642c9234f44ad3c (patch)
treeaa0b73335ef1bc8bf6905265aa9e31362413be47
parentfb69daea04d7ab7e6b92d0ef6a43afeed82fbe24 (diff)
downloadmullvadvpn-c76fd4b39cb6514bba2e01179642c9234f44ad3c.tar.xz
mullvadvpn-c76fd4b39cb6514bba2e01179642c9234f44ad3c.zip
Rename deserialize_and_verify_insecure
-rw-r--r--mullvad-update/meta/src/platform.rs4
-rw-r--r--mullvad-update/src/format/deserializer.rs6
-rw-r--r--mullvad-update/src/version.rs4
3 files changed, 7 insertions, 7 deletions
diff --git a/mullvad-update/meta/src/platform.rs b/mullvad-update/meta/src/platform.rs
index e1f471f2e5..2368c643d1 100644
--- a/mullvad-update/meta/src/platform.rs
+++ b/mullvad-update/meta/src/platform.rs
@@ -192,7 +192,7 @@ impl Platform {
// Read unsigned JSON data
let data = fs::read(work_path).await?;
- let mut response = format::SignedResponse::deserialize_and_verify_insecure(&data)?;
+ let mut response = format::SignedResponse::deserialize_insecure(&data)?;
// Update the expiration date
response.signed.metadata_expiry = chrono::Utc::now()
@@ -424,7 +424,7 @@ impl Platform {
Err(error) => bail!("Failed to read {}: {error}", work_path.display()),
};
// Note: We don't need to verify the signature here
- format::SignedResponse::deserialize_and_verify_insecure(&bytes)
+ format::SignedResponse::deserialize_insecure(&bytes)
}
}
diff --git a/mullvad-update/src/format/deserializer.rs b/mullvad-update/src/format/deserializer.rs
index dc78737c80..c47de65fe3 100644
--- a/mullvad-update/src/format/deserializer.rs
+++ b/mullvad-update/src/format/deserializer.rs
@@ -20,7 +20,7 @@ impl SignedResponse {
/// This method is used mostly for testing, and skips all verification.
/// Own method to prevent accidental misuse.
- pub fn deserialize_and_verify_insecure(bytes: &[u8]) -> Result<Self, anyhow::Error> {
+ pub fn deserialize_insecure(bytes: &[u8]) -> Result<Self, anyhow::Error> {
let partial_data: PartialSignedResponse =
serde_json::from_slice(bytes).context("Invalid version JSON")?;
let signed = serde_json::from_value(partial_data.signed)
@@ -186,8 +186,8 @@ mod test {
let bytes = serde_json::to_vec(&value).expect("serialize should succeed");
- let response = SignedResponse::deserialize_and_verify_insecure(&bytes)
- .expect("deserialization failed");
+ let response =
+ SignedResponse::deserialize_insecure(&bytes).expect("deserialization failed");
let expected_key = VerifyingKey::from_hex(pubkey).unwrap();
let expected_sig = Signature::from_hex(fakesig).unwrap();
diff --git a/mullvad-update/src/version.rs b/mullvad-update/src/version.rs
index 686ff62def..4b94e66b42 100644
--- a/mullvad-update/src/version.rs
+++ b/mullvad-update/src/version.rs
@@ -178,7 +178,7 @@ mod test {
/// Test version info response handler (rollout 1, x86)
#[test]
fn test_version_info_parser_x86() -> anyhow::Result<()> {
- let response = format::SignedResponse::deserialize_and_verify_insecure(include_bytes!(
+ let response = format::SignedResponse::deserialize_insecure(include_bytes!(
"../test-version-response.json"
))?;
@@ -199,7 +199,7 @@ mod test {
/// Test version info response handler (rollout 0.01, arm64)
#[test]
fn test_version_info_parser_arm64() -> anyhow::Result<()> {
- let response = format::SignedResponse::deserialize_and_verify_insecure(include_bytes!(
+ let response = format::SignedResponse::deserialize_insecure(include_bytes!(
"../test-version-response.json"
))?;