From fee2617be48d7c86b763dbe198797b02a8ea9a7d Mon Sep 17 00:00:00 2001 From: Daniel Seither Date: Thu, 30 Jul 2015 18:44:52 +0200 Subject: mac: Add missing overrides --- src/lib/mac/cbc_mac/cbc_mac.h | 16 ++++++++-------- src/lib/mac/cmac/cmac.h | 16 ++++++++-------- src/lib/mac/hmac/hmac.h | 16 ++++++++-------- src/lib/mac/poly1305/poly1305.h | 14 +++++++------- src/lib/mac/siphash/siphash.h | 16 ++++++++-------- src/lib/mac/x919_mac/x919_mac.h | 16 ++++++++-------- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/lib/mac/cbc_mac/cbc_mac.h b/src/lib/mac/cbc_mac/cbc_mac.h index 722658174..f1c6d5230 100644 --- a/src/lib/mac/cbc_mac/cbc_mac.h +++ b/src/lib/mac/cbc_mac/cbc_mac.h @@ -19,12 +19,12 @@ namespace Botan { class BOTAN_DLL CBC_MAC : public MessageAuthenticationCode { public: - std::string name() const; - MessageAuthenticationCode* clone() const; - size_t output_length() const { return m_cipher->block_size(); } - void clear(); + std::string name() const override; + MessageAuthenticationCode* clone() const override; + size_t output_length() const override { return m_cipher->block_size(); } + void clear() override; - Key_Length_Specification key_spec() const + Key_Length_Specification key_spec() const override { return m_cipher->key_spec(); } @@ -36,9 +36,9 @@ class BOTAN_DLL CBC_MAC : public MessageAuthenticationCode static CBC_MAC* make(const Spec& spec); private: - void add_data(const byte[], size_t); - void final_result(byte[]); - void key_schedule(const byte[], size_t); + void add_data(const byte[], size_t) override; + void final_result(byte[]) override; + void key_schedule(const byte[], size_t) override; std::unique_ptr m_cipher; secure_vector m_state; diff --git a/src/lib/mac/cmac/cmac.h b/src/lib/mac/cmac/cmac.h index f90e5d40c..4f8d22b76 100644 --- a/src/lib/mac/cmac/cmac.h +++ b/src/lib/mac/cmac/cmac.h @@ -19,13 +19,13 @@ namespace Botan { class BOTAN_DLL CMAC : public MessageAuthenticationCode { public: - std::string name() const; - size_t output_length() const { return m_cipher->block_size(); } - MessageAuthenticationCode* clone() const; + std::string name() const override; + size_t output_length() const override { return m_cipher->block_size(); } + MessageAuthenticationCode* clone() const override; - void clear(); + void clear() override; - Key_Length_Specification key_spec() const + Key_Length_Specification key_spec() const override { return m_cipher->key_spec(); } @@ -47,9 +47,9 @@ class BOTAN_DLL CMAC : public MessageAuthenticationCode CMAC(const CMAC&) = delete; CMAC& operator=(const CMAC&) = delete; private: - void add_data(const byte[], size_t); - void final_result(byte[]); - void key_schedule(const byte[], size_t); + void add_data(const byte[], size_t) override; + void final_result(byte[]) override; + void key_schedule(const byte[], size_t) override; std::unique_ptr m_cipher; secure_vector m_buffer, m_state, m_B, m_P; diff --git a/src/lib/mac/hmac/hmac.h b/src/lib/mac/hmac/hmac.h index 6b01eb365..3f5652352 100644 --- a/src/lib/mac/hmac/hmac.h +++ b/src/lib/mac/hmac/hmac.h @@ -19,13 +19,13 @@ namespace Botan { class BOTAN_DLL HMAC : public MessageAuthenticationCode { public: - void clear(); - std::string name() const; - MessageAuthenticationCode* clone() const; + void clear() override; + std::string name() const override; + MessageAuthenticationCode* clone() const override; - size_t output_length() const { return m_hash->output_length(); } + size_t output_length() const override { return m_hash->output_length(); } - Key_Length_Specification key_spec() const + Key_Length_Specification key_spec() const override { // Absurd max length here is to support PBKDF2 return Key_Length_Specification(0, 512); @@ -41,9 +41,9 @@ class BOTAN_DLL HMAC : public MessageAuthenticationCode HMAC(const HMAC&) = delete; HMAC& operator=(const HMAC&) = delete; private: - void add_data(const byte[], size_t); - void final_result(byte[]); - void key_schedule(const byte[], size_t); + void add_data(const byte[], size_t) override; + void final_result(byte[]) override; + void key_schedule(const byte[], size_t) override; std::unique_ptr m_hash; secure_vector m_ikey, m_okey; diff --git a/src/lib/mac/poly1305/poly1305.h b/src/lib/mac/poly1305/poly1305.h index 1c7fbf7fd..20bc9b5ad 100644 --- a/src/lib/mac/poly1305/poly1305.h +++ b/src/lib/mac/poly1305/poly1305.h @@ -22,21 +22,21 @@ class BOTAN_DLL Poly1305 : public MessageAuthenticationCode public: std::string name() const override { return "Poly1305"; } - MessageAuthenticationCode* clone() const { return new Poly1305; } + MessageAuthenticationCode* clone() const override { return new Poly1305; } - void clear(); + void clear() override; - size_t output_length() const { return 16; } + size_t output_length() const override { return 16; } - Key_Length_Specification key_spec() const + Key_Length_Specification key_spec() const override { return Key_Length_Specification(32); } private: - void add_data(const byte[], size_t); - void final_result(byte[]); - void key_schedule(const byte[], size_t); + void add_data(const byte[], size_t) override; + void final_result(byte[]) override; + void key_schedule(const byte[], size_t) override; secure_vector m_poly; secure_vector m_buf; diff --git a/src/lib/mac/siphash/siphash.h b/src/lib/mac/siphash/siphash.h index ec57864eb..574835ca4 100644 --- a/src/lib/mac/siphash/siphash.h +++ b/src/lib/mac/siphash/siphash.h @@ -17,21 +17,21 @@ class BOTAN_DLL SipHash : public MessageAuthenticationCode public: SipHash(size_t c = 2, size_t d = 4) : m_C(c), m_D(d) {} - void clear(); - std::string name() const; + void clear() override; + std::string name() const override; - MessageAuthenticationCode* clone() const; + MessageAuthenticationCode* clone() const override; - size_t output_length() const { return 8; } + size_t output_length() const override { return 8; } - Key_Length_Specification key_spec() const + Key_Length_Specification key_spec() const override { return Key_Length_Specification(16); } private: - void add_data(const byte[], size_t); - void final_result(byte[]); - void key_schedule(const byte[], size_t); + void add_data(const byte[], size_t) override; + void final_result(byte[]) override; + void key_schedule(const byte[], size_t) override; const size_t m_C, m_D; secure_vector m_V; diff --git a/src/lib/mac/x919_mac/x919_mac.h b/src/lib/mac/x919_mac/x919_mac.h index 7b7d7d88b..9cdcd1527 100644 --- a/src/lib/mac/x919_mac/x919_mac.h +++ b/src/lib/mac/x919_mac/x919_mac.h @@ -19,13 +19,13 @@ namespace Botan { class BOTAN_DLL ANSI_X919_MAC : public MessageAuthenticationCode { public: - void clear(); - std::string name() const; - size_t output_length() const { return 8; } + void clear() override; + std::string name() const override; + size_t output_length() const override { return 8; } - MessageAuthenticationCode* clone() const; + MessageAuthenticationCode* clone() const override; - Key_Length_Specification key_spec() const + Key_Length_Specification key_spec() const override { return Key_Length_Specification(8, 16, 8); } @@ -35,9 +35,9 @@ class BOTAN_DLL ANSI_X919_MAC : public MessageAuthenticationCode ANSI_X919_MAC(const ANSI_X919_MAC&) = delete; ANSI_X919_MAC& operator=(const ANSI_X919_MAC&) = delete; private: - void add_data(const byte[], size_t); - void final_result(byte[]); - void key_schedule(const byte[], size_t); + void add_data(const byte[], size_t) override; + void final_result(byte[]) override; + void key_schedule(const byte[], size_t) override; std::unique_ptr m_des1, m_des2; secure_vector m_state; -- cgit v1.2.3