diff options
| -rw-r--r-- | src/build-data/cc/gcc.txt | 2 | ||||
| -rw-r--r-- | src/cli/speed.cpp | 2 | ||||
| -rw-r--r-- | src/lib/pubkey/dh/dh.cpp | 4 | ||||
| -rw-r--r-- | src/lib/stream/chacha/chacha.cpp | 2 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/build.sh | 1 | ||||
| -rw-r--r-- | src/tests/test_fpe.cpp | 2 | ||||
| -rw-r--r-- | src/tests/unit_tls.cpp | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 7d795d4e1..b086583ff 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -12,7 +12,7 @@ lang_flags "-std=c++11 -D_REENTRANT" # This should only contain flags which are included in GCC 4.8 warning_flags "-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant -Wnon-virtual-dtor" -maintainer_warning_flags "-Wold-style-cast -Wsuggest-override -Wshadow -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 -Wno-error=deprecated-declarations" +maintainer_warning_flags "-Wold-style-cast -Wsuggest-override -Wshadow -Werror -Wno-error=old-style-cast -Wno-error=zero-as-null-pointer-constant -Wno-error=strict-overflow -Wno-error=deprecated-declarations" compile_flags "-c" debug_info_flags "-g" diff --git a/src/cli/speed.cpp b/src/cli/speed.cpp index f1c193ba6..1323fbf3a 100644 --- a/src/cli/speed.cpp +++ b/src/cli/speed.cpp @@ -1092,7 +1092,7 @@ class Speed final : public Command #endif #if defined(BOTAN_HAS_NEWHOPE) && defined(BOTAN_HAS_CHACHA) - void bench_newhope(const std::string& provider, + void bench_newhope(const std::string& /*provider*/, std::chrono::milliseconds msec) { const std::string nm = "NEWHOPE"; diff --git a/src/lib/pubkey/dh/dh.cpp b/src/lib/pubkey/dh/dh.cpp index 763e1f20b..8ed79aa3d 100644 --- a/src/lib/pubkey/dh/dh.cpp +++ b/src/lib/pubkey/dh/dh.cpp @@ -58,7 +58,7 @@ DH_PrivateKey::DH_PrivateKey(RandomNumberGenerator& rng, } else { - //load_check(rng); + load_check(rng); } } @@ -73,7 +73,7 @@ DH_PrivateKey::DH_PrivateKey(const AlgorithmIdentifier& alg_id, if(m_y == 0) m_y = power_mod(group_g(), m_x, group_p()); - //load_check(rng); + load_check(rng); } /* diff --git a/src/lib/stream/chacha/chacha.cpp b/src/lib/stream/chacha/chacha.cpp index 6101281a0..c74f60f2d 100644 --- a/src/lib/stream/chacha/chacha.cpp +++ b/src/lib/stream/chacha/chacha.cpp @@ -57,7 +57,7 @@ void ChaCha::chacha_x4(byte output[64*4], u32bit input[16], size_t rounds) c += d; b ^= c; b = rotate_left(b, 7); \ } while(0) - for(size_t i = 0; i != rounds / 2; ++i) + for(size_t r = 0; r != rounds / 2; ++r) { CHACHA_QUARTER_ROUND(x00, x04, x08, x12); CHACHA_QUARTER_ROUND(x01, x05, x09, x13); diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index cf90136b7..16c4b6524 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -7,6 +7,7 @@ TEST_PREFIX="" TEST_EXE=./botan-test CFG_FLAGS=(--prefix=/tmp/botan-installation --cc=$CC --os=$TRAVIS_OS_NAME) +# PKCS11 is optional but doesn't pull in new dependencies CFG_FLAGS+=(--with-pkcs11) CC_BIN=$CXX diff --git a/src/tests/test_fpe.cpp b/src/tests/test_fpe.cpp index 10f7ceca0..e2a7c6e68 100644 --- a/src/tests/test_fpe.cpp +++ b/src/tests/test_fpe.cpp @@ -19,7 +19,7 @@ class FPE_FE1_Tests : public Text_Based_Test public: FPE_FE1_Tests() : Text_Based_Test("fpe_fe1.vec", {"Mod", "In", "Out", "Key", "Tweak"}) {} - Test::Result run_one_test(const std::string& algo, const VarMap& vars) override + Test::Result run_one_test(const std::string&, const VarMap& vars) override { const Botan::BigInt modulus = get_req_bn(vars, "Mod"); const Botan::BigInt input = get_req_bn(vars, "In"); diff --git a/src/tests/unit_tls.cpp b/src/tests/unit_tls.cpp index 33c6c245e..081b1038d 100644 --- a/src/tests/unit_tls.cpp +++ b/src/tests/unit_tls.cpp @@ -773,7 +773,7 @@ class Test_Policy : public Botan::TLS::Text_Policy size_t dtls_initial_timeout() const override { return 1; } size_t dtls_maximum_timeout() const override { return 8; } - size_t minimum_rsa_bits() const { return 1024; } + size_t minimum_rsa_bits() const override { return 1024; } }; |