diff options
author | lloyd <lloyd@randombit.net> | 2014-01-18 18:17:08 +0000 |
---|---|---|
committer | lloyd <lloyd@randombit.net> | 2014-01-18 18:17:08 +0000 |
commit | b96ad4c05c0a8f835b54ef4e2cff849c749409b0 (patch) | |
tree | d8a5805e6d85cd66d2336f624f0cbeaaf1d5bed3 /src/lib/modes/aead | |
parent | 6b457468faa88180142de9bd2ba0fee90be43463 (diff) |
Split off the keyed interfaces of transform to Keyed_Transform
Remove the unhelpful 'Algorithm' base class which had previously
acted more or less as a global base.
Diffstat (limited to 'src/lib/modes/aead')
-rw-r--r-- | src/lib/modes/aead/ccm/ccm.h | 2 | ||||
-rw-r--r-- | src/lib/modes/aead/eax/eax.h | 6 | ||||
-rw-r--r-- | src/lib/modes/aead/gcm/gcm.h | 6 | ||||
-rw-r--r-- | src/lib/modes/aead/ocb/ocb.h | 6 | ||||
-rw-r--r-- | src/lib/modes/aead/siv/siv.h | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/modes/aead/ccm/ccm.h b/src/lib/modes/aead/ccm/ccm.h index 87dd5805c..a57ef34c1 100644 --- a/src/lib/modes/aead/ccm/ccm.h +++ b/src/lib/modes/aead/ccm/ccm.h @@ -39,7 +39,7 @@ class BOTAN_DLL CCM_Mode : public AEAD_Mode size_t default_nonce_length() const override; - void clear(); + void clear() override; size_t tag_size() const { return m_tag_size; } diff --git a/src/lib/modes/aead/eax/eax.h b/src/lib/modes/aead/eax/eax.h index 224fb5298..89dfff86f 100644 --- a/src/lib/modes/aead/eax/eax.h +++ b/src/lib/modes/aead/eax/eax.h @@ -28,16 +28,16 @@ class BOTAN_DLL EAX_Mode : public AEAD_Mode std::string name() const override; - size_t update_granularity() const; + size_t update_granularity() const override; Key_Length_Specification key_spec() const override; // EAX supports arbitrary nonce lengths bool valid_nonce_length(size_t) const override { return true; } - size_t tag_size() const { return m_tag_size; } + size_t tag_size() const override { return m_tag_size; } - void clear(); + void clear() override; protected: void key_schedule(const byte key[], size_t length) override; diff --git a/src/lib/modes/aead/gcm/gcm.h b/src/lib/modes/aead/gcm/gcm.h index 12d66a3d1..3feaece02 100644 --- a/src/lib/modes/aead/gcm/gcm.h +++ b/src/lib/modes/aead/gcm/gcm.h @@ -36,9 +36,9 @@ class BOTAN_DLL GCM_Mode : public AEAD_Mode // GCM supports arbitrary nonce lengths bool valid_nonce_length(size_t) const override { return true; } - size_t tag_size() const { return m_tag_size; } + size_t tag_size() const override { return m_tag_size; } - void clear(); + void clear() override; protected: void key_schedule(const byte key[], size_t length) override; @@ -124,7 +124,7 @@ class BOTAN_DLL GHASH : public SymmetricAlgorithm Key_Length_Specification key_spec() const { return Key_Length_Specification(16); } - void clear(); + void clear() override; std::string name() const { return "GHASH"; } private: diff --git a/src/lib/modes/aead/ocb/ocb.h b/src/lib/modes/aead/ocb/ocb.h index e7d042de3..05bc859e0 100644 --- a/src/lib/modes/aead/ocb/ocb.h +++ b/src/lib/modes/aead/ocb/ocb.h @@ -35,15 +35,15 @@ class BOTAN_DLL OCB_Mode : public AEAD_Mode std::string name() const override; - size_t update_granularity() const; + size_t update_granularity() const override; Key_Length_Specification key_spec() const override; bool valid_nonce_length(size_t) const override; - size_t tag_size() const { return m_tag_size; } + size_t tag_size() const override { return m_tag_size; } - void clear(); + void clear() override; ~OCB_Mode(); protected: diff --git a/src/lib/modes/aead/siv/siv.h b/src/lib/modes/aead/siv/siv.h index 31df4d049..5ab85e133 100644 --- a/src/lib/modes/aead/siv/siv.h +++ b/src/lib/modes/aead/siv/siv.h @@ -35,15 +35,15 @@ class BOTAN_DLL SIV_Mode : public AEAD_Mode std::string name() const override; - size_t update_granularity() const; + size_t update_granularity() const override; Key_Length_Specification key_spec() const override; bool valid_nonce_length(size_t) const override; - void clear(); + void clear() override; - size_t tag_size() const { return 16; } + size_t tag_size() const override { return 16; } protected: SIV_Mode(BlockCipher* cipher); |