diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-04-02 13:50:57 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-04-03 14:11:18 +0200 |
| commit | f65e04a4be4270764ed2c2e859be01c52777dabe (patch) | |
| tree | 82892fbc92eb61ffee0f6b3de99fec2e5a15d479 | |
| parent | 3d03dc779f6829a236d139543e3c19fa56c4a25e (diff) | |
| download | mullvadvpn-f65e04a4be4270764ed2c2e859be01c52777dabe.tar.xz mullvadvpn-f65e04a4be4270764ed2c2e859be01c52777dabe.zip | |
Rename 'keys' module to 'defaults'
| -rw-r--r-- | mullvad-update/src/client/api.rs | 4 | ||||
| -rw-r--r-- | mullvad-update/src/defaults.rs (renamed from mullvad-update/src/keys.rs) | 3 | ||||
| -rw-r--r-- | mullvad-update/src/format/deserializer.rs | 2 | ||||
| -rw-r--r-- | mullvad-update/src/lib.rs | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/mullvad-update/src/client/api.rs b/mullvad-update/src/client/api.rs index 05c8359449..c2af2a54c7 100644 --- a/mullvad-update/src/client/api.rs +++ b/mullvad-update/src/client/api.rs @@ -42,8 +42,8 @@ impl HttpVersionInfoProvider { pub fn new(url: String) -> Self { HttpVersionInfoProvider { url, - pinned_certificate: Some(crate::keys::PINNED_CERTIFICATE.clone()), - verifying_keys: crate::keys::TRUSTED_METADATA_SIGNING_PUBKEYS.clone(), + pinned_certificate: Some(crate::defaults::PINNED_CERTIFICATE.clone()), + verifying_keys: crate::defaults::TRUSTED_METADATA_SIGNING_PUBKEYS.clone(), } } diff --git a/mullvad-update/src/keys.rs b/mullvad-update/src/defaults.rs index 73ca8519d0..cc58de4bc8 100644 --- a/mullvad-update/src/keys.rs +++ b/mullvad-update/src/defaults.rs @@ -1,10 +1,11 @@ -//! Keys that may be used for verifying data +//! Default keys and certificates that may be used for verifying data use crate::format::key::VerifyingKey; use std::sync::LazyLock; use vec1::Vec1; /// Default TLS certificate to pin to +#[cfg(feature = "client")] pub static PINNED_CERTIFICATE: LazyLock<reqwest::Certificate> = LazyLock::new(|| { const CERT_BYTES: &[u8] = include_bytes!("../../mullvad-api/le_root_cert.pem"); reqwest::Certificate::from_pem(CERT_BYTES).expect("invalid cert") diff --git a/mullvad-update/src/format/deserializer.rs b/mullvad-update/src/format/deserializer.rs index 8b138578b5..a274651d03 100644 --- a/mullvad-update/src/format/deserializer.rs +++ b/mullvad-update/src/format/deserializer.rs @@ -17,7 +17,7 @@ impl SignedResponse { min_metadata_version: usize, ) -> Result<Self, anyhow::Error> { Self::deserialize_and_verify_with_keys( - &crate::keys::TRUSTED_METADATA_SIGNING_PUBKEYS, + &crate::defaults::TRUSTED_METADATA_SIGNING_PUBKEYS, bytes, min_metadata_version, ) diff --git a/mullvad-update/src/lib.rs b/mullvad-update/src/lib.rs index eb9877f62f..bfce66e120 100644 --- a/mullvad-update/src/lib.rs +++ b/mullvad-update/src/lib.rs @@ -6,8 +6,7 @@ mod client; #[cfg(feature = "client")] pub use client::*; -#[cfg(feature = "client")] -mod keys; +mod defaults; pub mod version; |