Extend injector interface, add tests, add host endian

include/nil/crypto3/block/accumulators/block.hpp

@@ -70,7 +70,7 @@ namespace nil {
                     constexpr static const std::size_t value_bits = sizeof(typename block_type::value_type) * CHAR_BIT;
                     constexpr static const std::size_t block_values = block_bits / value_bits;
 
-                    typedef ::nil::crypto3::detail::injector<endian_type, value_bits, block_values, block_bits>
+                    typedef ::nil::crypto3::detail::injector<endian_type, endian_type, value_bits, block_values>
                         injector_type;
 
                 public:

include/nil/crypto3/detail/endian_shift.hpp

@@ -102,8 +102,8 @@ namespace nil {
 
                     std::size_t sz[2] = {UnitBits - shift_rem, shift_rem};
                     word_type masks[2] = {
-                        unbounded_shr(high_bits<word_bits>(~word_type(), sz[0]), shift_unit_bits),
-                        unbounded_shr(high_bits<word_bits>(~word_type(), sz[1]), shift_unit_bits + UnitBits + sz[0])};
+                        unbounded_shr(high_bits<word_bits, word_type>(~word_type(), sz[0]), shift_unit_bits),
+                        unbounded_shr(high_bits<word_bits, word_type>(~word_type(), sz[1]), shift_unit_bits + UnitBits + sz[0])};
 
                     std::size_t bits_left = word_bits - shift;
                     word_type w_combined = 0;

include/nil/crypto3/detail/reverser.hpp

@@ -66,7 +66,7 @@ namespace nil {
                 b = unbounded_shr<16>(((b * 0x0802LU & 0x22110LU) | (b * 0x8020LU & 0x88440LU)) * 0x10101LU);
 #elif (BOOST_ARCH_CURRENT_WORD_BITS == 64)
                 b = (b * 0x0202020202ULL & 0x010884422010ULL) % 1023;
-#else                
+#else
 #error "BOOST_ARCH_CURRENT_WORD_BITS not set"
 #endif
             }
@@ -156,7 +156,7 @@ namespace nil {
 
             /*!
              * @brief bit_in_unit_reverser transforms the sequence of bits in each unit of
-             * the input value into reversed sequence of bytes in each unit of the output value.
+             * the input value into reversed sequence of bits in each unit of the output value.
              * The function reverse is recursively invoked and the parameter k is used to track
              * the number of already processed input units. The recursion ends, when all input
              * units have been processed, i.e. when k == InputBits.
@@ -510,6 +510,38 @@ namespace nil {
                     return out;
                 }
             };
+
+            /*!
+             * @brief reverser reverses both the sequence of units in the given value and with within a unit, if InputEndianness
+             * and OutputEndianness endiannesses have different unit orders, and the sequence of bits in each unit of the given value,
+             * if InputEndianness and OutputEndianness endiannesses have different bit orders.
+             *
+             * @ingroup reverser
+             *
+             * @tparam InputEndianness
+             * @tparam OutputEndianness
+             * @tparam UnitBits
+             */
+            template<typename InputEndianness, typename OutputEndianness, int UnitBits>
+            class reverser {
+            private:
+                using unit_reverser_specified = unit_reverser<InputEndianness, OutputEndianness, UnitBits>;
+                using bit_reverser_specified = bit_reverser<InputEndianness, OutputEndianness, UnitBits>;
+            public:
+                template<typename ValueType, int ValueBits = sizeof(ValueType) * CHAR_BIT>
+                inline static void reverse(ValueType &val) {
+                    unit_reverser_specified::reverse(val);
+                    bit_reverser_specified::reverse(val);
+                }
+
+                template<typename ValueType, int ValueBits = sizeof(ValueType) * CHAR_BIT>
+                inline static ValueType reverse(ValueType const &val) {
+                    ValueType out = unit_reverser_specified::reverse(val);
+                    bit_reverser_specified::reverse(out);
+                    return out;
+                }
+            };
+
         }    // namespace detail
     }        // namespace crypto3
 }    // namespace nil

include/nil/crypto3/detail/stream_endian.hpp

@@ -25,6 +25,7 @@
 #ifndef CRYPTO3_STREAM_ENDIAN_HPP
 #define CRYPTO3_STREAM_ENDIAN_HPP
 
+#include <boost/predef/other/endian.h>
 #include <boost/static_assert.hpp>
 
 #include <climits>
@@ -34,6 +35,7 @@ namespace nil {
         namespace stream_endian {
             // General versions; There should be no need to use these directly
 
+            // TODO: int -> std::size_t
             template<int UnitBits>
             struct big_unit_big_bit { };
             template<int UnitBits>
@@ -65,6 +67,19 @@ namespace nil {
 
             typedef host_unit<CHAR_BIT> host_byte;
 
+            using host_endian =
+                #ifdef BOOST_ENDIAN_BIG_BYTE_AVAILABLE
+                    stream_endian::big_octet_big_bit;
+                #elif defined(BOOST_ENDIAN_LITTLE_BYTE_AVAILABLE)
+                    stream_endian::little_octet_big_bit;
+                #elif defined(BOOST_ENDIAN_BIG_WORD_AVAILABLE)
+                    stream_endian::big_unit_big_bit<BOOST_ARCH_CURRENT_WORD_BITS>;
+                #elif defined(BOOST_ENDIAN_LITTLE_WORD_AVAILABLE)
+                    stream_endian::little_unit_big_bit<BOOST_ARCH_CURRENT_WORD_BITS>;
+                #else
+                    #error "Unknown endianness"
+                #endif
+
         }    // namespace stream_endian
     }        // namespace crypto3
 }    // namespace nil

test/CMakeLists.txt

@@ -40,11 +40,12 @@ macro(define_block_cipher_test name)
 endmacro()
 
 set(TESTS_NAMES
-    "pack"
-    "rijndael"
+    "injector"
     "kasumi"
     "md4"
     "md5"
+    "pack"
+    "rijndael"
     "shacal"
     "shacal2")