Minor inclusion fixes #1

Author: nemothenoone

include/nil/crypto3/mac/accumulators/mac.hpp

@@ -7,8 +7,8 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //---------------------------------------------------------------------------//
 
-#ifndef CRYPTO3_ACCUMULATORS_BLOCK_HPP
-#define CRYPTO3_ACCUMULATORS_BLOCK_HPP
+#ifndef CRYPTO3_ACCUMULATORS_MAC_HPP
+#define CRYPTO3_ACCUMULATORS_MAC_HPP
 
 #include <boost/container/static_vector.hpp>
 
@@ -19,13 +19,11 @@
 #include <boost/accumulators/framework/depends_on.hpp>
 #include <boost/accumulators/framework/parameters/sample.hpp>
 
-#include <nil/crypto3/block/accumulators/parameters/cipher.hpp>
-#include <nil/crypto3/block/accumulators/parameters/bits.hpp>
+#include <nil/crypto3/mac/accumulators/parameters/cipher.hpp>
+#include <nil/crypto3/mac/accumulators/parameters/bits.hpp>
 
-#include <nil/crypto3/block/detail/make_array.hpp>
-#include <nil/crypto3/block/detail/digest.hpp>
-
-#include <nil/crypto3/block/cipher.hpp>
+#include <nil/crypto3/detail/make_array.hpp>
+#include <nil/crypto3/detail/digest.hpp>
 
 namespace nil {
     namespace crypto3 {

include/nil/crypto3/mac/algorithm/compute.hpp

@@ -12,6 +12,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/concept_check.hpp>
+
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/concepts.hpp>

include/nil/crypto3/mac/algorithm/verify.hpp

@@ -12,6 +12,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/concept_check.hpp>
+
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/concepts.hpp>
@@ -44,7 +45,7 @@ namespace nil {
 
                     return std::move(result.begin(), result.end(), out);
                 };
-            }
+            }    // namespace detail
 
             /*!
              * @brief
@@ -94,8 +95,8 @@ namespace nil {
 
                 return range;
             };
-        }
-    }
-}
+        }    // namespace mac
+    }        // namespace crypto3
+}    // namespace nil
 
-#endif //CRYPTO3_MAC_VERIFY_HPP
+#endif    // CRYPTO3_MAC_VERIFY_HPP

include/nil/crypto3/mac/detail/cbc_mac/accumulator.hpp

@@ -21,8 +21,8 @@
 
 #include <nil/crypto3/block/accumulators/block.hpp>
 
-#include <nil/crypto3/mac/detail/make_array.hpp>
-#include <nil/crypto3/mac/detail/static_digest.hpp>
+#include <nil/crypto3/detail/make_array.hpp>
+#include <nil/crypto3/detail/static_digest.hpp>
 
 namespace nil {
     namespace crypto3 {
@@ -75,7 +75,6 @@ namespace nil {
 
                 protected:
                     inline void process(const block_type &block, std::size_t bits) {
-
                     }
 
                     mac_type mac;

include/nil/crypto3/mac/detail/cmac/accumulator.hpp

@@ -19,8 +19,8 @@
 #include <boost/accumulators/framework/depends_on.hpp>
 #include <boost/accumulators/framework/parameters/sample.hpp>
 
-#include <nil/crypto3/mac/detail/make_array.hpp>
-#include <nil/crypto3/mac/detail/static_digest.hpp>
+#include <nil/crypto3/detail/make_array.hpp>
+#include <nil/crypto3/detail/static_digest.hpp>
 
 namespace nil {
     namespace crypto3 {
@@ -82,7 +82,6 @@ namespace nil {
 
                 protected:
                     inline void process(const block_type &block, std::size_t bits) {
-
                     }
 
                     block::cipher<cipher_type, mode_type, padding_type> cipher;

include/nil/crypto3/mac/detail/gmac/accumulator.hpp

@@ -22,8 +22,8 @@
 #include <nil/crypto3/block/accumulators/parameters/cipher.hpp>
 #include <nil/crypto3/block/accumulators/parameters/bits.hpp>
 
-#include <nil/crypto3/block/detail/make_array.hpp>
-#include <nil/crypto3/block/detail/digest.hpp>
+#include <nil/crypto3/detail/make_array.hpp>
+#include <nil/crypto3/detail/digest.hpp>
 
 #include <nil/crypto3/block/cipher.hpp>
 

include/nil/crypto3/mac/detail/hmac/accumulator.hpp

@@ -22,8 +22,8 @@
 #include <nil/crypto3/block/accumulators/parameters/cipher.hpp>
 #include <nil/crypto3/block/accumulators/parameters/bits.hpp>
 
-#include <nil/crypto3/block/detail/make_array.hpp>
-#include <nil/crypto3/block/detail/digest.hpp>
+#include <nil/crypto3/detail/make_array.hpp>
+#include <nil/crypto3/detail/digest.hpp>
 
 #include <nil/crypto3/block/cipher.hpp>
 

include/nil/crypto3/mac/detail/poly1305/poly1305_policy.hpp

@@ -10,9 +10,10 @@
 #ifndef CRYPTO3_MAC_POLY1305_POLICY_HPP
 #define CRYPTO3_MAC_POLY1305_POLICY_HPP
 
-#include <boost/container/static_vector.hpp>
 #include <boost/integer.hpp>
 
+#include <boost/container/static_vector.hpp>
+
 #include <nil/crypto3/mac/detail/basic_functions.hpp>
 
 namespace nil {

include/nil/crypto3/mac/detail/siphash/siphash_functions.hpp

@@ -10,8 +10,8 @@
 #ifndef CRYPTO3_MAC_SIPHASH_FUNCTIONS_HPP
 #define CRYPTO3_MAC_SIPHASH_FUNCTIONS_HPP
 
-#include <boost/container/static_vector.hpp>
 #include <boost/integer.hpp>
+#include <boost/container/static_vector.hpp>
 
 #include <nil/crypto3/mac/detail/siphash/siphash_policy.hpp>