summaryrefslogtreecommitdiffstats
path: root/openpgp
diff options
context:
space:
mode:
Diffstat (limited to 'openpgp')
-rw-r--r--openpgp/src/armor.rs17
-rw-r--r--openpgp/src/crypto/aead.rs5
-rw-r--r--openpgp/src/crypto/mod.rs3
-rw-r--r--openpgp/src/crypto/symmetric.rs5
-rw-r--r--openpgp/src/packet/mod.rs8
-rw-r--r--openpgp/src/packet/signature/subpacket.rs12
-rw-r--r--openpgp/src/packet/user_attribute.rs6
-rw-r--r--openpgp/src/packet_pile.rs9
-rw-r--r--openpgp/src/parse/hashed_reader.rs3
-rw-r--r--openpgp/src/parse/mpis.rs15
-rw-r--r--openpgp/src/parse/packet_parser_builder.rs11
-rw-r--r--openpgp/src/parse/packet_pile_parser.rs9
-rw-r--r--openpgp/src/parse/parse.rs64
-rw-r--r--openpgp/src/parse/stream.rs31
14 files changed, 88 insertions, 110 deletions
diff --git a/openpgp/src/armor.rs b/openpgp/src/armor.rs
index 64cf5242..5fef5c48 100644
--- a/openpgp/src/armor.rs
+++ b/openpgp/src/armor.rs
@@ -26,10 +26,7 @@
//! ```
extern crate base64;
-use buffered_reader::{
- BufferedReader, BufferedReaderGeneric, BufferedReaderMemory,
- BufferedReaderFile,
-};
+use buffered_reader::BufferedReader;
use std::io::{Cursor, Read, Write};
use std::io::{Result, Error, ErrorKind};
use std::path::Path;
@@ -437,7 +434,7 @@ impl<'a> Reader<'a> {
where R: 'a + Read
{
Self::from_buffered_reader(
- Box::new(BufferedReaderGeneric::new(inner, None)),
+ Box::new(buffered_reader::Generic::new(inner, None)),
kind)
}
@@ -446,7 +443,7 @@ impl<'a> Reader<'a> {
where R: 'a + Read
{
Self::from_buffered_reader(
- Box::new(BufferedReaderGeneric::new(reader, None)),
+ Box::new(buffered_reader::Generic::new(reader, None)),
kind)
}
@@ -455,14 +452,14 @@ impl<'a> Reader<'a> {
where P: AsRef<Path>
{
Ok(Self::from_buffered_reader(
- Box::new(BufferedReaderFile::open(path)?),
+ Box::new(buffered_reader::File::open(path)?),
kind))
}
/// Creates a `Reader` from a buffer.
pub fn from_bytes(bytes: &'a [u8], kind: Option<Kind>) -> Self {
Self::from_buffered_reader(
- Box::new(BufferedReaderMemory::new(bytes)),
+ Box::new(buffered_reader::Memory::new(bytes)),
kind)
}
@@ -470,7 +467,7 @@ impl<'a> Reader<'a> {
inner: Box<'a + BufferedReader<C>>, kind: Option<Kind>) -> Self
{
Reader {
- source: Box::new(BufferedReaderGeneric::new(inner, None)),
+ source: Box::new(buffered_reader::Generic::new(inner, None)),
kind: kind,
strict: kind.is_some(),
buffer: Vec::<u8>::with_capacity(1024),
@@ -697,7 +694,7 @@ fn is_armored_pgp_blob(bytes: &[u8]) -> bool {
if d.len() == 0 {
break false;
}
- let mut br = BufferedReaderMemory::new(&d);
+ let mut br = buffered_reader::Memory::new(&d);
break Header::plausible(&mut br).is_ok()
},
Err(_) =>
diff --git a/openpgp/src/crypto/aead.rs b/openpgp/src/crypto/aead.rs
index b791e2b4..6e7dda1b 100644
--- a/openpgp/src/crypto/aead.rs
+++ b/openpgp/src/crypto/aead.rs
@@ -4,7 +4,6 @@ use std::io::{self, Read};
use nettle::{aead, cipher};
use buffered_reader::BufferedReader;
-use buffered_reader::BufferedReaderGeneric;
use constants::{
AEADAlgorithm,
@@ -392,7 +391,7 @@ impl<R: io::Read> io::Read for Decryptor<R> {
/// A `BufferedReader` that decrypts AEAD-encrypted data as it is
/// read.
pub(crate) struct BufferedReaderDecryptor<R: BufferedReader<C>, C> {
- reader: BufferedReaderGeneric<Decryptor<R>, C>,
+ reader: buffered_reader::Generic<Decryptor<R>, C>,
}
impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
@@ -405,7 +404,7 @@ impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
-> Result<Self>
{
Ok(BufferedReaderDecryptor {
- reader: BufferedReaderGeneric::with_cookie(
+ reader: buffered_reader::Generic::with_cookie(
Decryptor::new(version, cipher, aead, chunk_size, iv, key,
source)?,
None, cookie),
diff --git a/openpgp/src/crypto/mod.rs b/openpgp/src/crypto/mod.rs
index 9259611b..eb482c3a 100644
--- a/openpgp/src/crypto/mod.rs
+++ b/openpgp/src/crypto/mod.rs
@@ -168,10 +168,9 @@ pub fn hash_file<R: Read>(reader: R, algos: &[HashAlgorithm])
use ::parse::HashesFor;
use buffered_reader::BufferedReader;
- use buffered_reader::BufferedReaderGeneric;
let reader
- = BufferedReaderGeneric::with_cookie(
+ = buffered_reader::Generic::with_cookie(
reader, None, Default::default());
let mut reader
diff --git a/openpgp/src/crypto/symmetric.rs b/openpgp/src/crypto/symmetric.rs
index 1d18efc9..1a174a4a 100644
--- a/openpgp/src/crypto/symmetric.rs
+++ b/openpgp/src/crypto/symmetric.rs
@@ -9,7 +9,6 @@ use Error;
use SymmetricAlgorithm;
use buffered_reader::BufferedReader;
-use buffered_reader::BufferedReaderGeneric;
use nettle::Cipher;
use nettle::Mode;
@@ -284,7 +283,7 @@ impl<R: io::Read> io::Read for Decryptor<R> {
/// A `BufferedReader` that decrypts symmetrically-encrypted data as
/// it is read.
pub(crate) struct BufferedReaderDecryptor<R: BufferedReader<C>, C> {
- reader: BufferedReaderGeneric<Decryptor<R>, C>,
+ reader: buffered_reader::Generic<Decryptor<R>, C>,
}
impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
@@ -296,7 +295,7 @@ impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
-> Result<Self>
{
Ok(BufferedReaderDecryptor {
- reader: BufferedReaderGeneric::with_cookie(
+ reader: buffered_reader::Generic::with_cookie(
Decryptor::new(algo, key, reader)?, None, cookie),
})
}
diff --git a/openpgp/src/packet/mod.rs b/openpgp/src/packet/mod.rs
index 9bde146e..7f8e1007 100644
--- a/openpgp/src/packet/mod.rs
+++ b/openpgp/src/packet/mod.rs
@@ -182,12 +182,10 @@ impl BodyLength {
#[test]
fn body_length_new_format() {
- use buffered_reader::BufferedReaderMemory;
-
fn test(input: &[u8], expected_result: BodyLength) {
assert_eq!(
BodyLength::parse_new_format(
- &mut BufferedReaderMemory::new(input)).unwrap(),
+ &mut buffered_reader::Memory::new(input)).unwrap(),
expected_result);
}
@@ -211,11 +209,9 @@ fn body_length_new_format() {
#[test]
fn body_length_old_format() {
- use buffered_reader::BufferedReaderMemory;
-
fn test(input: &[u8], plt: PacketLengthType,
expected_result: BodyLength, expected_rest: &[u8]) {
- let mut bio = BufferedReaderMemory::new(input);
+ 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();
diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs
index b5c48c5a..01e9ef6f 100644
--- a/openpgp/src/packet/signature/subpacket.rs
+++ b/openpgp/src/packet/signature/subpacket.rs
@@ -63,7 +63,7 @@ use time;
use quickcheck::{Arbitrary, Gen};
-use buffered_reader::{BufferedReader, BufferedReaderMemory};
+use buffered_reader::BufferedReader;
use {
Error,
@@ -343,7 +343,7 @@ impl Hash for SubpacketArea {
/// Iterates over SubpacketAreas yielding raw packets.
struct SubpacketAreaIterRaw<'a> {
- reader: BufferedReaderMemory<'a, ()>,
+ reader: buffered_reader::Memory<'a, ()>,
data: &'a [u8],
}
@@ -404,7 +404,7 @@ impl<'a> Iterator for SubpacketAreaIterRaw<'a> {
impl SubpacketArea {
fn iter_raw(&self) -> SubpacketAreaIterRaw {
SubpacketAreaIterRaw {
- reader: BufferedReaderMemory::new(&self.data[..]),
+ reader: buffered_reader::Memory::new(&self.data[..]),
data: &self.data[..],
}
}
@@ -1097,7 +1097,7 @@ impl<'a> From<SubpacketRaw<'a>> for Subpacket<'a> {
pub(crate) type SubpacketLength = u32;
pub(crate) trait SubpacketLengthTrait {
/// Parses a subpacket length.
- fn parse<C>(bio: &mut BufferedReaderMemory<C>) -> io::Result<u32>;
+ fn parse<C>(bio: &mut buffered_reader::Memory<C>) -> io::Result<u32>;
/// Writes the subpacket length to `w`.
fn serialize<W: io::Write>(&self, sink: &mut W) -> io::Result<()>;
/// Returns the length of the serialized subpacket length.
@@ -1105,7 +1105,7 @@ pub(crate) trait SubpacketLengthTrait {
}
impl SubpacketLengthTrait for SubpacketLength {
- fn parse<C>(bio: &mut BufferedReaderMemory<C>) -> io::Result<u32> {
+ fn parse<C>(bio: &mut buffered_reader::Memory<C>) -> io::Result<u32> {
let octet1 = bio.data_consume_hard(1)?[0];
if octet1 < 192 {
// One octet.
@@ -1155,7 +1155,7 @@ quickcheck! {
let mut encoded = Vec::new();
length.serialize(&mut encoded).unwrap();
assert_eq!(encoded.len(), length.len());
- let mut reader = BufferedReaderMemory::new(&encoded);
+ let mut reader = buffered_reader::Memory::new(&encoded);
SubpacketLength::parse(&mut reader).unwrap() == length
}
}
diff --git a/openpgp/src/packet/user_attribute.rs b/openpgp/src/packet/user_attribute.rs
index 3df01e3b..dac6a3dd 100644
--- a/openpgp/src/packet/user_attribute.rs
+++ b/openpgp/src/packet/user_attribute.rs
@@ -7,7 +7,7 @@
use std::fmt;
use quickcheck::{Arbitrary, Gen};
-use buffered_reader::{BufferedReader, BufferedReaderMemory};
+use buffered_reader::BufferedReader;
use Error;
use Result;
@@ -79,7 +79,7 @@ impl UserAttribute {
/// Iterates over the subpackets.
pub fn subpackets(&self) -> SubpacketIterator {
SubpacketIterator {
- reader: BufferedReaderMemory::new(&self.value[..]),
+ reader: buffered_reader::Memory::new(&self.value[..]),
}
}
}
@@ -100,7 +100,7 @@ impl Arbitrary for UserAttribute {
/// Iterates over subpackets.
pub struct SubpacketIterator<'a> {
- reader: BufferedReaderMemory<'a, ()>,
+ reader: buffered_reader::Memory<'a, ()>,
}
impl<'a> Iterator for SubpacketIterator<'a> {
diff --git a/openpgp/src/packet_pile.rs b/openpgp/src/packet_pile.rs
index 77525351..9600c4d4 100644
--- a/openpgp/src/packet_pile.rs
+++ b/openpgp/src/packet_pile.rs
@@ -5,9 +5,6 @@ use std::io;
use std::path::Path;
use buffered_reader::BufferedReader;
-use buffered_reader::BufferedReaderGeneric;
-use buffered_reader::BufferedReaderMemory;
-use buffered_reader::BufferedReaderFile;
use Result;
use Error;
@@ -57,7 +54,7 @@ impl<'a> Parse<'a, PacketPile> for PacketPile {
/// [`PacketParser`]: parse/struct.PacketParser.html
/// [`PacketPileParser`]: parse/struct.PacketPileParser.html
fn from_reader<R: 'a + io::Read>(reader: R) -> Result<PacketPile> {
- let bio = BufferedReaderGeneric::with_cookie(
+ let bio = buffered_reader::Generic::with_cookie(
reader, None, Cookie::default());
PacketPile::from_buffered_reader(Box::new(bio))
}
@@ -68,14 +65,14 @@ impl<'a> Parse<'a, PacketPile> for PacketPile {
/// See `from_reader` for more details and caveats.
fn from_file<P: AsRef<Path>>(path: P) -> Result<PacketPile> {
PacketPile::from_buffered_reader(
- Box::new(BufferedReaderFile::with_cookie(path, Cookie::default())?))
+ Box::new(buffered_reader::File::with_cookie(path, Cookie::default())?))
}
/// Deserializes the OpenPGP message stored in the provided buffer.
///
/// See `from_reader` for more details and caveats.
fn from_bytes(data: &'a [u8]) -> Result<PacketPile> {
- let bio = BufferedReaderMemory::with_cookie(
+ let bio = buffered_reader::Memory::with_cookie(
data, Cookie::default());
PacketPile::from_buffered_reader(Box::new(bio))
}
diff --git a/openpgp/src/parse/hashed_reader.rs b/openpgp/src/parse/hashed_reader.rs
index 764451c0..6e4f646b 100644
--- a/openpgp/src/parse/hashed_reader.rs
+++ b/openpgp/src/parse/hashed_reader.rs
@@ -228,7 +228,6 @@ mod test {
use super::*;
use buffered_reader::BufferedReader;
- use buffered_reader::BufferedReaderGeneric;
#[test]
fn hash_test_1() {
@@ -265,7 +264,7 @@ mod test {
for test in tests.iter() {
let reader
- = BufferedReaderGeneric::with_cookie(
+ = buffered_reader::Generic::with_cookie(
test.data, None, Default::default());
let mut reader
= HashedReader::new(reader, HashesFor::MDC,
diff --git a/openpgp/src/parse/mpis.rs b/openpgp/src/parse/mpis.rs
index 49a92d9b..182fb918 100644
--- a/openpgp/src/parse/mpis.rs
+++ b/openpgp/src/parse/mpis.rs
@@ -11,7 +11,6 @@ use {
use constants::Curve;
use crypto::mpis::{self, MPI};
use parse::{
- BufferedReaderGeneric,
PacketHeaderParser,
Cookie,
};
@@ -30,7 +29,7 @@ impl mpis::PublicKey {
use std::io::Cursor;
let cur = Cursor::new(buf);
- let bio = BufferedReaderGeneric::with_cookie(
+ let bio = buffered_reader::Generic::with_cookie(
cur, None, Cookie::default());
let mut php = PacketHeaderParser::new_naked(Box::new(bio));
Self::parse(algo, &mut php)
@@ -154,7 +153,7 @@ impl mpis::SecretKey {
use nettle::hash::insecure_do_not_use::Sha1;
// read mpis
- let bio = BufferedReaderGeneric::with_cookie(
+ let bio = buffered_reader::Generic::with_cookie(
cur, None, Cookie::default());
let mut php = PacketHeaderParser::new_naked(Box::new(bio));
let mpis = Self::parse(algo, &mut php)?;
@@ -191,7 +190,7 @@ impl mpis::SecretKey {
use std::io::Cursor;
let cur = Cursor::new(buf);
- let bio = BufferedReaderGeneric::with_cookie(
+ let bio = buffered_reader::Generic::with_cookie(
cur, None, Cookie::default());
let mut php = PacketHeaderParser::new_naked(Box::new(bio));
Self::parse(algo, &mut php)
@@ -287,7 +286,7 @@ impl mpis::Ciphertext {
use std::io::Cursor;
let cur = Cursor::new(buf);
- let bio = BufferedReaderGeneric::with_cookie(
+ let bio = buffered_reader::Generic::with_cookie(
cur, None, Cookie::default());
let mut php = PacketHeaderParser::new_naked(Box::new(bio));
Self::parse(algo, &mut php)
@@ -367,7 +366,7 @@ impl mpis::Signature {
use std::io::Cursor;
let cur = Cursor::new(buf);
- let bio = BufferedReaderGeneric::with_cookie(
+ let bio = buffered_reader::Generic::with_cookie(
cur, None, Cookie::default());
let mut php = PacketHeaderParser::new_naked(Box::new(bio));
Self::parse(algo, &mut php)
@@ -463,7 +462,7 @@ fn mpis_parse_test() {
{
let buf = b"\x00\x01\x01\x00\x02\x02".to_vec();
let cur = Cursor::new(buf);
- let bio = BufferedReaderGeneric::with_cookie(
+ let bio = buffered_reader::Generic::with_cookie(
cur, None, Cookie::default());
let mut parser = PacketHeaderParser::new_naked(Box::new(bio));
let mpis = mpis::PublicKey::parse(RSAEncryptSign, &mut parser).unwrap();
@@ -487,7 +486,7 @@ fn mpis_parse_test() {
{
let buf = b"\x00\x02\x02".to_vec();
let cur = Cursor::new(buf);
- let bio = BufferedReaderGeneric::with_cookie(
+ let bio = buffered_reader::Generic::with_cookie(
cur, None, Cookie::default());
let mut parser = PacketHeaderParser::new_naked(Box::new(bio));
let mpis = mpis::Ciphertext::parse(RSAEncryptSign, &mut parser)
diff --git a/openpgp/src/parse/packet_parser_builder.rs b/openpgp/src/parse/packet_parser_builder.rs
index cc4591cd..6a66d3c8 100644
--- a/openpgp/src/parse/packet_parser_builder.rs
+++ b/openpgp/src/parse/packet_parser_builder.rs
@@ -2,9 +2,6 @@ use std::io;
use std::path::Path;
use buffered_reader::BufferedReader;
-use buffered_reader::BufferedReaderGeneric;
-use buffered_reader::BufferedReaderMemory;
-use buffered_reader::BufferedReaderFile;
use Result;
use parse::PacketParserResult;
@@ -49,7 +46,7 @@ impl<'a> Parse<'a, PacketParserBuilder<'a>> for PacketParserBuilder<'a> {
/// in a `std::io::Read` object.
fn from_reader<R: io::Read + 'a>(reader: R) -> Result<Self> {
PacketParserBuilder::from_buffered_reader(
- Box::new(BufferedReaderGeneric::with_cookie(
+ Box::new(buffered_reader::Generic::with_cookie(
reader, None, Cookie::default())))
}
@@ -57,14 +54,14 @@ impl<'a> Parse<'a, PacketParserBuilder<'a>> for PacketParserBuilder<'a> {
/// in the file named `path`.
fn from_file<P: AsRef<Path>>(path: P) -> Result<Self> {
PacketParserBuilder::from_buffered_reader(
- Box::new(BufferedReaderFile::with_cookie(path, Cookie::default())?))
+ Box::new(buffered_reader::File::with_cookie(path, Cookie::default())?))
}
/// Creates a `PacketParserBuilder` for an OpenPGP message stored
/// in the specified buffer.
fn from_bytes(bytes: &'a [u8]) -> Result<PacketParserBuilder> {
PacketParserBuilder::from_buffered_reader(
- Box::new(BufferedReaderMemory::with_cookie(
+ Box::new(buffered_reader::Memory::with_cookie(
bytes, Cookie::default())))
}
}
@@ -165,7 +162,7 @@ impl<'a> PacketParserBuilder<'a> {
};
if dearmor {
- self.bio = Box::new(BufferedReaderGeneric::with_cookie(
+ self.bio = Box::new(buffered_reader::Generic::with_cookie(
armor::Reader::from_buffered_reader(self.bio, None),
None,
Default::default()));
diff --git a/openpgp/src/parse/packet_pile_parser.rs b/openpgp/src/parse/packet_pile_parser.rs
index 064b4174..d531727b 100644
--- a/openpgp/src/parse/packet_pile_parser.rs
+++ b/openpgp/src/parse/packet_pile_parser.rs
@@ -14,8 +14,7 @@ use parse::{
Parse,
Cookie
};
-use buffered_reader::{BufferedReader, BufferedReaderGeneric,
- BufferedReaderMemory, BufferedReaderFile};
+use buffered_reader::BufferedReader;
#[cfg(test)]
#[allow(unused_macros)]
@@ -108,7 +107,7 @@ impl<'a> Parse<'a, PacketPileParser<'a>> for PacketPileParser<'a> {
/// in the `io::Read` object.
fn from_reader<R: io::Read + 'a>(reader: R)
-> Result<PacketPileParser<'a>> {
- let bio = Box::new(BufferedReaderGeneric::with_cookie(
+ let bio = Box::new(buffered_reader::Generic::with_cookie(
reader, None, Cookie::default()));
PacketPileParser::from_buffered_reader(bio)
}
@@ -118,14 +117,14 @@ impl<'a> Parse<'a, PacketPileParser<'a>> for PacketPileParser<'a> {
fn from_file<P: AsRef<Path>>(path: P)
-> Result<PacketPileParser<'a>> {
PacketPileParser::from_buffered_reader(
- Box::new(BufferedReaderFile::with_cookie(path, Cookie::default())?))
+ Box::new(buffered_reader::File::with_cookie(path, Cookie::default())?))
}
/// Creates a `PacketPileParser` to parse the OpenPGP message stored
/// in the provided buffer.
fn from_bytes(data: &'a [u8])
-> Result<PacketPileParser<'a>> {
- let bio = Box::new(BufferedReaderMemory::with_cookie(
+ let bio = Box::new(buffered_reader::Memory::with_cookie(
data, Cookie::default()));
PacketPileParser::from_buffered_reader(bio)
}
diff --git a/openpgp/src/parse/parse.rs b/openpgp/src/parse/parse.rs
index 3c159673..54eeab0a 100644
--- a/openpgp/src/parse/parse.rs
+++ b/openpgp/src/parse/parse.rs
@@ -156,10 +156,10 @@ const MAX_RECURSION_DEPTH : u8 = 16;
// This struct is not exposed to the user. Instead, when a header has
// been successfully parsed, a `PacketParser` is returned.
pub(crate) struct PacketHeaderParser<'a> {
- // The reader stack wrapped in a BufferedReaderDup so that if
+ // The reader stack wrapped in a buffered_reader::Dup so that if
// there is a parse error, we can abort and still return an
// Unknown packet.
- reader: BufferedReaderDup<'a, Cookie>,
+ reader: buffered_reader::Dup<'a, Cookie>,
// The current packet's header.
header: Header,
@@ -248,7 +248,7 @@ impl<'a> PacketHeaderParser<'a> {
None
};
PacketHeaderParser {
- reader: BufferedReaderDup::with_cookie(inner, cookie),
+ reader: buffered_reader::Dup::with_cookie(inner, cookie),
header: header,
header_bytes: header_bytes.clone(),
path: path,
@@ -293,7 +293,7 @@ impl<'a> PacketHeaderParser<'a> {
self.field("body", body.len());
}
- // This is a BufferedReaderDup, so this always has an
+ // This is a buffered_reader::Dup, so this always has an
// inner.
let mut inner = Box::new(self.reader).into_inner().unwrap();
@@ -301,14 +301,14 @@ impl<'a> PacketHeaderParser<'a> {
let mut data = Vec::with_capacity(total_out + body.len());
// We know that the inner reader must have at least
// `total_out` bytes buffered, otherwise we could never
- // have read that much from the `BufferedReaderDup`.
+ // have read that much from the `buffered_reader::Dup`.
data.extend_from_slice(&inner.buffer()[..total_out]);
data.extend(body);
self.map.as_mut().unwrap().finalize(data);
inner
} else {
- // This is a BufferedReaderDup, so this always has an
+ // This is a buffered_reader::Dup, so this always has an
// inner.
Box::new(self.reader).into_inner().unwrap()
};
@@ -406,7 +406,7 @@ pub(crate) struct Cookie {
// underlying `BufferedReader`) has no level.
//
// Before parsing a top-level packet, we may push a
- // `BufferedReaderLimitor` in front of the external
+ // `buffered_reader::Limitor` in front of the external
// `BufferedReader`. Such `BufferedReader`s are assigned a level
// of 0.
//
@@ -420,7 +420,7 @@ pub(crate) struct Cookie {
// parser.
//
// When the parser encounters the `CompressedData`'s first child,
- // say, a `Literal` packet, it pushes a `BufferedReaderLimitor` on
+ // say, a `Literal` packet, it pushes a `buffered_reader::Limitor` on
// the `BufferedReader` stack with a level of 1. Then, a
// `PacketParser` for the `Literal` data packet is created with a
// recursion depth of 1.
@@ -773,7 +773,7 @@ impl S2K {
impl<'a> Parse<'a, S2K> for S2K {
/// Reads an S2K from `reader`.
fn from_reader<R: 'a + Read>(reader: R) -> Result<Self> {
- let bio = BufferedReaderGeneric::with_cookie(
+ let bio = buffered_reader::Generic::with_cookie(
reader, None, Cookie::default());
let mut parser = PacketHeaderParser::new_naked(Box::new(bio));
Self::parse(&mut parser)
@@ -882,7 +882,7 @@ impl<'a> Parse<'a, Header> for Header {
/// [Section 4.2 of RFC 4880]: https://tools.ietf.org/html/rfc4880#section-4.2
fn from_reader<R: 'a + Read>(reader: R) -> Result<Self>
{
- let mut reader = BufferedReaderGeneric::with_cookie(
+ let mut reader = buffered_reader::Generic::with_cookie(
reader, None, Cookie::default());
Header::parse(&mut reader)
}
@@ -909,14 +909,14 @@ impl Unknown {
#[cfg(test)]
pub(crate) fn to_unknown_packet<R: Read>(reader: R) -> Result<Unknown>
{
- let mut reader = BufferedReaderGeneric::with_cookie(
+ let mut reader = buffered_reader::Generic::with_cookie(
reader, None, Cookie::default());
let header = Header::parse(&mut reader)?;
let reader : Box<BufferedReader<Cookie>>
= match header.length {
BodyLength::Full(len) =>
- Box::new(BufferedReaderLimitor::with_cookie(
+ Box::new(buffered_reader::Limitor::with_cookie(
Box::new(reader), len as u64