diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
commit | 40a355a42d4a9444dc753c04c6608dade2f06a23 (patch) | |
tree | 871fc667d2de662f171103ce5ec067014ef85e61 /security/manager/ssl/osclientcerts | |
parent | Adding upstream version 124.0.1. (diff) | |
download | firefox-40a355a42d4a9444dc753c04c6608dade2f06a23.tar.xz firefox-40a355a42d4a9444dc753c04c6608dade2f06a23.zip |
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'security/manager/ssl/osclientcerts')
-rw-r--r-- | security/manager/ssl/osclientcerts/Cargo.toml | 4 | ||||
-rw-r--r-- | security/manager/ssl/osclientcerts/src/lib.rs | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/security/manager/ssl/osclientcerts/Cargo.toml b/security/manager/ssl/osclientcerts/Cargo.toml index db71b97a46..7bd44a3b52 100644 --- a/security/manager/ssl/osclientcerts/Cargo.toml +++ b/security/manager/ssl/osclientcerts/Cargo.toml @@ -18,10 +18,10 @@ pkcs11-bindings = "0.1" rsclientcerts = { path = "../rsclientcerts" } sha2 = "0.10.2" -[target."cfg(target_os = \"macos\")".dependencies.core-foundation] +[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.core-foundation] version = "0.9" -[target."cfg(target_os = \"macos\")".dependencies.libloading] +[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.libloading] version = "0.7" [target."cfg(target_os = \"windows\")".dependencies.winapi] diff --git a/security/manager/ssl/osclientcerts/src/lib.rs b/security/manager/ssl/osclientcerts/src/lib.rs index acffe51556..728c244543 100644 --- a/security/manager/ssl/osclientcerts/src/lib.rs +++ b/security/manager/ssl/osclientcerts/src/lib.rs @@ -6,11 +6,11 @@ #![allow(non_snake_case)] extern crate byteorder; -#[cfg(target_os = "macos")] +#[cfg(any(target_os = "macos", target_os = "ios"))] #[macro_use] extern crate core_foundation; extern crate env_logger; -#[cfg(target_os = "macos")] +#[cfg(any(target_os = "macos", target_os = "ios"))] #[macro_use] extern crate lazy_static; #[cfg(target_os = "macos")] @@ -30,12 +30,12 @@ use std::ffi::CStr; use std::sync::Mutex; use std::thread; -#[cfg(target_os = "macos")] +#[cfg(any(target_os = "macos", target_os = "ios"))] mod backend_macos; #[cfg(target_os = "windows")] mod backend_windows; -#[cfg(target_os = "macos")] +#[cfg(any(target_os = "macos", target_os = "ios"))] use crate::backend_macos::Backend; #[cfg(target_os = "windows")] use crate::backend_windows::Backend; @@ -143,7 +143,7 @@ extern "C" fn C_Initialize(pInitArgs: CK_VOID_PTR) -> CK_RV { mechanisms, }) { Some(_unexpected_previous_module_state) => { - #[cfg(target_os = "macos")] + #[cfg(any(target_os = "macos", target_os = "ios"))] { log_with_thread_id!(info, "C_Initialize: module state previously set (this is expected on macOS - replacing it)"); } @@ -1233,5 +1233,5 @@ pub unsafe extern "C" fn C_GetFunctionList(ppFunctionList: CK_FUNCTION_LIST_PTR_ CKR_OK } -#[cfg_attr(target_os = "macos", link(name = "Security", kind = "framework"))] +#[cfg_attr(any(target_os = "macos", target_os = "ios"), link(name = "Security", kind = "framework"))] extern "C" {} |