Skip to content
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.

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

Pin down psa-crypto-sys version #34

Open
wants to merge 3 commits into
base: v0.6.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ crate-type = ["staticlib"]
parsec-client = "0.13.0"
lazy_static = "1.4.0"
psa-crypto = { version = "0.9.0", default-features = false, features = ["interface"] }
psa-crypto-sys = { version = "=0.9.1", default-features = false, features = ["interface"] }
log = "0.4.11"
env_logger = { version = "0.7.1", optional = true }

Expand Down
10 changes: 5 additions & 5 deletions ci/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ fi
# C Tests #
###########

cp /tmp/NVChip .
# Copy the TPM state for the SQLite KIM
cp /tmp/sqlite/NVChip .
# Start and configure TPM server
tpm_server &
sleep 5
Expand All @@ -43,7 +44,7 @@ tpm2_startup -T mssim
mkdir /run/parsec

# Install and run Parsec
git clone --branch 0.6.0 https://github.com/parallaxsecond/parsec
git clone --branch 1.0.0 https://github.com/parallaxsecond/parsec
pushd parsec
cargo build --features tpm-provider --release
./target/release/parsec -c ../ci/config.toml &
Expand All @@ -65,9 +66,8 @@ MBEDTLS_INCLUDE_DIR=$(pwd)/mbedtls/include cargo build --release
make -C ci/c-tests run MBED_TLS_PATH=$(pwd)/mbedtls

# Check that Parsec was called by checking if the service contains the key
# this is done by checking if the mappings folder is empty.
# Maybe use parsec-tool instead?
[ "$(ls -A /tmp/mappings)" ]
cargo install --locked parsec-tool
[ "$(RUST_LOG=error parsec-tool list-keys | wc -l)" -ne "0" ]

# Kill Parsec for clean logs
pkill parsec
9 changes: 4 additions & 5 deletions ci/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ timeout = 3000 # in milliseconds
auth_type = "UnixPeerCredentials"

[[key_manager]]
name = "on-disk-manager"
manager_type = "OnDisk"
# Warning: this path is used in the CI script
store_path = "/tmp/mappings"
name = "sqlite-manager"
manager_type = "SQLite"
sqlite_db_path = "./kim-mappings/sqlite/sqlite-key-info-manager.sqlite3"

[[provider]]
provider_type = "Tpm"
key_info_manager = "on-disk-manager"
key_info_manager = "sqlite-manager"
tcti = "mssim"
owner_hierarchy_auth = "hex:74706d5f70617373" # "tpm_pass" in hex
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#![deny(
nonstandard_style,
const_err,
dead_code,
improper_ctypes,
non_shorthand_field_patterns,
Expand Down