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.

10 files changed, 18 insertions, 18 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);
diff --git a/src/lib/modes/cbc/cbc.h b/src/lib/modes/cbc/cbc.h
index 0a10f3661..707b4a446 100644
--- a/src/lib/modes/cbc/cbc.h
+++ b/src/lib/modes/cbc/cbc.h
@@ -33,7 +33,7 @@ class BOTAN_DLL CBC_Mode : public Cipher_Mode
 
       bool valid_nonce_length(size_t n) const override;
 
-      void clear();
+      void clear() override;
    protected:
       CBC_Mode(BlockCipher* cipher, BlockCipherModePaddingMethod* padding);
 
diff --git a/src/lib/modes/cfb/cfb.h b/src/lib/modes/cfb/cfb.h
index 48be0a2d9..9145e5667 100644
--- a/src/lib/modes/cfb/cfb.h
+++ b/src/lib/modes/cfb/cfb.h
@@ -37,7 +37,7 @@ class BOTAN_DLL CFB_Mode : public Cipher_Mode
 
       bool valid_nonce_length(size_t n) const override;
 
-      void clear();
+      void clear() override;
    protected:
       CFB_Mode(BlockCipher* cipher, size_t feedback_bits);
 
diff --git a/src/lib/modes/cipher_mode.h b/src/lib/modes/cipher_mode.h
index 91e2af5a9..ce5427ad9 100644
--- a/src/lib/modes/cipher_mode.h
+++ b/src/lib/modes/cipher_mode.h
@@ -15,7 +15,7 @@ namespace Botan {
 /**
 * Interface for cipher modes
 */
-class BOTAN_DLL Cipher_Mode : public Transformation
+class BOTAN_DLL Cipher_Mode : public Keyed_Transform
    {
    public:
       /**
diff --git a/src/lib/modes/ecb/ecb.h b/src/lib/modes/ecb/ecb.h
index 441eafbc1..b1561bf4f 100644
--- a/src/lib/modes/ecb/ecb.h
+++ b/src/lib/modes/ecb/ecb.h
@@ -33,7 +33,7 @@ class BOTAN_DLL ECB_Mode : public Cipher_Mode
 
       bool valid_nonce_length(size_t n) const override;
 
-      void clear();
+      void clear() override;
    protected:
       ECB_Mode(BlockCipher* cipher, BlockCipherModePaddingMethod* padding);
 
diff --git a/src/lib/modes/xts/xts.h b/src/lib/modes/xts/xts.h
index 21bc495e1..3a83b3864 100644
--- a/src/lib/modes/xts/xts.h
+++ b/src/lib/modes/xts/xts.h
@@ -34,7 +34,7 @@ class BOTAN_DLL XTS_Mode : public Cipher_Mode
 
       bool valid_nonce_length(size_t n) const override;
 
-      void clear();
+      void clear() override;
    protected:
       XTS_Mode(BlockCipher* cipher);