diff options
| -rw-r--r-- | src/key.rs | 25 |
1 files changed, 16 insertions, 9 deletions
@@ -110,25 +110,32 @@ impl KeyHandle { } } - pub fn new_from_search(uuid: &Uuid) -> Result<Self> { - let key_name = Self::format_key_name(uuid); - let key_name = CStr::as_ptr(&key_name); + fn search_keyring(keyring: i32, key_name: &CStr) -> Result<i64> { + let key_name = CStr::as_ptr(key_name); let key_type = c_str!("user"); - let key_id = - unsafe { keyctl_search(keyutils::KEY_SPEC_USER_KEYRING, key_type, key_name, 0) }; + let key_id = unsafe { keyctl_search(keyring, key_type, key_name, 0) }; if key_id > 0 { info!("Found key in keyring"); - Ok(Self { - _uuid: *uuid, - _id: key_id, - }) + Ok(key_id) } else { Err(ErrnoError(errno::errno()).into()) } } + pub fn new_from_search(uuid: &Uuid) -> Result<Self> { + let key_name = Self::format_key_name(uuid); + + Self::search_keyring(keyutils::KEY_SPEC_SESSION_KEYRING, &key_name) + .or_else(|_| Self::search_keyring(keyutils::KEY_SPEC_USER_KEYRING, &key_name)) + .or_else(|_| Self::search_keyring(keyutils::KEY_SPEC_USER_SESSION_KEYRING, &key_name)) + .map(|id| Self { + _uuid: *uuid, + _id: id, + }) + } + fn wait_for_unlock(uuid: &Uuid) -> Result<Self> { loop { match Self::new_from_search(uuid) { |