use std::io;
use std::io::prelude::*;
use std::convert::TryFrom;
use std::cmp;
use std::str;
use std::mem;
use std::fmt;
use std::path::Path;
use std::result::Result as StdResult;
use xxhash_rust::xxh3::Xxh3;
pub use buffered_reader;
use ::buffered_reader::*;
use crate::{
cert::CertValidator,
cert::CertValidity,
cert::KeyringValidator,
cert::KeyringValidity,
crypto::{aead, hash::Hash},
Result,
packet::header::{
CTB,
BodyLength,
PacketLengthType,
},
crypto::S2K,
Error,
packet::{
Container,
Header,
},
packet::signature::Signature3,
packet::signature::Signature4,
packet::signature::Signature6,
packet::prelude::*,
Packet,
Fingerprint,
KeyID,
crypto::SessionKey,
};
use crate::types::{
AEADAlgorithm,
CompressionAlgorithm,
Features,
HashAlgorithm,
KeyFlags,
KeyServerPreferences,
PublicKeyAlgorithm,
RevocationKey,
SignatureType,
SymmetricAlgorithm,
Timestamp,
};
use crate::crypto::{self, mpi::{PublicKey, MPI, ProtectedMPI}};
use crate::crypto::symmetric::{Decryptor, BufferedReaderDecryptor};
use crate::message;
use crate::message::MessageValidator;
mod partial_body;
use self::partial_body::BufferedReaderPartialBodyFilter;
use crate::packet::signature::subpacket::{
NotationData,
NotationDataFlags,
Subpacket,
SubpacketArea,
SubpacketLength,
SubpacketTag,
SubpacketValue,
};
use crate::serialize::MarshalInto;
mod packet_pile_parser;
pub use self::packet_pile_parser::PacketPileParser;
mod hashed_reader;
pub(crate) use self::hashed_reader::{
HashingMode,
HashedReader,
};
mod packet_parser_builder;
pub use self::packet_parser_builder::{Dearmor, PacketParserBuilder};
use packet_parser_builder::ARMOR_READER_LEVEL;
pub mod map;
mod mpis;
pub mod stream;
const TRACE : bool = false;
pub(crate) const RECOVERY_THRESHOLD: usize = 32 * 1024;
pub trait Parse<'a, T>: crate::seal::Sealed {
fn from_buffered_reader<R>(reader: R) -> Result<T>
where
R: BufferedReader<Cookie> + 'a;
fn from_reader<R: 'a + Read + Send + Sync>(reader: R) -> Result<T> {
Self::from_buffered_reader(
buffered_reader::Generic::with_cookie(reader,
None,
Default::default())
.into_boxed())
}
fn from_file<P: AsRef<Path>>(path: P) -> Result<T>
{
Self::from_buffered_reader(
buffered_reader::File::with_cookie(path.as_ref(),
Default::default())?
.into_boxed())
}
fn from_bytes<D: AsRef<[u8]> + ?Sized + Send + Sync>(data: &'a D) -> Result<T> {
Self::from_buffered_reader(
buffered_reader::Memory::with_cookie(data.as_ref(), Default::default())
.into_boxed())
}
}
macro_rules! impl_parse_with_buffered_reader {
($typ: ident) => {
impl_parse_with_buffered_reader!(
$typ,
|br: Box<dyn BufferedReader<Cookie>>| -> Result<$typ> {
let parser = PacketHeaderParser::new_naked(br);
let mut pp = Self::parse(parser)?;
pp.buffer_unread_content()?;
match pp.next()? {
#[allow(deprecated)]
(Packet::$typ(o), PacketParserResult::EOF(_))
=> Ok(o),
(Packet::Unknown(u), PacketParserResult::EOF(_)) =>
Err(u.into_error()),
(p, PacketParserResult::EOF(_)) =>
Err(Error::InvalidOperation(
format!("Not a {} packet: {:?}", stringify!($typ),
p)).into()),
(_, PacketParserResult::Some(_)) =>
Err(Error::InvalidOperation(
"Excess data after packet".into()).into()),
}
});
};
($typ: ident, $from_buffered_reader: expr) => {
impl<'a> Parse<'a, $typ> for $typ {
fn from_buffered_reader<R>(reader: R) -> Result<Self>
where
R: BufferedReader<Cookie> + 'a,
{
Ok($from_buffered_reader(reader.into_boxed())?)
}
}
}
}
pub const DEFAULT_MAX_RECURSION_DEPTH : u8 = 16;
pub const DEFAULT_MAX_PACKET_SIZE: u32 = 1 << 20;
pub(crate) struct PacketHeaderParser<'a> {
reader: buffered_reader::Dup<Box<dyn BufferedReader<Cookie> + 'a>, Cookie>,
header: Header,
header_bytes: Vec<u8>,
path: Vec<usize>,
state: PacketParserState,
map: Option<map::Map>,
}
macro_rules! make_php_try {
($parser:expr) => {
macro_rules! php_try {
($e:expr) => {
match $e {
Ok(b) => {
Ok(b)
},
Err(e) => {
t!("parsing failed at {}:{}: {}", file!(), line!(), e);
let e = match e.downcast::<io::Error>() {
Ok(e) =>
if let io::ErrorKind::UnexpectedEof = e.kind() {
return $parser.error(e.into());
} else {
e.into()
},
Err(e) => e,
};
let e = match e.downcast::<Error>() {
Ok(e) => return $parser.error(e.into()),
Err(e) => e,
};
Err(e)
},
}?
};
}
};
}
impl std::fmt::Debug for PacketHeaderParser<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
f.debug_struct("PacketHeaderParser")
.field("header", &self.header)
.field("path", &self.path)
.field("reader", &self.reader)
.field("state", &self.state)
.field("map", &self.map)
.finish()
}
}
impl<'a> PacketHeaderParser<'a> {
fn new(inner: Box<dyn BufferedReader<Cookie> + 'a>,
state: PacketParserState,
path: Vec<usize>, header: Header,
header_bytes: Vec<u8>) -> Self
{
assert!(!path.is_empty());
let cookie = Cookie {
level: inner.cookie_ref().level,
..Default::default()
};
let map = if state.settings.map {
Some(map::Map::new(header_bytes.clone()))
} else {
None
};
PacketHeaderParser {
reader: buffered_reader::Dup::with_cookie(inner, cookie),
header,
header_bytes,
path,
state,
map,
}
}
fn new_naked(inner: Box<dyn BufferedReader<Cookie> + 'a>) -> Self {
PacketHeaderParser::new(inner,
PacketParserState::new(Default::default()),
vec![ 0 ],
Header::new(CTB::new(Tag::Reserved),
BodyLength::Full(0)),
Vec::new())
}
fn ok(mut self, packet: Packet) -> Result<PacketParser<'a>> {
tracer!(TRACE, "PacketHeaderParser::ok",
self.reader.cookie_ref().level.unwrap_or(0));
let total_out = self.reader.total_out();
t!("total_out = {}", total_out);
if self.state.settings.map {
self.reader.rewind();
let body = if self.state.settings.buffer_unread_content {
self.reader.steal_eof()?
} else {
self.reader.steal(total_out)?
};
t!("got {} bytes of body for the map", body.len());
if body.len() > total_out {
self.field("body", body.len() - total_out);
}
self.map.as_mut().unwrap().finalize(body);
}
let mut reader = Box::new(self.reader).into_inner().unwrap();
if total_out > 0 {
reader.data_consume_hard(total_out).unwrap();
}
Ok(PacketParser {
header: self.header,
packet,
path: self.path,
last_path: vec![],
reader,
content_was_read: false,
processed: true,
finished: false,
map: self.map,
body_hash: Some(Container::make_body_hash()),
state: self.state,
})
}
fn fail(self, reason: &'static str) -> Result<PacketParser<'a>> {
self.error(Error::MalformedPacket(reason.into()).into())
}
fn error(mut self, error: anyhow::Error) -> Result<PacketParser<'a>> {
self.reader.rewind();
Unknown::parse(self, error)
}
fn field(&mut self, name: &'static str, size: usize) {
if let Some(ref mut map) = self.map {
map.add(name, size)
}
}
fn parse_u8(&mut self, name: &'static str) -> Result<u8> {
let r = self.reader.data_consume_hard(1)?[0];
self.field(name, 1);
Ok(r)
}
fn parse_u8_len(&mut self, name: &'static str) -> Result<usize> {
self.parse_u8(name).map(Into::into)
}
fn parse_be_u16(&mut self, name: &'static str) -> Result<u16> {
let r = self.reader.read_be_u16()?;
self.field(name, 2);
Ok(r)
}
fn parse_be_u32(&mut self, name: &'static str) -> Result<u32> {
let r = self.reader.read_be_u32()?;
self.field(name, 4);
Ok(r)
}
fn parse_bool(&mut self, name: &'static str) -> Result<bool> {
let v = self.reader.data_consume_hard(1)?[0];
self.field(name, 1);
match v {
0 => Ok(false),
1 => Ok(true),
n => Err(Error::MalformedPacket(
format!("Invalid value for bool: {}", n)).into()),
}
}
fn parse_bytes(&mut self, name: &'static str, amount: usize)
-> Result<Vec<u8>> {
let r = self.reader.steal(amount)?;
self.field(name, amount);
Ok(r)
}
fn parse_bytes_into(&mut self, name: &'static str, buf: &mut [u8])
-> Result<()> {
self.reader.read_exact(buf)?;
self.field(name, buf.len());
Ok(())
}
fn parse_bytes_eof(&mut self, name: &'static str) -> Result<Vec<u8>> {
let r = self.reader.steal_eof()?;
self.field(name, r.len());
Ok(r)
}
fn recursion_depth(&self) -> isize {
self.path.len() as isize - 1
}
fn variable_sized_field_start<L>(&self, name: &'static str, len: L)
-> VariableSizedField
where
L: Into<u32>,
{
VariableSizedField {
name,
start: self.reader.total_out().try_into()
.expect("offsets in packet headers cannot exceed u32"),
length: len.into(),
}
}
fn variable_sized_field_remaining(&self, f: &VariableSizedField) -> usize {
let current: u32 = self.reader.total_out().try_into()
.expect("offsets in packet headers cannot exceed u32");
f.length.saturating_sub(current - f.start) as usize
}
fn variable_sized_field_end(&self, f: VariableSizedField) -> Result<()>
{
let l = u32::try_from(self.reader.total_out())
.expect("offsets in packet headers cannot exceed u32")
- f.start;
use std::cmp::Ordering;
match l.cmp(&f.length) {
Ordering::Less => Err(Error::MalformedPacket(format!(
"{}: length {} but only consumed {} bytes",
f.name, f.length, l)).into()),
Ordering::Equal => Ok(()),
Ordering::Greater => Err(Error::MalformedPacket(format!(
"{}: length {} but consumed {} bytes",
f.name, f.length, l)).into()),
}
}
}
#[must_use]
struct VariableSizedField {
name: &'static str,
start: u32,
length: u32,
}
#[derive(Copy, Clone, PartialEq, Debug)]
pub(crate) enum HashesFor {
Nothing,
MDC,
Signature,
CleartextSignature,
}
#[derive(Copy, Clone, PartialEq, Debug)]
enum Hashing {
Enabled,
Notarized,
Disabled,
}
#[derive(Debug)]
pub struct Cookie {
level: Option<isize>,
hashes_for: HashesFor,
hashing: Hashing,
saw_last: bool,
sig_groups: Vec<SignatureGroup>,
sig_groups_max_len: usize,
hash_stash: Option<Vec<u8>>,
fake_eof: bool,
csf_transformation: bool,
}
assert_send_and_sync!(Cookie);
#[derive(Default)]
pub(crate) struct SignatureGroup {
ops_count: usize,
pub(crate) hashes: Vec<HashingMode<crypto::hash::Context>>,
}
impl fmt::Debug for SignatureGroup {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let algos = self.hashes.iter()
.map(|mode| mode.map(|ctx| ctx.algo()))
.collect::<Vec<_>>();
f.debug_struct("Cookie")
.field("ops_count", &self.ops_count)
.field("hashes", &algos)
.finish()
}
}
impl SignatureGroup {
fn clear(&mut self) {
self.ops_count = 0;
self.hashes.clear();
}
}
impl Default for Cookie {
fn default() -> Self {
Cookie {
level: None,
hashing: Hashing::Enabled,
hashes_for: HashesFor::Nothing,
saw_last: false,
sig_groups: vec![Default::default()],
sig_groups_max_len: 1,
hash_stash: None,
fake_eof: false,
csf_transformation: false,
}
}
}
impl Cookie {
fn new(level: isize) -> Cookie {
Cookie {
level: Some(level),
hashing: Hashing::Enabled,
hashes_for: HashesFor::Nothing,
saw_last: false,
sig_groups: vec![Default::default()],
sig_groups_max_len: 1,
hash_stash: None,
fake_eof: false,
csf_transformation: false,
}
}
pub(crate) fn sig_group(&self) -> &SignatureGroup {
assert!(!self.sig_groups.is_empty());
&self.sig_groups[self.sig_groups.len() - 1]
}
pub(crate) fn sig_group_mut(&mut self) -> &mut SignatureGroup {
assert!(!self.sig_groups.is_empty());
let len = self.sig_groups.len();
&mut self.sig_groups[len - 1]
}
fn signature_level(&self) -> usize {
self.sig_groups_max_len - self.sig_groups.len()
}
fn sig_group_unused(&self) -> bool {
assert!(!self.sig_groups.is_empty());
self.sig_groups[self.sig_groups.len() - 1].ops_count == 0
}
fn sig_group_push(&mut self) {
self.sig_groups.push(Default::default());
self.sig_groups_max_len += 1;
}
fn sig_group_pop(&mut self) {
if self.sig_groups.len() == 1 {
self.sig_groups[0].clear();
self.hashes_for = HashesFor::Nothing;
} else {
self.sig_groups.pop();
}
}
}
impl Cookie {
fn hashing(reader: &mut dyn BufferedReader<Cookie>,
how: Hashing, level: isize) {
let mut reader : Option<&mut dyn BufferedReader<Cookie>>
= Some(reader);
while let Some(r) = reader {
{
let cookie = r.cookie_mut();
if let Some(br_level) = cookie.level {
if br_level < level {
break;
}
if br_level == level
&& (cookie.hashes_for == HashesFor::Signature
|| cookie.hashes_for == HashesFor::CleartextSignature)
{
cookie.hashing = how;
}
} else {
break;
}
}
reader = r.get_mut();
}
}
pub(crate) fn set_processing_csf_message(&mut self) {
tracer!(TRACE, "set_processing_csf_message", self.level.unwrap_or(0));
t!("Enabling CSF Transformation mode");
self.csf_transformation = true;
}
fn processing_csf_message(reader: &dyn BufferedReader<Cookie>)
-> bool {
let mut reader: Option<&dyn BufferedReader<Cookie>>
= Some(reader);
while let Some(r) = reader {
if r.cookie_ref().level == Some(ARMOR_READER_LEVEL) {
return r.cookie_ref().csf_transformation;
} else {
reader = r.get_ref();
}
}
false
}
}
fn buffered_reader_stack_pop<'a>(
mut reader: Box<dyn BufferedReader<Cookie> + 'a>, depth: isize)
-> Result<(bool, Box<dyn BufferedReader<Cookie> + 'a>)>
{
tracer!(TRACE, "buffered_reader_stack_pop", depth);
t!("(reader level: {:?}, pop through: {})",
reader.cookie_ref().level, depth);
while let Some(level) = reader.cookie_ref().level {
assert!(level <= depth || depth < 0);
if level >= depth {
let fake_eof = reader.cookie_ref().fake_eof;
t!("top reader at level {:?} (fake eof: {}), pop through: {}",
reader.cookie_ref().level, fake_eof, depth);
t!("popping level {:?} reader, reader: {:?}",
reader.cookie_ref().level,
reader);
if reader.eof() && ! reader.consummated() {
return Err(Error::MalformedPacket("Truncated packet".into())
.into());
}
reader.drop_eof()?;
reader = reader.into_inner().unwrap();
if level == depth && fake_eof {
t!("Popped a fake EOF reader at level {}, stopping.", depth);
return Ok((true, reader));
}
t!("now at level {:?} reader: {:?}",
reader.cookie_ref().level, reader);
} else {
break;
}
}
Ok((false, reader))
}
#[derive(Clone, Debug)]
struct PacketParserSettings {
max_recursion_depth: u8,
max_packet_size: u32,
buffer_unread_content: bool,
map: bool,
automatic_hashing: bool,
}
impl Default for PacketParserSettings {
fn default() -> Self {
PacketParserSettings {
max_recursion_depth: DEFAULT_MAX_RECURSION_DEPTH,
max_packet_size: DEFAULT_MAX_PACKET_SIZE,
buffer_unread_content: false,
map: false,
automatic_hashing: true,
}
}
}
impl S2K {
fn parse_v4(php: &mut PacketHeaderParser<'_>)
-> Result<Self> {
Self::parse_common(php, None)
}
fn parse_v6(php: &mut PacketHeaderParser, s2k_len: u8) -> Result<Self> {
Self::parse_common(php, Some(s2k_len))
}
fn parse_common(php: &mut PacketHeaderParser<'_>,
s2k_len: Option<u8>)
-> Result<Self>
{
if s2k_len == Some(0) {
return Err(Error::MalformedPacket(
"Invalid size for S2K object: 0 octets".into()).into());
}
let check_size = |expected| {
if let Some(got) = s2k_len {
if got != expected {
return Err(Error::MalformedPacket(format!(
"Invalid size for S2K object: {} octets, expected {}",
got, expected)));
}
}
Ok(())
};
let s2k = php.parse_u8("s2k_type")?;
#[allow(deprecated)]
let ret = match s2k {
0 => {
check_size(2)?;
S2K::Simple {
hash: HashAlgorithm::from(php.parse_u8("s2k_hash_algo")?),
}
},
1 => {
check_size(10)?;
S2K::Salted {
hash: HashAlgorithm::from(php.parse_u8("s2k_hash_algo")?),
salt: Self::read_salt(php)?,
}
},
3 => {
check_size(11)?;
S2K::Iterated {
hash: HashAlgorithm::from(php.parse_u8("s2k_hash_algo")?),
salt: Self::read_salt(php)?,
hash_bytes: S2K::decode_count(php.parse_u8("s2k_count")?),
}
},
4 => S2K::Argon2 {
salt: {
let mut b = [0u8; 16];
let b_len = b.len();
b.copy_from_slice(
&php.parse_bytes("argon2_salt", b_len)?);
b
},
t: php.parse_u8("argon2_t")?,
p: php.parse_u8("argon2_p")?,
m: php.parse_u8("argon2_m")?,
},
100..=110 => S2K::Private {
tag: s2k,
parameters: if let Some(l) = s2k_len {
Some(
php.parse_bytes("parameters", l as usize - 1 )?
.into())
} else {
None
},
},
u => S2K::Unknown {
tag: u,
parameters: if let Some(l) = s2k_len {
Some(
php.parse_bytes("parameters", l as usize - 1 )?
.into())
} else {
None
},
},
};
Ok(ret)
}
fn read_salt(php: &mut PacketHeaderParser<'_>) -> Result<[u8; 8]> {
let mut b = [0u8; 8];
b.copy_from_slice(&php.parse_bytes("s2k_salt", 8)?);
Ok(b)
}
}
impl_parse_with_buffered_reader!(
S2K,
|bio: Box<dyn BufferedReader<Cookie>>| -> Result<Self> {
let mut parser = PacketHeaderParser::new_naked(bio.into_boxed());
Self::parse_v4(&mut parser)
});
impl Header {
pub(crate) fn parse<R: BufferedReader<C>, C: fmt::Debug + Send + Sync> (bio: &mut R)
-> Result<Header>
{
let ctb = CTB::try_from(bio.data_consume_hard(1)?[0])?;
let length = match ctb {
CTB::New(_) => BodyLength::parse_new_format(bio)?,
CTB::Old(ref ctb) =>
BodyLength::parse_old_format(bio, ctb.length_type())?,
};
Ok(Header::new(ctb, length))
}
}
impl_parse_with_buffered_reader!(
Header,
|mut reader| -> Result<Self> {
Header::parse(&mut reader)
});
impl BodyLength {
pub(crate) fn parse_new_format<T: BufferedReader<C>, C: fmt::Debug + Send + Sync> (bio: &mut T)
-> io::Result<BodyLength>
{
let octet1 : u8 = bio.data_consume_hard(1)?[0];
match octet1 {
0..=191 => Ok(BodyLength::Full(octet1 as u32)),
192..=223 => { let octet2 = bio.data_consume_hard(1)?[0];
Ok(BodyLength::Full(((octet1 as u32 - 192) << 8)
+ octet2 as u32 + 192))
},
224..=254 => Ok(BodyLength::Partial(1 << (octet1 & 0x1F))),
255 => Ok(BodyLength::Full(bio.read_be_u32()?)),
}
}
pub(crate) fn parse_old_format<T: BufferedReader<C>, C: fmt::Debug + Send + Sync>
(bio: &mut T, length_type: PacketLengthType)
-> Result<BodyLength>
{
match length_type {
PacketLengthType::OneOctet =>
Ok(BodyLength::Full(bio.data_consume_hard(1)?[0] as u32)),
PacketLengthType::TwoOctets =>
Ok(BodyLength::Full(bio.read_be_u16()? as u32)),
PacketLengthType::FourOctets =>
Ok(BodyLength::Full(bio.read_be_u32()? as u32)),
PacketLengthType::Indeterminate =>
Ok(BodyLength::Indeterminate),
}
}
}
#[test]
fn body_length_new_format() {
fn test(input: &[u8], expected_result: BodyLength) {
assert_eq!(
BodyLength::parse_new_format(
&mut buffered_reader::Memory::new(input)).unwrap(),
expected_result);
}
test(&[0x64][..], BodyLength::Full(100));
test(&[0xC5, 0xFB][..], BodyLength::Full(1723));
test(&[0xFF, 0x00, 0x01, 0x86, 0xA0][..], BodyLength::Full(100000));
test(&[0xEF][..], BodyLength::Partial(32768));
test(&[0xE1][..], BodyLength::Partial(2));
test(&[0xF0][..], BodyLength::Partial(65536));
test(&[0xC5, 0xDD][..], BodyLength::Full(1693));
}
#[test]
fn body_length_old_format() {
fn test(input: &[u8], plt: PacketLengthType,
expected_result: BodyLength, expected_rest: &[u8]) {
let mut bio = buffered_reader::Memory::new(input);
assert_eq!(BodyLength::parse_old_format(&mut bio, plt).unwrap(),
expected_result);
let rest = bio.data_eof();
assert_eq!(rest.unwrap(), expected_rest);
}
test(&[1], PacketLengthType::OneOctet, BodyLength::Full(1), &b""[..]);
test(&[1, 2], PacketLengthType::TwoOctets,
BodyLength::Full((1 << 8) + 2), &b""[..]);
test(&[1, 2, 3, 4], PacketLengthType::FourOctets,
BodyLength::Full((1 << 24) + (2 << 16) + (3 << 8) + 4), &b""[..]);
test(&[1, 2, 3, 4, 5, 6], PacketLengthType::FourOctets,
BodyLength::Full((1 << 24) + (2 << 16) + (3 << 8) + 4), &[5, 6][..]);
test(&[1, 2, 3, 4], PacketLengthType::Indeterminate,
BodyLength::Indeterminate, &[1, 2, 3, 4][..]);
}
impl Unknown {
fn parse(php: PacketHeaderParser, error: anyhow::Error)
-> Result<PacketParser>
{
let tag = php.header.ctb().tag();
php.ok(Packet::Unknown(Unknown::new(tag, error)))
}
}
#[cfg(test)]
pub(crate) fn to_unknown_packet<R: Read + Send + Sync>(reader: R) -> Result<Unknown>
{
let mut reader = buffered_reader::Generic::with_cookie(
reader, None, Cookie::default());
let header = Header::parse(&mut reader)?;
let reader : Box<dyn BufferedReader<Cookie>>
= match header.length() {
&BodyLength::Full(len) =>
Box::new(buffered_reader::Limitor::with_cookie(
reader, len as u64, Cookie::default())),
&BodyLength::Partial(len) =>
Box::new(BufferedReaderPartialBodyFilter::with_cookie(
reader, len, true, Cookie::default())),
_ => Box::new(reader),
};
let parser = PacketHeaderParser::new(
reader, PacketParserState::new(Default::default()), vec![ 0 ], header, Vec::new());
let mut pp =
Unknown::parse(parser,
anyhow::anyhow!("explicit conversion to unknown"))?;
pp.buffer_unread_content()?;
pp.finish()?;
if let Packet::Unknown(packet) = pp.packet {
Ok(packet)
} else {
panic!("Internal inconsistency.");
}
}
impl Signature {
fn parse(mut php: PacketHeaderParser)
-> Result<PacketParser>
{
let indent = php.recursion_depth();
tracer!(TRACE, "Signature::parse", indent);
make_php_try!(php);
let version = php_try!(php.parse_u8("version"));
match version {
3 => Signature3::parse(php),
4 => Signature4::parse(php),
6 => Signature6::parse(php),
_ => {
t!("Ignoring version {} packet.", version);
php.fail("unknown version")
},
}
}
fn plausible<C, T>(bio: &mut buffered_reader::Dup<T, C>, header: &Header)
-> Result<()>
where T: BufferedReader<C>, C: fmt::Debug + Send + Sync
{
Signature4::plausible(bio, header)
}
fn parse_finish(indent: isize, mut pp: PacketParser,
hash_algo: HashAlgorithm)
-> Result<PacketParser>
{
tracer!(TRACE, "Signature::parse_finish", indent);
let sig: &Signature = pp.packet.downcast_ref()
.ok_or_else(
|| Error::InvalidOperation(
format!("Called Signature::parse_finish on a {:?}",
pp.packet)))?;
if sig.typ() != SignatureType::Binary
&& sig.typ() != SignatureType::Text
{
return Ok(pp);
}
let need_hash = HashingMode::for_signature(hash_algo, sig);
t!("Need a {:?}", need_hash);
if TRACE {
pp.reader.dump(&mut std::io::stderr())?;
}
let mut computed_digest = None;
{
let recursion_depth = pp.recursion_depth();
let mut r = (&mut pp.reader).get_mut();
while let Some(tmp) = r {
{
let cookie = tmp.cookie_mut();
assert!(cookie.level.unwrap_or(-1)
<= recursion_depth);
if cookie.level.is_none()
|| cookie.level.unwrap() < recursion_depth - 1 {
t!("Abandoning search for suitable \
hashed reader at {:?}.", cookie.level);
break
}
if cookie.hashes_for == HashesFor::Signature {
cookie.sig_group_mut().ops_count -= 1;
}
if cookie.hashes_for == HashesFor::Signature
|| cookie.hashes_for == HashesFor::CleartextSignature
{
t!("Have: {:?}",
cookie.sig_group().hashes.iter()
.map(|h| h.map(|h| h.algo()))
.collect::<Vec<_>>());
if let Some(hash) =
cookie.sig_group().hashes.iter().find_map(
|mode|
if mode.map(|ctx| ctx.algo()) == need_hash
{
Some(mode.as_ref())
} else {
None
})
{
t!("found a {:?} HashedReader", need_hash);
computed_digest = Some((cookie.signature_level(),
hash.clone()));
}
if cookie.sig_group_unused() {
cookie.sig_group_pop();
}
break;
}
}
r = tmp.get_mut();
}
}
if let Some((level, mut hash)) = computed_digest {
if let Packet::Signature(ref mut sig) = pp.packet {
sig.hash(&mut hash)?;
let mut digest = vec![0u8; hash.digest_size()];
let _ = hash.digest(&mut digest);
sig.set_computed_digest(Some(digest));
sig.set_level(level);
} else {
unreachable!()
}
}
Ok(pp)
}
}
impl Signature6 {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
let indent = php.recursion_depth();
tracer!(TRACE, "Signature6::parse", indent);
make_php_try!(php);
let typ = php_try!(php.parse_u8("type"));
let pk_algo: PublicKeyAlgorithm = php_try!(php.parse_u8("pk_algo")).into();
let hash_algo: HashAlgorithm =
php_try!(php.parse_u8("hash_algo")).into();
let hashed_area_len = php_try!(php.parse_be_u32("hashed_area_len"));
let hashed_area
= php_try!(SubpacketArea::parse(&mut php,
hashed_area_len as usize,
hash_algo));
let unhashed_area_len = php_try!(php.parse_be_u32("unhashed_area_len"));
let unhashed_area
= php_try!(SubpacketArea::parse(&mut php,
unhashed_area_len as usize,
hash_algo));
let digest_prefix1 = php_try!(php.parse_u8("digest_prefix1"));
let digest_prefix2 = php_try!(php.parse_u8("digest_prefix2"));
if ! pk_algo.for_signing() {
return php.fail("not a signature algorithm");
}
let salt_len = php_try!(php.parse_u8("salt_len")) as usize;
let salt = php_try!(php.parse_bytes("salt", salt_len));
let mpis = php_try!(
crypto::mpi::Signature::_parse(pk_algo, &mut php));
let typ = typ.into();
let sig = php_try!(Signature6::new(
typ, pk_algo, hash_algo,
hashed_area,
unhashed_area,
[digest_prefix1, digest_prefix2],
salt,
mpis));
let pp = php.ok(sig.into())?;
Signature::parse_finish(indent, pp, hash_algo)
}
}
impl Signature4 {
fn parse(mut php: PacketHeaderParser)
-> Result<PacketParser>
{
let indent = php.recursion_depth();
tracer!(TRACE, "Signature4::parse", indent);
make_php_try!(php);
let typ = php_try!(php.parse_u8("type"));
let pk_algo: PublicKeyAlgorithm = php_try!(php.parse_u8("pk_algo")).into();
let hash_algo: HashAlgorithm =
php_try!(php.parse_u8("hash_algo")).into();
let hashed_area_len = php_try!(php.parse_be_u16("hashed_area_len"));
let hashed_area
= php_try!(SubpacketArea::parse(&mut php,
hashed_area_len as usize,
hash_algo));
let unhashed_area_len = php_try!(php.parse_be_u16("unhashed_area_len"));
let unhashed_area
= php_try!(SubpacketArea::parse(&mut php,
unhashed_area_len as usize,
hash_algo));
let digest_prefix1 = php_try!(php.parse_u8("digest_prefix1"));
let digest_prefix2 = php_try!(php.parse_u8("digest_prefix2"));
if ! pk_algo.for_signing() {
return php.fail("not a signature algorithm");
}
let mpis = php_try!(
crypto::mpi::Signature::_parse(pk_algo, &mut php));
let typ = typ.into();
let pp = php.ok(Packet::Signature(Signature4::new(
typ, pk_algo, hash_algo,
hashed_area,
unhashed_area,
[digest_prefix1, digest_prefix2],
mpis).into()))?;
Signature::parse_finish(indent, pp, hash_algo)
}
fn plausible<C, T>(bio: &mut buffered_reader::Dup<T, C>, header: &Header)
-> Result<()>
where T: BufferedReader<C>, C: fmt::Debug + Send + Sync
{
if let BodyLength::Full(len) = header.length() {
if *len < 11 {
return Err(
Error::MalformedPacket("Packet too short".into()).into());
}
} else {
return Err(
Error::MalformedPacket(
format!("Unexpected body length encoding: {:?}",
header.length())).into());
}
let data = bio.data(11)?;
if data.len() < 11 {
return Err(
Error::MalformedPacket("Short read".into()).into());
}
let version = data[0];
let typ : SignatureType = data[1].into();
let pk_algo : PublicKeyAlgorithm = data[2].into();
let hash_algo : HashAlgorithm = data[3].into();
if version == 4
&& !matches!(typ, SignatureType::Unknown(_))
&& !matches!(pk_algo, PublicKeyAlgorithm::Unknown(_))
&& !matches!(hash_algo, HashAlgorithm::Unknown(_))
{
Ok(())
} else {
Err(Error::MalformedPacket("Invalid or unsupported data".into())
.into())
}
}
}
impl Signature3 {
fn parse(mut php: PacketHeaderParser)
-> Result<PacketParser>
{
let indent = php.recursion_depth();
tracer!(TRACE, "Signature3::parse", indent);
make_php_try!(php);
let len = php_try!(php.parse_u8("hashed length"));
if len != 5 {
return php.fail("invalid length \
(a v3 sig has 5 bytes of hashed data)");
}
let typ = php_try!(php.parse_u8("type"));
let creation_time: Timestamp
= php_try!(php.parse_be_u32("creation_time")).into();
let issuer: KeyID
= KeyID::from_bytes(&php_try!(php.parse_bytes("issuer", 8))[..]);
let pk_algo: PublicKeyAlgorithm
= php_try!(php.parse_u8("pk_algo")).into();
let hash_algo: HashAlgorithm =
php_try!(php.parse_u8("hash_algo")).into();
let digest_prefix1 = php_try!(php.parse_u8("digest_prefix1"));
let digest_prefix2 = php_try!(php.parse_u8("digest_prefix2"));
if ! pk_algo.for_signing() {
return php.fail("not a signature algorithm");
}
let mpis = php_try!(
crypto::mpi::Signature::_parse(pk_algo, &mut php));
let typ = typ.into();
let pp = php.ok(Packet::Signature(Signature3::new(
typ, creation_time, issuer, pk_algo, hash_algo,
[digest_prefix1, digest_prefix2],
mpis).into()))?;
Signature::parse_finish(indent, pp, hash_algo)
}
}
impl_parse_with_buffered_reader!(Signature);
#[test]
fn signature_parser_test () {
use crate::serialize::MarshalInto;
let data = crate::tests::message("sig.gpg");
{
let pp = PacketParser::from_bytes(data).unwrap().unwrap();
assert_eq!(pp.header.length(), &BodyLength::Full(307));
if let Packet::Signature(ref p) = pp.packet {
assert_eq!(p.version(), 4);
assert_eq!(p.typ(), SignatureType::Binary);
assert_eq!(p.pk_algo(), PublicKeyAlgorithm::RSAEncryptSign);
assert_eq!(p.hash_algo(), HashAlgorithm::SHA512);
assert_eq!(p.hashed_area().iter().count(), 2);
assert_eq!(p.unhashed_area().iter().count(), 1);
assert_eq!(p.digest_prefix(), &[0x65u8, 0x74]);
assert_eq!(p.mpis().serialized_len(), 258);
} else {
panic!("Wrong packet!");
}
}
}
impl SubpacketArea {
fn parse(php: &mut PacketHeaderParser,
mut limit: usize,
hash_algo: HashAlgorithm)
-> Result<Self>
{
let indent = php.recursion_depth();
tracer!(TRACE, "SubpacketArea::parse", indent);
let mut packets = Vec::new();
while limit > 0 {
let r = Subpacket::parse(php, limit, hash_algo);
t!("Subpacket::parse(_, {}, {:?}) => {:?}",
limit, hash_algo, r);
let p = r?;
assert!(limit >= p.length.len() + p.length.serialized_len());
limit -= p.length.len() + p.length.serialized_len();
packets.push(p);
}
assert!(limit == 0);
Self::new(packets)
}
}
impl Subpacket {
fn parse(php: &mut PacketHeaderParser,
limit: usize,
hash_algo: HashAlgorithm)
-> Result<Self>
{
let length = SubpacketLength::parse(&mut php.reader)?;
php.field("subpacket length", length.serialized_len());
let len = length.len() as usize;
if limit < length.serialized_len() + len {
return Err(Error::MalformedPacket(
"Subpacket extends beyond the end of the subpacket area".into())
.into());
}
if len == 0 {
return Err(Error::MalformedPacket("Zero-length subpacket".into())
.into());
}
let tag = php.parse_u8("subpacket tag")?;
let len = len - 1;
let total_out_before = php.reader.total_out();
let critical = tag & (1 << 7) != 0;
let tag: SubpacketTag = (tag & !(1 << 7)).into();
#[allow(deprecated)]
let value = match tag {
SubpacketTag::SignatureCreationTime =>
SubpacketValue::SignatureCreationTime(
php.parse_be_u32("sig creation time")?.into()),
SubpacketTag::SignatureExpirationTime =>
SubpacketValue::SignatureExpirationTime(
php.parse_be_u32("sig expiry time")?.into()),
SubpacketTag::ExportableCertification =>
SubpacketValue::ExportableCertification(
php.parse_bool("exportable")?),
SubpacketTag::TrustSignature =>
SubpacketValue::TrustSignature {
level: php.parse_u8("trust level")?,
trust: php.parse_u8("trust value")?,
},
SubpacketTag::RegularExpression => {
let mut v = php.parse_bytes("regular expr", len)?;
if v.is_empty() || v[v.len() - 1] != 0 {
return Err(Error::MalformedPacket(
"Regular expression not 0-terminated".into())
.into());
}
v.pop();
SubpacketValue::RegularExpression(v)
},
SubpacketTag::Revocable =>
SubpacketValue::Revocable(php.parse_bool("revocable")?),
SubpacketTag::KeyExpirationTime =>
SubpacketValue::KeyExpirationTime(
php.parse_be_u32("key expiry time")?.into()),
SubpacketTag::PreferredSymmetricAlgorithms =>
SubpacketValue::PreferredSymmetricAlgorithms(
php.parse_bytes("pref sym algos", len)?
.iter().map(|o| (*o).into()).collect()),
SubpacketTag::RevocationKey => {
if len < 22 {
return Err(Error::MalformedPacket(
"Short revocation key subpacket".into())
.into());
}
let class = php.parse_u8("class")?;
let pk_algo = php.parse_u8("pk algo")?.into();
let fp = Fingerprint::from_bytes_intern(
None,
&php.parse_bytes("fingerprint", len - 2)?)?;
SubpacketValue::RevocationKey(
RevocationKey::from_bits(pk_algo, fp, class)?)
},
SubpacketTag::Issuer =>
SubpacketValue::Issuer(
KeyID::from_bytes(&php.parse_bytes("issuer", len)?)),
SubpacketTag::NotationData => {
let flags = php.parse_bytes("flags", 4)?;
let name_len = php.parse_be_u16("name len")? as usize;
let value_len = php.parse_be_u16("value len")? as usize;
if len != 8 + name_len + value_len {
return Err(Error::MalformedPacket(
format!("Malformed notation data subpacket: \
expected {} bytes, got {}",
8 + name_len + value_len,
len)).into());
}
SubpacketValue::NotationData(
NotationData::new(
std::str::from_utf8(
&php.parse_bytes("notation name", name_len)?)
.map_err(|e| anyhow::Error::from(
Error::MalformedPacket(
format!("Malformed notation name: {}", e)))
)?,
&php.parse_bytes("notation value", value_len)?,
Some(NotationDataFlags::new(&flags)?)))
},
SubpacketTag::PreferredHashAlgorithms =>
SubpacketValue::PreferredHashAlgorithms(
php.parse_bytes("pref hash algos", len)?
.iter().map(|o| (*o).into()).collect()),
SubpacketTag::PreferredCompressionAlgorithms =>
SubpacketValue::PreferredCompressionAlgorithms(
php.parse_bytes("pref compression algos", len)?
.iter().map(|o| (*o).into()).collect()),
SubpacketTag::KeyServerPreferences =>
SubpacketValue::KeyServerPreferences(
KeyServerPreferences::new(
&php.parse_bytes("key server pref", len)?
)),
SubpacketTag::PreferredKeyServer =>
SubpacketValue::PreferredKeyServer(
php.parse_bytes("pref key server", len)?),
SubpacketTag::PrimaryUserID =>
SubpacketValue::PrimaryUserID(
php.parse_bool("primary user id")?),
SubpacketTag::PolicyURI =>
SubpacketValue::PolicyURI(php.parse_bytes("policy URI", len)?),
SubpacketTag::KeyFlags =>
SubpacketValue::KeyFlags(KeyFlags::new(
&php.parse_bytes("key flags", len)?)),
SubpacketTag::SignersUserID =>
SubpacketValue::SignersUserID(
php.parse_bytes("signers user id", len)?),
SubpacketTag::ReasonForRevocation => {
if len == 0 {
return Err(Error::MalformedPacket(
"Short reason for revocation subpacket".into()).into());
}
SubpacketValue::ReasonForRevocation {
code: php.parse_u8("revocation reason")?.into(),
reason: php.parse_bytes("human-readable", len - 1)?,
}
},
SubpacketTag::Features =>
SubpacketValue::Features(Features::new(
&php.parse_bytes("features", len)?)),
SubpacketTag::SignatureTarget => {
if len < 2 {
return Err(Error::MalformedPacket(
"Short reason for revocation subpacket".into()).into());
}
SubpacketValue::SignatureTarget {
pk_algo: php.parse_u8("pk algo")?.into(),
hash_algo: php.parse_u8("hash algo")?.into(),
digest: php.parse_bytes("digest", len - 2)?,
}
},
SubpacketTag::EmbeddedSignature =>
SubpacketValue::EmbeddedSignature(
Signature::from_bytes(
&php.parse_bytes("embedded sig", len)?)?),
SubpacketTag::IssuerFingerprint => {
if len == 0 {
return Err(Error::MalformedPacket(
"Short issuer fingerprint subpacket".into()).into());
}
let version = php.parse_u8("version")?;
if let Some(expect_len) = match version {
4 => Some(1 + 20),
6 => Some(1 + 32),
_ => None,
} {
if len != expect_len {
return Err(Error::MalformedPacket(
format!("Malformed issuer fingerprint subpacket: \
expected {} bytes, got {}",
expect_len, len)).into());
}
}
let bytes = php.parse_bytes("issuer fp", len - 1)?;
SubpacketValue::IssuerFingerprint(
Fingerprint::from_bytes(version, &bytes)?)
},
SubpacketTag::IntendedRecipient => {
if len == 0 {
return Err(Error::MalformedPacket(
"Short intended recipient subpacket".into()).into());
}
let version = php.parse_u8("version")?;
if let Some(expect_len) = match version {
4 => Some(1 + 20),
6 => Some(1 + 32),
_ => None,
} {
if len != expect_len {
return Err(Error::MalformedPacket(
format!("Malformed intended recipient subpacket: \
expected {} bytes, got {}",
expect_len, len)).into());
}
}
let bytes = php.parse_bytes("intended rcpt", len - 1)?;
SubpacketValue::IntendedRecipient(
Fingerprint::from_bytes(version, &bytes)?)
},
SubpacketTag::ApprovedCertifications => {
let digest_size =
hash_algo.context().map(|c| c.for_digest().digest_size())
.unwrap_or(len);
if digest_size == 0 {
SubpacketValue::ApprovedCertifications(
Vec::with_capacity(0))
} else {
if len % digest_size != 0 {
return Err(Error::BadSignature(
"Wrong number of bytes in certification subpacket"
.into()).into());
}
let bytes = php.parse_bytes("attested crts", len)?;
SubpacketValue::ApprovedCertifications(
bytes.chunks(digest_size).map(Into::into).collect())
}
},
SubpacketTag::PreferredAEADCiphersuites => {
if len % 2 != 0 {
return Err(Error::BadSignature(
"Wrong number of bytes in preferred AEAD \
Ciphersuites subpacket"
.into()).into());
}
SubpacketValue::PreferredAEADCiphersuites(
php.parse_bytes("pref aead ciphersuites", len)?
.chunks(2).map(|o| (o[0].into(),
o[1].into())).collect())
},
SubpacketTag::Reserved(_)
| SubpacketTag::PlaceholderForBackwardCompatibility
| SubpacketTag::PreferredAEADAlgorithms
| SubpacketTag::Private(_)
| SubpacketTag::Unknown(_) =>
SubpacketValue::Unknown {
tag,
body: php.parse_bytes("unknown subpacket", len)?,
},
};
let total_out = php.reader.total_out();
if total_out_before + len != total_out {
return Err(Error::MalformedPacket(
format!("Malformed subpacket: \
body length is {} bytes, but read {}",
len, total_out - total_out_before)).into());
}
Ok(Subpacket::with_length(
length,
value,
critical,
))
}
}
impl SubpacketLength {
fn parse<R: BufferedReader<C>, C: fmt::Debug + Send + Sync>(bio: &mut R) -> Result<Self> {
let octet1 = bio.data_consume_hard(1)?[0];
if octet1 < 192 {
Ok(Self::new(
octet1 as u32,
None))
} else if (192..255).contains(&octet1) {
let octet2 = bio.data_consume_hard(1)?[0];
let len = ((octet1 as u32 - 192) << 8) + octet2 as u32 + 192;
Ok(Self::new(
len,
if Self::len_optimal_encoding(len) == 2 {
None
} else {
Some(vec![octet1, octet2])
}))
} else {
assert_eq!(octet1, 255);
let len = bio.read_be_u32()?;
Ok(Self::new(
len,
if Self::len_optimal_encoding(len) == 5 {
None
} else {
let mut out = Vec::with_capacity(5);
out.push(octet1);
out.extend_from_slice(&len.to_be_bytes());
Some(out)
}))
}
}
}
#[cfg(test)]
quickcheck! {
fn length_roundtrip(l: u32) -> bool {
use crate::serialize::Marshal;
let length = SubpacketLength::from(l);
let mut encoded = Vec::new();
length.serialize(&mut encoded).unwrap();
assert_eq!(encoded.len(), length.serialized_len());
let mut reader = buffered_reader::Memory::new(&encoded);
SubpacketLength::parse(&mut reader).unwrap().len() == l as usize
}
}
impl OnePassSig {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
let indent = php.recursion_depth();
tracer!(TRACE, "OnePassSig", indent);
make_php_try!(php);
let version = php_try!(php.parse_u8("version"));
match version {
3 => OnePassSig3::parse(php),
6 => OnePassSig6::parse(php),
_ => {
t!("Ignoring version {} packet", version);
php.fail("unknown version")
},
}
}
}
impl_parse_with_buffered_reader!(OnePassSig);
impl OnePassSig3 {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
let indent = php.recursion_depth();
tracer!(TRACE, "OnePassSig3", indent);
make_php_try!(php);
let typ = php_try!(php.parse_u8("type"));
let hash_algo = php_try!(php.parse_u8("hash_algo"));
let pk_algo = php_try!(php.parse_u8("pk_algo"));
let mut issuer = [0u8; 8];
issuer.copy_from_slice(&php_try!(php.parse_bytes("issuer", 8)));
let last = php_try!(php.parse_u8("last"));
let hash_algo = hash_algo.into();
let typ = typ.into();
let mut sig = OnePassSig3::new(typ);
sig.set_hash_algo(hash_algo);
sig.set_pk_algo(pk_algo.into());
sig.set_issuer(KeyID::from_bytes(&issuer));
sig.set_last_raw(last);
let need_hash = HashingMode::for_salt_and_type(hash_algo, &[], typ);
let recursion_depth = php.recursion_depth();
let want_hashes_for = if Cookie::processing_csf_message(&php.reader) {
HashesFor::CleartextSignature
} else {
HashesFor::Signature
};
let done = {
let mut done = false;
let mut reader : Option<&mut dyn BufferedReader<Cookie>>
= Some(&mut php.reader);
while let Some(r) = reader {
{
let cookie = r.cookie_mut();
if let Some(br_level) = cookie.level {
if br_level < recursion_depth - 1 {
break;
}
if br_level == recursion_depth - 1
&& cookie.hashes_for == want_hashes_for {
if cookie.saw_last {
cookie.sig_group_push();
cookie.saw_last = false;
cookie.hash_stash =
Some(php.header_bytes.clone());
}
if php.state.settings.automatic_hashing
&& ! cookie.sig_group().hashes.iter()
.any(|mode| {
mode.map(|ctx| ctx.algo()) == need_hash
})
{
if let Ok(ctx) = hash_algo.context() {
let ctx = ctx.for_signature(4);
cookie.sig_group_mut().hashes.push(
HashingMode::for_salt_and_type(
ctx, &[], typ)
);
}
}
cookie.sig_group_mut().ops_count += 1;
cookie.saw_last = last > 0;
done = true;
break;
}
} else {
break;
}
}
reader = r.get_mut();
}
done
};
let mut pp = php.ok(Packet::OnePassSig(sig.into()))?;
if done {
return Ok(pp);
}
let mut algos = Vec::new();
if pp.state.settings.automatic_hashing && hash_algo.is_supported() {
algos.push(HashingMode::for_salt_and_type(hash_algo, &[], typ));
}
assert!(pp.reader.cookie_ref().level <= Some(recursion_depth));
let (fake_eof, reader)
= buffered_reader_stack_pop(Box::new(pp.take_reader()),
recursion_depth)?;
assert!(! fake_eof);
let mut reader = HashedReader::new(
reader, want_hashes_for, algos)?;
reader.cookie_mut().level = Some(recursion_depth - 1);
reader.cookie_mut().sig_group_mut().ops_count += 1;
reader.cookie_mut().saw_last = last > 0;
t!("Pushed a hashed reader, level {:?}", reader.cookie_mut().level);
let mut reader = buffered_reader::Limitor::with_cookie(
reader, 0, Cookie::default());
reader.cookie_mut().level = Some(recursion_depth);
pp.reader = Box::new(reader);
Ok(pp)
}
}
impl PacketParser<'_> {
pub fn start_hashing(&mut self) -> Result<()> {
let ops: &OnePassSig = self.packet.downcast_ref()
.ok_or_else(|| Error::InvalidOperation(
"Must only be invoked on one-pass-signature packets".into())
)?;
let sig_version = match ops.version() {
3 => 4,
n => return Err(Error::InvalidOperation(
format!("don't know how to hash for v{} one pass sig",
n)).into()),
};
let hash_algo = ops.hash_algo();
let typ = ops.typ();
let salt = ops.salt().unwrap_or(&[]);
let need_hash = HashingMode::for_salt_and_type(hash_algo, salt, typ);
let recursion_depth = self.recursion_depth();
let want_hashes_for = if Cookie::processing_csf_message(&self.reader) {
HashesFor::CleartextSignature
} else {
HashesFor::Signature
};
let mut reader : Option<&mut dyn BufferedReader<Cookie>>
= Some(&mut self.reader);
while let Some(r) = reader {
{
let cookie = r.cookie_mut();
if let Some(br_level) = cookie.level {
if br_level < recursion_depth - 1 {
break;
}
if br_level == recursion_depth - 1
&& cookie.hashes_for == want_hashes_for {
if ! cookie.sig_group().hashes.iter()
.any(|mode| {
mode.map(|ctx| ctx.algo()) == need_hash
})
{
let mut ctx = hash_algo.context()?
.for_signature(sig_version);
ctx.update(&salt);
cookie.sig_group_mut().hashes.push(
HashingMode::for_salt_and_type(
ctx, salt, typ));
}
break;
}
} else {
break;
}
}
reader = r.get_mut();
}
Ok(())
}
}
#[test]
fn one_pass_sig3_parser_test () {
use crate::SignatureType;
use crate::PublicKeyAlgorithm;
let data = crate::tests::message("signed-1.gpg");
let mut pp = PacketParser::from_bytes(data).unwrap().unwrap();
let p = pp.finish().unwrap();
if let &Packet::OnePassSig(ref p) = p {
assert_eq!(p.version(), 3);
assert_eq!(p.typ(), SignatureType::Binary);
assert_eq!(p.hash_algo(), HashAlgorithm::SHA512);
assert_eq!(p.pk_algo(), PublicKeyAlgorithm::RSAEncryptSign);
assert_eq!(format!("{:X}", p.issuer()), "7223B56678E02528");
assert_eq!(p.last_raw(), 1);
} else {
panic!("Wrong packet!");
}
}
impl_parse_with_buffered_reader!(
OnePassSig3,
|reader| -> Result<Self> {
OnePassSig::from_buffered_reader(reader).and_then(|p| match p {
OnePassSig::V3(p) => Ok(p),
p => Err(Error::InvalidOperation(
format!("Not a OnePassSig::V3 packet: {:?}", p)).into()),
})
});
impl OnePassSig6 {
#[allow(clippy::blocks_in_if_conditions)]
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
let indent = php.recursion_depth();
tracer!(TRACE, "OnePassSig6", indent);
make_php_try!(php);
let typ = php_try!(php.parse_u8("type"));
let hash_algo = php_try!(php.parse_u8("hash_algo"));
let pk_algo = php_try!(php.parse_u8("pk_algo"));
let salt_len = php_try!(php.parse_u8("salt_len"));
let salt = php_try!(php.parse_bytes("salt", salt_len.into()));
let mut issuer = [0u8; 32];
issuer.copy_from_slice(&php_try!(php.parse_bytes("issuer", 32)));
let last = php_try!(php.parse_u8("last"));
let hash_algo = hash_algo.into();
let typ = typ.into();
let mut sig =
OnePassSig6::new(typ, Fingerprint::from_bytes(6, &issuer)?);
sig.set_salt(salt.clone());
sig.set_hash_algo(hash_algo);
sig.set_pk_algo(pk_algo.into());
sig.set_last_raw(last);
let need_hash = HashingMode::for_salt_and_type(hash_algo, &salt, typ);
let recursion_depth = php.recursion_depth();
let want_hashes_for = if Cookie::processing_csf_message(&php.reader) {
HashesFor::CleartextSignature
} else {
HashesFor::Signature
};
let done = {
let mut done = false;
let mut reader : Option<&mut dyn BufferedReader<Cookie>>
= Some(&mut php.reader);
while let Some(r) = reader {
{
let cookie = r.cookie_mut();
if let Some(br_level) = cookie.level {
if br_level < recursion_depth - 1 {
break;
}
if br_level == recursion_depth - 1
&& cookie.hashes_for == want_hashes_for {
if cookie.saw_last {
cookie.sig_group_push();
cookie.saw_last = false;
cookie.hash_stash =
Some(php.header_bytes.clone());
}
if php.state.settings.automatic_hashing
&& ! cookie.sig_group().hashes.iter()
.any(|mode| {
mode.map(|ctx| ctx.algo()) == need_hash
})
{
if let Ok(ctx) = hash_algo.context() {
let mut ctx = ctx.for_signature(6);
ctx.update(&salt);
cookie.sig_group_mut().hashes.push(
HashingMode::for_salt_and_type(
ctx, &salt, typ)
);
}
}
cookie.sig_group_mut().ops_count += 1;
cookie.saw_last = last > 0;
done = true;
break;
}
} else {
break;
}
}
reader = r.get_mut();
}
done
};
let mut pp = php.ok(Packet::OnePassSig(sig.into()))?;
if done {
return Ok(pp);
}
let mut algos = Vec::new();
if pp.state.settings.automatic_hashing && hash_algo.is_supported() {
algos.push(HashingMode::for_salt_and_type(hash_algo, &salt, typ));
}
assert!(pp.reader.cookie_ref().level <= Some(recursion_depth));
let (fake_eof, reader)
= buffered_reader_stack_pop(Box::new(pp.take_reader()),
recursion_depth)?;
assert!(! fake_eof);
let mut reader = HashedReader::new(
reader, want_hashes_for, algos)?;
reader.cookie_mut().level = Some(recursion_depth - 1);
reader.cookie_mut().sig_group_mut().ops_count += 1;
reader.cookie_mut().saw_last = last > 0;
t!("Pushed a hashed reader, level {:?}", reader.cookie_mut().level);
let mut reader = buffered_reader::Limitor::with_cookie(
reader, 0, Cookie::default());
reader.cookie_mut().level = Some(recursion_depth);
pp.reader = Box::new(reader);
Ok(pp)
}
}
impl_parse_with_buffered_reader!(
OnePassSig6,
|reader| -> Result<Self> {
OnePassSig::from_buffered_reader(reader).and_then(|p| match p {
OnePassSig::V6(p) => Ok(p),
p => Err(Error::InvalidOperation(
format!("Not a OnePassSig::V6 packet: {:?}", p)).into()),
})
});
#[test]
fn one_pass_sig_test () {
struct Test<'a> {
filename: &'a str,
digest_prefix: Vec<[u8; 2]>,
}
let tests = [
Test {
filename: "signed-1.gpg",
digest_prefix: vec![ [ 0x83, 0xF5 ] ],
},
Test {
filename: "signed-2-partial-body.gpg",
digest_prefix: vec![ [ 0x2F, 0xBE ] ],
},
Test {
filename: "signed-3-partial-body-multiple-sigs.gpg",
digest_prefix: vec![ [ 0x29, 0x64 ], [ 0xff, 0x7d ] ],
},
];
for test in tests.iter() {
eprintln!("Trying {}...", test.filename);
let mut ppr = PacketParserBuilder::from_bytes(
crate::tests::message(test.filename))
.expect(&format!("Reading {}", test.filename)[..])
.build().unwrap();
let mut one_pass_sigs = 0;
let mut sigs = 0;
while let PacketParserResult::Some(pp) = ppr {
if let Packet::OnePassSig(_) = pp.packet {
one_pass_sigs += 1;
} else if let Packet::Signature(ref sig) = pp.packet {
eprintln!(" {}:\n prefix: expected: {}, in sig: {}",
test.filename,
crate::fmt::to_hex(&test.digest_prefix[sigs][..], false),
crate::fmt::to_hex(sig.digest_prefix(), false));
eprintln!(" computed hash: {}",
crate::fmt::to_hex(sig.computed_digest().unwrap(),
false));
assert_eq!(&test.digest_prefix[sigs], sig.digest_prefix());
assert_eq!(&test.digest_prefix[sigs][..],
&sig.computed_digest().unwrap()[..2]);
sigs += 1;
} else if one_pass_sigs > 0 {
assert_eq!(one_pass_sigs, test.digest_prefix.len(),
"Number of OnePassSig packets does not match \
number of expected OnePassSig packets.");
}
ppr = pp.recurse().expect("Parsing message").1;
}
assert_eq!(one_pass_sigs, sigs,
"Number of OnePassSig packets does not match \
number of signature packets.");
eprintln!("done.");
}
}
impl Key<key::UnspecifiedParts, key::UnspecifiedRole>
{
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "Key::parse", php.recursion_depth());
make_php_try!(php);
let tag = php.header.ctb().tag();
assert!(tag == Tag::Reserved
|| tag == Tag::PublicKey
|| tag == Tag::PublicSubkey
|| tag == Tag::SecretKey
|| tag == Tag::SecretSubkey);
let version = php_try!(php.parse_u8("version"));
match version {
4 => Key4::parse(php),
6 => Key6::parse(php),
_ => php.fail("unknown version"),
}
}
fn plausible<C, T>(bio: &mut buffered_reader::Dup<T, C>, header: &Header)
-> Result<()>
where T: BufferedReader<C>, C: fmt::Debug + Send + Sync
{
if let BodyLength::Full(len) = header.length() {
if *len < 6 {
return Err(Error::MalformedPacket(
format!("Packet too short ({} bytes)", len)).into());
}
} else {
return Err(
Error::MalformedPacket(
format!("Unexpected body length encoding: {:?}",
header.length())).into());
}
let data = bio.data(6)?;
if data.len() < 6 {
return Err(
Error::MalformedPacket("Short read".into()).into());
}
let version = data[0];
match version {
4 => Key4::plausible(bio, header),
6 => Key6::plausible(bio, header),
n => Err(Error::MalformedPacket(
format!("Unknown version {}", n)).into()),
}
}
}
impl Key4<key::UnspecifiedParts, key::UnspecifiedRole>
{
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "Key4::parse", php.recursion_depth());
make_php_try!(php);
let tag = php.header.ctb().tag();
assert!(tag == Tag::Reserved
|| tag == Tag::PublicKey
|| tag == Tag::PublicSubkey
|| tag == Tag::SecretKey
|| tag == Tag::SecretSubkey);
let creation_time = php_try!(php.parse_be_u32("creation_time"));
let pk_algo: PublicKeyAlgorithm = php_try!(php.parse_u8("pk_algo")).into();
let mpis = php_try!(PublicKey::_parse(pk_algo, &mut php));
let secret = if let Ok(s2k_usage) = php.parse_u8("s2k_usage") {
use crypto::mpi;
let sec = match s2k_usage {
0 => {
let sec = php_try!(
mpi::SecretKeyMaterial::_parse(
pk_algo, &mut php,
Some(mpi::SecretKeyChecksum::Sum16)));
sec.into()
}
253 => {
let sym_algo: SymmetricAlgorithm =
php_try!(php.parse_u8("sym_algo")).into();
let aead_algo: AEADAlgorithm =
php_try!(php.parse_u8("aead_algo")).into();
let s2k = php_try!(S2K::parse_v4(&mut php));
let aead_iv = php_try!(php.parse_bytes(
"aead_iv",
aead_algo.nonce_size().unwrap_or(0)))
.into();
let cipher =
php_try!(php.parse_bytes_eof("encrypted_mpis"))
.into_boxed_slice();
crate::packet::key::Encrypted::new_aead(
s2k, sym_algo, aead_algo, aead_iv, cipher).into()
},
_ => {
let sk: SymmetricAlgorithm = match s2k_usage {
254 | 255 =>
php_try!(php.parse_u8("sym_algo")).into(),
_ => s2k_usage.into(),
};
let s2k = match s2k_usage {
254 | 255 => php_try!(S2K::parse_v4(&mut php)),
_ => {
#[allow(deprecated)] S2K::Implicit
},
};
let s2k_supported = s2k.is_supported();
let cipher =
php_try!(php.parse_bytes_eof("encrypted_mpis"))
.into_boxed_slice();
crate::packet::key::Encrypted::new_raw(
s2k, sk,
match s2k_usage {
254 => Some(mpi::SecretKeyChecksum::SHA1),
255 => Some(mpi::SecretKeyChecksum::Sum16),
_ => Some(mpi::SecretKeyChecksum::Sum16),
},
if s2k_supported {
Ok((0, cipher))
} else {
Err(cipher)
},
).into()
}
};
Some(sec)
} else {
None
};
let have_secret = secret.is_some();
if have_secret {
if tag == Tag::PublicKey || tag == Tag::PublicSubkey {
return php.error(Error::MalformedPacket(
format!("Unexpected secret key found in {:?} packet", tag)
).into());
}
} else if tag == Tag::SecretKey || tag == Tag::SecretSubkey {
return php.error(Error::MalformedPacket(
format!("Expected secret key in {:?} packet", tag)
).into());
}
fn k<R>(creation_time: u32,
pk_algo: PublicKeyAlgorithm,
mpis: PublicKey)
-> Result<Key4<key::PublicParts, R>>
where R: key::KeyRole
{
Key4::make(creation_time, pk_algo, mpis, None)
}
fn s<R>(creation_time: u32,
pk_algo: PublicKeyAlgorithm,
mpis: PublicKey,
secret: SecretKeyMaterial)
-> Result<Key4<key::SecretParts, R>>
where R: key::KeyRole
{
Key4::make(creation_time, pk_algo, mpis, Some(secret))
}
let tag = php.header.ctb().tag();
let p : Packet = match tag {
Tag::Reserved => if have_secret {
Packet::SecretKey(
php_try!(s(creation_time, pk_algo, mpis, secret.unwrap()))
.into())
} else {
Packet::PublicKey(
php_try!(k(creation_time, pk_algo, mpis)).into())
},
Tag::PublicKey => Packet::PublicKey(
php_try!(k(creation_time, pk_algo, mpis)).into()),
Tag::PublicSubkey => Packet::PublicSubkey(
php_try!(k(creation_time, pk_algo, mpis)).into()),
Tag::SecretKey => Packet::SecretKey(
php_try!(s(creation_time, pk_algo, mpis, secret.unwrap()))
.into()),
Tag::SecretSubkey => Packet::SecretSubkey(
php_try!(s(creation_time, pk_algo, mpis, secret.unwrap()))
.into()),
_ => unreachable!(),
};
php.ok(p)
}
fn plausible<C>(bio: &mut dyn BufferedReader<C>, _: &Header)
-> Result<()>
where
C: fmt::Debug + Send + Sync,
{
let data = bio.data(6)?;
if data.len() < 6 {
return Err(
Error::MalformedPacket("Short read".into()).into());
}
let version = data[0];
let pk_algo : PublicKeyAlgorithm = data[5].into();
if version == 4 && !matches!(pk_algo, PublicKeyAlgorithm::Unknown(_)) {
Ok(())
} else {
Err(Error::MalformedPacket("Invalid or unsupported data".into())
.into())
}
}
}
impl Key6<key::UnspecifiedParts, key::UnspecifiedRole>
{
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "Key6::parse", php.recursion_depth());
make_php_try!(php);
let tag = php.header.ctb().tag();
assert!(tag == Tag::Reserved
|| tag == Tag::PublicKey
|| tag == Tag::PublicSubkey
|| tag == Tag::SecretKey
|| tag == Tag::SecretSubkey);
let creation_time = php_try!(php.parse_be_u32("creation_time"));
let pk_algo: PublicKeyAlgorithm = php_try!(php.parse_u8("pk_algo")).into();
let public_len = php_try!(php.parse_be_u32("public_len"));
let public_mpis =
php.variable_sized_field_start("public_mpis", public_len);
let mpis = php_try!(PublicKey::_parse(pk_algo, &mut php));
php_try!(php.variable_sized_field_end(public_mpis));
let secret = if let Ok(s2k_usage) = php.parse_u8("s2k_usage") {
use crypto::mpi;
let sec = match s2k_usage {
0 => {
let sec = php_try!(
mpi::SecretKeyMaterial::_parse(
pk_algo, &mut php, None));
sec.into()
},
1..=252 => {
return php.fail("unsupported secret key encryption");
},
253 => {
let parameters_len =
php_try!(php.parse_u8("parameters_len"));
let parameters =
php.variable_sized_field_start("parameters",
parameters_len);
let sym_algo: SymmetricAlgorithm =
php_try!(php.parse_u8("sym_algo")).into();
let aead_algo: AEADAlgorithm =
php_try!(php.parse_u8("aead_algo")).into();
let s2k_len = php_try!(php.parse_u8("s2k_len"));
let s2k_params =
php.variable_sized_field_start("s2k_params", s2k_len);
let s2k = php_try!(S2K::parse_v6(&mut php, s2k_len as _));
php_try!(php.variable_sized_field_end(s2k_params));
let aead_iv = php_try!(php.parse_bytes(
"aead_iv",
php.variable_sized_field_remaining(¶meters)))
.into();
php_try!(php.variable_sized_field_end(parameters));
let cipher =
php_try!(php.parse_bytes_eof("encrypted_mpis"))
.into_boxed_slice();
crate::packet::key::Encrypted::new_aead(
s2k, sym_algo, aead_algo, aead_iv, cipher).into()
},
254 | 255 => {
let parameters_len =
php_try!(php.parse_u8("parameters_len"));
let parameters =
php.variable_sized_field_start("parameters",
parameters_len);
let sym_algo: SymmetricAlgorithm =
php_try!(php.parse_u8("sym_algo")).into();
let s2k_len = php_try!(php.parse_u8("s2k_len"));
let s2k_params =
php.variable_sized_field_start("s2k_params", s2k_len);
let s2k = php_try!(S2K::parse_v6(&mut php, s2k_len as _));
php_try!(php.variable_sized_field_end(s2k_params));
let cfb_iv = php_try!(php.parse_bytes(
"cfb_iv",
php.variable_sized_field_remaining(¶meters)));
php_try!(php.variable_sized_field_end(parameters));
let cipher =
php_try!(php.parse_bytes_eof("encrypted_mpis"));
let cfb_iv_len = cfb_iv.len();
let mut combined_ciphertext = cfb_iv;
combined_ciphertext.extend_from_slice(&cipher);
crate::packet::key::Encrypted::new_raw(
s2k, sym_algo,
if s2k_usage == 254 {
Some(mpi::SecretKeyChecksum::SHA1)
} else {
Some(mpi::SecretKeyChecksum::Sum16)
},
Ok((cfb_iv_len, combined_ciphertext.into())))
.into()
},
};
Some(sec)
} else {
None
};
let have_secret = secret.is_some();
if have_secret {
if tag == Tag::PublicKey || tag == Tag::PublicSubkey {
return php.error(Error::MalformedPacket(
format!("Unexpected secret key found in {:?} packet", tag)
).into());
}
} else if tag == Tag::SecretKey || tag == Tag::SecretSubkey {
return php.error(Error::MalformedPacket(
format!("Expected secret key in {:?} packet", tag)
).into());
}
fn k<R>(creation_time: u32,
pk_algo: PublicKeyAlgorithm,
mpis: PublicKey)
-> Result<Key6<key::PublicParts, R>>
where R: key::KeyRole
{
Key6::make(creation_time, pk_algo, mpis, None)
}
fn s<R>(creation_time: u32,
pk_algo: PublicKeyAlgorithm,
mpis: PublicKey,
secret: SecretKeyMaterial)
-> Result<Key6<key::SecretParts, R>>
where R: key::KeyRole
{
Key6::make(creation_time, pk_algo, mpis, Some(secret))
}
let tag = php.header.ctb().tag();
let p : Packet = match tag {
Tag::Reserved => if have_secret {
Packet::SecretKey(
php_try!(s(creation_time, pk_algo, mpis, secret.unwrap()))
.into())
} else {
Packet::PublicKey(
php_try!(k(creation_time, pk_algo, mpis)).into())
},
Tag::PublicKey => Packet::PublicKey(
php_try!(k(creation_time, pk_algo, mpis)).into()),
Tag::PublicSubkey => Packet::PublicSubkey(
php_try!(k(creation_time, pk_algo, mpis)).into()),
Tag::SecretKey => Packet::SecretKey(
php_try!(s(creation_time, pk_algo, mpis, secret.unwrap()))
.into()),
Tag::SecretSubkey => Packet::SecretSubkey(
php_try!(s(creation_time, pk_algo, mpis, secret.unwrap()))
.into()),
_ => unreachable!(),
};
php.ok(p)
}
fn plausible<C>(bio: &mut dyn BufferedReader<C>, header: &Header)
-> Result<()>
where
C: fmt::Debug + Send + Sync,
{
const MIN: usize = 10;
let data = bio.data(MIN)?;
if data.len() < MIN {
return Err(
Error::MalformedPacket("Short read".into()).into());
}
let version = data[0];
let creation_time =
u32::from_be_bytes(data[1..5].try_into().unwrap());
let pk_algo: PublicKeyAlgorithm = data[5].into();
let public_len =
u32::from_be_bytes(data[6..10].try_into().unwrap());
const RFC9580_PUBLICATION_TIME: u32 = 1722376800;
if version == 6
&& !matches!(pk_algo, PublicKeyAlgorithm::Unknown(_))
&& creation_time >= RFC9580_PUBLICATION_TIME
&& match header.length() {
BodyLength::Full(len) => public_len < *len,
_ => false,
}
{
Ok(())
} else {
Err(Error::MalformedPacket("Invalid or unsupported data".into())
.into())
}
}
}
use key::UnspecifiedKey;
impl_parse_with_buffered_reader!(
UnspecifiedKey,
|br| -> Result<Self> {
let parser = PacketHeaderParser::new_naked(br);
let mut pp = Self::parse(parser)?;
pp.buffer_unread_content()?;
match pp.next()? {
(Packet::PublicKey(o), PacketParserResult::EOF(_)) => Ok(o.into()),
(Packet::PublicSubkey(o), PacketParserResult::EOF(_)) => Ok(o.into()),
(Packet::SecretKey(o), PacketParserResult::EOF(_)) => Ok(o.into()),
(Packet::SecretSubkey(o), PacketParserResult::EOF(_)) => Ok(o.into()),
(Packet::Unknown(u), PacketParserResult::EOF(_)) =>
Err(u.into_error()),
(p, PacketParserResult::EOF(_)) =>
Err(Error::InvalidOperation(
format!("Not a Key packet: {:?}", p)).into()),
(_, PacketParserResult::Some(_)) =>
Err(Error::InvalidOperation(
"Excess data after packet".into()).into()),
}
});
impl Trust {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "Trust::parse", php.recursion_depth());
make_php_try!(php);
let value = php_try!(php.parse_bytes_eof("value"));
php.ok(Packet::Trust(Trust::from(value)))
}
}
impl_parse_with_buffered_reader!(Trust);
impl UserID {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "UserID::parse", php.recursion_depth());
make_php_try!(php);
let value = php_try!(php.parse_bytes_eof("value"));
php.ok(Packet::UserID(UserID::from(value)))
}
}
impl_parse_with_buffered_reader!(UserID);
impl UserAttribute {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "UserAttribute::parse", php.recursion_depth());
make_php_try!(php);
let value = php_try!(php.parse_bytes_eof("value"));
php.ok(Packet::UserAttribute(UserAttribute::from(value)))
}
}
impl_parse_with_buffered_reader!(UserAttribute);
impl Marker {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser>
{
tracer!(TRACE, "Marker::parse", php.recursion_depth());
make_php_try!(php);
let marker = php_try!(php.parse_bytes("marker", Marker::BODY.len()));
if &marker[..] == Marker::BODY {
php.ok(Marker::default().into())
} else {
php.fail("invalid marker")
}
}
fn plausible<C, T>(bio: &mut buffered_reader::Dup<T, C>, header: &Header)
-> Result<()>
where T: BufferedReader<C>, C: fmt::Debug + Send + Sync
{
if let BodyLength::Full(len) = header.length() {
let len = *len;
if len as usize != Marker::BODY.len() {
return Err(Error::MalformedPacket(
format!("Unexpected packet length {}", len)).into());
}
} else {
return Err(Error::MalformedPacket(
format!("Unexpected body length encoding: {:?}",
header.length())).into());
}
let data = bio.data(Marker::BODY.len())?;
if data.len() < Marker::BODY.len() {
return Err(Error::MalformedPacket("Short read".into()).into());
}
if data == Marker::BODY {
Ok(())
} else {
Err(Error::MalformedPacket("Invalid or unsupported data".into())
.into())
}
}
}
impl_parse_with_buffered_reader!(Marker);
impl Literal {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser>
{
tracer!(TRACE, "Literal::parse", php.recursion_depth());
make_php_try!(php);
let format = php_try!(php.parse_u8("format"));
let filename_len = php_try!(php.parse_u8("filename_len"));
let filename = if filename_len > 0 {
Some(php_try!(php.parse_bytes("filename", filename_len as usize)))
} else {
None
};
let date = php_try!(php.parse_be_u32("date"));
let recursion_depth = php.recursion_depth();
let mut literal = Literal::new(format.into());
if let Some(filename) = filename {
literal.set_filename(&filename)
.expect("length checked above");
}
literal.set_date(
Some(std::time::SystemTime::from(Timestamp::from(date))))?;
let mut pp = php.ok(Packet::Literal(literal))?;
Cookie::hashing(pp.mut_reader(), Hashing::Enabled,
recursion_depth - 1);
Ok(pp)
}
}
impl_parse_with_buffered_reader!(Literal);
#[test]
fn literal_parser_test () {
use crate::types::DataFormat;
{
let data = crate::tests::message("literal-mode-b.gpg");
let mut pp = PacketParser::from_bytes(data).unwrap().unwrap();
assert_eq!(pp.header.length(), &BodyLength::Full(18));
let content = pp.steal_eof().unwrap();
let p = pp.finish().unwrap();
if let &Packet::Literal(ref p) = p {
assert_eq!(p.format(), DataFormat::Binary);
assert_eq!(p.filename().unwrap()[..], b"foobar"[..]);
assert_eq!(p.date().unwrap(), Timestamp::from(1507458744).into());
assert_eq!(content, b"FOOBAR");
} else {
panic!("Wrong packet!");
}
}
{
let data = crate::tests::message("literal-mode-t-partial-body.gpg");
let mut pp = PacketParser::from_bytes(data).unwrap().unwrap();
assert_eq!(pp.header.length(), &BodyLength::Partial(4096));
let content = pp.steal_eof().unwrap();
let p = pp.finish().unwrap();
if let &Packet::Literal(ref p) = p {
#[allow(deprecated)] {
assert_eq!(p.format(), DataFormat::Text);
}
assert_eq!(p.filename().unwrap()[..],
b"manifesto.txt"[..]);
assert_eq!(p.date().unwrap(), Timestamp::from(1508000649).into());
let expected = crate::tests::manifesto();
assert_eq!(&content[..], expected);
} else {
panic!("Wrong packet!");
}
}
}
impl CompressedData {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
let recursion_depth = php.recursion_depth();
tracer!(TRACE, "CompressedData::parse", recursion_depth);
make_php_try!(php);
let algo: CompressionAlgorithm =
php_try!(php.parse_u8("algo")).into();
let recursion_depth = php.recursion_depth();
let mut pp = php.ok(Packet::CompressedData(CompressedData::new(algo)))?;
#[allow(unreachable_patterns)]
match algo {
CompressionAlgorithm::Uncompressed => (),
#[cfg(feature = "compression-deflate")]
CompressionAlgorithm::Zip
| CompressionAlgorithm::Zlib => (),
#[cfg(feature = "compression-bzip2")]
CompressionAlgorithm::BZip2 => (),
_ => {
t!("Algorithm {} unknown or unsupported.", algo);
return Ok(pp.set_processed(false));
},
}
t!("Pushing a decompressor for {}, recursion depth = {:?}.",
algo, recursion_depth);
let reader = pp.take_reader();
let reader = match algo {
CompressionAlgorithm::Uncompressed => {
if TRACE {
eprintln!("CompressedData::parse(): Actually, no need \
for a compression filter: this is an \
\"uncompressed compression packet\".");
}
let _ = recursion_depth;
reader
},
#[cfg(feature = "compression-deflate")]
CompressionAlgorithm::Zip =>
Box::new(buffered_reader::Deflate::with_cookie(
reader, Cookie::new(recursion_depth))),
#[cfg(feature = "compression-deflate")]
CompressionAlgorithm::Zlib =>
Box::new(buffered_reader::Zlib::with_cookie(
reader, Cookie::new(recursion_depth))),
#[cfg(feature = "compression-bzip2")]
CompressionAlgorithm::BZip2 =>
Box::new(buffered_reader::Bzip::with_cookie(
reader, Cookie::new(recursion_depth))),
_ => unreachable!(), };
pp.set_reader(reader);
Ok(pp)
}
}
impl_parse_with_buffered_reader!(CompressedData);
#[cfg(any(feature = "compression-deflate", feature = "compression-bzip2"))]
#[test]
fn compressed_data_parser_test () {
use crate::types::DataFormat;
let expected = crate::tests::manifesto();
for i in 1..4 {
match CompressionAlgorithm::from(i) {
#[cfg(feature = "compression-deflate")]
CompressionAlgorithm::Zip | CompressionAlgorithm::Zlib => (),
#[cfg(feature = "compression-bzip2")]
CompressionAlgorithm::BZip2 => (),
_ => continue,
}
let pp = PacketParser::from_bytes(crate::tests::message(
&format!("compressed-data-algo-{}.gpg", i))).unwrap().unwrap();
if let Packet::CompressedData(ref compressed) = pp.packet {
assert_eq!(compressed.algo(), i.into());
} else {
panic!("Wrong packet!");
}
let ppr = pp.recurse().unwrap().1;
let mut pp = ppr.unwrap();
assert_eq!(pp.recursion_depth(), 1);
let content = pp.steal_eof().unwrap();
let (literal, ppr) = pp.recurse().unwrap();
if let Packet::Literal(literal) = literal {
assert_eq!(literal.filename(), None);
assert_eq!(literal.format(), DataFormat::Binary);
assert_eq!(literal.date().unwrap(),
Timestamp::from(1509219866).into());
assert_eq!(content, expected.to_vec());
} else {
panic!("Wrong packet!");
}
assert!(ppr.is_eof());
}
}
impl SKESK {
fn parse(mut php: PacketHeaderParser)
-> Result<PacketParser>
{
tracer!(TRACE, "SKESK::parse", php.recursion_depth());
make_php_try!(php);
let version = php_try!(php.parse_u8("version"));
match version {
4 => SKESK4::parse(php),
6 => SKESK6::parse(php),
_ => php.fail("unknown version"),
}
}
}
impl SKESK4 {
fn parse(mut php: PacketHeaderParser)
-> Result<PacketParser>
{
tracer!(TRACE, "SKESK4::parse", php.recursion_depth());
make_php_try!(php);
let sym_algo = php_try!(php.parse_u8("sym_algo"));
let s2k = php_try!(S2K::parse_v4(&mut php));
let s2k_supported = s2k.is_supported();
let esk = php_try!(php.parse_bytes_eof("esk"));
let skesk = php_try!(SKESK4::new_raw(
sym_algo.into(),
s2k,
if s2k_supported || esk.is_empty() {
Ok(if ! esk.is_empty() {
Some(esk.into())
} else {
None
})
} else {
Err(esk.into())
},
));
php.ok(skesk.into())
}
}
impl SKESK6 {
fn parse(mut php: PacketHeaderParser)
-> Result<PacketParser>
{
tracer!(TRACE, "SKESK5::parse", php.recursion_depth());
make_php_try!(php);
let parameter_len = php_try!(php.parse_u8_len("parameter_len"));
if parameter_len < 1 + 1 + 1 + 2 + 12 {
return php.fail("expected at least 16 parameter octets");
}
let sym_algo: SymmetricAlgorithm =
php_try!(php.parse_u8("sym_algo")).into();
let aead_algo: AEADAlgorithm =
php_try!(php.parse_u8("aead_algo")).into();
let s2k_len = php_try!(php.parse_u8_len("s2k_len"));
if parameter_len < 1 + 1 + 1 + s2k_len + 12 {
return php.fail("S2K overflows parameter count");
}
let s2k = php_try!(S2K::parse_v6(&mut php, s2k_len as u8));
let iv =
if let Some(iv_len) = parameter_len.checked_sub(1 + 1 + 1 + s2k_len) {
php_try!(php.parse_bytes("iv", iv_len as usize)).into()
} else {
return php.fail("IV overflows parameter count");
};
let esk = php_try!(php.parse_bytes_eof("esk")).into();
let skesk = php_try!(SKESK6::new(
sym_algo,
aead_algo,
s2k,
iv,
esk,
));
php.ok(skesk.into())
}
}
impl_parse_with_buffered_reader!(SKESK);
#[test]
fn skesk_parser_test() {
use crate::crypto::Password;
struct Test<'a> {
filename: &'a str,
s2k: S2K,
cipher_algo: SymmetricAlgorithm,
password: Password,
key_hex: &'a str,
}
let tests = [
Test {
filename: "s2k/mode-3-encrypted-key-password-bgtyhn.gpg",
cipher_algo: SymmetricAlgorithm::AES128,
s2k: S2K::Iterated {
hash: HashAlgorithm::SHA1,
salt: [0x82, 0x59, 0xa0, 0x6e, 0x98, 0xda, 0x94, 0x1c],
hash_bytes: S2K::decode_count(238),
},
password: "bgtyhn".into(),
key_hex: "474E5C373BA18AF0A499FCAFE6093F131DF636F6A3812B9A8AE707F1F0214AE9",
},
];
for test in tests.iter() {
let pp = PacketParser::from_bytes(
crate::tests::message(test.filename)).unwrap().unwrap();
if let Packet::SKESK(SKESK::V4(ref skesk)) = pp.packet {
eprintln!("{:?}", skesk);
assert_eq!(skesk.symmetric_algo(), test.cipher_algo);
assert_eq!(skesk.s2k(), &test.s2k);
match skesk.decrypt(&test.password) {
Ok((_sym_algo, key)) => {
let key = crate::fmt::to_hex(&key[..], false);
assert_eq!(&key[..], test.key_hex);
}
Err(e) => {
panic!("No session key, got: {:?}", e);
}
}
} else {
panic!("Wrong packet!");
}
}
}
impl SEIP {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "SEIP::parse", php.recursion_depth());
make_php_try!(php);
let version = php_try!(php.parse_u8("version"));
match version {
1 => SEIP1::parse(php),
2 => SEIP2::parse(php),
_ => php.fail("unknown version"),
}
}
}
impl_parse_with_buffered_reader!(SEIP);
impl SEIP1 {
fn parse(php: PacketHeaderParser) -> Result<PacketParser> {
php.ok(SEIP1::new().into())
.map(|pp| pp.set_processed(false))
}
}
impl SEIP2 {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "SEIP2::parse", php.recursion_depth());
make_php_try!(php);
let cipher: SymmetricAlgorithm =
php_try!(php.parse_u8("sym_algo")).into();
let aead: AEADAlgorithm =
php_try!(php.parse_u8("aead_algo")).into();
let chunk_size = php_try!(php.parse_u8("chunk_size"));
if chunk_size > 16 {
return php.fail("unsupported chunk size");
}
let chunk_size: u64 = 1 << (chunk_size + 6);
let salt_v = php_try!(php.parse_bytes("salt", 32));
let mut salt = [0u8; 32];
salt.copy_from_slice(&salt_v);
let seip2 = php_try!(Self::new(cipher, aead, chunk_size, salt));
php.ok(seip2.into()).map(|pp| pp.set_processed(false))
}
}
impl MDC {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "MDC::parse", php.recursion_depth());
make_php_try!(php);
let mut computed_digest : [u8; 20] = Default::default();
{
let mut r : Option<&mut dyn BufferedReader<Cookie>>
= Some(&mut php.reader);
while let Some(bio) = r {
{
let state = bio.cookie_mut();
if state.hashes_for == HashesFor::MDC {
if !state.sig_group().hashes.is_empty() {
let h = state.sig_group_mut().hashes
.iter_mut().find_map(
|mode|
if matches!(mode.map(|ctx| ctx.algo()),
HashingMode::Binary(_, HashAlgorithm::SHA1))
{
Some(mode.as_mut())
} else {
None
}).unwrap();
let _ = h.digest(&mut computed_digest);
}
break;
}
}
r = bio.get_mut();
}
}
let mut digest: [u8; 20] = Default::default();
digest.copy_from_slice(&php_try!(php.parse_bytes("digest", 20)));
#[allow(deprecated)]
php.ok(Packet::MDC(MDC::new(digest, computed_digest)))
}
}
impl_parse_with_buffered_reader!(MDC);
impl Padding {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "Padding::parse", php.recursion_depth());
make_php_try!(php);
let value = php_try!(php.parse_bytes_eof("value"));
php.ok(Packet::Padding(Padding::from(value)))
}
}
impl_parse_with_buffered_reader!(Padding);
impl MPI {
fn parse(name_len: &'static str,
name: &'static str,
php: &mut PacketHeaderParser<'_>) -> Result<Self> {
Ok(MPI::parse_common(name_len, name, false, false, php)?.into())
}
fn parse_common(
name_len: &'static str,
name: &'static str,
parsing_secrets: bool,
lenient_parsing: bool,
php: &mut PacketHeaderParser<'_>)
-> Result<Vec<u8>> {
let uniform_error_for_secrets = |e: Error| {
if parsing_secrets {
Err(Error::MalformedMPI("Details omitted, \
parsing secret".into()).into())
} else {
Err(e.into())
}
};
let bits = {
let buf = php.reader.data_hard(2)?;
u16::from_be_bytes([buf[0], buf[1]]) as usize
};
if bits == 0 {
php.parse_be_u16(name_len).expect("worked before");
return Ok(vec![]);
}
let bytes = (bits + 7) / 8;
let value = {
let buf = php.reader.data_hard(2 + bytes)?;
Vec::from(&buf[2..2 + bytes])
};
let unused_bits = bytes * 8 - bits;
assert_eq!(bytes * 8 - unused_bits, bits);
if unused_bits > 0 {
let mask = !((1 << (8 - unused_bits)) - 1);
let unused_value = value[0] & mask;
if unused_value != 0 && ! lenient_parsing {
return uniform_error_for_secrets(
Error::MalformedMPI(
format!("{} unused bits not zeroed: ({:x})",
unused_bits, unused_value)
));
}
}
let first_used_bit = 8 - unused_bits;
if value[0] & (1 << (first_used_bit - 1)) == 0 && ! lenient_parsing {
return uniform_error_for_secrets(
Error::MalformedMPI(
format!("leading bit is not set: \
expected bit {} to be set in {:8b} ({:x})",
first_used_bit, value[0], value[0])
));
}
php.reader.consume(2 + bytes);
php.field(name_len, 2);
php.field(name, bytes);
Ok(value)
}
}
impl_parse_with_buffered_reader!(
MPI,
|bio: Box<dyn BufferedReader<Cookie>>| -> Result<Self> {
let mut parser = PacketHeaderParser::new_naked(bio.into_boxed());
Self::parse("(none_len)", "(none)", &mut parser)
});
impl ProtectedMPI {
fn parse(name_len: &'static str,
name: &'static str,
php: &mut PacketHeaderParser<'_>) -> Result<Self> {
Ok(MPI::parse_common(name_len, name, true, false, php)?.into())
}
}
impl PKESK {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "PKESK::parse", php.recursion_depth());
make_php_try!(php);
let version = php_try!(php.parse_u8("version"));
match version {
3 => PKESK3::parse(php),
6 => PKESK6::parse(php),
_ => php.fail("unknown version"),
}
}
}
impl_parse_with_buffered_reader!(PKESK);
impl PKESK3 {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "PKESK3::parse", php.recursion_depth());
make_php_try!(php);
let keyid = {
let mut keyid = [0u8; 8];
keyid.copy_from_slice(&php_try!(php.parse_bytes("keyid", 8)));
let keyid = KeyID::from_bytes(&keyid);
if keyid.is_wildcard() {
None
} else {
Some(keyid)
}
};
let pk_algo: PublicKeyAlgorithm = php_try!(php.parse_u8("pk_algo")).into();
if ! pk_algo.for_encryption() {
return php.fail("not an encryption algorithm");
}
let mpis = crypto::mpi::Ciphertext::_parse(pk_algo, &mut php)?;
let pkesk = php_try!(PKESK3::new(keyid, pk_algo, mpis));
php.ok(pkesk.into())
}
}
impl_parse_with_buffered_reader!(
PKESK3,
|reader| -> Result<Self> {
PKESK::from_buffered_reader(reader).and_then(|p| match p {
PKESK::V3(p) => Ok(p),
p => Err(Error::InvalidOperation(
format!("Not a PKESKv3 packet: {:?}", p)).into()),
})
});
impl PKESK6 {
fn parse(mut php: PacketHeaderParser) -> Result<PacketParser> {
tracer!(TRACE, "PKESK6::parse", php.recursion_depth());
make_php_try!(php);
let fp_len = php_try!(php.parse_u8("recipient_len"));
let fingerprint = if fp_len == 0 {
None
} else {
let fp_version = php_try!(php.parse_u8("recipient_version"));
if let Some(expected_length) = match fp_version {
4 => Some(20),
6 => Some(32),
_ => None,
} {
if fp_len - 1 != expected_length {
return php.fail("bad fingerprint length");
}
}
Some(Fingerprint::from_bytes(
fp_version,
&php_try!(php.parse_bytes("recipient", (fp_len - 1).into())))?)
};
let pk_algo: PublicKeyAlgorithm =
php_try!(php.parse_u8("pk_algo")).into();
if ! pk_algo.for_encryption() { return php.fail("not an encryption algorithm");
}
let mpis = crypto::mpi::Ciphertext::_parse(pk_algo, &mut php)?;
let pkesk = php_try!(PKESK6::new(fingerprint, pk_algo, mpis));
php.ok(pkesk.into())
}
}
impl_parse_with_buffered_reader!(
PKESK6,
|reader| -> Result<Self> {
PKESK::from_buffered_reader(reader).and_then(|p| match p {
PKESK::V6(p) => Ok(p),
p => Err(Error::InvalidOperation(
format!("Not a PKESKv6 packet: {:?}", p)).into()),
})
});
impl_parse_with_buffered_reader!(
Packet,
|br| -> Result<Self> {
let ppr =
PacketParserBuilder::from_buffered_reader(br)
?.buffer_unread_content().build()?;
let (p, ppr) = match ppr {
PacketParserResult::Some(pp) => {
pp.next()?
},
PacketParserResult::EOF(_) =>
return Err(Error::InvalidOperation(
"Unexpected EOF".into()).into()),
};
match (p, ppr) {
(p, PacketParserResult::EOF(_)) =>
Ok(p),
(_, PacketParserResult::Some(_)) =>
Err(Error::InvalidOperation(
"Excess data after packet".into()).into()),
}
});
#[derive(Debug)]
struct PacketParserState {
settings: PacketParserSettings,
message_validator: MessageValidator,
keyring_validator: KeyringValidator,
cert_validator: CertValidator,
first_packet: bool,
pending_error: Option<anyhow::Error>,
}
impl PacketParserState {
fn new(settings: PacketParserSettings) -> Self {
PacketParserState {
settings,
message_validator: Default::default(),
keyring_validator: Default::default(),
cert_validator: Default::default(),
first_packet: true,
pending_error: None,
}
}
}
pub struct PacketParser<'a> {
header: Header,
pub packet: Packet,
path: Vec<usize>,
last_path: Vec<usize>,
reader: Box<dyn BufferedReader<Cookie> + 'a>,
content_was_read: bool,
finished: bool,
processed: bool,
map: Option<map::Map>,
body_hash: Option<Box<Xxh3>>,
state: PacketParserState,
}
assert_send_and_sync!(PacketParser<'_>);
impl<'a> std::fmt::Display for PacketParser<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "PacketParser")
}
}
impl<'a> std::fmt::Debug for PacketParser<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
f.debug_struct("PacketParser")
.field("header", &self.header)
.field("packet", &self.packet)
.field("path", &self.path)
.field("last_path", &self.last_path)
.field("processed", &self.processed)
.field("content_was_read", &self.content_was_read)
.field("settings", &self.state.settings)
.field("map", &self.map)
.finish()
}
}
enum ParserResult<'a> {
Success(PacketParser<'a>),
EOF((Box<dyn BufferedReader<Cookie> + 'a>, PacketParserState, Vec<usize>)),
}
#[derive(Debug)]
pub struct PacketParserEOF<'a> {
state: PacketParserState,
reader: Box<dyn BufferedReader<Cookie> + 'a>,
last_path: Vec<usize>,
}
assert_send_and_sync!(PacketParserEOF<'_>);
impl<'a> PacketParserEOF<'a> {
fn new(mut state: PacketParserState,
reader: Box<dyn BufferedReader<Cookie> + 'a>)
-> Self {
state.message_validator.finish();
state.keyring_validator.finish();
state.cert_validator.finish();
PacketParserEOF {
state,
reader,
last_path: vec![],
}
}
fn empty() -> Self {
Self::new(
PacketParserState::new(Default::default()),
buffered_reader::Memory::with_cookie(b"", Default::default())
.into_boxed())
}
pub fn is_message(&self) -> Result<()> {
use crate::message::MessageValidity;
match self.state.message_validator.check() {
MessageValidity::Message => Ok(()),
MessageValidity::MessagePrefix => unreachable!(),
MessageValidity::Error(err) => Err(err),
}
}
pub fn is_keyring(&self) -> Result<()> {
match self.state.keyring_validator.check() {
KeyringValidity::Keyring => Ok(()),
KeyringValidity::KeyringPrefix => unreachable!(),
KeyringValidity::Error(err) => Err(err),
}
}
pub fn is_cert(&self) -> Result<()> {
match self.state.cert_validator.check() {
CertValidity::Cert => Ok(()),
CertValidity::CertPrefix => unreachable!(),
CertValidity::Error(err) => Err(err),
}
}
pub fn last_path(&self) -> &[usize] {
&self.last_path[..]
}
pub fn last_recursion_depth(&self) -> Option<isize> {
if self.last_path.is_empty() {
None
} else {
Some(self.last_path.len() as isize - 1)
}
}
pub fn into_reader(self) -> Box<dyn BufferedReader<Cookie> + 'a> {
self.reader
}
}
#[derive(Debug)]
pub enum PacketParserResult<'a> {
Some(PacketParser<'a>),
EOF(PacketParserEOF<'a>),
}
assert_send_and_sync!(PacketParserResult<'_>);
impl<'a> PacketParserResult<'a> {
pub fn is_eof(&self) -> bool {
matches!(self, PacketParserResult::EOF(_))
}
pub fn is_some(&self) -> bool {
! Self::is_eof(self)
}
pub fn expect(self, msg: &str) -> PacketParser<'a> {
if let PacketParserResult::Some(pp) = self {
pp
} else {
panic!("{}", msg);
}
}
pub fn unwrap(self) -> PacketParser<'a> {
self.expect("called `PacketParserResult::unwrap()` on a \
`PacketParserResult::PacketParserEOF` value")
}
pub fn as_ref(&self)
-> StdResult<&PacketParser<'a>, &PacketParserEOF> {
match self {
PacketParserResult::Some(pp) => Ok(pp),
PacketParserResult::EOF(eof) => Err(eof),
}
}
pub fn as_mut(&mut self)
-> StdResult<&mut PacketParser<'a>, &mut PacketParserEOF<'a>>
{
match self {
PacketParserResult::Some(pp) => Ok(pp),
PacketParserResult::EOF(eof) => Err(eof),
}
}
pub fn take(&mut self) -> Self {
mem::replace(
self,
PacketParserResult::EOF(PacketParserEOF::empty()))
}
pub fn map<U, F>(self, f: F) -> StdResult<U, PacketParserEOF<'a>>
where F: FnOnce(PacketParser<'a>) -> U
{
match self {
PacketParserResult::Some(x) => Ok(f(x)),
PacketParserResult::EOF(e) => Err(e),
}
}
}
impl<'a> Parse<'a, PacketParserResult<'a>> for PacketParser<'a> {
fn from_buffered_reader<R>(reader: R) -> Result<PacketParserResult<'a>>
where
R: BufferedReader<Cookie> + 'a,
{
PacketParserBuilder::from_buffered_reader(reader.into_boxed())?.build()
}
}
impl<'a> crate::seal::Sealed for PacketParser<'a> {}
impl <'a> PacketParser<'a> {
pub(crate) fn from_cookie_reader(bio: Box<dyn BufferedReader<Cookie> + 'a>)
-> Result<PacketParserResult<'a>> {
PacketParserBuilder::from_cookie_reader(bio)?.build()
}
fn take_reader(&mut self) -> Box<dyn BufferedReader<Cookie> + 'a> {
self.set_reader(
Box::new(buffered_reader::EOF::with_cookie(Default::default())))
}
fn set_reader(&mut self, reader: Box<dyn BufferedReader<Cookie> + 'a>)
-> Box<dyn BufferedReader<Cookie> + 'a>
{
mem::replace(&mut self.reader, reader)
}
fn mut_reader(&mut self) -> &mut dyn BufferedReader<Cookie> {
&mut self.reader
}
fn set_processed(mut self, v: bool) -> Self {
self.processed = v;
self
}
pub fn processed(&self) -> bool {
self.processed
}
pub fn last_path(&self) -> &[usize] {
&self.last_path[..]
}
pub fn path(&self) -> &[usize] {
&self.path[..]
}
pub fn recursion_depth(&self) -> isize {
self.path.len() as isize - 1
}
pub fn last_recursion_depth(&self) -> Option<isize> {
if self.last_path.is_empty() {
assert_eq!(&self.path[..], &[ 0 ]);
None
} else {
Some(self.last_path.len() as isize - 1)
}
}
pub fn possible_message(&self) -> Result<()> {
use crate::message::MessageValidity;
match self.state.message_validator.check() {
MessageValidity::Message => unreachable!(),
MessageValidity::MessagePrefix => Ok(()),
MessageValidity::Error(err) => Err(err),
}
}
pub fn possible_keyring(&self) -> Result<()> {
match self.state.keyring_validator.check() {
KeyringValidity::Keyring => unreachable!(),
KeyringValidity::KeyringPrefix => Ok(()),
KeyringValidity::Error(err) => Err(err),
}
}
pub fn possible_cert(&self) -> Result<()> {
match self.state.cert_validator.check() {
CertValidity::Cert => unreachable!(),
CertValidity::CertPrefix => Ok(()),
CertValidity::Error(err) => Err(err),
}
}
pub(crate) fn plausible_cert<C, T>(bio: &mut buffered_reader::Dup<T, C>,
header: &Header)
-> Result<()>
where T: BufferedReader<C>, C: fmt::Debug + Send + Sync
{
let bad = Err(
Error::MalformedPacket("Can't make an educated case".into()).into());
match header.ctb().tag() {
Tag::Reserved
| Tag::Unknown(_) | Tag::Private(_) =>
Err(Error::MalformedPacket("Looks like garbage".into()).into()),
Tag::Marker => Marker::plausible(bio, header),
Tag::Padding => {
bad
},
Tag::Signature => Signature::plausible(bio, header),
Tag::SecretKey => Key::plausible(bio, header),
Tag::PublicKey => Key::plausible(bio, header),
Tag::SecretSubkey => Key::plausible(bio, header),
Tag::PublicSubkey => Key::plausible(bio, header),
Tag::UserID => bad,
Tag::UserAttribute => bad,
Tag::PKESK => bad,
Tag::SKESK => bad,
Tag::OnePassSig => bad,
Tag::CompressedData => bad,
Tag::SED => bad,
Tag::Literal => bad,
Tag::Trust => bad,
Tag::SEIP => bad,
Tag::MDC => bad,
Tag::AED => bad,
}
}
fn parse(mut bio: Box<dyn BufferedReader<Cookie> + 'a>,
mut state: PacketParserState,
path: Vec<usize>)
-> Result<ParserResult<'a>>
{
assert!(!path.is_empty());
let indent = path.len() as isize - 1;
tracer!(TRACE, "PacketParser::parse", indent);
if let Some(err) = state.pending_error.take() {
t!("Returning pending error: {}", err);
return Err(err);
}
t!("Parsing packet at {:?}", path);
let recursion_depth = path.len() as isize - 1;
if bio.data(1)?.is_empty() {
t!("No packet at {:?} (EOF).", path);
return Ok(ParserResult::EOF((bio, state, path)));
}
let mut bio = buffered_reader::Dup::with_cookie(bio, Cookie::default());
let header;
let mut skip = 0;
let mut orig_error : Option<anyhow::Error> = None;
loop {
bio.rewind();
if let Err(_err) = bio.data_consume_hard(skip) {
assert!(skip > 0);
header = Header::new(CTB::new(Tag::Reserved),
BodyLength::Full(skip as u32));
break;
}
match Header::parse(&mut bio) {
Ok(header_) => {
if skip == 0 {
header = header_;
break;
}
match Self::plausible_cert(&mut bio, &header_) {
Ok(()) => {
header = Header::new(CTB::new(Tag::Reserved),
BodyLength::Full(skip as u32));
break;
}
Err(err_) => {
t!("{} not plausible @ {}: {}",
header_.ctb().tag(), skip, err_);
},
}
}
Err(err) => {
t!("Failed to read a header after skipping {} bytes: {}",
skip, err);
if orig_error.is_none() {
orig_error = Some(err);
}
if state.first_packet {
return Err(orig_error.unwrap());
}
if skip > RECOVERY_THRESHOLD {
state.pending_error = orig_error;
header = Header::new(CTB::new(Tag::Reserved),
BodyLength::Full(skip as u32));
break;
}
}
}
skip += 1;
}
let consumed = if skip == 0 {
bio.total_out()
} else {
t!("turning {} bytes of junk into an Unknown packet", skip);
bio.rewind();
0
};
let tag = header.ctb().tag();
t!("Packet's tag is {}", tag);
let mut bio = Box::new(bio).into_inner().unwrap();
if tag == Tag::Literal {
Cookie::hashing(
&mut bio, Hashing::Disabled, recursion_depth - 1);
} else if tag == Tag::OnePassSig || tag == Tag::Signature {
if Cookie::processing_csf_message(&bio) {
Cookie::hashing(
&mut bio, Hashing::Disabled, recursion_depth - 1);
} else {
Cookie::hashing(
&mut bio, Hashing::Notarized, recursion_depth - 1);
}
}
let header_bytes =
Vec::from(&bio.data_consume_hard(consumed)?[..consumed]);
let bio : Box<dyn BufferedReader<Cookie>>
= match header.length() {
&BodyLength::Full(len) => {
t!("Pushing a limitor ({} bytes), level: {}.",
len, recursion_depth);
Box::new(buffered_reader::Limitor::with_cookie(
bio, len as u64,
Cookie::new(recursion_depth)))
},
&BodyLength::Partial(len) => {
t!("Pushing a partial body chunk decoder, level: {}.",
recursion_depth);
Box::new(BufferedReaderPartialBodyFilter::with_cookie(
bio, len,
tag != Tag::Literal,
Cookie::new(recursion_depth)))
},
BodyLength::Indeterminate => {
t!("Indeterminate length packet, not adding a limitor.");
bio
},
};
let mut header_syntax_error = header.valid(true).err();
if header_syntax_error.is_none() {
let max_size = state.settings.max_packet_size;
match tag {
Tag::Literal | Tag::CompressedData | Tag::SED | Tag::SEIP
| Tag::AED => (),
_ => match header.length() {
BodyLength::Full(l) => if *l > max_size {
header_syntax_error = Some(
Error::PacketTooLarge(tag, *l, max_size).into());
},
_ => unreachable!("non-data packets have full length, \
syntax check above"),
}
}
}
let parser = PacketHeaderParser::new(bio, state, path,
header, header_bytes);
let mut result = match tag {
Tag::Reserved if skip > 0 => Unknown::parse(
parser, Error::MalformedPacket(format!(
"Skipped {} bytes of junk", skip)).into()),
_ if header_syntax_error.is_some() =>
Unknown::parse(parser, header_syntax_error.unwrap()),
Tag::Signature => Signature::parse(parser),
Tag::OnePassSig => OnePassSig::parse(parser),
Tag::PublicSubkey => Key::parse(parser),
Tag::PublicKey => Key::parse(parser),
Tag::SecretKey => Key::parse(parser),
Tag::SecretSubkey => Key::parse(parser),
Tag::Trust => Trust::parse(parser),
Tag::UserID => UserID::parse(parser),
Tag::UserAttribute => UserAttribute::parse(parser),
Tag::Marker => Marker::parse(parser),
Tag::Literal => Literal::parse(parser),
Tag::CompressedData => CompressedData::parse(parser),
Tag::SKESK => SKESK::parse(parser),
Tag::SEIP => SEIP::parse(parser),
Tag::MDC => MDC::parse(parser),
Tag::PKESK => PKESK::parse(parser),
Tag::Padding => Padding::parse(parser),
_ => Unknown::parse(parser,
Error::UnsupportedPacketType(tag).into()),
}?;
if tag == Tag::OnePassSig {
Cookie::hashing(
&mut result, Hashing::Enabled, recursion_depth - 1);
}
result.state.first_packet = false;
t!(" -> {:?}, path: {:?}, level: {:?}.",
result.packet.tag(), result.path, result.cookie_ref().level);
return Ok(ParserResult::Success(result));
}
pub fn next(mut self)
-> Result<(Packet, PacketParserResult<'a>)>
{
let indent = self.recursion_depth();
tracer!(TRACE, "PacketParser::next", indent);
t!("({:?}, path: {:?}, level: {:?}).",
self.packet.tag(), self.path, self.cookie_ref().level);
self.finish()?;
let (mut fake_eof, mut reader) = buffered_reader_stack_pop(
mem::replace(&mut self.reader,
Box::new(buffered_reader::EOF::with_cookie(
Default::default()))),
self.recursion_depth())?;
self.last_path.clear();
self.last_path.extend_from_slice(&self.path[..]);
*self.path.last_mut().expect("A path is never empty") += 1;
loop {
t!("Reading packet at {:?}", self.path);
let recursion_depth = self.recursion_depth();
let ppr = PacketParser::parse(reader, self.state, self.path)?;
match ppr {
ParserResult::EOF((reader_, state_, path_)) => {
t!("depth: {}, got EOF trying to read the next packet",
recursion_depth);
self.path = path_;
if ! fake_eof && recursion_depth == 0 {
t!("Popped top-level container, done reading message.");
let (_, reader_) = buffered_reader_stack_pop(
reader_, ARMOR_READER_LEVEL)?;
let mut eof = PacketParserEOF::new(state_, reader_);
eof.last_path = self.last_path;
return Ok((self.packet,
PacketParserResult::EOF(eof)));
} else {
self.state = state_;
self.finish()?;
let (fake_eof_, reader_) = buffered_reader_stack_pop(
reader_, recursion_depth - 1)?;
fake_eof = fake_eof_;
if ! fake_eof {
self.path.pop().unwrap();
*self.path.last_mut()
.expect("A path is never empty") += 1;
}
reader = reader_;
}
},
ParserResult::Success(mut pp) => {
let path = pp.path().to_vec();
pp.state.message_validator.push(
pp.packet.tag(), pp.packet.version(),
&path);
pp.state.keyring_validator.push(pp.packet.tag());
pp.state.cert_validator.push(pp.packet.tag());
pp.last_path = self.last_path;
return Ok((self.packet, PacketParserResult::Some(pp)));
}
}
}
}
pub fn recurse(self) -> Result<(Packet, PacketParserResult<'a>)> {
let indent = self.recursion_depth();
tracer!(TRACE, "PacketParser::recurse", indent);
t!("({:?}, path: {:?}, level: {:?})",
self.packet.tag(), self.path, self.cookie_ref().level);
match self.packet {
Packet::CompressedData(_) | Packet::SEIP(_)
if self.processed =>
{
if self.recursion_depth() as u8
>= self.state.settings.max_recursion_depth
{
t!("Not recursing into the {:?} packet, maximum recursion \
depth ({}) reached.",
self.packet.tag(),
self.state.settings.max_recursion_depth);
} else if self.content_was_read {
t!("Not recursing into the {:?} packet, some data was \
already read.",
self.packet.tag());
} else {
let mut last_path = self.last_path;
last_path.clear();
last_path.extend_from_slice(&self.path[..]);
let mut path = self.path;
path.push(0);
match PacketParser::parse(self.reader, self.state,
path.clone())?
{
ParserResult::Success(mut pp) => {
t!("Recursed into the {:?} packet, got a {:?}.",
self.packet.tag(), pp.packet.tag());
pp.state.message_validator.push(
pp.packet.tag(),
pp.packet.version(),
&path);
pp.state.keyring_validator.push(pp.packet.tag());
pp.state.cert_validator.push(pp.packet.tag());
pp.last_path = last_path;
return Ok((self.packet,
PacketParserResult::Some(pp)));
},
ParserResult::EOF(_) => {
return Err(Error::MalformedPacket(
"Container is truncated".into()).into());
},
}
}
},
#[allow(deprecated)]
Packet::Unknown(_) | Packet::Signature(_) | Packet::OnePassSig(_)
| Packet::PublicKey(_) | Packet::PublicSubkey(_)
| Packet::SecretKey(_) | Packet::SecretSubkey(_)
| Packet::Marker(_) | Packet::Trust(_)
| Packet::UserID(_) | Packet::UserAttribute(_)
| Packet::Literal(_) | Packet::PKESK(_) | Packet::SKESK(_)
| Packet::SEIP(_) | Packet::MDC(_)
| Packet::CompressedData(_)
| Packet::Padding(_) => {
t!("A {:?} packet is not a container, not recursing.",
self.packet.tag());
},
}
self.next()
}
pub fn buffer_unread_content(&mut self) -> Result<&[u8]> {
let rest = self.steal_eof()?;
fn set_or_extend(rest: Vec<u8>, c: &mut Container, processed: bool)
-> Result<&[u8]> {
if !rest.is_empty() {
let current = match c.body() {
Body::Unprocessed(bytes) => &bytes[..],
Body::Processed(bytes) => &bytes[..],
Body::Structured(packets) if packets.is_empty() => &[][..],
Body::Structured(_) => return Err(Error::InvalidOperation(
"cannot append unread bytes to parsed packets"
.into()).into()),
};
let rest = if !current.is_empty() {
let mut new =
Vec::with_capacity(current.len() + rest.len());
new.extend_from_slice(current);
new.extend_from_slice(&rest);
new
} else {
rest
};
c.set_body(if processed {
Body::Processed(rest)
} else {
Body::Unprocessed(rest)
});
}
match c.body() {
Body::Unprocessed(bytes) => Ok(bytes),
Body::Processed(bytes) => Ok(bytes),
Body::Structured(packets) if packets.is_empty() => Ok(&[][..]),
Body::Structured(_) => Err(Error::InvalidOperation(
"cannot append unread bytes to parsed packets"
.into()).into()),
}
}
match &mut self.packet {
Packet::Literal(p) => set_or_extend(rest, p.container_mut(), false),
Packet::Unknown(p) => set_or_extend(rest, p.container_mut(), false),
Packet::CompressedData(p) =>
set_or_extend(rest, p.container_mut(), self.processed),
Packet::SEIP(SEIP::V1(p)) =>
set_or_extend(rest, p.container_mut(), self.processed),
Packet::SEIP(SEIP::V2(p)) =>
set_or_extend(rest, p.container_mut(), self.processed),
p => {
if !rest.is_empty() {
Err(Error::MalformedPacket(
format!("Unexpected body data for {:?}: {}",
p, crate::fmt::hex::encode_pretty(rest)))
.into())
} else {
Ok(&b""[..])
}
},
}
}
pub fn finish(&mut self) -> Result<&Packet> {
let indent = self.recursion_depth();
tracer!(TRACE, "PacketParser::finish", indent);
if self.finished {
return Ok(&self.packet);
}
let recursion_depth = self.recursion_depth();
let unread_content = if self.state.settings.buffer_unread_content {
t!("({:?} at depth {}): buffering {} bytes of unread content",
self.packet.tag(), recursion_depth,
self.data_eof().unwrap_or(&[]).len());
!self.buffer_unread_content()?.is_empty()
} else {
t!("({:?} at depth {}): dropping {} bytes of unread content",
self.packet.tag(), recursion_depth,
self.data_eof().unwrap_or(&[]).len());
self.drop_eof()?
};
if unread_content {
match self.packet.tag() {
Tag::SEIP | Tag::AED | Tag::SED | Tag::CompressedData => {
let mut path = self.path().to_vec();
path.push(0);
self.state.message_validator.push_token(
message::Token::OpaqueContent, &path);
}
_ => {},
}
}
if let Some(c) = self.packet.container_mut() {
let h = self.body_hash.take()
.expect("body_hash is Some");
c.set_body_hash(h);
}
self.finished = true;
Ok(&self.packet)
}
fn hash_read_content(&mut self, b: &[u8]) {
if !b.is_empty() {
assert!(self.body_hash.is_some());
if let Some(h) = self.body_hash.as_mut() {
h.update(b);
}
self.content_was_read = true;
}
}
pub fn header(&self) -> &Header {
&self.header
}
pub fn map(&self) -> Option<&map::Map> {
self.map.as_ref()
}
pub fn take_map(&mut self) -> Option<map::Map> {
self.map.take()
}
pub(crate) fn processing_csf_message(&self) -> bool {
Cookie::processing_csf_message(&self.reader)
}
}
impl<'a> io::Read for PacketParser<'a> {
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
buffered_reader_generic_read_impl(self, buf)
}
}
impl<'a> BufferedReader<Cookie> for PacketParser<'a> {
fn buffer(&self) -> &[u8] {
self.reader.buffer()
}
fn data(&mut self, amount: usize) -> io::Result<&[u8]> {
self.reader.data(amount)
}
fn data_hard(&mut self, amount: usize) -> io::Result<&[u8]> {
self.reader.data_hard(amount)
}
fn data_eof(&mut self) -> io::Result<&[u8]> {
self.reader.data_eof()
}
fn consume(&mut self, amount: usize) -> &[u8] {
if let Some(mut body_hash) = self.body_hash.take() {
let data = self.data_hard(amount)
.expect("It is an error to consume more than data returns");
body_hash.update(&data[..amount]);
self.body_hash = Some(body_hash);
self.content_was_read |= amount > 0;
} else {
panic!("body_hash is None");
}
self.reader.consume(amount)
}
fn data_consume(&mut self, mut amount: usize) -> io::Result<&[u8]> {
if let Some(mut body_hash) = self.body_hash.take() {
let data = self.data(amount)?;
amount = cmp::min(data.len(), amount);
body_hash.update(&data[..amount]);
self.body_hash = Some(body_hash);
self.content_was_read |= amount > 0;
} else {
panic!("body_hash is None");
}
self.reader.data_consume(amount)
}
fn data_consume_hard(&mut self, amount: usize) -> io::Result<&[u8]> {
if let Some(mut body_hash) = self.body_hash.take() {
let data = self.data_hard(amount)?;
body_hash.update(&data[..amount]);
self.body_hash = Some(body_hash);
self.content_was_read |= amount > 0;
} else {
panic!("body_hash is None");
}
self.reader.data_consume_hard(amount)
}
fn steal(&mut self, amount: usize) -> io::Result<Vec<u8>> {
let v = self.reader.steal(amount)?;
self.hash_read_content(&v);
Ok(v)
}
fn steal_eof(&mut self) -> io::Result<Vec<u8>> {
let v = self.reader.steal_eof()?;
self.hash_read_content(&v);
Ok(v)
}
fn get_mut(&mut self) -> Option<&mut dyn BufferedReader<Cookie>> {
None
}
fn get_ref(&self) -> Option<&dyn BufferedReader<Cookie>> {
None
}
fn into_inner<'b>(self: Box<Self>)
-> Option<Box<dyn BufferedReader<Cookie> + 'b>>
where Self: 'b {
None
}
fn cookie_set(&mut self, cookie: Cookie)
-> Cookie {
self.reader.cookie_set(cookie)
}
fn cookie_ref(&self) -> &Cookie {
self.reader.cookie_ref()
}
fn cookie_mut(&mut self) -> &mut Cookie {
self.reader.cookie_mut()
}
}
#[cfg(feature = "compression-deflate")]
#[test]
fn packet_parser_reader_interface() {
use std::io::Read;
let expected = crate::tests::manifesto();
let pp = PacketParser::from_bytes(
crate::tests::message("compressed-data-algo-1.gpg")).unwrap().unwrap();
let packet_depth = pp.recursion_depth();
let (packet, ppr) = pp.recurse().unwrap();
let pp_depth = ppr.as_ref().unwrap().recursion_depth();
if let Packet::CompressedData(_) = packet {
} else {
panic!("Expected a compressed data packet.");
}
let relative_position = pp_depth - packet_depth;
assert_eq!(relative_position, 1);
let mut pp = ppr.unwrap();
if let Packet::Literal(_) = pp.packet {
} else {
panic!("Expected a literal data packet.");
}
for i in 0..expected.len() {
let mut buf = [0u8; 1];
let r = pp.read(&mut buf).unwrap();
assert_eq!(r, 1);
assert_eq!(buf[0], expected[i]);
}
let mut buf = [0u8; 1];
let r = pp.read(&mut buf).unwrap();
assert_eq!(r, 0);
let (packet, ppr) = pp.recurse().unwrap();
assert!(ppr.is_eof());
assert_eq!(packet.unprocessed_body().unwrap().len(), 0);
}
impl<'a> PacketParser<'a> {
pub fn decrypt<A>(&mut self, algo: A, key: &SessionKey)
-> Result<()>
where
A: Into<Option<SymmetricAlgorithm>>,
{
self.decrypt_(algo.into(), key)
}
fn decrypt_(&mut self,
algo: Option<SymmetricAlgorithm>,
key: &SessionKey)
-> Result<()>
{
let indent = self.recursion_depth();
tracer!(TRACE, "PacketParser::decrypt", indent);
if self.content_was_read {
return Err(Error::InvalidOperation(
"Packet's content has already been read.".to_string()).into());
}
if self.processed {
return Err(Error::InvalidOperation(
"Packet not encrypted.".to_string()).into());
}
match self.packet.clone() {
Packet::SEIP(SEIP::V1(_)) => {
let algo = if let Some(a) = algo {
a
} else {
return Err(Error::InvalidOperation(
"Trying to decrypt a SEIPDv1 packet: \
no symmetric algorithm given".into()).into());
};
if algo.key_size()? != key.len () {
return Err(Error::InvalidOperation(
format!("Bad key size: {} expected: {}",
key.len(), algo.key_size()?)).into());
}
let bl = algo.block_size()?;
{
let mut dec = Decryptor::new(
algo, key, &self.data_hard(bl + 2)?[..bl + 2])?;
let mut header = vec![ 0u8; bl + 2 ];
dec.read_exact(&mut header)?;
if !(header[bl - 2] == header[bl]
&& header[bl - 1] == header[bl + 1]) {
return Err(Error::InvalidSessionKey(
"Decryption failed".into()).into());
}
}
let reader = self.take_reader();
let mut reader = BufferedReaderDecryptor::with_cookie(
algo, key, reader, Cookie::default()).unwrap();
reader.cookie_mut().level = Some(self.recursion_depth());
t!("Pushing Decryptor, level {:?}.", reader.cookie_ref().level);
let mut reader = HashedReader::new(
reader, HashesFor::MDC,
vec![HashingMode::Binary(vec![], HashAlgorithm::SHA1)])?;
reader.cookie_mut().level = Some(self.recursion_depth());
t!("Pushing HashedReader, level {:?}.",
reader.cookie_ref().level);
let mut reader = buffered_reader::Reserve::with_cookie(
reader, 1 + 1 + 20,
Cookie::new(self.recursion_depth()));
reader.cookie_mut().fake_eof = true;
t!("Pushing buffered_reader::Reserve, level: {}.",
self.recursion_depth());
reader.data_consume_hard(bl + 2).unwrap();
self.reader = Box::new(reader);
self.processed = true;
Ok(())
},
Packet::SEIP(SEIP::V2(seip)) => {
let chunk_size =
aead::chunk_size_usize(seip.chunk_size())?;
{
let amount = aead::chunk_size_usize(
seip.chunk_digest_size()?
+ seip.aead().digest_size()? as u64)?;
let data = self.data(amount)?;
let (message_key, schedule) = aead::SEIPv2Schedule::new(
key,
seip.symmetric_algo(),
seip.aead(),
chunk_size,
seip.salt())?;
let dec = aead::Decryptor::new(
seip.symmetric_algo(), seip.aead(), chunk_size,
schedule, message_key,
&data[..cmp::min(data.len(), amount)])?;
let mut chunk = Vec::new();
dec.take(seip.chunk_size() as u64).read_to_end(&mut chunk)?;
}
let (message_key, schedule) = aead::SEIPv2Schedule::new(
key,
seip.symmetric_algo(),
seip.aead(),
chunk_size,
seip.salt())?;
let reader = self.take_reader();
let mut reader = aead::BufferedReaderDecryptor::with_cookie(
seip.symmetric_algo(), seip.aead(), chunk_size,
schedule, message_key, reader, Cookie::default()).unwrap();
reader.cookie_mut().level = Some(self.recursion_depth());
t!("Pushing aead::Decryptor, level {:?}.",
reader.cookie_ref().level);
self.reader = Box::new(reader);
self.processed = true;
Ok(())
},
_ =>
Err(Error::InvalidOperation(
format!("Can't decrypt {:?} packets.",
self.packet.tag())).into())
}
}
}
#[cfg(test)]
mod test {
use super::*;
use crate::serialize::Serialize;
enum Data<'a> {
File(&'a str),
String(&'a [u8]),
}
impl<'a> Data<'a> {
fn content(&self) -> Vec<u8> {
match self {
Data::File(filename) => crate::tests::message(filename).to_vec(),
Data::String(data) => data.to_vec(),
}
}
}
struct DecryptTest<'a> {
filename: &'a str,
algo: SymmetricAlgorithm,
aead_algo: Option<AEADAlgorithm>,
key_hex: &'a str,
plaintext: Data<'a>,
paths: &'a[ (Tag, &'a[ usize ] ) ],
}
const DECRYPT_TESTS: &[DecryptTest] = &[
DecryptTest {
filename: "encrypted-aes256-password-123.gpg",
algo: SymmetricAlgorithm::AES256,
aead_algo: None,
key_hex: "7EF4F08C44F780BEA866961423306166B8912C43352F3D9617F745E4E3939710",
plaintext: Data::File("a-cypherpunks-manifesto.txt"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::Literal, &[ 1, 0 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
DecryptTest {
filename: "encrypted-aes192-password-123456.gpg",
algo: SymmetricAlgorithm::AES192,
aead_algo: None,
key_hex: "B2F747F207EFF198A6C826F1D398DE037986218ED468DB61",
plaintext: Data::File("a-cypherpunks-manifesto.txt"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::Literal, &[ 1, 0 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
DecryptTest {
filename: "encrypted-aes128-password-123456789.gpg",
algo: SymmetricAlgorithm::AES128,
aead_algo: None,
key_hex: "AC0553096429260B4A90B1CEC842D6A0",
plaintext: Data::File("a-cypherpunks-manifesto.txt"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::Literal, &[ 1, 0 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
DecryptTest {
filename: "encrypted-camellia256-password-123.gpg",
algo: SymmetricAlgorithm::Camellia256,
aead_algo: None,
key_hex: "FC9644B500B9D0540880CB44B40F8C89\
A7D817F2EF7EF9DA0D34A574377E300A",
plaintext: Data::File("a-cypherpunks-manifesto.txt"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::Literal, &[ 1, 0 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
DecryptTest {
filename: "encrypted-camellia192-password-123.gpg",
algo: SymmetricAlgorithm::Camellia192,
aead_algo: None,
key_hex: "EC941DB1C5F4D3605E3F3C10B30888DA3287256E55CC978B",
plaintext: Data::File("a-cypherpunks-manifesto.txt"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::Literal, &[ 1, 0 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
DecryptTest {
filename: "encrypted-camellia128-password-123.gpg",
algo: SymmetricAlgorithm::Camellia128,
aead_algo: None,
key_hex: "E1CF87BF2E030CC89CBC0F03EC2B7DF5",
plaintext: Data::File("a-cypherpunks-manifesto.txt"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::Literal, &[ 1, 0 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
DecryptTest {
filename: "encrypted-twofish-password-red-fish-blue-fish.gpg",
algo: SymmetricAlgorithm::Twofish,
aead_algo: None,
key_hex: "96AFE1EDFA7C9CB7E8B23484C718015E5159CFA268594180D4DB68B2543393CB",
plaintext: Data::File("a-cypherpunks-manifesto.txt"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::Literal, &[ 1, 0 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
#[cfg(feature = "compression-deflate")]
DecryptTest {
filename: "seip/msg-compression-not-signed-password-123.pgp",
algo: SymmetricAlgorithm::AES128,
aead_algo: None,
key_hex: "86A8C1C7961F55A3BE181A990D0ABB2A",
plaintext: Data::String(b"compression, not signed\n"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::CompressedData, &[ 1, 0 ]),
(Tag::Literal, &[ 1, 0, 0 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
#[cfg(feature = "compression-deflate")]
DecryptTest {
filename: "seip/msg-compression-signed-password-123.pgp",
algo: SymmetricAlgorithm::AES128,
aead_algo: None,
key_hex: "1B195CD35CAD4A99D9399B4CDA4CDA4E",
plaintext: Data::String(b"compression, signed\n"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::CompressedData, &[ 1, 0 ]),
(Tag::OnePassSig, &[ 1, 0, 0 ]),
(Tag::Literal, &[ 1, 0, 1 ]),
(Tag::Signature, &[ 1, 0, 2 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
DecryptTest {
filename: "seip/msg-no-compression-not-signed-password-123.pgp",
algo: SymmetricAlgorithm::AES128,
aead_algo: None,
key_hex: "AFB43B83A4B9D971E4B4A4C53749076A",
plaintext: Data::String(b"no compression, not signed\n"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::Literal, &[ 1, 0 ]),
(Tag::MDC, &[ 1, 1 ]),
],
},
DecryptTest {
filename: "seip/msg-no-compression-signed-password-123.pgp",
algo: SymmetricAlgorithm::AES128,
aead_algo: None,
key_hex: "9D5DB92F77F0E4A356EE53813EF2C3DC",
plaintext: Data::String(b"no compression, signed\n"),
paths: &[
(Tag::SKESK, &[ 0 ]),
(Tag::SEIP, &[ 1 ]),
(Tag::OnePassSig, &[ 1, 0 ]),
(Tag::Literal, &[ 1, 1 ]),
(Tag::Signature, &[ 1, 2 ]),
(Tag::MDC, &[ 1, 3 ]),
],
},
];
fn consume_until<'a>(mut ppr: PacketParserResult<'a>,
ignore_first: bool, keep: &[Tag], skip: &[Tag])
-> PacketParserResult<'a>
{
if ignore_first {
ppr = ppr.unwrap().recurse().unwrap().1;
}
while let PacketParserResult::Some(pp) = ppr {
let tag = pp.packet.tag();
for t in keep.iter() {
if *t == tag {
return PacketParserResult::Some(pp);
}
}
let mut ok = false;
for t in skip.iter() {
if *t == tag {
ok = true;
}
}
if !ok {
panic!("Packet not in keep ({:?}) or skip ({:?}) set: {:?}",
keep, skip, pp.packet);
}
ppr = pp.recurse().unwrap().1;
}
ppr
}
#[test]
fn decrypt_test() {
decrypt_test_common(false);
}
#[test]
fn decrypt_test_stream() {
decrypt_test_common(true);
}
#[allow(deprecated)]
fn decrypt_test_common(stream: bool) {
for test in DECRYPT_TESTS.iter() {
if !test.algo.is_supported() {
eprintln!("Algorithm {} unsupported, skipping", test.algo);
continue;
}
if let Some(aead_algo) = test.aead_algo {
if !aead_algo.is_supported() {
eprintln!("AEAD algorithm {} unsupported by
selected crypto backend, skipping", aead_algo);
continue;
}
}
eprintln!("Decrypting {}, streaming content: {}",
test.filename, stream);
let ppr = PacketParserBuilder::from_bytes(
crate::tests::message(test.filename)).unwrap()
.buffer_unread_content()
.build()
.expect(&format!("Error reading {}", test.filename)[..]);
let mut ppr = consume_until(
ppr, false, &[ Tag::SEIP, Tag::AED ][..],
&[ Tag::SKESK, Tag::PKESK ][..] );
if let PacketParserResult::Some(ref mut pp) = ppr {
let key = crate::fmt::from_hex(test.key_hex, false)
.unwrap().into();
pp.decrypt(Some(test.algo), &key).unwrap();
} else {
panic!("Expected a SEIP packet. Got: {:?}", ppr);
}
let mut ppr = consume_until(
ppr, true, &[ Tag::Literal ][..],
&[ Tag::OnePassSig, Tag::CompressedData ][..]);
if let PacketParserResult::Some(ref mut pp) = ppr {
if stream {
let mut body = Vec::new();
loop {
let mut b = [0];
if pp.read(&mut b).unwrap() == 0 {
break;
}
body.push(b[0]);
}
assert_eq!(&body[..],
&test.plaintext.content()[..],
"{:?}", pp.packet);
} else {
pp.buffer_unread_content().unwrap();
if let Packet::Literal(l) = &pp.packet {
assert_eq!(l.body(), &test.plaintext.content()[..],
"{:?}", pp.packet);
} else {
panic!("Expected literal, got: {:?}", pp.packet);
}
}
} else {
panic!("Expected a Literal packet. Got: {:?}", ppr);
}
let ppr = consume_until(
ppr, true, &[ Tag::MDC ][..], &[ Tag::Signature ][..]);
if let PacketParserResult::Some(
PacketParser { packet: Packet::MDC(ref mdc), .. }) = ppr
{
assert_eq!(mdc.computed_digest(), mdc.digest(),
"MDC doesn't match");
}
if ppr.is_eof() {
continue;
}
let ppr = consume_until(
ppr, true, &[][..], &[][..]);
assert!(ppr.is_eof());
}
}
#[test]
fn message_validator() {
for marker in 0..4 {
let marker_before = marker & 1 > 0;
let marker_after = marker & 2 > 0;
for test in DECRYPT_TESTS.iter() {
if !test.algo.is_supported() {
eprintln!("Algorithm {} unsupported, skipping", test.algo);
continue;
}
if let Some(aead_algo) = test.aead_algo {
if !aead_algo.is_supported() {
eprintln!("AEAD algorithm {} unsupported by
selected crypto backend, skipping", aead_algo);
continue;
}
}
let mut buf = Vec::new();
if marker_before {
Packet::Marker(Default::default()).serialize(&mut buf).unwrap();
}
buf.extend_from_slice(crate::tests::message(test.filename));
if marker_after {
Packet::Marker(Default::default()).serialize(&mut buf).unwrap();
}
let mut ppr = PacketParserBuilder::from_bytes(&buf)
.unwrap()
.build()
.expect(&format!("Error reading {}", test.filename)[..]);
let mut saw_literal = false;
while let PacketParserResult::Some(mut pp) = ppr {
pp.possible_message().unwrap();
match pp.packet {
Packet::SEIP(_) => {
let key = crate::fmt::from_hex(test.key_hex, false)
.unwrap().into();
pp.decrypt(Some(test.algo), &key).unwrap();
},
Packet::Literal(_) => {
assert!(! saw_literal);
saw_literal = true;
},
_ => {},
}
ppr = pp.recurse().unwrap().1;
}
assert!(saw_literal);
if let PacketParserResult::EOF(eof) = ppr {
eof.is_message().unwrap();
} else {
unreachable!();
}
}
}
}
#[test]
fn keyring_validator() {
for marker in 0..4 {
let marker_before = marker & 1 > 0;
let marker_after = marker & 2 > 0;
for test in &["testy.pgp",
"lutz.gpg",
"testy-new.pgp",
"neal.pgp"]
{
let mut buf = Vec::new();
if marker_before {
Packet::Marker(Default::default()).serialize(&mut buf).unwrap();
}
buf.extend_from_slice(crate::tests::key("testy.pgp"));
buf.extend_from_slice(crate::tests::key(test));
if marker_after {
Packet::Marker(Default::default()).serialize(&mut buf).unwrap();
}
let mut ppr = PacketParserBuilder::from_bytes(&buf)
.unwrap()
.build()
.expect(&format!("Error reading {:?}", test));
while let PacketParserResult::Some(pp) = ppr {
assert!(pp.possible_keyring().is_ok());
ppr = pp.recurse().unwrap().1;
}
if let PacketParserResult::EOF(eof) = ppr {
assert!(eof.is_keyring().is_ok());
assert!(eof.is_cert().is_err());
} else {
unreachable!();
}
}
}
}
#[test]
fn cert_validator() {
for marker in 0..4 {
let marker_before = marker & 1 > 0;
let marker_after = marker & 2 > 0;
for test in &["testy.pgp",
"lutz.gpg",
"testy-new.pgp",
"neal.pgp"]
{
let mut buf = Vec::new();
if marker_before {
Packet::Marker(Default::default()).serialize(&mut buf).unwrap();
}
buf.extend_from_slice(crate::tests::key(test));
if marker_after {
Packet::Marker(Default::default()).serialize(&mut buf).unwrap();
}
let mut ppr = PacketParserBuilder::from_bytes(&buf)
.unwrap()
.build()
.expect(&format!("Error reading {:?}", test));
while let PacketParserResult::Some(pp) = ppr {
assert!(pp.possible_keyring().is_ok());
assert!(pp.possible_cert().is_ok());
ppr = pp.recurse().unwrap().1;
}
if let PacketParserResult::EOF(eof) = ppr {
assert!(eof.is_keyring().is_ok());
assert!(eof.is_cert().is_ok());
} else {
unreachable!();
}
}
}
}
#[test]
fn message_validator_opaque_content() {
for test in DECRYPT_TESTS.iter() {
let mut ppr = PacketParserBuilder::from_bytes(
crate::tests::message(test.filename)).unwrap()
.build()
.expect(&format!("Error reading {}", test.filename)[..]);
let mut saw_literal = false;
while let PacketParserResult::Some(pp) = ppr {
assert!(pp.possible_message().is_ok());
match pp.packet {
Packet::Literal(_) => {
assert!(! saw_literal);
saw_literal = true;
},
_ => {},
}
ppr = pp.recurse().unwrap().1;
}
assert!(! saw_literal);
if let PacketParserResult::EOF(eof) = ppr {
eprintln!("eof: {:?}; message: {:?}", eof, eof.is_message());
assert!(eof.is_message().is_ok());
} else {
unreachable!();
}
}
}
#[test]
fn path() {
for test in DECRYPT_TESTS.iter() {
if !test.algo.is_supported() {
eprintln!("Algorithm {} unsupported, skipping", test.algo);
continue;
}
if let Some(aead_algo) = test.aead_algo {
if !aead_algo.is_supported() {
eprintln!("AEAD algorithm {} unsupported, skipping", aead_algo);
continue;
}
}
eprintln!("Decrypting {}", test.filename);
let mut ppr = PacketParserBuilder::from_bytes(
crate::tests::message(test.filename)).unwrap()
.build()
.expect(&format!("Error reading {}", test.filename)[..]);
let mut last_path = vec![];
let mut paths = test.paths.to_vec();
paths.reverse();
while let PacketParserResult::Some(mut pp) = ppr {
let path = paths.pop().expect("Message longer than expect");
assert_eq!(path.0, pp.packet.tag());
assert_eq!(path.1, pp.path());
assert_eq!(last_path, pp.last_path());
last_path = pp.path.to_vec();
eprintln!(" {}: {:?}", pp.packet.tag(), pp.path());
match pp.packet {
Packet::SEIP(_) => {
let key = crate::fmt::from_hex(test.key_hex, false)
.unwrap().into();
pp.decrypt(test.algo, &key).unwrap();
}
_ => (),
}
ppr = pp.recurse().unwrap().1;
}
paths.reverse();
assert_eq!(paths.len(), 0,
"Message shorter than expected (expecting: {:?})",
paths);
if let PacketParserResult::EOF(eof) = ppr {
assert_eq!(last_path, eof.last_path());
} else {
panic!("Expect an EOF");
}
}
}
#[test]
fn corrupted_cert() {
use crate::armor::{Reader, ReaderMode, Kind};
let mut ppr = PacketParser::from_reader(
Reader::from_bytes(crate::tests::key("corrupted.pgp"),
ReaderMode::Tolerant(Some(Kind::PublicKey))))
.unwrap();
let mut sigs = 0;
let mut subkeys = 0;
let mut userids = 0;
let mut uas = 0;
let mut unknown = 0;
while let PacketParserResult::Some(pp) = ppr {
match pp.packet {
Packet::Signature(_) => sigs += 1,
Packet::PublicSubkey(_) => subkeys += 1,
Packet::UserID(_) => userids += 1,
Packet::UserAttribute(_) => uas += 1,
Packet::Unknown(ref p) => {
dbg!(p);
unknown += 1;
},
_ => (),
}
ppr = pp.next().unwrap().1;
}
assert_eq!(sigs, 53);
assert_eq!(subkeys, 3);
assert_eq!(userids, 5);
assert_eq!(uas, 0);
assert_eq!(unknown, 2);
}
#[test]
fn junk_prefix() {
let msg = crate::tests::message("sig.gpg");
let ppr = PacketParserBuilder::from_bytes(msg).unwrap()
.dearmor(packet_parser_builder::Dearmor::Disabled)
.build();
assert_match!(Ok(PacketParserResult::Some(ref _pp)) = ppr);
let mut msg2 = Vec::new();
msg2.push(0);
msg2.extend_from_slice(msg);
let ppr = PacketParserBuilder::from_bytes(&msg2[..]).unwrap()
.dearmor(packet_parser_builder::Dearmor::Disabled)
.build();
assert_match!(Err(_) = ppr);
}
#[test]
fn truncated_packet() {
for msg in &[crate::tests::message("literal-mode-b.gpg"),
crate::tests::message("literal-mode-t-partial-body.gpg"),
] {
let ppr = PacketParserBuilder::from_bytes(msg).unwrap()
.dearmor(packet_parser_builder::Dearmor::Disabled)
.build();
assert_match!(Ok(PacketParserResult::Some(ref _pp)) = ppr);
let msg2 = &msg[..msg.len() - 1];
let ppr = PacketParserBuilder::from_bytes(msg2).unwrap()
.dearmor(packet_parser_builder::Dearmor::Disabled)
.build().unwrap();
if let PacketParserResult::Some(pp) = ppr {
let err = pp.next().err().unwrap();
assert_match!(Some(&Error::MalformedPacket(_))
= err.downcast_ref());
} else {
panic!("No packet!?");
}
}
}
#[test]
fn max_packet_size() {
use crate::serialize::Serialize;
let uid = Packet::UserID("foobar".into());
let mut buf = Vec::new();
uid.serialize(&mut buf).unwrap();
let ppr = PacketParserBuilder::from_bytes(&buf).unwrap()
.build().unwrap();
if let PacketParserResult::Some(pp) = ppr {
assert_eq!(Packet::UserID("foobar".into()), pp.packet);
} else {
panic!("failed to parse userid");
}
let ppr = PacketParserBuilder::from_bytes(&buf).unwrap()
.max_packet_size(5)
.build().unwrap();
if let PacketParserResult::Some(pp) = ppr {
if let Packet::Unknown(ref u) = pp.packet {
assert_eq!(u.tag(), Tag::UserID);
assert_match!(Some(&Error::PacketTooLarge(_, _, _))
= u.error().downcast_ref());
} else {
panic!("expected an unknown packet, got {:?}", pp.packet);
}
} else {
panic!("failed to parse userid");
}
}
#[test]
fn issue_455() -> Result<()> {
let sk: SessionKey =
crate::fmt::hex::decode("3E99593760EE241488462BAFAE4FA268\
260B14B82D310D196DCEC82FD4F67678")?.into();
let algo = SymmetricAlgorithm::AES256;
eprintln!("Decrypt, then next():\n");
let mut ppr = PacketParser::from_bytes(
crate::tests::message("encrypted-to-testy.gpg"))?;
while let PacketParserResult::Some(mut pp) = ppr {
match &pp.packet {
Packet::SEIP(_) => {
pp.decrypt(algo, &sk)?;
},
_ => (),
}
ppr = pp.next()?.1;
}
eprintln!("\nDecrypt, buffer, then recurse():\n");
let mut ppr = PacketParser::from_bytes(
crate::tests::message("encrypted-to-testy.gpg"))?;
while let PacketParserResult::Some(mut pp) = ppr {
match &pp.packet {
Packet::SEIP(_) => {
pp.decrypt(algo, &sk)?;
pp.buffer_unread_content()?;
},
_ => (),
}
ppr = pp.recurse()?.1;
}
Ok(())
}
#[test]
fn issue_514() -> Result<()> {
let data = &[212, 43, 1, 0, 0, 125, 212, 0, 10, 10, 10];
let ppr = PacketParser::from_bytes(&data)?;
let packet = &ppr.unwrap().packet;
if let Packet::Unknown(_) = packet {
Ok(())
} else {
panic!("expected unknown packet, got: {:?}", packet);
}
}
#[test]
fn malformed_embedded_signature() -> Result<()> {
let ppr = PacketParser::from_bytes(
crate::tests::file("edge-cases/malformed-embedded-sig.pgp"))?;
let packet = &ppr.unwrap().packet;
if let Packet::Unknown(_) = packet {
Ok(())
} else {
panic!("expected unknown packet, got: {:?}", packet);
}
}
#[test]
fn malformed_notation_name() -> Result<()> {
let ppr = PacketParser::from_bytes(
crate::tests::file("edge-cases/malformed-notation-name.pgp"))?;
let packet = &ppr.unwrap().packet;
if let Packet::Unknown(_) = packet {
Ok(())
} else {
panic!("expected unknown packet, got: {:?}", packet);
}
}
#[test]
fn issue_537() -> Result<()> {
let ppr0 = PacketParserBuilder::from_bytes(
crate::tests::message("literal-mode-b.gpg"))?
.buffer_unread_content()
.build()?;
let pp0 = ppr0.unwrap();
let (packet0, _) = pp0.recurse()?;
let ppr1 = PacketParser::from_bytes(
crate::tests::message("literal-mode-b.gpg"))?;
let pp1 = ppr1.unwrap();
let (packet1, _) = pp1.recurse()?;
let ppr2 = PacketParser::from_bytes(
crate::tests::message("literal-mode-b.gpg"))?;
let mut pp2 = ppr2.unwrap();
io::copy(&mut pp2, &mut io::sink())?;
let (packet2, _) = pp2.recurse()?;
let ppr3 = PacketParser::from_bytes(
crate::tests::message("literal-mode-b.gpg"))?;
let mut pp3 = ppr3.unwrap();
let mut buf = [0];
let nread = pp3.read(&mut buf)?;
assert_eq!(buf.len(), nread);
let (packet3, _) = pp3.recurse()?;
assert_eq!(packet0, packet1);
assert_eq!(packet1, packet2);
assert_eq!(packet2, packet3);
Ok(())
}
#[test]
fn issue_530_verifying() -> Result<()> {
use std::io::Write;
use crate::*;
use crate::packet::signature;
use crate::serialize::stream::{Message, Signer};
use crate::policy::StandardPolicy;
use crate::{Result, Cert};
use crate::parse::Parse;
use crate::parse::stream::*;
let data = b"one\r\ntwo\r\nthree";
let p = &StandardPolicy::new();
let cert: Cert =
Cert::from_bytes(crate::tests::key("testy-new-private.pgp"))?;
let signing_keypair = cert.keys().secret()
.with_policy(p, None).alive().revoked(false).for_signing().next().unwrap()
.key().clone().into_keypair()?;
let mut signature = vec![];
{
let message = Message::new(&mut signature);
let mut message = Signer::with_template(
message, signing_keypair,
signature::SignatureBuilder::new(SignatureType::Text)
)?.detached().build()?;
message.write_all(data)?;
message.finalize()?;
}
struct Helper {}
impl VerificationHelper for Helper {
fn get_certs(&mut self, _ids: &[KeyHandle]) -> Result<Vec<Cert>> {
Ok(vec![Cert::from_bytes(crate::tests::key("testy-new.pgp"))?])
}
fn check(&mut self, structure: MessageStructure) -> Result<()> {
for (i, layer) in structure.iter().enumerate() {
assert_eq!(i, 0);
if let MessageLayer::SignatureGroup { results } = layer {
assert_eq!(results.len(), 1);
results[0].as_ref().unwrap();
assert!(results[0].is_ok());
return Ok(());
} else {
unreachable!();
}
}
unreachable!()
}
}
let h = Helper {};
let mut v = DetachedVerifierBuilder::from_bytes(&signature)?
.with_policy(p, None, h)?;
for data in &[
&b"one\r\ntwo\r\nthree"[..], b"one\ntwo\nthree", b"one\ntwo\r\nthree", b"one\r\ntwo\nthree",
b"one\rtwo\rthree", ] {
v.verify_bytes(data)?;
}
Ok(())
}
#[test]
fn issue_588() -> Result<()> {
let data = vec![0x8c, 0x34, 0x05, 0x12, 0x02, 0x00, 0xaf, 0x0d,
0xff, 0xff, 0x65];
let _ = PacketParser::from_bytes(&data);
Ok(())
}
#[test]
fn packet_parser_on_mangled_cert() -> Result<()> {
let mut ppr = match PacketParser::from_bytes(
crate::tests::key("bobs-cert-badly-mangled.asc")) {
Ok(ppr) => ppr,
Err(_) => return Ok(()),
};
while let PacketParserResult::Some(pp) = ppr {
dbg!(&pp.packet);
if let Ok((_, tmp)) = pp.recurse() {
ppr = tmp;
} else {
break;
}
}
Ok(())
}
#[test]
fn packet_before_junk_emitted() -> Result<()> {
let bytes = crate::tests::key("testy-new.pgp");
let mut ppr = match PacketParser::from_bytes(bytes) {
Ok(ppr) => ppr,
Err(_) => panic!("valid"),
};
let mut packets_ok = Vec::new();
while let PacketParserResult::Some(pp) = ppr {
if let Ok((packet, tmp)) = pp.recurse() {
packets_ok.push(packet);
ppr = tmp;
} else {
break;
}
}
let mut bytes = bytes.to_vec();
bytes.push(0);
let mut ppr = match PacketParser::from_bytes(&bytes[..]) {
Ok(ppr) => ppr,
Err(_) => panic!("valid"),
};
let mut packets_mangled = Vec::new();
while let PacketParserResult::Some(pp) = ppr {
if let Ok((packet, tmp)) = pp.recurse() {
packets_mangled.push(packet);
ppr = tmp;
} else {
break;
}
}
assert_eq!(packets_ok.len(), packets_mangled.len());
assert_eq!(packets_ok, packets_mangled);
Ok(())
}
fn parse_message(message: &str) {
eprintln!("parsing {:?}", message);
let mut ppr = match PacketParser::from_bytes(message) {
Ok(ppr) => ppr,
Err(_) => return,
};
while let PacketParserResult::Some(pp) = ppr {
dbg!(&pp.packet);
if let Ok((_, tmp)) = pp.recurse() {
ppr = tmp;
} else {
break;
}
}
}
#[test]
fn panic_on_short_zip() {
parse_message("-----BEGIN PGP SIGNATURE-----
owGjAA0=
zXvj
-----END PGP SIGNATURE-----
");
}
#[test]
fn panic_on_malformed_armor() {
parse_message("-----BEGIN PGP MESSAGE-----
heLBX8Pq0kUBwQz2iFAzRwOdgTBvH5KsDU9lmE
-----END PGP MESSAGE-----
");
}
#[test]
#[ignore]
fn parse_secret_with_leading_zeros() -> Result<()> {
crate::Cert::from_bytes(
crate::tests::key("leading-zeros-private.pgp"))?
.primary_key().key().clone()
.parts_into_secret()?
.decrypt_secret(&("hunter22"[..]).into())?
.into_keypair()?;
Ok(())
}
#[test]
#[cfg(feature = "compression-deflate")]
fn parse_junk_with_mapping() -> Result<()> {
let silly = "-----BEGIN PGP MESSAGE-----
yCsBO81bKqlfklugX5yRX5qTopuXX6KbWpFZXKJXUlGSetb4dXm+gYFBCRcA
=IHpt
-----END PGP MESSAGE-----
";
let mut ppr = PacketParserBuilder::from_bytes(silly)?
.map(true).buffer_unread_content().build()?;
let mut i = 0;
while let PacketParserResult::Some(pp) = ppr {
assert!(pp.map().unwrap().iter().count() > 0);
for f in pp.map().unwrap().iter() {
eprintln!("{:?}", f);
}
ppr = match pp.recurse() {
Ok((_, ppr)) => {
i += 1;
ppr
},
Err(_) => {
assert_eq!(i, 2);
break;
},
}
}
Ok(())
}
#[test]
fn key_unknown_s2k() -> Result<()> {
let mut ppr = PacketParser::from_bytes(
crate::tests::key("hardware-backed-secret.pgp"))?;
let mut i = 0;
while let PacketParserResult::Some(pp) = ppr {
if i == 0 {
assert!(matches!(&pp.packet, Packet::SecretKey(_)));
}
if i == 3 {
assert!(matches!(&pp.packet, Packet::SecretSubkey(_)));
}
let p = &pp.packet;
let v = p.to_vec()?;
let q = Packet::from_bytes(&v)?;
assert_eq!(p, &q);
ppr = pp.recurse()?.1;
i += 1;
}
Ok(())
}
}