diff options
| -rw-r--r-- | openpgp/src/cert/builder.rs | 9 | ||||
| -rw-r--r-- | openpgp/src/cert/mod.rs | 12 | ||||
| -rw-r--r-- | sqv/tests/revoked-key.rs | 13 |
3 files changed, 15 insertions, 19 deletions
diff --git a/openpgp/src/cert/builder.rs b/openpgp/src/cert/builder.rs index 4ea6dd27..6dfb6a92 100644 --- a/openpgp/src/cert/builder.rs +++ b/openpgp/src/cert/builder.rs @@ -291,7 +291,7 @@ impl CertBuilder { /// Generates the actual Cert. pub fn generate(mut self) -> Result<(Cert, Signature)> { - use crate::{PacketPile, Packet}; + use crate::Packet; use crate::types::ReasonForRevocation; use std::convert::TryFrom; @@ -326,8 +326,7 @@ impl CertBuilder { // signatures. let sig = sig.set_revocation_key(vec![])?; - let mut cert = - Cert::try_from(PacketPile::from(packets))?; + let mut cert = Cert::try_from(packets)?; // Sign UserIDs. for uid in self.userids.into_iter() { @@ -581,7 +580,6 @@ mod tests { #[test] fn builder_roundtrip() { - use crate::PacketPile; use std::convert::TryFrom; let (cert,_) = CertBuilder::new() @@ -589,8 +587,7 @@ mod tests { .add_signing_subkey() .generate().unwrap(); let pile = cert.clone().into_packet_pile().into_children().collect::<Vec<_>>(); - let exp = Cert::try_from(PacketPile::from(pile)) - .unwrap(); + let exp = Cert::try_from(pile).unwrap(); assert_eq!(cert, exp); } diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs index b873ef23..07298bf5 100644 --- a/openpgp/src/cert/mod.rs +++ b/openpgp/src/cert/mod.rs @@ -2086,7 +2086,7 @@ impl Cert { } } - Cert::try_from(PacketPile::from(combined)) + Cert::try_from(combined) } /// Returns whether at least one of the keys includes secret @@ -3440,12 +3440,12 @@ mod test { (bind1, rev1, bind2, rev2) }; let pk : key::PublicKey = key.into(); - let cert = Cert::try_from(PacketPile::from(vec![ + let cert = Cert::try_from(vec![ pk.into(), bind1.into(), bind2.into(), rev1.into() - ])).unwrap(); + ]).unwrap(); let f1: f32 = thread_rng().sample(Open01); let f2: f32 = thread_rng().sample(Open01); @@ -3810,7 +3810,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= }) .collect::<Vec<_>>(); eprintln!("parse back"); - let cert = Cert::try_from(PacketPile::from(pile)).unwrap(); + let cert = Cert::try_from(pile).unwrap(); assert_eq!(cert.subkeys().len(), 2); } @@ -4073,9 +4073,9 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= key.set_creation_time(t1).unwrap(); let mut pair = key.clone().into_keypair().unwrap(); let pk : key::PublicKey = key.clone().into(); - let mut cert = Cert::try_from(PacketPile::from(vec![ + let mut cert = Cert::try_from(vec![ pk.into(), - ])).unwrap(); + ]).unwrap(); let uid: UserID = "foo@example.org".into(); let sig = uid.certify(&mut pair, &cert, SignatureType::PositiveCertification, diff --git a/sqv/tests/revoked-key.rs b/sqv/tests/revoked-key.rs index 79d6913e..518bf8b8 100644 --- a/sqv/tests/revoked-key.rs +++ b/sqv/tests/revoked-key.rs @@ -254,7 +254,6 @@ fn create_key() { use sequoia_openpgp::{ Cert, Packet, - PacketPile, packet::{ signature, Key, @@ -353,14 +352,14 @@ fn create_key() { .unwrap(); let sk_bind2 = b.sign_subkey_binding(&mut signer, &key, &subkey).unwrap(); - let cert = Cert::try_from(PacketPile::from(vec![ + let cert = Cert::try_from(vec![ key.clone().into(), direct1.clone().into(), direct2.clone().into(), subkey.clone().into(), sk_bind1.clone().into(), sk_bind2.clone().into(), - ])).unwrap(); + ]).unwrap(); let mut fd = File::create("revoked-key-cert-not-revoked.pgp").unwrap(); cert.serialize(&mut fd).unwrap(); @@ -386,7 +385,7 @@ fn create_key() { } let rev = b.sign_direct_key(&mut signer).unwrap(); - let cert = Cert::try_from(PacketPile::from(vec![ + let cert = Cert::try_from(vec![ key.clone().into(), direct1.clone().into(), rev.clone().into(), @@ -394,7 +393,7 @@ fn create_key() { subkey.clone().into(), sk_bind1.clone().into(), sk_bind2.clone().into(), - ])).unwrap(); + ]).unwrap(); let mut fd = File::create(format!("revoked-key-cert-revoked-{}.pgp", slug)) @@ -413,7 +412,7 @@ fn create_key() { } let rev = b.sign_subkey_binding(&mut signer, &key, &subkey).unwrap(); - let cert = Cert::try_from(PacketPile::from(vec![ + let cert = Cert::try_from(vec![ key.clone().into(), direct1.clone().into(), direct2.clone().into(), @@ -421,7 +420,7 @@ fn create_key() { sk_bind1.clone().into(), rev.clone().into(), sk_bind2.clone().into(), - ])).unwrap(); + ]).unwrap(); let mut fd = File::create(format!("revoked-key-cert-revoked-{}.sk.pgp", slug)) |