2 files changed, 20 insertions, 16 deletions
diff --git a/cxx/include/aesxx/api.hpp b/cxx/include/aesxx/api.hpp
index 789320f..68112bf 100644
--- a/cxx/include/aesxx/api.hpp
+++ b/cxx/include/aesxx/api.hpp
@@ -66,20 +66,23 @@ namespace aes
         const typename Types<algorithm>::RoundKeys& encryption_keys,
         typename Types<algorithm>::RoundKeys& decryption_keys);
 
-    template <Algorithm algorithm, Mode mode, typename std::enable_if<ModeRequiresInitVector<mode>::value>::type* = nullptr>
+    template <Algorithm algorithm, Mode mode,
+              typename std::enable_if<ModeRequiresInitVector<mode>::value>::type* = nullptr>
     void encrypt_block(
         const typename Types<algorithm>::Block& plaintext,
         const typename Types<algorithm>::RoundKeys& round_keys,
         typename Types<algorithm>::Block& iv,
         typename Types<algorithm>::Block& ciphertext);
 
-    template <Algorithm algorithm, Mode mode, typename std::enable_if<!ModeRequiresInitVector<mode>::value>::type* = nullptr>
+    template <Algorithm algorithm, Mode mode,
+              typename std::enable_if<!ModeRequiresInitVector<mode>::value>::type* = nullptr>
     void encrypt_block(
         const typename Types<algorithm>::Block& plaintext,
         const typename Types<algorithm>::RoundKeys& round_keys,
         typename Types<algorithm>::Block& ciphertext);
 
-    template <Algorithm algorithm, Mode mode, typename std::enable_if<!ModeRequiresInitVector<mode>::value>::type* = nullptr>
+    template <Algorithm algorithm, Mode mode,
+              typename std::enable_if<!ModeRequiresInitVector<mode>::value>::type* = nullptr>
     void encrypt_block(
         const typename Types<algorithm>::Block& plaintext,
         const typename Types<algorithm>::RoundKeys& round_keys,
@@ -89,20 +92,23 @@ namespace aes
         encrypt_block<algorithm, mode>(plaintext, round_keys, ciphertext);
     }
 
-    template <Algorithm algorithm, Mode mode, typename std::enable_if<ModeRequiresInitVector<mode>::value>::type* = nullptr>
+    template <Algorithm algorithm, Mode mode,
+              typename std::enable_if<ModeRequiresInitVector<mode>::value>::type* = nullptr>
     void decrypt_block(
         const typename Types<algorithm>::Block& ciphertext,
         const typename Types<algorithm>::RoundKeys& round_keys,
         typename Types<algorithm>::Block& iv,
         typename Types<algorithm>::Block& plaintext);
 
-    template <Algorithm algorithm, Mode mode, typename std::enable_if<!ModeRequiresInitVector<mode>::value>::type* = nullptr>
+    template <Algorithm algorithm, Mode mode,
+              typename std::enable_if<!ModeRequiresInitVector<mode>::value>::type* = nullptr>
     void decrypt_block(
         const typename Types<algorithm>::Block& ciphertext,
         const typename Types<algorithm>::RoundKeys& round_keys,
         typename Types<algorithm>::Block& plaintext);
 
-    template <Algorithm algorithm, Mode mode, typename std::enable_if<!ModeRequiresInitVector<mode>::value>::type* = nullptr>
+    template <Algorithm algorithm, Mode mode,
+              typename std::enable_if<!ModeRequiresInitVector<mode>::value>::type* = nullptr>
     void decrypt_block(
         const typename Types<algorithm>::Block& ciphertext,
         const typename Types<algorithm>::RoundKeys& round_keys,
@@ -117,7 +123,7 @@ namespace aes
     {
         EncryptWrapper(
             const typename Types<algorithm>::Key& key,
-            const typename Types<algorithm>::Block& iv) : iv(iv)
+            const typename Types<algorithm>::Block& iv) : iv{iv}
         {
             expand_key<algorithm>(key, encryption_keys);
         }
@@ -139,7 +145,7 @@ namespace aes
     {
         DecryptWrapper(
             const typename Types<algorithm>::Key& key,
-            const typename Types<algorithm>::Block& iv) : iv(iv)
+            const typename Types<algorithm>::Block& iv) : iv{iv}
         {
             typename Types<algorithm>::RoundKeys encryption_keys;
             expand_key<algorithm>(key, encryption_keys);
diff --git a/cxx/include/aesxx/box.hpp b/cxx/include/aesxx/box.hpp
index 3d9529b..076407c 100644
--- a/cxx/include/aesxx/box.hpp
+++ b/cxx/include/aesxx/box.hpp
@@ -11,10 +11,8 @@
 
 #include <aes/all.h>
 
-#include <cassert>
 #include <cstddef>
 
-#include <iostream>
 #include <string>
 #include <vector>
 
@@ -77,16 +75,16 @@ namespace aes
         }
 
         Box(Algorithm algorithm, const Key& key)
-            : algorithm(algorithm)
-            , mode(AES_ECB)
+            : algorithm{algorithm}
+            , mode{AES_ECB}
         {
             aes_box_init(&impl, algorithm, &key, mode, nullptr,
                 ErrorDetailsThrowsInDestructor{});
         }
 
         Box(Algorithm algorithm, const Key& key, Mode mode, const Block& iv)
-            : algorithm(algorithm)
-            , mode(mode)
+            : algorithm{algorithm}
+            , mode{mode}
         {
             aes_box_init(&impl, algorithm, &key, mode, &iv,
                 ErrorDetailsThrowsInDestructor{});
@@ -110,7 +108,7 @@ namespace aes
             const void* src_buf,
             std::size_t src_size)
         {
-            std::size_t dest_size;
+            std::size_t dest_size = 0;
 
             aes_box_encrypt_buffer(
                 &impl,
@@ -139,7 +137,7 @@ namespace aes
             const void* src_buf,
             std::size_t src_size)
         {
-            std::size_t dest_size;
+            std::size_t dest_size = 0;
 
             aes_box_decrypt_buffer(
                 &impl,