Merge GH #404

10 files changed, 10 insertions, 10 deletions

diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 79c9ba5f4..c507b6f02 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -8,7 +8,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lang_flags "-std=c++11 -D_REENTRANT"
-maintainer_warning_flags "-Wold-style-cast -Werror -Wno-error=old-style-cast -Wno-error=zero-as-null-pointer-constant -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=strict-overflow"
+maintainer_warning_flags "-Wold-style-cast -Werror -Wno-error=old-style-cast -Wno-error=zero-as-null-pointer-constant -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=strict-overflow -Wsuggest-override"
 warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant -Wnon-virtual-dtor"
 
 compile_flags "-c"
diff --git a/src/cli/bench.cpp b/src/cli/bench.cpp
index 44668f1d3..4f1986de6 100644
--- a/src/cli/bench.cpp
+++ b/src/cli/bench.cpp
@@ -245,7 +245,7 @@ class Benchmark : public Command
    public:
       Benchmark() : Command("bench --msec=1000 --provider= --buf-size=8 *algos") {}
 
-      void go()
+      void go() override
          {
          std::chrono::milliseconds msec(get_arg_sz("msec"));
          const size_t buf_size = get_arg_sz("buf-size");
diff --git a/src/lib/pubkey/pk_ops_impl.h b/src/lib/pubkey/pk_ops_impl.h
index 0acceb53c..bda3434bf 100644
--- a/src/lib/pubkey/pk_ops_impl.h
+++ b/src/lib/pubkey/pk_ops_impl.h
@@ -167,7 +167,7 @@ class KEM_Decryption_with_KDF : public KEM_Decryption
                                       size_t len,
                                       size_t desired_shared_key_len,
                                       const uint8_t salt[],
-                                      size_t salt_len);
+                                      size_t salt_len) override;
 
    protected:
       virtual secure_vector<byte>
diff --git a/src/tests/test_bigint.cpp b/src/tests/test_bigint.cpp
index 6599b89b3..e63be6333 100644
--- a/src/tests/test_bigint.cpp
+++ b/src/tests/test_bigint.cpp
@@ -152,7 +152,7 @@ class BigInt_KAT_Tests : public Text_Based_Test
                                            {"In1","In2","Input","Shift","Modulus","Value","Base","Exponent","IsPrime"})
          {}
 
-      Test::Result run_one_test(const std::string& algo, const VarMap& vars)
+      Test::Result run_one_test(const std::string& algo, const VarMap& vars) override
          {
          Test::Result result("BigInt " + algo);
 
diff --git a/src/tests/test_c25519.cpp b/src/tests/test_c25519.cpp
index c04902674..43be2258b 100644
--- a/src/tests/test_c25519.cpp
+++ b/src/tests/test_c25519.cpp
@@ -42,7 +42,7 @@ class Curve25519_Sclarmult_Tests : public Text_Based_Test
 class Curve25519_Roundtrip_Test : public Test
    {
    public:
-      std::vector<Test::Result> run()
+      std::vector<Test::Result> run() override
          {
          std::vector<Test::Result> results;
 
diff --git a/src/tests/test_kdf.cpp b/src/tests/test_kdf.cpp
index e1bd0305c..c11edd817 100644
--- a/src/tests/test_kdf.cpp
+++ b/src/tests/test_kdf.cpp
@@ -23,7 +23,7 @@ class KDF_KAT_Tests : public Text_Based_Test
                                         {"IKM","XTS"})
          {}
 
-      Test::Result run_one_test(const std::string& kdf_name, const VarMap& vars)
+      Test::Result run_one_test(const std::string& kdf_name, const VarMap& vars) override
          {
          Test::Result result(kdf_name);
 
diff --git a/src/tests/test_ocb.cpp b/src/tests/test_ocb.cpp
index 5c45acb0c..0e2dcda05 100644
--- a/src/tests/test_ocb.cpp
+++ b/src/tests/test_ocb.cpp
@@ -23,7 +23,7 @@ class OCB_Long_KAT_Tests : public Text_Based_Test
       OCB_Long_KAT_Tests() : Text_Based_Test("ocb_long.vec",
                                              {"Keylen", "Taglen", "Output"}) {}
 
-      Test::Result run_one_test(const std::string&, const VarMap& vars)
+      Test::Result run_one_test(const std::string&, const VarMap& vars) override
          {
          const size_t keylen = get_req_sz(vars, "Keylen");
          const size_t taglen = get_req_sz(vars, "Taglen");
diff --git a/src/tests/test_pbkdf.cpp b/src/tests/test_pbkdf.cpp
index a6b673199..393a96243 100644
--- a/src/tests/test_pbkdf.cpp
+++ b/src/tests/test_pbkdf.cpp
@@ -22,7 +22,7 @@ class PBKDF_KAT_Tests : public Text_Based_Test
                                           {"OutputLen", "Iterations", "Salt", "Passphrase", "Output"})
          {}
 
-      Test::Result run_one_test(const std::string& pbkdf_name, const VarMap& vars)
+      Test::Result run_one_test(const std::string& pbkdf_name, const VarMap& vars) override
          {
          Test::Result result(pbkdf_name);
          std::unique_ptr<Botan::PBKDF> pbkdf(Botan::PBKDF::create(pbkdf_name));
diff --git a/src/tests/test_rfc6979.cpp b/src/tests/test_rfc6979.cpp
index 0ebb4c86d..30846c9e3 100644
--- a/src/tests/test_rfc6979.cpp
+++ b/src/tests/test_rfc6979.cpp
@@ -23,7 +23,7 @@ class RFC6979_KAT_Tests : public Text_Based_Test
       RFC6979_KAT_Tests() : Text_Based_Test("rfc6979.vec",
                                             {"Q", "X", "H", "K"}) {}
 
-      Test::Result run_one_test(const std::string& hash, const VarMap& vars)
+      Test::Result run_one_test(const std::string& hash, const VarMap& vars) override
          {
          const BigInt Q = get_req_bn(vars, "Q");
          const BigInt X = get_req_bn(vars, "X");
diff --git a/src/tests/unit_ecc.cpp b/src/tests/unit_ecc.cpp
index 4cb585e45..2bcf4d3dc 100644
--- a/src/tests/unit_ecc.cpp
+++ b/src/tests/unit_ecc.cpp
@@ -195,7 +195,7 @@ class NIST_Curve_Reduction_Tests : public Test
    {
    public:
       typedef std::function<void (Botan::BigInt&, Botan::secure_vector<Botan::word>&)> reducer_fn;
-      std::vector<Test::Result> run()
+      std::vector<Test::Result> run() override
          {
          std::vector<Test::Result> results;