SW backend API cleanup

Get rid of unnecessary "virtual" specifiers.
Use "override" instead.
Remove unnecessary destructors.

Change-Id: Ide0892647acee5fe2046653d6e65bfa09b2fbe01

diff --git a/src/manager/crypto/sw-backend/obj.h b/src/manager/crypto/sw-backend/obj.h
index 17a69f4..094075e 100644 (file)
--- a/src/manager/crypto/sw-backend/obj.h
+++ b/src/manager/crypto/sw-backend/obj.h
@@ -38,7 +38,7 @@ public:
        BData(RawBuffer buffer, DataType keyType) :
                m_raw(std::move(buffer)), m_type(keyType) {}
 
-       virtual RawBuffer getBinary() const
+       RawBuffer getBinary() const override
        {
                return m_raw;
        }
@@ -53,8 +53,8 @@ public:
        SKey(RawBuffer buffer, DataType keyType) :
                BData(std::move(buffer), keyType) {}
 
-       virtual RawBuffer encrypt(const CryptoAlgorithm &, const RawBuffer &);
-       virtual RawBuffer decrypt(const CryptoAlgorithm &, const RawBuffer &);
+       RawBuffer encrypt(const CryptoAlgorithm &, const RawBuffer &) override;
+       RawBuffer decrypt(const CryptoAlgorithm &, const RawBuffer &) override;
 };
 
 class AKey : public BData {
@@ -62,12 +62,12 @@ public:
        AKey(RawBuffer buffer, DataType dataType) :
                BData(std::move(buffer), dataType) {}
 
-       virtual RawBuffer sign(const CryptoAlgorithm &alg, const RawBuffer &message);
-       virtual int verify(const CryptoAlgorithm &alg, const RawBuffer &message,
-                                          const RawBuffer &sign);
-       virtual RawBuffer encrypt(const CryptoAlgorithm &, const RawBuffer &);
-       virtual RawBuffer decrypt(const CryptoAlgorithm &, const RawBuffer &);
-       virtual ~AKey() {}
+       RawBuffer sign(const CryptoAlgorithm &alg, const RawBuffer &message) override;
+       int verify(const CryptoAlgorithm &alg,
+                  const RawBuffer &message,
+                  const RawBuffer &sign) override;
+       RawBuffer encrypt(const CryptoAlgorithm &, const RawBuffer &) override;
+       RawBuffer decrypt(const CryptoAlgorithm &, const RawBuffer &) override;
 
 protected:
        virtual EvpShPtr getEvpShPtr();
@@ -80,10 +80,8 @@ public:
        Cert(RawBuffer buffer, DataType dataType) :
                AKey(std::move(buffer), dataType) {}
 
-       virtual ~Cert() {}
-
 protected:
-       virtual EvpShPtr getEvpShPtr();
+       EvpShPtr getEvpShPtr() override;
 };
 
 } // namespace SW

diff --git a/src/manager/crypto/sw-backend/store.h b/src/manager/crypto/sw-backend/store.h
index 6acbbd0..cfffd9d 100644 (file)
--- a/src/manager/crypto/sw-backend/store.h
+++ b/src/manager/crypto/sw-backend/store.h
@@ -32,17 +32,17 @@ public:
        explicit Store(CryptoBackend backendId);
 
        virtual GObjUPtr getObject(const Token &, const Password &);
-       virtual TokenPair generateAKey(const CryptoAlgorithm &,
-                                                                  const Password &,
-                                                                  const Password &,
-                                                                  const RawBuffer &,
-                                                                  const RawBuffer &);
-       virtual Token generateSKey(const CryptoAlgorithm &,
-                                                          const Password &,
-                                                          const RawBuffer &);
-       virtual Token import(const Data &data, const Password &, const EncryptionParams &,
-                                                                  const RawBuffer &);
-       virtual void destroy(const Token &) {}
+       TokenPair generateAKey(const CryptoAlgorithm &,
+                                                  const Password &,
+                                                  const Password &,
+                                                  const RawBuffer &,
+                                                  const RawBuffer &) override;
+       Token generateSKey(const CryptoAlgorithm &,
+                                          const Password &,
+                                          const RawBuffer &) override;
+       Token import(const Data &data, const Password &, const EncryptionParams &,
+                                const RawBuffer &) override;
+       void destroy(const Token &) override {}
 };
 
 } // namespace SW