diff --git a/Cargo.lock b/Cargo.lock index fd12f2fa7..b25a316a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1828,9 +1828,9 @@ dependencies = [ [[package]] name = "openssl-kdf" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1fa996d05b13619516a4a4a76da9d0c1ffd60b1d1f3f3523f0bd5d27c12f27" +checksum = "feda4b74ded511c6d8543db00166f70f572ca7e5eb72f4817bf08628b5bbc1f4" dependencies = [ "foreign-types", "libc", diff --git a/client-linuxapp/src/serviceinfo.rs b/client-linuxapp/src/serviceinfo.rs index 5c9837f36..c26df0289 100644 --- a/client-linuxapp/src/serviceinfo.rs +++ b/client-linuxapp/src/serviceinfo.rs @@ -722,17 +722,14 @@ async fn process_serviceinfo_in(si_in: &ServiceInfo, si_out: &mut ServiceInfo) - sshkey_user.as_ref().unwrap() ))?; } - if sshkey_keys.is_some() { + if let Some(sshkey_keys) = sshkey_keys { log::info!("SSHkey module was active, installing SSH keys"); create_user(sshkey_user.as_ref().unwrap()).context(format!( "Error creating new user: {}", sshkey_user.as_ref().unwrap() ))?; - let sshkey_keys_v: Vec = sshkey_keys - .unwrap() - .split(';') - .map(|s| s.to_string()) - .collect(); + let sshkey_keys_v: Vec = + sshkey_keys.split(';').map(|s| s.to_string()).collect(); for key in sshkey_keys_v { let key_s: String = key; install_ssh_key(sshkey_user.as_ref().unwrap(), key_s.as_str()) diff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml index fdce99210..686f7974b 100644 --- a/data-formats/Cargo.toml +++ b/data-formats/Cargo.toml @@ -28,14 +28,14 @@ byteorder = "1" http = "0.2" -openssl-kdf = { version = "0.4.1", features = ["allow_custom"] } +openssl-kdf = { version = "0.4.2", features = ["allow_custom"] } [features] # Whether to use a non-interoperable KDF. use_noninteroperable_kdf = [] [build-dependencies] -openssl-kdf = { version = "0.4.1", features = ["allow_custom"] } +openssl-kdf = { version = "0.4.2", features = ["allow_custom"] } [dev-dependencies] maplit = "1.0"