Additional final annotations

6 files changed, 16 insertions, 15 deletions

diff --git a/src/cli/cli.h b/src/cli/cli.h
index fc27e1d83..1e81c2ff6 100644
--- a/src/cli/cli.h
+++ b/src/cli/cli.h
@@ -554,7 +554,7 @@ class Command
          return r;
          }
 
-      class Registration
+      class Registration final
          {
          public:
             Registration(const std::string& name, cmd_maker_fn maker_fn)
diff --git a/src/cli/encryption.cpp b/src/cli/encryption.cpp
index 9c9279901..e8d5622c2 100644
--- a/src/cli/encryption.cpp
+++ b/src/cli/encryption.cpp
@@ -74,7 +74,7 @@ secure_vector<byte> do_crypt(const std::string &cipher,
 
 }
 
-class Encryption : public Command
+class Encryption final : public Command
    {
    public:
       Encryption() : Command("encryption --buf-size=4096 --decrypt --mode= --key= --iv= --ad=") {}
diff --git a/src/cli/speed.cpp b/src/cli/speed.cpp
index 9e1430668..3bb4f9279 100644
--- a/src/cli/speed.cpp
+++ b/src/cli/speed.cpp
@@ -132,7 +132,7 @@ namespace Botan_CLI {
 
 namespace {
 
-class Timer
+class Timer final
    {
    public:
       Timer(const std::string& name,
@@ -211,7 +211,7 @@ class Timer
          return (milliseconds() < msec.count());
          }
 
-      class Timer_Scope
+      class Timer_Scope final
          {
          public:
             explicit Timer_Scope(Timer& timer)
@@ -465,7 +465,7 @@ std::vector<std::string> default_benchmark_list()
 
 }
 
-class Summary
+class Summary final
    {
    public:
       Summary() {}
@@ -591,7 +591,7 @@ class Summary
          }
 
    private:
-      class EntryBps
+      class EntryBps final
          {
          public:
             EntryBps(const std::string& algo
@@ -618,7 +618,7 @@ class Summary
             std::map<size_t, double> m_bps;
          };
 
-      class EntryOps
+      class EntryOps final
          {
          public:
             EntryOps(const std::string& algo
diff --git a/src/cli/timing_tests.cpp b/src/cli/timing_tests.cpp
index 9600f2a5e..258780845 100644
--- a/src/cli/timing_tests.cpp
+++ b/src/cli/timing_tests.cpp
@@ -89,7 +89,7 @@ class Timing_Test
 
 #if defined(BOTAN_HAS_RSA) && defined(BOTAN_HAS_EME_PKCS1v15) && defined(BOTAN_HAS_EME_RAW)
 
-class Bleichenbacker_Timing_Test : public Timing_Test
+class Bleichenbacker_Timing_Test final : public Timing_Test
    {
    public:
       Bleichenbacker_Timing_Test(size_t keysize)
@@ -133,7 +133,7 @@ class Bleichenbacker_Timing_Test : public Timing_Test
 * Padding (OAEP) as Standardized in PKCS #1 v2.0" James Manger
 * http://archiv.infsec.ethz.ch/education/fs08/secsem/Manger01.pdf
 */
-class Manger_Timing_Test : public Timing_Test
+class Manger_Timing_Test final : public Timing_Test
    {
    public:
       Manger_Timing_Test(size_t keysize)
@@ -181,7 +181,7 @@ class Manger_Timing_Test : public Timing_Test
 /*
 * Test handling of countermeasure to the Lucky13 attack
 */
-class Lucky13_Timing_Test : public Timing_Test
+class Lucky13_Timing_Test final : public Timing_Test
    {
    public:
       Lucky13_Timing_Test(const std::string& mac_name, size_t mac_keylen)
@@ -240,7 +240,7 @@ ticks Lucky13_Timing_Test::measure_critical_function(std::vector<uint8_t> input)
 
 #if defined(BOTAN_HAS_ECDSA)
 
-class ECDSA_Timing_Test : public Timing_Test
+class ECDSA_Timing_Test final : public Timing_Test
    {
    public:
       ECDSA_Timing_Test(std::string ecgroup);
@@ -337,7 +337,7 @@ std::vector<std::vector<ticks>> Timing_Test::execute_evaluation(
    return all_results;
    }
 
-class Timing_Test_Command : public Command
+class Timing_Test_Command final : public Command
    {
    public:
       Timing_Test_Command()
diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp
index 25ffabdb8..2c5f6889d 100644
--- a/src/cli/tls_proxy.cpp
+++ b/src/cli/tls_proxy.cpp
@@ -60,7 +60,8 @@ void log_text_message(const char* where,  const uint8_t buf[], size_t buf_len)
    //std::cout << where << ' ' << std::string(c, c + buf_len)  << std::endl;
    }
 
-class tls_proxy_session : public boost::enable_shared_from_this<tls_proxy_session>, public Botan::TLS::Callbacks
+class tls_proxy_session final : public boost::enable_shared_from_this<tls_proxy_session>,
+                                public Botan::TLS::Callbacks
    {
    public:
       enum { readbuf_size = 4 * 1024 };
@@ -337,7 +338,7 @@ class tls_proxy_session : public boost::enable_shared_from_this<tls_proxy_sessio
       std::vector<uint8_t> m_p2s_pending;
    };
 
-class tls_proxy_server
+class tls_proxy_server final
    {
    public:
       typedef tls_proxy_session session;
diff --git a/src/cli/tls_utils.cpp b/src/cli/tls_utils.cpp
index 96be073db..f62781af9 100644
--- a/src/cli/tls_utils.cpp
+++ b/src/cli/tls_utils.cpp
@@ -16,7 +16,7 @@
 
 namespace Botan_CLI {
 
-class TLS_All_Policy : public Botan::TLS::Policy
+class TLS_All_Policy final : public Botan::TLS::Policy
    {
    public:
       std::vector<std::string> allowed_ciphers() const override