diff options
author | Daniel Seither <[email protected]> | 2015-07-30 18:59:44 +0200 |
---|---|---|
committer | Daniel Seither <[email protected]> | 2015-07-30 18:59:44 +0200 |
commit | e44e6b50e98628e385f59de4b61b4b4733fc1816 (patch) | |
tree | 89b1d0cb9ecaa1d39d28da0d6b15f91de48bdb6a /src | |
parent | f7348a8be29fa6ca9c869f1c683602bd62734a0d (diff) |
pk_pad: Add missing overrides
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/pk_pad/eme_oaep/oaep.h | 6 | ||||
-rw-r--r-- | src/lib/pk_pad/eme_pkcs1/eme_pkcs.h | 6 | ||||
-rw-r--r-- | src/lib/pk_pad/eme_raw/eme_raw.h | 6 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa1/emsa1.h | 8 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h | 2 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h | 16 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa_pssr/pssr.h | 8 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa_raw/emsa_raw.h | 8 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa_x931/emsa_x931.h | 8 |
9 files changed, 34 insertions, 34 deletions
diff --git a/src/lib/pk_pad/eme_oaep/oaep.h b/src/lib/pk_pad/eme_oaep/oaep.h index 74d8784eb..13e6efeec 100644 --- a/src/lib/pk_pad/eme_oaep/oaep.h +++ b/src/lib/pk_pad/eme_oaep/oaep.h @@ -19,7 +19,7 @@ namespace Botan { class BOTAN_DLL OAEP : public EME { public: - size_t maximum_input_size(size_t) const; + size_t maximum_input_size(size_t) const override; static OAEP* make(const Spec& spec); @@ -30,8 +30,8 @@ class BOTAN_DLL OAEP : public EME OAEP(HashFunction* hash, const std::string& P = ""); private: secure_vector<byte> pad(const byte[], size_t, size_t, - RandomNumberGenerator&) const; - secure_vector<byte> unpad(const byte[], size_t, size_t) const; + RandomNumberGenerator&) const override; + secure_vector<byte> unpad(const byte[], size_t, size_t) const override; secure_vector<byte> m_Phash; std::unique_ptr<HashFunction> m_hash; diff --git a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h index b7261433c..83c99e61b 100644 --- a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h +++ b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h @@ -18,11 +18,11 @@ namespace Botan { class BOTAN_DLL EME_PKCS1v15 : public EME { public: - size_t maximum_input_size(size_t) const; + size_t maximum_input_size(size_t) const override; private: secure_vector<byte> pad(const byte[], size_t, size_t, - RandomNumberGenerator&) const; - secure_vector<byte> unpad(const byte[], size_t, size_t) const; + RandomNumberGenerator&) const override; + secure_vector<byte> unpad(const byte[], size_t, size_t) const override; }; } diff --git a/src/lib/pk_pad/eme_raw/eme_raw.h b/src/lib/pk_pad/eme_raw/eme_raw.h index 34743d1af..04604c72d 100644 --- a/src/lib/pk_pad/eme_raw/eme_raw.h +++ b/src/lib/pk_pad/eme_raw/eme_raw.h @@ -14,14 +14,14 @@ namespace Botan { class BOTAN_DLL EME_Raw : public EME { public: - size_t maximum_input_size(size_t i) const; + size_t maximum_input_size(size_t i) const override; EME_Raw() {} private: secure_vector<byte> pad(const byte[], size_t, size_t, - RandomNumberGenerator&) const; + RandomNumberGenerator&) const override; - secure_vector<byte> unpad(const byte[], size_t, size_t) const; + secure_vector<byte> unpad(const byte[], size_t, size_t) const override; }; } diff --git a/src/lib/pk_pad/emsa1/emsa1.h b/src/lib/pk_pad/emsa1/emsa1.h index e81a746fc..3e10162b2 100644 --- a/src/lib/pk_pad/emsa1/emsa1.h +++ b/src/lib/pk_pad/emsa1/emsa1.h @@ -28,16 +28,16 @@ class BOTAN_DLL EMSA1 : public EMSA protected: size_t hash_output_length() const { return m_hash->output_length(); } private: - void update(const byte[], size_t); - secure_vector<byte> raw_data(); + void update(const byte[], size_t) override; + secure_vector<byte> raw_data() override; secure_vector<byte> encoding_of(const secure_vector<byte>& msg, size_t output_bits, - RandomNumberGenerator& rng); + RandomNumberGenerator& rng) override; bool verify(const secure_vector<byte>& coded, const secure_vector<byte>& raw, - size_t key_bits); + size_t key_bits) override; std::unique_ptr<HashFunction> m_hash; }; diff --git a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h b/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h index 591af2f7d..24d8b99e2 100644 --- a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h +++ b/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h @@ -27,7 +27,7 @@ class BOTAN_DLL EMSA1_BSI : public EMSA1 EMSA1_BSI(HashFunction* hash) : EMSA1(hash) {} private: secure_vector<byte> encoding_of(const secure_vector<byte>&, size_t, - RandomNumberGenerator& rng); + RandomNumberGenerator& rng) override; }; } diff --git a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h index 21ee7c1a2..7bcae3bd1 100644 --- a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h +++ b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h @@ -26,15 +26,15 @@ class BOTAN_DLL EMSA_PKCS1v15 : public EMSA */ EMSA_PKCS1v15(HashFunction* hash); - void update(const byte[], size_t); + void update(const byte[], size_t) override; - secure_vector<byte> raw_data(); + secure_vector<byte> raw_data() override; secure_vector<byte> encoding_of(const secure_vector<byte>&, size_t, - RandomNumberGenerator& rng); + RandomNumberGenerator& rng) override; bool verify(const secure_vector<byte>&, const secure_vector<byte>&, - size_t); + size_t) override; private: std::unique_ptr<HashFunction> m_hash; std::vector<byte> m_hash_id; @@ -48,15 +48,15 @@ class BOTAN_DLL EMSA_PKCS1v15 : public EMSA class BOTAN_DLL EMSA_PKCS1v15_Raw : public EMSA { public: - void update(const byte[], size_t); + void update(const byte[], size_t) override; - secure_vector<byte> raw_data(); + secure_vector<byte> raw_data() override; secure_vector<byte> encoding_of(const secure_vector<byte>&, size_t, - RandomNumberGenerator& rng); + RandomNumberGenerator& rng) override; bool verify(const secure_vector<byte>&, const secure_vector<byte>&, - size_t); + size_t) override; private: secure_vector<byte> message; diff --git a/src/lib/pk_pad/emsa_pssr/pssr.h b/src/lib/pk_pad/emsa_pssr/pssr.h index e51ade494..066c580d8 100644 --- a/src/lib/pk_pad/emsa_pssr/pssr.h +++ b/src/lib/pk_pad/emsa_pssr/pssr.h @@ -33,17 +33,17 @@ class BOTAN_DLL PSSR : public EMSA static PSSR* make(const Spec& spec); private: - void update(const byte input[], size_t length); + void update(const byte input[], size_t length) override; - secure_vector<byte> raw_data(); + secure_vector<byte> raw_data() override; secure_vector<byte> encoding_of(const secure_vector<byte>& msg, size_t output_bits, - RandomNumberGenerator& rng); + RandomNumberGenerator& rng) override; bool verify(const secure_vector<byte>& coded, const secure_vector<byte>& raw, - size_t key_bits); + size_t key_bits) override; size_t SALT_SIZE; std::unique_ptr<HashFunction> hash; diff --git a/src/lib/pk_pad/emsa_raw/emsa_raw.h b/src/lib/pk_pad/emsa_raw/emsa_raw.h index 731405fde..d1d6ac912 100644 --- a/src/lib/pk_pad/emsa_raw/emsa_raw.h +++ b/src/lib/pk_pad/emsa_raw/emsa_raw.h @@ -19,13 +19,13 @@ namespace Botan { class BOTAN_DLL EMSA_Raw : public EMSA { private: - void update(const byte[], size_t); - secure_vector<byte> raw_data(); + void update(const byte[], size_t) override; + secure_vector<byte> raw_data() override; secure_vector<byte> encoding_of(const secure_vector<byte>&, size_t, - RandomNumberGenerator&); + RandomNumberGenerator&) override; bool verify(const secure_vector<byte>&, const secure_vector<byte>&, - size_t); + size_t) override; secure_vector<byte> message; }; diff --git a/src/lib/pk_pad/emsa_x931/emsa_x931.h b/src/lib/pk_pad/emsa_x931/emsa_x931.h index ee57a14ff..29bad4a4a 100644 --- a/src/lib/pk_pad/emsa_x931/emsa_x931.h +++ b/src/lib/pk_pad/emsa_x931/emsa_x931.h @@ -26,14 +26,14 @@ class BOTAN_DLL EMSA_X931 : public EMSA */ EMSA_X931(HashFunction* hash); private: - void update(const byte[], size_t); - secure_vector<byte> raw_data(); + void update(const byte[], size_t) override; + secure_vector<byte> raw_data() override; secure_vector<byte> encoding_of(const secure_vector<byte>&, size_t, - RandomNumberGenerator& rng); + RandomNumberGenerator& rng) override; bool verify(const secure_vector<byte>&, const secure_vector<byte>&, - size_t); + size_t) override; secure_vector<byte> m_empty_hash; std::unique_ptr<HashFunction> m_hash; |