From 48226a3341f67aa4598d93e69956cd703f0f37c4 Mon Sep 17 00:00:00 2001 From: Noor Date: Tue, 15 Apr 2025 23:07:16 +0000 Subject: [PATCH] refactor: update proto remove base 64 encoding updated package with new dtpm remove unused crate and error --- Cargo.lock | 4 +--- Cargo.toml | 1 - src/sgx/grpc_dtpm.rs | 2 -- src/sgx/mod.rs | 4 ++-- src/sgx/packaging.rs | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bfd2eef..c68869b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1067,7 +1067,6 @@ dependencies = [ "detee-shared", "ed25519-dalek", "env_logger", - "hex", "hyper", "hyper-rustls", "lazy_static", @@ -1130,9 +1129,8 @@ dependencies = [ [[package]] name = "detee-shared" version = "0.1.0" -source = "git+ssh://git@gitea.detee.cloud/testnet/proto.git?branch=feat_dir_support_dtpm_config#64d7a1c9e16836615602636e346a356960dabd00" +source = "git+ssh://git@gitea.detee.cloud/testnet/proto.git?branch=feat_dir_support_dtpm_config#20ba749427ac4453a06bc8a8ef3fb8f0ec6bb592" dependencies = [ - "base64", "bincode", "prost", "serde", diff --git a/Cargo.toml b/Cargo.toml index bd1298f..f10726d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,6 @@ bs58 = "0.5.1" chrono = "0.4.39" reqwest = {version = "0.12.12", features = ["blocking"] } serde_json = "1.0.139" -hex = "0.4.3" hyper = "1.6.0" rustls = "0.23.23" tower = "0.5.2" diff --git a/src/sgx/grpc_dtpm.rs b/src/sgx/grpc_dtpm.rs index 04980cf..9a27269 100644 --- a/src/sgx/grpc_dtpm.rs +++ b/src/sgx/grpc_dtpm.rs @@ -30,8 +30,6 @@ pub enum Error { DtpmConnection(#[from] tonic::transport::Error), #[error("Received error from DTPM: {}", _0.message())] ResponseStatus(#[from] tonic::Status), - #[error("Hex: {0}")] - HexDecode(#[from] hex::FromHexError), #[error("Disk access error: {0}")] DiskAccess(#[from] std::io::Error), #[error("HRatls: {0}")] diff --git a/src/sgx/mod.rs b/src/sgx/mod.rs index fd508a7..0534464 100644 --- a/src/sgx/mod.rs +++ b/src/sgx/mod.rs @@ -73,9 +73,9 @@ pub static PACKAGES_INDEX: LazyLock = LazyLock::new(|| { packages: vec![ PackageElement{ package_name: "actix-static-server".to_string(), - package_url: "https://registry.detee.ltd/sgx/packages_staging/actix-static-server_package_2025-04-10_09-26-42.tar.gz".to_string(), + package_url: "https://registry.detee.ltd/sgx/packages_staging/actix-static-server_package_2025-04-15_22-47-40.tar.gz".to_string(), launch_config_url: "https://registry.detee.ltd/sgx/launch_configs_staging/actix-static-server-launch-config_001.yaml".to_string(), - mr_enclave: [40, 113, 121, 165, 242, 180, 73, 116, 237, 163, 141, 178, 63, 246, 229, 68, 109, 78, 102, 212, 22, 92, 37, 93, 171, 123, 213, 120, 162, 77, 162, 154], + mr_enclave: [97, 9, 55, 254, 254, 21, 143, 123, 239, 36, 47, 228, 8, 224, 114, 237, 159, 40, 32, 244, 54, 253, 126, 19, 13, 86, 42, 142, 248, 20, 89, 58], }, /* PackageElement{ diff --git a/src/sgx/packaging.rs b/src/sgx/packaging.rs index 82e60e0..ae065e3 100644 --- a/src/sgx/packaging.rs +++ b/src/sgx/packaging.rs @@ -18,7 +18,7 @@ pub fn package_enclave( format!( r#"docker run --rm -it -v ./:/app/ \ -v {signing_key_path}:/keys/app_signing_key.pem:ro \ - noormohammedb/enclave_packager_01:pub_v4 {package_items}"# + noormohammedb/enclave_packager_01:pub_v5 {package_items}"# ) } else { format!(