From 04fbca239db1a02ec1cea8488864744959282940 Mon Sep 17 00:00:00 2001 From: Patrik Koncity Date: Thu, 12 Jan 2023 08:18:07 +0100 Subject: [PATCH] Remove unused option "openstack" for obtaining uuid For python agent was openstack option already removed, and in rust agent is stil placeholder for this option, but won't be used. [1] Remove related unit test and notes about openstack method in agent conf. Can be confusing for user to see openstack option as method for obtaining uuid. [1] https://github.com/keylime/keylime/commit/c9f7906a0d254a4fceef8e9b0c612b378c27d6e4 --- keylime-agent.conf | 1 - keylime-agent/src/config.rs | 5 ----- 2 files changed, 6 deletions(-) diff --git a/keylime-agent.conf b/keylime-agent.conf index 143e5141d..6dfc8ac14 100644 --- a/keylime-agent.conf +++ b/keylime-agent.conf @@ -6,7 +6,6 @@ version = "2.0" # The agent's UUID. -# Set to "openstack", it will try to get the UUID from the metadata service. # If you set this to "generate", Keylime will create a random UUID. # If you set this to "hash_ek", Keylime will set the UUID to the result # of 'SHA256(public EK in PEM format)'. diff --git a/keylime-agent/src/config.rs b/keylime-agent/src/config.rs index ca835568d..42938bdfa 100644 --- a/keylime-agent/src/config.rs +++ b/keylime-agent/src/config.rs @@ -601,10 +601,6 @@ fn config_get_file_path( fn get_uuid(agent_uuid_config: &str) -> String { match agent_uuid_config { - "openstack" => { - info!("Openstack placeholder..."); - "openstack".into() - } "hash_ek" => { info!("Using hashed EK as UUID"); // DO NOT change this to something else. It is used later to set the correct value. @@ -728,7 +724,6 @@ mod tests { #[test] fn test_get_uuid() { - assert_eq!(get_uuid("openstack"), "openstack"); assert_eq!(get_uuid("hash_ek"), "hash_ek"); let _ = Uuid::parse_str(&get_uuid("generate")).unwrap(); //#[allow_ci] assert_eq!(