hatter/oss-backupd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use ok_or_else

Browse Source
This commit is contained in:
Hatter Jiang
2020-04-12 15:15:12 +08:00
parent 537628221b
commit 9945bfee8a
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pgp_util.rs
View File

@@ -54,13 +54,11 @@ impl OpenPGPTool {
return Err(new_box_error(&format!("To file exists: {}", to_file))); return Err(new_box_error(&format!("To file exists: {}", to_file)));
} }
let recipient: Recipient = match self.tpk.keys_valid() let recipient: Recipient = self.tpk.keys_valid()
.key_flags(KeyFlags::default().set_encrypt_at_rest(true).set_encrypt_for_transport(true)) .key_flags(KeyFlags::default().set_encrypt_at_rest(true).set_encrypt_for_transport(true))
.map(|(_, _, key)| key.into()) .map(|(_, _, key)| key.into())
.nth(0) { .nth(0)
None => return Err(new_box_error("Encryption key not found in TPK")), .ok_or_else(|| new_box_error("Encryption key not found in TPK"))?;
Some(r) => r,
};
let bw = BufWriter::new(File::create(to_file)?); let bw = BufWriter::new(File::create(to_file)?);
let message = if armor { let message = if armor {
Message::new(armor::Writer::new(bw, armor::Kind::Message, &[])?) Message::new(armor::Writer::new(bw, armor::Kind::Message, &[])?)