Merge pull request #569 from 7flying/bump-openssl-kdf

fix: bump openssl-kdf to 0.4.2
fdo-rs · Oct 26, 2023 · b83d784 · b83d784
2 parents 906144f + 1637888
commit b83d784
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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<String> = sshkey_keys
-                .unwrap()
-                .split(';')
-                .map(|s| s.to_string())
-                .collect();
+            let sshkey_keys_v: Vec<String> =
+                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
@@ -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"