aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Warta <[email protected]>2015-08-08 13:06:40 +0200
committerSimon Warta <[email protected]>2015-08-08 13:06:40 +0200
commit84826abe06174305dd5ad80d0ffdd628f2a2767c (patch)
tree199915e43d655124ec861d2f06b489071a14cc63 /src
parentb3bb7eef49760bb9410b316f1fda0860b94c9a9c (diff)
parent307cee6bcb3858a0f670ef0a03a2191b99ea7345 (diff)
Merge pull request #235 from tiwoc/overrides
Add two missing overrides and fix bug in fuzzer relating to these
Diffstat (limited to 'src')
-rw-r--r--src/cmd/fuzzer.cpp2
-rw-r--r--src/lib/filters/secqueue.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/fuzzer.cpp b/src/cmd/fuzzer.cpp
index 2bbffd288..3174c76b8 100644
--- a/src/cmd/fuzzer.cpp
+++ b/src/cmd/fuzzer.cpp
@@ -39,7 +39,7 @@ class Fuzzer_Creds : public Credentials_Manager
}
std::string psk_identity_hint(const std::string&, const std::string&) override { return "psk_hint"; }
- std::string psk_identity(const std::string&, const std::string&) { return "psk_id"; }
+ std::string psk_identity(const std::string&, const std::string&, const std::string&) override { return "psk_id"; }
SymmetricKey psk(const std::string&, const std::string&, const std::string&) override
{
return SymmetricKey("AABBCCDDEEFF00112233445566778899");
diff --git a/src/lib/filters/secqueue.h b/src/lib/filters/secqueue.h
index b548f367f..759d2001f 100644
--- a/src/lib/filters/secqueue.h
+++ b/src/lib/filters/secqueue.h
@@ -32,7 +32,7 @@ class BOTAN_DLL SecureQueue : public Fanout_Filter, public DataSource
bool empty() const;
- bool check_available(size_t n) { return n <= size(); }
+ bool check_available(size_t n) override { return n <= size(); }
/**
* @return number of bytes available in the queue