Skip to content

Commit

Permalink
Remove unused option "openstack" for obtaining uuid
Browse files Browse the repository at this point in the history
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] keylime/keylime@c9f7906

Signed-off-by: Patrik Koncity <[email protected]>
  • Loading branch information
Koncpa authored and ansasaki committed Jan 23, 2023
1 parent 52e4006 commit 2428265
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
1 change: 0 additions & 1 deletion keylime-agent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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)'.
Expand Down
5 changes: 0 additions & 5 deletions keylime-agent/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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!(
Expand Down

0 comments on commit 2428265

Please sign in to comment.