Skip to content

Workaround for the time-core crate #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kornelski merged 2 commits into from
Sep 2, 2025
+18 −7
Merged

Workaround for the time-core crate #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a5ab36
Workaround for the time-core crate
kornelski Sep 2, 2025
e5dbae7
Don't race keychain tests
kornelski Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ jobs:
with:
toolchain: ${{ matrix.rust }}

- name: Fix time MSRV
run: |
cargo update -p time --precise 0.3.41
cargo update -p time-core --precise 0.1.4

- name: Run cargo test
run: cargo test --all-features --all

Expand Down
20 changes: 13 additions & 7 deletions security-framework/src/cms.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@ mod decoder {

#[cfg(test)]
mod tests {
use std::sync::Mutex;
use std::sync::MutexGuard;
use crate::cms::{cms_encode_content, CMSDecoder, SignedAttributes};
use crate::import_export::{ImportedIdentity, Pkcs12ImportOptions};
use crate::policy::SecPolicy;
Expand All @@ -509,14 +511,18 @@ mod tests {
const ENCRYPTED_CMS: &[u8] = include_bytes!("../test/cms/encrypted.p7m");
const SIGNED_ENCRYPTED_CMS: &[u8] = include_bytes!("../test/cms/signed-encrypted.p7m");

fn import_keystore() -> Vec<ImportedIdentity> {
static SHARED_KEYCHAIN: Mutex<()> = Mutex::new(());

fn import_keystore() -> (MutexGuard<'static, ()>, Vec<ImportedIdentity>) {
let mut import_opts = Pkcs12ImportOptions::new();
import_opts.passphrase("cms").import(KEYSTORE).unwrap()
let id = import_opts.passphrase("cms").import(KEYSTORE).unwrap();
let lock = SHARED_KEYCHAIN.lock().unwrap();
(lock, id)
}

#[test]
fn test_decode_encrypted() {
let _identities = import_keystore();
let _lock = import_keystore();

let decoder = CMSDecoder::create().unwrap();
decoder.update_message(ENCRYPTED_CMS).unwrap();
Expand All @@ -530,7 +536,7 @@ mod tests {

#[test]
fn test_decode_signed_and_encrypted() {
let _identities = import_keystore();
let _lock = import_keystore();

let decoder = CMSDecoder::create().unwrap();
decoder.update_message(SIGNED_ENCRYPTED_CMS).unwrap();
Expand All @@ -554,7 +560,7 @@ mod tests {

#[test]
fn test_encode_encrypted() {
let identities = import_keystore();
let (_lock, identities) = import_keystore();

let chain = identities
.iter().find_map(|id| id.cert_chain.as_ref())
Expand All @@ -577,7 +583,7 @@ mod tests {

#[test]
fn test_encode_signed_encrypted() {
let identities = import_keystore();
let (_lock, identities) = import_keystore();

let chain = identities
.iter().find_map(|id| id.cert_chain.as_ref())
Expand Down Expand Up @@ -605,7 +611,7 @@ mod tests {

#[test]
fn test_encode_with_cms_encoder() {
let identities = import_keystore();
let (_lock, identities) = import_keystore();

let chain = identities
.iter().find_map(|id| id.cert_chain.as_ref())
Expand Down
Loading