c7b2752739
- Set supplementary groups when dropping privileges - Show more descriptive error messages on missing files errors - Create /usr/libexec/keylime directory Related: rhbz#2084552 Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
95 lines
2.4 KiB
Diff
95 lines
2.4 KiB
Diff
diff --git a/Cargo.toml b/Cargo.toml
|
|
index 92f3974..f0c7d39 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -21,7 +21,7 @@ doc = false
|
|
actix-web = { version = "4", features = ["openssl"] }
|
|
base64 = "0.13"
|
|
cfg-if = "1"
|
|
-clap = { version = "3.0.14", features = ["derive"] }
|
|
+clap = { version = "~3.1.18", features = ["derive"] }
|
|
compress-tools = "0.12"
|
|
flate2 = "1.0.4"
|
|
futures = "0.3.6"
|
|
diff --git a/src/main.rs b/src/main.rs
|
|
index 1896104..8540597 100644
|
|
--- a/src/main.rs
|
|
+++ b/src/main.rs
|
|
@@ -51,7 +51,7 @@ mod tpm;
|
|
mod version_handler;
|
|
|
|
use actix_web::{dev::Service, http, middleware, rt, web, App, HttpServer};
|
|
-use clap::{App as ClapApp, Arg};
|
|
+use clap::{Arg, Command as ClapApp};
|
|
use common::*;
|
|
use compress_tools::*;
|
|
use error::{Error, Result};
|
|
--
|
|
2.35.3
|
|
|
|
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index f0c7d39..0f4e4ab 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -34,7 +34,6 @@ picky-asn1-x509 = "0.6.1"
|
|
pretty_env_logger = "0.4"
|
|
reqwest = {version = "0.11", features = ["json"]}
|
|
rust-ini = "0.17"
|
|
-rustc-serialize = "0.3.24"
|
|
serde = "1.0.80"
|
|
serde_derive = "1.0.80"
|
|
serde_json = { version = "1.0", features = ["raw_value"] }
|
|
--
|
|
2.35.3
|
|
|
|
|
|
From f7b59a6a7739d275ffe15a915eb48a36ceafccdd Mon Sep 17 00:00:00 2001
|
|
From: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
|
|
Date: Tue, 17 May 2022 18:56:50 +0200
|
|
Subject: [PATCH 3/3] Drop unused dependency flate2
|
|
|
|
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
|
|
---
|
|
Cargo.lock | 1 -
|
|
Cargo.toml | 1 -
|
|
src/tpm.rs | 3 ---
|
|
3 files changed, 5 deletions(-)
|
|
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index 0f4e4ab..69d2eec 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -23,7 +23,6 @@ base64 = "0.13"
|
|
cfg-if = "1"
|
|
clap = { version = "~3.1.18", features = ["derive"] }
|
|
compress-tools = "0.12"
|
|
-flate2 = "1.0.4"
|
|
futures = "0.3.6"
|
|
hex = "0.4"
|
|
libc = "0.2.43"
|
|
diff --git a/src/tpm.rs b/src/tpm.rs
|
|
index 355dd0d..43129f1 100644
|
|
--- a/src/tpm.rs
|
|
+++ b/src/tpm.rs
|
|
@@ -20,8 +20,6 @@ use openssl::{
|
|
pkey::{Id, PKeyRef, Public},
|
|
};
|
|
|
|
-use flate2::{write::ZlibEncoder, Compression};
|
|
-
|
|
use tss_esapi::{
|
|
abstraction::{
|
|
ak,
|
|
@@ -635,7 +633,6 @@ pub(crate) fn quote(
|
|
#[cfg(test)]
|
|
pub mod testing {
|
|
use super::*;
|
|
- use flate2::read::ZlibDecoder;
|
|
use tss_esapi::constants::structure_tags::StructureTag;
|
|
use tss_esapi::structures::{Attest, AttestBuffer, DigestList, Ticket};
|
|
use tss_esapi::tss2_esys::Tss2_MU_TPMT_SIGNATURE_Unmarshal;
|
|
--
|
|
2.35.3
|
|
|