Merge pull request #1568 from evoskuil/master

Add sha256-224 and sha512-224/256/384 template specializations.

Author: evoskuil

include/bitcoin/system/hash/algorithms.hpp

@@ -33,11 +33,11 @@ using rmd160_320 = rmd::algorithm<rmd::h160<320>>; // not fully implemented
 
 /// bc::system sha algorithm aliases (compressed, vectorized, cached).
 using sha160     = sha::algorithm<sha::h160>;
-using sha256_224 = sha::algorithm<sha::h256<224>>; // not fully implemented
+using sha256_224 = sha::algorithm<sha::h256<224>>;
 using sha256     = sha::algorithm<sha::h256<>>;
-using sha512_256 = sha::algorithm<sha::h512<256>>; // not fully implemented
-using sha512_224 = sha::algorithm<sha::h512<224>>; // not fully implemented
-using sha512_384 = sha::algorithm<sha::h512<384>>; // not fully implemented
+using sha512_256 = sha::algorithm<sha::h512<256>>;
+using sha512_224 = sha::algorithm<sha::h512<224>>;
+using sha512_384 = sha::algorithm<sha::h512<384>>;
 using sha512     = sha::algorithm<sha::h512<>>;
 
 } // namespace system

include/bitcoin/system/hash/sha/sha256.hpp

@@ -58,13 +58,19 @@ struct k256
     };
 };
 
-// Digest 224 changes IV (specialize template).
 template <size_t Digest = 256,
     bool_if<Digest == 224 || Digest == 256> = true>
 struct h256
   : public h<k256, Digest>
 {
-    using state_t = typename h<k256, Digest>::state_t;
+    // Digest 224/256 have unique IV (specialize template).
+};
+
+template <>
+struct h256<256>
+  : public h<k256, 256>
+{
+    using state_t = typename h<k256, 256>::state_t;
 
     // initial value (H)
     static constexpr state_t get
@@ -80,6 +86,26 @@ struct h256
     };
 };
 
+template <>
+struct h256<224>
+  : public h<k256, 224>
+{
+    using state_t = typename h<k256, 224>::state_t;
+
+    // initial value (H)
+    static constexpr state_t get
+    {
+        0xc1059ed8,
+        0x367cd507,
+        0x3070dd17,
+        0xf70e5939,
+        0xffc00b31,
+        0x68581511,
+        0x64f98fa7,
+        0xbefa4fa4
+    };
+};
+
 } // namespace sha
 } // namespace system
 } // namespace libbitcoin

include/bitcoin/system/hash/sha/sha512.hpp

@@ -84,14 +84,20 @@ struct k512
     };
 };
 
-// Digest 224/256/384 change IV (specialize template).
 template <size_t Digest = 512,
     bool_if<Digest == 224 || Digest == 256 ||
             Digest == 384 || Digest == 512> = true>
 struct h512
   : public h<k512, Digest>
 {
-    using state_t = typename h<k512, Digest>::state_t;
+    // Digest 224/256/384/512 have unique IV (specialize template).
+};
+
+template <>
+struct h512<512>
+  : public h<k512, 512>
+{
+    using state_t = typename h<k512, 512>::state_t;
 
     // initial value (H)
     static constexpr state_t get
@@ -107,6 +113,66 @@ struct h512
     };
 };
 
+template <>
+struct h512<384>
+  : public h<k512, 384>
+{
+    using state_t = typename h<k512, 384>::state_t;
+
+    // initial value (H)
+    static constexpr state_t get
+    {
+        0xcbbb9d5dc1059ed8,
+        0x629a292a367cd507,
+        0x9159015a3070dd17,
+        0x152fecd8f70e5939,
+        0x67332667ffc00b31,
+        0x8eb44a8768581511,
+        0xdb0c2e0d64f98fa7,
+        0x47b5481dbefa4fa4
+    };
+};
+
+template <>
+struct h512<256>
+  : public h<k512, 256>
+{
+    using state_t = typename h<k512, 256>::state_t;
+
+    // initial value (H)
+    static constexpr state_t get
+    {
+        0x22312194fc2bf72c,
+        0x9f555fa3c84c64c2,
+        0x2393b86b6f53b151,
+        0x963877195940eabd,
+        0x96283ee2a88effe3,
+        0xbe5e1e2553863992,
+        0x2b0199fc2c85b8aa,
+        0x0eb72ddc81c52ca2
+    };
+};
+
+template <>
+struct h512<224>
+  : public h<k512, 224>
+{
+    using state_t = typename h<k512, 224>::state_t;
+
+    // initial value (H)
+    static constexpr state_t get
+    {
+        0x8c3d37c819544da2,
+        0x73e1996689dcd4d6,
+        0x1dfab7ae32ff9c82,
+        0x679dd514582f9fcf,
+        0x0f6d2b697bd44da8,
+        0x77e36f7304c48942,
+        0x3f9d85a86a1d36c8,
+        0x1112e6ad91d692a1
+    };
+};
+
 } // namespace sha
 } // namespace system
 } // namespace libbitcoin

include/bitcoin/system/impl/data/array_cast.ipp

@@ -178,7 +178,7 @@ template <typename To, typename From,
     if_integral_integer<From>,
     if_integral_array<To>>
 inline std_vector<std::reference_wrapper<To>>
- unsafe_vector_cast(From* bytes, size_t count) NOEXCEPT
+unsafe_vector_cast(From* bytes, size_t count) NOEXCEPT
 {
     using inner_type = array_element<To>;
     constexpr auto inner_count = array_count<To>;

include/bitcoin/system/impl/endian/integrals.ipp

@@ -23,7 +23,7 @@
 #include <bitcoin/system/define.hpp>
 #include <bitcoin/system/math/math.hpp>
 
-// These are euqally-efficient generalizations of the common practice of
+// These are equally-efficient generalizations of the common practice of
 // shifting with or-ing to construct integers from bytes, and shifting with
 // masking to obtain bytes from integers. The byte<offset> template performs
 // integer byte extraction (zero offset is low order byte). These avoid byte