buffered-reader: Make Generic::reader private and add accessors.

2 files changed, 6 insertions, 6 deletions

diff --git a/openpgp/src/crypto/aead.rs b/openpgp/src/crypto/aead.rs
index bbeb13bd..d6b937b4 100644
--- a/openpgp/src/crypto/aead.rs
+++ b/openpgp/src/crypto/aead.rs
@@ -480,16 +480,16 @@ impl<'a> BufferedReader<Cookie> for BufferedReaderDecryptor<'a> {
     }
 
     fn get_mut(&mut self) -> Option<&mut dyn BufferedReader<Cookie>> {
-        Some(&mut self.reader.reader.source)
+        Some(&mut self.reader.reader_mut().source)
     }
 
     fn get_ref(&self) -> Option<&dyn BufferedReader<Cookie>> {
-        Some(&self.reader.reader.source)
+        Some(&self.reader.reader_ref().source)
     }
 
     fn into_inner<'b>(self: Box<Self>)
             -> Option<Box<dyn BufferedReader<Cookie> + 'b>> where Self: 'b {
-        Some(self.reader.reader.source.as_boxed())
+        Some(self.reader.into_reader().source.as_boxed())
     }
 
     fn cookie_set(&mut self, cookie: Cookie) -> Cookie {
diff --git a/openpgp/src/crypto/symmetric.rs b/openpgp/src/crypto/symmetric.rs
index 67d64480..09de7448 100644
--- a/openpgp/src/crypto/symmetric.rs
+++ b/openpgp/src/crypto/symmetric.rs
@@ -280,16 +280,16 @@ impl<R: BufferedReader<C>, C> BufferedReader<C>
     }
 
     fn get_mut(&mut self) -> Option<&mut dyn BufferedReader<C>> {
-        Some(&mut self.reader.reader.source)
+        Some(&mut self.reader.reader_mut().source)
     }
 
     fn get_ref(&self) -> Option<&dyn BufferedReader<C>> {
-        Some(&self.reader.reader.source)
+        Some(&self.reader.reader_ref().source)
     }
 
     fn into_inner<'b>(self: Box<Self>)
             -> Option<Box<dyn BufferedReader<C> + 'b>> where Self: 'b {
-        Some(self.reader.reader.source.as_boxed())
+        Some(self.reader.into_reader().source.as_boxed())
     }
 
     fn cookie_set(&mut self, cookie: C) -> C {