Merge pull request #20 from dongcarl/2018-12-from-inner

[Discussion Needed] Allow constructing Hashes from underlying byte array

Author: apoelstra

src/hash160.rs

@@ -67,6 +67,10 @@ impl HashTrait for Hash {
     fn into_inner(self) -> Self::Inner {
         self.0
     }
+
+    fn from_inner(inner: Self::Inner) -> Self {
+        Hash(inner)
+    }
 }
 
 #[cfg(test)]

src/hmac.rs

@@ -175,6 +175,10 @@ impl<T: Hash> Hash for Hmac<T> {
     fn into_inner(self) -> Self::Inner {
         self.0.into_inner()
     }
+
+    fn from_inner(inner: T::Inner) -> Self {
+        Hmac(T::from_inner(inner))
+    }
 }
 
 #[cfg(feature="serde")]

src/lib.rs

@@ -119,4 +119,7 @@ pub trait Hash: Copy + Clone + PartialEq + Eq + Default + PartialOrd + Ord +
 
     /// Unwraps the hash and returns the underlying byte array
     fn into_inner(self) -> Self::Inner;
+
+    /// Constructs a hash from the underlying byte array
+    fn from_inner(inner: Self::Inner) -> Self;
 }

src/ripemd160.rs

@@ -134,6 +134,10 @@ impl HashTrait for Hash {
     fn into_inner(self) -> Self::Inner {
         self.0
     }
+
+    fn from_inner(inner: Self::Inner) -> Self {
+        Hash(inner)
+    }
 }
 
 macro_rules! round(

src/sha1.rs

@@ -113,6 +113,10 @@ impl HashTrait for Hash {
     fn into_inner(self) -> Self::Inner {
         self.0
     }
+
+    fn from_inner(inner: Self::Inner) -> Self {
+        Hash(inner)
+    }
 }
 
 impl HashEngine {

src/sha256.rs

@@ -127,6 +127,10 @@ impl HashTrait for Hash {
     fn into_inner(self) -> Self::Inner {
         self.0
     }
+
+    fn from_inner(inner: Self::Inner) -> Self {
+        Hash(inner)
+    }
 }
 
 macro_rules! Ch( ($x:expr, $y:expr, $z:expr) => ($z ^ ($x & ($y ^ $z))) );

src/sha256d.rs

@@ -63,6 +63,10 @@ impl HashTrait for Hash {
     fn into_inner(self) -> Self::Inner {
         self.0
     }
+
+    fn from_inner(inner: Self::Inner) -> Self {
+        Hash(inner)
+    }
 }
 
 #[cfg(test)]

src/sha512.rs

@@ -184,6 +184,10 @@ impl HashTrait for Hash {
     fn into_inner(self) -> Self::Inner {
         self.0
     }
+
+    fn from_inner(inner: Self::Inner) -> Self {
+        Hash(inner)
+    }
 }
 
 macro_rules! Ch( ($x:expr, $y:expr, $z:expr) => ($z ^ ($x & ($y ^ $z))) );