diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-11-28 15:27:33 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-11-28 16:26:43 +0100 |
| commit | bbbc6da375d6584c7b2bcc74e838fff943f489d4 (patch) | |
| tree | 0a965698c96dbc0fc8541c6adc2224935b68bc07 /openpgp/src/packet/pkesk.rs | |
| parent | f53c77752ff04c3713c175a76a06723042e681ae (diff) | |
Call TPKs Certificates, update identifiers, documentation.
- Fixes #387.
Diffstat (limited to 'openpgp/src/packet/pkesk.rs')
| -rw-r--r-- | openpgp/src/packet/pkesk.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/openpgp/src/packet/pkesk.rs b/openpgp/src/packet/pkesk.rs index 3ea83c73..3cc70a27 100644 --- a/openpgp/src/packet/pkesk.rs +++ b/openpgp/src/packet/pkesk.rs @@ -207,7 +207,7 @@ impl Arbitrary for PKESK3 { #[cfg(test)] mod tests { use super::*; - use crate::TPK; + use crate::Cert; use crate::PacketPile; use crate::Packet; use crate::parse::Parse; @@ -223,12 +223,12 @@ mod tests { #[test] fn decrypt_rsa() { - let tpk = TPK::from_bytes( + let cert = Cert::from_bytes( crate::tests::key("testy-private.pgp")).unwrap(); let pile = PacketPile::from_bytes( crate::tests::message("encrypted-to-testy.gpg")).unwrap(); let mut keypair = - tpk.subkeys().next().unwrap() + cert.subkeys().next().unwrap() .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); @@ -244,12 +244,12 @@ mod tests { #[test] fn decrypt_ecdh_cv25519() { - let tpk = TPK::from_bytes( + let cert = Cert::from_bytes( crate::tests::key("testy-new-private.pgp")).unwrap(); let pile = PacketPile::from_bytes( crate::tests::message("encrypted-to-testy-new.pgp")).unwrap(); let mut keypair = - tpk.subkeys().next().unwrap() + cert.subkeys().next().unwrap() .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); @@ -265,12 +265,12 @@ mod tests { #[test] fn decrypt_ecdh_nistp256() { - let tpk = TPK::from_bytes( + let cert = Cert::from_bytes( crate::tests::key("testy-nistp256-private.pgp")).unwrap(); let pile = PacketPile::from_bytes( crate::tests::message("encrypted-to-testy-nistp256.pgp")).unwrap(); let mut keypair = - tpk.subkeys().next().unwrap() + cert.subkeys().next().unwrap() .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); @@ -286,12 +286,12 @@ mod tests { #[test] fn decrypt_ecdh_nistp384() { - let tpk = TPK::from_bytes( + let cert = Cert::from_bytes( crate::tests::key("testy-nistp384-private.pgp")).unwrap(); let pile = PacketPile::from_bytes( crate::tests::message("encrypted-to-testy-nistp384.pgp")).unwrap(); let mut keypair = - tpk.subkeys().next().unwrap() + cert.subkeys().next().unwrap() .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); @@ -307,12 +307,12 @@ mod tests { #[test] fn decrypt_ecdh_nistp521() { - let tpk = TPK::from_bytes( + let cert = Cert::from_bytes( crate::tests::key("testy-nistp521-private.pgp")).unwrap(); let pile = PacketPile::from_bytes( crate::tests::message("encrypted-to-testy-nistp521.pgp")).unwrap(); let mut keypair = - tpk.subkeys().next().unwrap() + cert.subkeys().next().unwrap() .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); let pkg = pile.descendants().skip(0).next().clone(); |