42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From f5266141477b9ea23c2f674e041d5f8dc6509668 Mon Sep 17 00:00:00 2001
|
|
From: houmingyong <houmingyong@huawei.com>
|
|
Date: Wed, 16 Oct 2024 19:52:04 +0800
|
|
Subject: [PATCH] add no_as ima reference path
|
|
|
|
Conflict: remove attestation/attestation-agent/c_header/example.c
|
|
---
|
|
.../attestation-service/verifier/src/virtcca/ima.rs | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/service/attestation/attestation-service/verifier/src/virtcca/ima.rs b/service/attestation/attestation-service/verifier/src/virtcca/ima.rs
|
|
index 30a151f..2b73b46 100644
|
|
--- a/service/attestation/attestation-service/verifier/src/virtcca/ima.rs
|
|
+++ b/service/attestation/attestation-service/verifier/src/virtcca/ima.rs
|
|
@@ -14,8 +14,13 @@ use ima_measurements::{Event, EventData, Parser};
|
|
use fallible_iterator::FallibleIterator;
|
|
use serde_json::{Value, Map, json};
|
|
|
|
+#[cfg(not(feature = "no_as"))]
|
|
const IMA_REFERENCE_FILE: &str = "/etc/attestation/attestation-service/verifier/virtcca/ima/digest_list_file";
|
|
|
|
+// attestation agent local ima reference
|
|
+#[cfg(feature = "no_as")]
|
|
+const IMA_REFERENCE_FILE: &str = "/etc/attestation/attestation-agent/local_verifier/virtcca/ima/digest_list_file";
|
|
+
|
|
#[derive(Debug, Default)]
|
|
pub struct ImaVerify {}
|
|
|
|
@@ -72,7 +77,8 @@ impl ImaVerify {
|
|
use std::io::BufRead;
|
|
use std::io::BufReader;
|
|
fn file_reader(file_path: &str) -> ::std::io::Result<Vec<String>> {
|
|
- let file = std::fs::File::open(file_path)?;
|
|
+ let file = std::fs::File::open(file_path)
|
|
+ .expect("open ima reference file failed");
|
|
let mut strings = Vec::<String>::new();
|
|
let mut reader = BufReader::new(file);
|
|
let mut buf = String::new();
|
|
--
|
|
2.33.0
|
|
|