Skip to content

Commit

Permalink
Bump min OS X version
Browse files Browse the repository at this point in the history
  • Loading branch information
kornelski committed Mar 27, 2024
1 parent 854b810 commit 7bb4b4a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
matrix:
os: [ macos-latest ]
# NOTE: when changing the MSRV version, change it below as well
rust: [ 1.60.0, stable, beta ]
rust: [ 1.65.0, stable, beta ]

steps:
- name: Checkout sources
Expand Down
2 changes: 1 addition & 1 deletion iostest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ security-framework-sys = { path = "../security-framework-sys" }

[dev-dependencies]
rand = "0.8.5"
serial_test = "2.0.0"
serial_test = "3.0"

[package.metadata.release]
release = false
Expand Down
4 changes: 2 additions & 2 deletions security-framework-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "security-framework-sys"
version = "2.9.1"
version = "2.10.0"
authors = ["Steven Fackler <[email protected]>", "Kornel <[email protected]>"]
license = "MIT OR Apache-2.0"
description = "Apple `Security.framework` low-level FFI bindings"
Expand All @@ -16,7 +16,7 @@ core-foundation-sys = "0.8.3"
libc = "0.2.139"

[features]
default = ["OSX_10_9"]
default = ["OSX_10_11"]
OSX_10_9 = []
OSX_10_10 = ["OSX_10_9"]
OSX_10_11 = ["OSX_10_10"]
Expand Down
10 changes: 5 additions & 5 deletions security-framework/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "security-framework"
version = "2.9.2"
version = "2.10.0"
authors = ["Steven Fackler <[email protected]>", "Kornel <[email protected]>"]
license = "MIT OR Apache-2.0"
description = "Security.framework bindings for macOS and iOS"
Expand All @@ -15,7 +15,7 @@ edition = "2021"
rust-version = "1.60"

[dependencies]
security-framework-sys = { version = "2.9.0", default-features = false, path = "../security-framework-sys" }
security-framework-sys = { version = "2.10.0", default-features = false, path = "../security-framework-sys" }
core-foundation = "0.9.3"
core-foundation-sys = "0.8.3"
bitflags = "1.3.2"
Expand All @@ -25,13 +25,13 @@ num-bigint = { version = "0.4.3", optional = true }

[dev-dependencies]
hex = "0.4.3"
env_logger = "0.10.0"
x509-parser = "0.15.0"
env_logger = "0.10"
x509-parser = "0.16"
time = "0.3.17"
tempfile = "3.3.0"

[features]
default = ["OSX_10_9"]
default = ["OSX_10_11"]
alpn = []
session-tickets = []
job-bless = []
Expand Down
2 changes: 1 addition & 1 deletion security-framework/src/os/macos/identity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ impl SecIdentityExt for SecIdentity {
unsafe {
let mut identity = ptr::null_mut();
cvt(SecIdentityCreateWithCertificate(
if !keychains.is_empty() {keychains.as_CFTypeRef()} else {ptr::null()},
if keychains.len() > 0 {keychains.as_CFTypeRef()} else {ptr::null()},
certificate.as_concrete_TypeRef(),
&mut identity,
))?;
Expand Down

0 comments on commit 7bb4b4a

Please sign in to comment.