diff options
-rw-r--r-- | openpgp/src/parse.rs | 3 | ||||
-rw-r--r-- | openpgp/src/parse/packet_parser_builder.rs | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/openpgp/src/parse.rs b/openpgp/src/parse.rs index f3ba9be6..cbdce4e0 100644 --- a/openpgp/src/parse.rs +++ b/openpgp/src/parse.rs @@ -255,6 +255,7 @@ pub(crate) use self::hashed_reader::{HashedReader, hash_update_text}; mod packet_parser_builder; pub use self::packet_parser_builder::{Dearmor, PacketParserBuilder}; +use packet_parser_builder::ARMOR_READER_LEVEL; pub mod map; mod mpis; @@ -4469,7 +4470,7 @@ impl <'a> PacketParser<'a> { t!("Popped top-level container, done reading message."); // Pop topmost filters (e.g. the armor::Reader). let (_, reader_) = buffered_reader_stack_pop( - reader_, -2)?; + reader_, ARMOR_READER_LEVEL)?; let mut eof = PacketParserEOF::new(state_, reader_); eof.last_path = self.last_path; return Ok((self.packet, diff --git a/openpgp/src/parse/packet_parser_builder.rs b/openpgp/src/parse/packet_parser_builder.rs index a3a14e22..344dbd3f 100644 --- a/openpgp/src/parse/packet_parser_builder.rs +++ b/openpgp/src/parse/packet_parser_builder.rs @@ -58,6 +58,10 @@ impl Default for Dearmor { } } +/// This is the level at which we insert the dearmoring filter into +/// the buffered reader stack. +pub(super) const ARMOR_READER_LEVEL: isize = -2; + /// A builder for configuring a `PacketParser`. /// /// Since the default settings are usually appropriate, this mechanism @@ -419,7 +423,7 @@ impl<'a> PacketParserBuilder<'a> { // the packet parser is finished. We use level -2 for that. self.bio = armor::Reader::from_buffered_reader(self.bio, Some(mode), - Cookie::new(-2)) + Cookie::new(ARMOR_READER_LEVEL)) .as_boxed(); } |