Cleanups in MDx_HashFunction

1 files changed, 7 insertions, 5 deletions

diff --git a/src/lib/hash/mdx_hash/mdx_hash.h b/src/lib/hash/mdx_hash/mdx_hash.h
index f958e9fb7..bd2752bef 100644
--- a/src/lib/hash/mdx_hash/mdx_hash.h
+++ b/src/lib/hash/mdx_hash/mdx_hash.h
@@ -27,7 +27,7 @@ class BOTAN_PUBLIC_API(2,0) MDx_HashFunction : public HashFunction
       MDx_HashFunction(size_t block_length,
                        bool big_byte_endian,
                        bool big_bit_endian,
-                       size_t counter_size = 8);
+                       uint8_t counter_size = 8);
 
       size_t hash_block_size() const override final { return m_buffer.size(); }
    protected:
@@ -55,12 +55,14 @@ class BOTAN_PUBLIC_API(2,0) MDx_HashFunction : public HashFunction
       */
       virtual void write_count(uint8_t out[]);
    private:
-      secure_vector<uint8_t> m_buffer;
+      const uint8_t m_pad_char;
+      const uint8_t m_counter_size;
+      const bool m_count_big_endian;
+      const size_t m_block_len;
+
       uint64_t m_count;
+      secure_vector<uint8_t> m_buffer;
       size_t m_position;
-
-      const bool BIG_BYTE_ENDIAN, BIG_BIT_ENDIAN;
-      const size_t COUNT_SIZE;
    };
 
 }