diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bdef06b8..8a7c455d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/iostest/Cargo.toml b/iostest/Cargo.toml index 588bc32d..3006e802 100644 --- a/iostest/Cargo.toml +++ b/iostest/Cargo.toml @@ -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 diff --git a/security-framework-sys/Cargo.toml b/security-framework-sys/Cargo.toml index 7d141ab6..98a463ae 100644 --- a/security-framework-sys/Cargo.toml +++ b/security-framework-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" authors = ["Steven Fackler ", "Kornel "] license = "MIT OR Apache-2.0" description = "Apple `Security.framework` low-level FFI bindings" @@ -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"] diff --git a/security-framework/Cargo.toml b/security-framework/Cargo.toml index 90640e54..db880f53 100644 --- a/security-framework/Cargo.toml +++ b/security-framework/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "security-framework" -version = "2.9.2" +version = "2.10.0" authors = ["Steven Fackler ", "Kornel "] license = "MIT OR Apache-2.0" description = "Security.framework bindings for macOS and iOS" @@ -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" @@ -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 = [] diff --git a/security-framework/src/os/macos/identity.rs b/security-framework/src/os/macos/identity.rs index 158c9973..d54cbe00 100644 --- a/security-framework/src/os/macos/identity.rs +++ b/security-framework/src/os/macos/identity.rs @@ -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, ))?;