diff --git a/.gitignore b/.gitignore index e41756d..9f6f3bd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /rust-keylime-0.2.0-vendor.tar.xz /v0.2.1.tar.gz /rust-keylime-0.2.1-vendor.tar.xz +/v0.2.2.tar.gz +/rust-keylime-0.2.2-vendor.tar.xz diff --git a/e2e_tests.fmf b/e2e_tests.fmf index 6fcc300..b942f7f 100644 --- a/e2e_tests.fmf +++ b/e2e_tests.fmf @@ -1,9 +1,10 @@ summary: run keylime e2e tests +# define context to filter out all test requiring TPM device context: - # define context to filter out all test requiring TPM device - swtpm: yes - agent: rust + swtpm: yes + agent: rust + faked_measured_boot_log: no prepare: - how: shell @@ -23,7 +24,7 @@ discover: - /functional/basic-attestation-on-localhost # now change IMA policy to signing and run all tests - /setup/configure_kernel_ima_module/ima_policy_signing - - "/functional/.*" + - "^/functional/.*" execute: how: tmt @@ -33,4 +34,3 @@ adjust: environment: AVC_CHECK_AUSEARCH_PARAMS: "-se keylime" because: "On Rawhide we ignore SELinux AVCs not related to keylime" - diff --git a/keylime-agent-rust.spec b/keylime-agent-rust.spec index 0920798..9d2a1e0 100644 --- a/keylime-agent-rust.spec +++ b/keylime-agent-rust.spec @@ -15,7 +15,7 @@ %endif Name: keylime-agent-rust -Version: 0.2.1 +Version: 0.2.2 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Summary: Rust agent for Keylime diff --git a/rust-keylime-metadata.patch b/rust-keylime-metadata.patch index 26599d5..3fb3c7b 100644 --- a/rust-keylime-metadata.patch +++ b/rust-keylime-metadata.patch @@ -1,8 +1,6 @@ -diff --git a/keylime-agent/Cargo.toml b/keylime-agent/Cargo.toml -index 0cc1385..286e807 100644 ---- a/keylime-agent/Cargo.toml -+++ b/keylime-agent/Cargo.toml -@@ -21,8 +21,8 @@ keylime = { path = "../keylime" } +--- a/keylime-agent/Cargo.toml 2023-07-13 17:19:34.757045275 +0200 ++++ b/keylime-agent/Cargo.toml 2023-07-13 17:46:40.031264398 +0200 +@@ -21,8 +21,8 @@ libc = "0.2.43" log = "0.4" openssl = "0.10.15" @@ -13,16 +11,7 @@ index 0cc1385..286e807 100644 pretty_env_logger = "0.4" reqwest = {version = "0.11", default-features = false, features = ["json"]} serde = "1.0.80" -@@ -31,7 +31,7 @@ serde_json = { version = "1.0", features = ["raw_value"] } - static_assertions = "1" - tempfile = "3.4.0" - tokio = {version = "1.24", features = ["rt", "sync"]} --tss-esapi = {version = "7.2.0", features = ["generate-bindings"]} -+tss-esapi = {version = "7", features = ["generate-bindings"]} - thiserror = "1.0" - uuid = {version = "1.3", features = ["v4"]} - zmq = {version = "0.9.2", optional = true} -@@ -48,18 +48,6 @@ actix-rt = "2" +@@ -48,18 +48,6 @@ default = [] # this should change to dev-dependencies when we have integration testing testing = ["wiremock"] diff --git a/sources b/sources index db5573b..702beba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v0.2.1.tar.gz) = 5d837054004f874ba671bbcf67f732673b3a1d7d7eedd746541e21485c0a9759dcb48d74106ba6bdc7c6f45ccb983a2d10c0184605b59707e9a48a0a338d3982 -SHA512 (rust-keylime-0.2.1-vendor.tar.xz) = a9f9b2549d09cf95fe8bffd2be7cf23975639a1de3423966c783ce6740e9971eafad8db7b8549f057a8f074808894054cb1575c8e3977d3caa51636768c7f5fe +SHA512 (v0.2.2.tar.gz) = d83dbece1e850383fe98dec7ab2c473cdad46193d0f31eba25ae0a75928df94ee00fa8ee656806f356fcccbc36a5b6f417c1029a1f6a3a0974186197826eb4cc +SHA512 (rust-keylime-0.2.2-vendor.tar.xz) = 2b7de85d6250161d6fccfbc70700c8561114c37698cf5ed328545a1934b1f6b3b92d7c62d3aca93d20c1c474e870c17441d02a60b407d80aee18d80a2addc8c2