diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2019-11-22 14:26:14 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2019-11-22 14:26:14 +0100 |
commit | ced195eb1a7d9151640f1ffacd890839a55b8680 (patch) | |
tree | 53001af1ba91361bfa2ed4b585686781983c6603 /openpgp/src/packet/pkesk.rs | |
parent | 28be944bd9f6548b2eee5fc222ffeb52c9d2f8aa (diff) |
openpgp: Make conversions into Key<SecretParts, _> fallible.
- Fixes #380.
Diffstat (limited to 'openpgp/src/packet/pkesk.rs')
-rw-r--r-- | openpgp/src/packet/pkesk.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/openpgp/src/packet/pkesk.rs b/openpgp/src/packet/pkesk.rs index b2e9a0f4..29fd715f 100644 --- a/openpgp/src/packet/pkesk.rs +++ b/openpgp/src/packet/pkesk.rs @@ -229,7 +229,7 @@ mod tests { crate::tests::message("encrypted-to-testy.gpg")).unwrap(); let mut keypair = tpk.subkeys().next().unwrap() - .key().clone().mark_parts_secret().into_keypair().unwrap(); + .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); @@ -250,7 +250,7 @@ mod tests { crate::tests::message("encrypted-to-testy-new.pgp")).unwrap(); let mut keypair = tpk.subkeys().next().unwrap() - .key().clone().mark_parts_secret().into_keypair().unwrap(); + .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); @@ -271,7 +271,7 @@ mod tests { crate::tests::message("encrypted-to-testy-nistp256.pgp")).unwrap(); let mut keypair = tpk.subkeys().next().unwrap() - .key().clone().mark_parts_secret().into_keypair().unwrap(); + .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); @@ -292,7 +292,7 @@ mod tests { crate::tests::message("encrypted-to-testy-nistp384.pgp")).unwrap(); let mut keypair = tpk.subkeys().next().unwrap() - .key().clone().mark_parts_secret().into_keypair().unwrap(); + .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); @@ -313,7 +313,7 @@ mod tests { crate::tests::message("encrypted-to-testy-nistp521.pgp")).unwrap(); let mut keypair = tpk.subkeys().next().unwrap() - .key().clone().mark_parts_secret().into_keypair().unwrap(); + .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); @@ -370,7 +370,8 @@ mod tests { let sess_key = SessionKey::new(32); let pkesk = PKESK3::for_recipient(SymmetricAlgorithm::AES256, &sess_key, &key).unwrap(); - let mut keypair = key.mark_parts_secret().into_keypair().unwrap(); + let mut keypair = + key.mark_parts_secret().unwrap().into_keypair().unwrap(); pkesk.decrypt(&mut keypair).unwrap(); } } |