aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2019-03-27 19:43:13 -0400
committerJack Lloyd <[email protected]>2019-03-27 19:43:13 -0400
commit07dd5c11a7893852f8b08e136da31a9aaa66f1ea (patch)
tree5824d89fc34a051d024e9eb27f5467c1e9a4f2d6
parent87fb7334de6a0f4b8f990e53545c5a46478b0f59 (diff)
Fix some extra semicolons
-rw-r--r--src/build-data/cc/gcc.txt2
-rw-r--r--src/cli/pubkey.cpp2
-rw-r--r--src/cli/tls_server.cpp2
-rw-r--r--src/lib/block/idea/idea.cpp2
-rw-r--r--src/lib/hash/streebog/streebog.h2
-rw-r--r--src/lib/pubkey/ec_group/curve_gfp.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 595b3634e..a72475ca4 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -7,7 +7,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 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant -Wnon-virtual-dtor"
-maintainer_warning_flags "-Wstrict-overflow=5 -Wold-style-cast -Wsuggest-override -Wshadow -Werror -Wno-error=strict-overflow"
+maintainer_warning_flags "-Wstrict-overflow=5 -Wold-style-cast -Wsuggest-override -Wshadow -Wextra-semi -Werror -Wno-error=strict-overflow"
optimization_flags "-O3"
sanitizer_optimization_flags "-O1 -fno-optimize-sibling-calls -fno-omit-frame-pointer"
diff --git a/src/cli/pubkey.cpp b/src/cli/pubkey.cpp
index 9567c9e0b..51224cd1b 100644
--- a/src/cli/pubkey.cpp
+++ b/src/cli/pubkey.cpp
@@ -191,7 +191,7 @@ class PK_Sign final : public Command
const std::string passphrase = get_passphrase_arg("Passphrase for " + key_file, "passphrase");
Botan::DataSource_Stream input(key_file);
- std::unique_ptr<Botan::Private_Key> key = Botan::PKCS8::load_key(input, passphrase);;
+ std::unique_ptr<Botan::Private_Key> key = Botan::PKCS8::load_key(input, passphrase);
if(!key)
{
diff --git a/src/cli/tls_server.cpp b/src/cli/tls_server.cpp
index ad300e8d4..cf1f7a8ff 100644
--- a/src/cli/tls_server.cpp
+++ b/src/cli/tls_server.cpp
@@ -277,7 +277,7 @@ class TLS_Server final : public Command, public Botan::TLS::Callbacks
m_line_buf.clear();
}
}
- };
+ }
void tls_emit_data(const uint8_t buf[], size_t length) override
{
diff --git a/src/lib/block/idea/idea.cpp b/src/lib/block/idea/idea.cpp
index 0bdc36a68..f8f5ceb34 100644
--- a/src/lib/block/idea/idea.cpp
+++ b/src/lib/block/idea/idea.cpp
@@ -29,7 +29,7 @@ inline uint16_t mul(uint16_t x, uint16_t y)
const uint16_t r_1 = static_cast<uint16_t>((P_lo - P_hi) + carry);
const uint16_t r_2 = 1 - x - y;
- return P_mask.select(r_2, r_1);;
+ return P_mask.select(r_2, r_1);
}
/*
diff --git a/src/lib/hash/streebog/streebog.h b/src/lib/hash/streebog/streebog.h
index 2c5928d0e..2a98beb4e 100644
--- a/src/lib/hash/streebog/streebog.h
+++ b/src/lib/hash/streebog/streebog.h
@@ -24,7 +24,7 @@ class BOTAN_PUBLIC_API(2,2) Streebog : public HashFunction
HashFunction* clone() const override { return new Streebog(m_output_bits); }
void clear() override;
std::string name() const override;
- size_t hash_block_size() const override { return 64; };
+ size_t hash_block_size() const override { return 64; }
std::unique_ptr<HashFunction> copy_state() const override;
diff --git a/src/lib/pubkey/ec_group/curve_gfp.cpp b/src/lib/pubkey/ec_group/curve_gfp.cpp
index 4cc4d4255..61ebfda35 100644
--- a/src/lib/pubkey/ec_group/curve_gfp.cpp
+++ b/src/lib/pubkey/ec_group/curve_gfp.cpp
@@ -333,7 +333,7 @@ BigInt CurveGFp_P256::invert_element(const BigInt& x, secure_vector<word>& ws) c
curve_sqr(r, p4, ws);
for(size_t i = 0; i != 3; ++i)
curve_sqr_tmp(r, tmp, ws);
- curve_mul(p8, r, p4, ws);;
+ curve_mul(p8, r, p4, ws);
curve_sqr(r, p8, ws);
for(size_t i = 0; i != 7; ++i)