openpgp: Prepare to encrypt passwords.

  - Remove direct access, provide Password::map instead.

1 files changed, 9 insertions, 14 deletions

diff --git a/openpgp/src/crypto/mod.rs b/openpgp/src/crypto/mod.rs
index 667f2d82..f02657df 100644
--- a/openpgp/src/crypto/mod.rs
+++ b/openpgp/src/crypto/mod.rs
@@ -116,20 +116,6 @@ impl fmt::Debug for SessionKey {
 #[derive(Clone, PartialEq, Eq)]
 pub struct Password(mem::Protected);
 
-impl AsRef<[u8]> for Password {
-    fn as_ref(&self) -> &[u8] {
-        &self.0
-    }
-}
-
-impl Deref for Password {
-    type Target = [u8];
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
 impl From<Vec<u8>> for Password {
     fn from(v: Vec<u8>) -> Self {
         Password(v.into())
@@ -166,6 +152,15 @@ impl fmt::Debug for Password {
     }
 }
 
+impl Password {
+    /// Maps the given function over the password.
+    pub fn map<F, T>(&self, mut fun: F) -> T
+        where F: FnMut(&mem::Protected) -> T
+    {
+        fun(&self.0)
+    }
+}
+
 
 /// Hash the specified file.
 ///