diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-03-26 12:52:30 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-03-26 16:30:56 +0100 |
| commit | a6d28b938882fbcd9770b11a5de7417d4237087a (patch) | |
| tree | f69a4d4982cdb5acd43d734b5e85022281991831 /openpgp/src/message | |
| parent | 0a6a215b16c87d2689b61e0eddefdf0dc89a11fa (diff) | |
openpgp: Add enum OnePassSig.
- See #228.
Diffstat (limited to 'openpgp/src/message')
| -rw-r--r-- | openpgp/src/message/mod.rs | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs index 66b735f0..6b59b0b8 100644 --- a/openpgp/src/message/mod.rs +++ b/openpgp/src/message/mod.rs @@ -406,15 +406,7 @@ mod tests { use crypto::KeyPair; use crypto::s2k::S2K; use crypto::mpis::{Ciphertext, MPI}; - use packet::Tag; - use packet::CompressedData; - use packet::Literal; - use packet::OnePassSig; - use packet::skesk::SKESK4; - use packet::PKESK; - use packet::SEIP; - use packet::MDC; - use packet::key::SecretKey; + use packet::prelude::*; use KeyID; use Container; @@ -770,7 +762,7 @@ mod tests { // 0: OnePassSig // => bad. let mut packets : Vec<Packet> = Vec::new(); - packets.push(OnePassSig::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); let message = Message::from_packets(packets); assert!(message.is_err(), "{:?}", message); @@ -779,7 +771,7 @@ mod tests { // 1: Literal // => bad. let mut packets : Vec<Packet> = Vec::new(); - packets.push(OnePassSig::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); packets.push(lit.clone().into()); let message = Message::from_packets(packets); @@ -790,7 +782,7 @@ mod tests { // 2: Signature // => good. let mut packets : Vec<Packet> = Vec::new(); - packets.push(OnePassSig::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); packets.push(lit.clone().into()); packets.push(sig.clone().into()); @@ -803,7 +795,7 @@ mod tests { // 3: Signature // => bad. let mut packets : Vec<Packet> = Vec::new(); - packets.push(OnePassSig::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); packets.push(lit.clone().into()); packets.push(sig.clone().into()); packets.push(sig.clone().into()); @@ -818,8 +810,8 @@ mod tests { // 4: Signature // => good. let mut packets : Vec<Packet> = Vec::new(); - packets.push(OnePassSig::new(SignatureType::Binary).into()); - packets.push(OnePassSig::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); packets.push(lit.clone().into()); packets.push(sig.clone().into()); packets.push(sig.clone().into()); @@ -835,8 +827,8 @@ mod tests { // 5: Signature // => bad. let mut packets : Vec<Packet> = Vec::new(); - packets.push(OnePassSig::new(SignatureType::Binary).into()); - packets.push(OnePassSig::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); packets.push(lit.clone().into()); packets.push(lit.clone().into()); packets.push(sig.clone().into()); @@ -853,8 +845,8 @@ mod tests { // 4: Signature // => good. let mut packets : Vec<Packet> = Vec::new(); - packets.push(OnePassSig::new(SignatureType::Binary).into()); - packets.push(OnePassSig::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); + packets.push(OnePassSig3::new(SignatureType::Binary).into()); packets.push( CompressedData::new(CompressionAlgorithm::Uncompressed) .push(lit.clone().into()) |