diff options
-rw-r--r-- | openpgp/src/packet/signature/mod.rs | 2 | ||||
-rw-r--r-- | openpgp/src/packet/signature/subpacket.rs | 29 | ||||
-rw-r--r-- | openpgp/src/parse/parse.rs | 5 | ||||
-rw-r--r-- | openpgp/src/serialize/mod.rs | 11 | ||||
-rw-r--r-- | tool/src/commands/dump.rs | 3 |
5 files changed, 15 insertions, 35 deletions
diff --git a/openpgp/src/packet/signature/mod.rs b/openpgp/src/packet/signature/mod.rs index e508ecd6..5480fec6 100644 --- a/openpgp/src/packet/signature/mod.rs +++ b/openpgp/src/packet/signature/mod.rs @@ -917,7 +917,7 @@ impl Signature4 { return Ok(true) } - if let Some(Packet::Signature(super::Signature::V4(backsig))) = + if let Some(super::Signature::V4(backsig)) = self.embedded_signature() { backsig.verify_primary_key_binding(pk, subkey) diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs index 3c47e893..987b2543 100644 --- a/openpgp/src/packet/signature/subpacket.rs +++ b/openpgp/src/packet/signature/subpacket.rs @@ -74,10 +74,10 @@ use crate::{ packet::signature::{self, Signature4}, packet::key, packet::Key, - Packet, Fingerprint, KeyID, SignatureType, + serialize::SerializeInto, }; use crate::types::{ AEADAlgorithm, @@ -659,10 +659,7 @@ pub enum SubpacketValue { digest: Vec<u8>, }, /// An embedded signature. - /// - /// This is a packet rather than a `Signature`, because we also - /// want to return an `Unknown` packet. - EmbeddedSignature(Packet), + EmbeddedSignature(Signature), /// 20-octet V4 fingerprint. IssuerFingerprint(Fingerprint), /// Preferred AEAD Algorithms. @@ -698,16 +695,7 @@ impl SubpacketValue { ReasonForRevocation { ref reason, .. } => 1 + reason.len(), Features(f) => f.as_vec().len(), SignatureTarget { ref digest, .. } => 1 + 1 + digest.len(), - EmbeddedSignature(p) => match p { - &Packet::Signature(Signature::V4(ref sig)) => { - use crate::serialize::Serialize; - let mut w = Vec::new(); - sig.serialize(&mut w).unwrap(); - w.len() - }, - // Bogus. - _ => 0, - }, + EmbeddedSignature(s) => s.serialized_len(), IssuerFingerprint(ref fp) => match fp { Fingerprint::V4(_) => 1 + 20, // Educated guess for unknown versions. @@ -1493,7 +1481,7 @@ impl SubpacketArea { /// /// Note: if the signature contains multiple instances of this /// subpacket, only the last one is considered. - pub fn embedded_signature(&self) -> Option<&Packet> { + pub fn embedded_signature(&self) -> Option<&Signature> { // 1 signature packet body if let Some(sb) = self.subpacket(SubpacketTag::EmbeddedSignature) { @@ -1819,7 +1807,7 @@ impl SubpacketAreas { /// /// Note: if the signature contains multiple instances of this /// subpacket, only the last one is considered. - pub fn embedded_signature(&self) -> Option<&Packet> { + pub fn embedded_signature(&self) -> Option<&Signature> { // 1 signature packet body if let Some(sb) = self.subpacket(SubpacketTag::EmbeddedSignature) { @@ -2220,7 +2208,7 @@ impl signature::Builder { pub fn set_embedded_signature(mut self, signature: Signature) -> Result<Self> { self.unhashed_area.replace(Subpacket::new( - SubpacketValue::EmbeddedSignature(signature.into()), + SubpacketValue::EmbeddedSignature(signature), true)?)?; Ok(self) @@ -2459,8 +2447,7 @@ fn accessors() { sig = sig.set_embedded_signature(embedded_sig.clone()).unwrap(); let sig_ = sig.clone().sign_hash(&mut keypair, hash.clone()).unwrap(); - assert_eq!(sig_.embedded_signature(), - Some(&Packet::Signature(embedded_sig))); + assert_eq!(sig_.embedded_signature(), Some(&embedded_sig)); sig = sig.set_issuer_fingerprint(fp.clone()).unwrap(); let sig_ = @@ -2506,6 +2493,7 @@ fn accessors() { #[cfg(feature = "compression-deflate")] #[test] fn subpacket_test_1 () { + use crate::Packet; use crate::PacketPile; use crate::parse::Parse; @@ -2559,6 +2547,7 @@ fn subpacket_test_1 () { #[test] fn subpacket_test_2() { + use crate::Packet; use crate::parse::Parse; use crate::PacketPile; diff --git a/openpgp/src/parse/parse.rs b/openpgp/src/parse/parse.rs index a05a40cd..33b27d1a 100644 --- a/openpgp/src/parse/parse.rs +++ b/openpgp/src/parse/parse.rs @@ -1352,10 +1352,7 @@ impl Subpacket { SubpacketTag::EmbeddedSignature => SubpacketValue::EmbeddedSignature( Signature::from_bytes( - &php.parse_bytes("embedded sig", len)?)? - .into() // XXX: This should just be a Signature, really. - ), - + &php.parse_bytes("embedded sig", len)?)?), SubpacketTag::IssuerFingerprint => { if len == 0 { return Err(Error::MalformedPacket( diff --git a/openpgp/src/serialize/mod.rs b/openpgp/src/serialize/mod.rs index 4c8e5273..fe19910c 100644 --- a/openpgp/src/serialize/mod.rs +++ b/openpgp/src/serialize/mod.rs @@ -1063,11 +1063,7 @@ impl Serialize for SubpacketValue { o.write_all(&[(*pk_algo).into(), (*hash_algo).into()])?; o.write_all(digest)?; }, - EmbeddedSignature(ref p) => match p { - &Packet::Signature(ref sig) => sig.serialize(o)?, - _ => return Err(Error::InvalidArgument( - format!("Not a signature: {:?}", p)).into()), - }, + EmbeddedSignature(sig) => sig.serialize(o)?, IssuerFingerprint(ref fp) => match fp { Fingerprint::V4(_) => { o.write_all(&[4])?; @@ -1121,10 +1117,7 @@ impl SerializeInto for SubpacketValue { ReasonForRevocation { ref reason, .. } => 1 + reason.len(), Features(ref f) => f.as_vec().len(), SignatureTarget { ref digest, .. } => 2 + digest.len(), - EmbeddedSignature(ref p) => match p { - &Packet::Signature(ref sig) => sig.serialized_len(), - _ => 0, - }, + EmbeddedSignature(sig) => sig.serialized_len(), IssuerFingerprint(ref fp) => match fp { Fingerprint::V4(_) => 1 + fp.serialized_len(), _ => 0, diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs index 92160f39..651c33a3 100644 --- a/tool/src/commands/dump.rs +++ b/tool/src/commands/dump.rs @@ -818,7 +818,8 @@ impl PacketDumper { writeln!(output)?; let indent = format!("{} ", i); write!(output, "{}", indent)?; - self.dump_packet(output, &indent, None, sig, None, None)?; + self.dump_packet(output, &indent, None, &sig.clone().into(), + None, None)?; }, _ => { if s.critical() { |