Fixed build issues

nymtech · Feb 14, 2025 · d888975 · d888975
1 parent 4acb348
commit d888975
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/nym-vpn-core/crates/nym-vpn-account-controller/Cargo.toml b/nym-vpn-core/crates/nym-vpn-account-controller/Cargo.toml
@@ -44,6 +44,7 @@ uuid.workspace = true
 zeroize.workspace = true
 windows-sys = { workspace = true, features = ["Win32_System_Threading", "Win32_System_SystemServices"] }
 widestring.workspace = true
+winapi = { version = "0.3" }
 
 [build-dependencies]
 sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite"] }

diff --git a/...tes/nym-vpn-account-controller/src/storage/credentials/pending_credential_requests/mod.rs b/...tes/nym-vpn-account-controller/src/storage/credentials/pending_credential_requests/mod.rs
@@ -19,13 +19,14 @@ use std::{
 use time::OffsetDateTime;
 use tracing::log::LevelFilter;
 #[cfg(windows)]
+use winapi::um::winnt::SECURITY_MAX_SID_SIZE;
+#[cfg(windows)]
 use windows_sys::Win32::Foundation::{FALSE, TRUE};
 #[cfg(windows)]
 use windows_sys::Win32::System::SystemServices::SECURITY_DESCRIPTOR_REVISION;
 
 // Consider requests older than 60 days as stale
 const DEFAULT_STALE_REQUESTS_MAX_AGE: Duration = Duration::from_secs(60 * 60 * 24 * 60);
-const SECURITY_MAX_SID_SIZE: u32 = 68;
 
 #[derive(Clone)]
 pub(crate) struct PendingCredentialRequestsStorage {
@@ -217,7 +218,7 @@ fn set_file_permission_owner_rw_windows<P: AsRef<Path>>(path: P) -> Result<(), s
         )
     })?;
 
-    let mut sid_size = SECURITY_MAX_SID_SIZE;
+    let mut sid_size: u32 = SECURITY_MAX_SID_SIZE as u32;
     let mut system_sid = vec![0u8; sid_size as usize];
 
     unsafe {

diff --git a/nym-vpn-core/crates/nym-vpn-store/Cargo.toml b/nym-vpn-core/crates/nym-vpn-store/Cargo.toml
@@ -23,7 +23,7 @@ tracing.workspace = true
 zeroize.workspace = true
 windows-sys = { workspace = true, features = ["Win32_System_Threading", "Win32_System_SystemServices"] }
 widestring.workspace = true
-winapi = "0.3.9"
+winapi = { version = "0.3" }
 
 [dev-dependencies]
 bip39 = { workspace = true, features = ["rand"] }

diff --git a/nym-vpn-core/crates/nym-vpn-store/src/mnemonic/on_disk.rs b/nym-vpn-core/crates/nym-vpn-store/src/mnemonic/on_disk.rs
@@ -2,17 +2,19 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use super::{MnemonicStorage, MnemonicStorageError, StoredMnemonic};
+#[cfg(windows)]
 use std::os::raw::c_void;
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
+#[cfg(windows)]
 use std::path::Path;
 use std::{
     fs::{self, File},
-    mem,
     path::PathBuf,
-    ptr,
 };
 #[cfg(windows)]
+use std::{mem, ptr};
+#[cfg(windows)]
 use widestring::U16CString;
 #[cfg(windows)]
 use winapi::um::winnt::SECURITY_MAX_SID_SIZE;