diff options
| author | Jesse Luehrs <doy@tozt.net> | 2020-05-03 03:07:36 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2020-05-03 03:07:36 -0400 |
| commit | 78bace42e03f1b17af751fa5f6b935706661beb1 (patch) | |
| tree | e028938c75efef4a039c3222acc2bb5b37f15601 | |
| parent | 20ac7d3d39cc81eee8bcd8dd5caad44fc1cab82d (diff) | |
| download | rbw-78bace42e03f1b17af751fa5f6b935706661beb1.tar.gz rbw-78bace42e03f1b17af751fa5f6b935706661beb1.zip | |
fix some unwraps
| -rw-r--r-- | src/cipherstring.rs | 6 | ||||
| -rw-r--r-- | src/error.rs | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/cipherstring.rs b/src/cipherstring.rs index 7ba64ca..94284d5 100644 --- a/src/cipherstring.rs +++ b/src/cipherstring.rs @@ -158,8 +158,8 @@ impl CipherString { let pkey = openssl::pkey::PKey::private_key_from_pkcs8( private_key.private_key(), ) - .unwrap(); // XXX - let rsa = pkey.rsa().unwrap(); // XXX + .context(crate::error::OpenSSL)?; + let rsa = pkey.rsa().context(crate::error::OpenSSL)?; let mut res = crate::locked::Vec::new(); res.extend(std::iter::repeat(0).take(rsa.size() as usize)); @@ -170,7 +170,7 @@ impl CipherString { res.data_mut(), openssl::rsa::Padding::PKCS1_OAEP, ) - .unwrap(); // XXX + .context(crate::error::OpenSSL)?; res.truncate(bytes); Ok(res) diff --git a/src/error.rs b/src/error.rs index 2222f66..8517581 100644 --- a/src/error.rs +++ b/src/error.rs @@ -58,6 +58,9 @@ pub enum Error { #[snafu(display("failed to load db: {}", source))] LoadDbJson { source: serde_json::Error }, + #[snafu(display("openssl error: {}", source))] + OpenSSL { source: openssl::error::ErrorStack }, + #[snafu(display("pbkdf2 requires at least 1 iteration (got 0)"))] Pbkdf2ZeroIterations, |