Make structure containers to handle memory in key-provider

Make WrappedKeyMaterialContainer class for handling memory for WrappedKeyMaterial structure
Replace space with tab

Change-Id: I2fdd44d9980fcb7a8f2992aaa3f4d3aaad6c5f19
Signed-off-by: kyungwook tak <k.tak@samsung.com>

diff --git a/src/manager/service/key-provider.h b/src/manager/service/key-provider.h
index 60fccf1..a8d6fff 100644 (file)
--- a/src/manager/service/key-provider.h
+++ b/src/manager/service/key-provider.h
@@ -7,8 +7,32 @@
 
 namespace CKM {
 
-// This is internal api so all functions should throw exception on errors.
+class WrappedKeyMaterialContainer{
+public:
+       WrappedKeyMaterialContainer();
+       WrappedKeyMaterialContainer(const unsigned char*);
+       WrappedKeyMaterial& getWrappedKeyMaterial();
+       ~WrappedKeyMaterialContainer();
+private:
+       WrappedKeyMaterial *wrappedKeyMaterial;
+};
 
+class KeyMaterialContainer{
+public:
+       class Exception{
+       public:
+               DECLARE_EXCEPTION_TYPE(CKM::Exception, Base)
+       };
+       KeyMaterialContainer();
+       KeyMaterialContainer(const unsigned char*);
+       KeyMaterial& getKeyMaterial();
+       ~KeyMaterialContainer();
+private:
+       KeyMaterial *keyMaterial;
+};
+
+
+// This is internal api so all functions should throw exception on errors.
 class KeyProvider {
 public:
        class Exception {
@@ -21,64 +45,63 @@ public:
                DECLARE_EXCEPTION_TYPE(Base, InputParamError)
        };
 
-    // To store in std containers
-    KeyProvider();
-    // In constructor you must check if SKMM is initialized. On error -> exception
-    // keyInWrapForm should be used like this:
-    // if (keyInWrapForm.size() != sizeof(WrappedKeyMaterial))
-    //     throw exception; // buffer does not have proper size to store WrappedKeyMaterial
-    // WrappedKeyMaterial *wkm = static_cast<WrappedKeyMaterial>(keyInWrapForm.data());
-    KeyProvider(const RawBuffer &domainKEKInWrapForm, const std::string &password);
+       // To store in std containers
+       KeyProvider();
+       // In constructor you must check if SKMM is initialized. On error -> exception
+       // keyInWrapForm should be used like this:
+       // if (keyInWrapForm.size() != sizeof(WrappedKeyMaterial))
+       //       throw exception; // buffer does not have proper size to store WrappedKeyMaterial
+       // WrappedKeyMaterial *wkm = static_cast<WrappedKeyMaterial>(keyInWrapForm.data());
+       KeyProvider(const RawBuffer &domainKEKInWrapForm, const std::string &password);
 
-    KeyProvider(KeyProvider &&);
-    KeyProvider(const KeyProvider &) = delete;
-    KeyProvider& operator=(const KeyProvider &) = delete;
-    KeyProvider& operator=(KeyProvider &&);
+       KeyProvider(KeyProvider &&);
+       KeyProvider(const KeyProvider &) = delete;
+       KeyProvider& operator=(const KeyProvider &) = delete;
+       KeyProvider& operator=(KeyProvider &&);
 
-    bool isInitialized();
+       bool isInitialized();
 
-    // Returns Key used to decrypt database.
-    RawBuffer getPureDomainKEK();
+       // Returns Key used to decrypt database.
+       RawBuffer getPureDomainKEK();
 
-    // Returns Key in form used to store key in file
-    // Requied by Control::resetPassword(const RawBuffer &newPassword);
-    // This api should be used only on Tizen 2.2.1
-    RawBuffer getWrappedDomainKEK(const std::string &password);
+       // Returns Key in form used to store key in file
+       // Requied by Control::resetPassword(const RawBuffer &newPassword);
+       // This api should be used only on Tizen 2.2.1
+       RawBuffer getWrappedDomainKEK(const std::string &password);
 
-    // EncryptedKey key extracted from database. Used to encrypt application data.
-    // This key will be used to decrypt/encrypt data in ROW
+       // EncryptedKey key extracted from database. Used to encrypt application data.
+       // This key will be used to decrypt/encrypt data in ROW
        // [tak] modify method name more appropriately getPureDEK
        // decryptDEK -> getPureDEK
-    KeyAES getPureDEK(const RawBuffer &DEKInWrapForm);
+       KeyAES getPureDEK(const RawBuffer &DEKInWrapForm);
 
-    // Returns WRAPPED DEK. This will be written to datbase.
-    // This key will be used to encrypt all application information.
-    // All application are identified by smackLabel.
-    RawBuffer generateDEK(const std::string &smackLabel);
+       // Returns WRAPPED DEK. This will be written to datbase.
+       // This key will be used to encrypt all application information.
+       // All application are identified by smackLabel.
+       RawBuffer generateDEK(const std::string &smackLabel);
 
-    // used by change user password. On error -> exception
-    static RawBuffer reencrypt(
-        const RawBuffer &domainKEKInWrapForm,
-        const std::string &oldPass,
-        const std::string &newPass);
+       // used by change user password. On error -> exception
+       static RawBuffer reencrypt(
+               const RawBuffer &domainKEKInWrapForm,
+               const std::string &oldPass,
+               const std::string &newPass);
 
-    // First run of application for some user. DomainKEK was not created yet. We must create one.
-    // This key will be used to encrypt user database.
-    static RawBuffer generateDomainKEK(const std::string &user, const std::string &userPassword);
+       // First run of application for some user. DomainKEK was not created yet. We must create one.
+       // This key will be used to encrypt user database.
+       static RawBuffer generateDomainKEK(const std::string &user, const std::string &userPassword);
 
-    // This will be called by framework at the begin of the program
+       // This will be called by framework at the begin of the program
        // [tak] need to declare return type
-    static int initializeLibrary();
-    // This will be called by framework at the end of the program
+       static int initializeLibrary();
+       // This will be called by framework at the end of the program
        // [tak] need to declare return type
-    static int closeLibrary();
+       static int closeLibrary();
 
-    virtual ~KeyProvider();
+       virtual ~KeyProvider();
 private:
-       // [tak] modify variable name
-       // m_dkek -> m_rawDKEK
-    KeyMaterial *m_rawDKEK;
-    bool m_isInitialized;
+       // KeyMaterialContainer class
+       KeyMaterialContainer *m_kmcDKEK;
+       bool m_isInitialized;
        static bool s_isInitialized;
 };