Merge remote-tracking branch 'remotes/github/master' into noreturn

# Conflicts:
#	src/build-data/cc/gcc.txt

1 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/hash/keccak/keccak.h b/src/lib/hash/keccak/keccak.h
index 0e7d3d5d1..c08b6c4e4 100644
--- a/src/lib/hash/keccak/keccak.h
+++ b/src/lib/hash/keccak/keccak.h
@@ -27,8 +27,8 @@ class BOTAN_DLL Keccak_1600 : public HashFunction
       */
       Keccak_1600(size_t output_bits = 512);
 
-      size_t hash_block_size() const override { return bitrate / 8; }
-      size_t output_length() const override { return output_bits / 8; }
+      size_t hash_block_size() const override { return m_bitrate / 8; }
+      size_t output_length() const override { return m_output_bits / 8; }
 
       HashFunction* clone() const override;
       std::string name() const override;
@@ -37,9 +37,9 @@ class BOTAN_DLL Keccak_1600 : public HashFunction
       void add_data(const byte input[], size_t length) override;
       void final_result(byte out[]) override;
 
-      size_t output_bits, bitrate;
-      secure_vector<u64bit> S;
-      size_t S_pos;
+      size_t m_output_bits, m_bitrate;
+      secure_vector<u64bit> m_S;
+      size_t m_S_pos;
    };
 
 }