Unification of import methods in gstore

Change-Id: I31dca502533360b759d6aea20e75a9e823eccc34

diff --git a/src/manager/crypto/generic-backend/gstore.h b/src/manager/crypto/generic-backend/gstore.h
index 564e4dd..2984fdc 100644 (file)
--- a/src/manager/crypto/generic-backend/gstore.h
+++ b/src/manager/crypto/generic-backend/gstore.h
@@ -55,13 +55,13 @@ public:
        {
                ThrowErr(Exc::Crypto::OperationNotSupported);
        }
-       virtual Token import(const Data &, const Password &)
-       {
-               ThrowErr(Exc::Crypto::OperationNotSupported);
-       }
-       virtual Token importEncrypted(const Data &,
-                                     const Password &,
-                                     const RawBuffer & /* iv */)
+
+       /*
+        * IV parameter makes sense only on device with built in key.
+        * IV parameter is used for decryption of Data.
+        * If Data is not encrypted it's ok to pass empty IV.
+        */
+       virtual Token import(const Data &, const Password &, const RawBuffer & /* iv */)
        {
                ThrowErr(Exc::Crypto::OperationNotSupported);
        }

diff --git a/src/manager/crypto/sw-backend/store.cpp b/src/manager/crypto/sw-backend/store.cpp
index 6930873..b41b8fd 100644 (file)
--- a/src/manager/crypto/sw-backend/store.cpp
+++ b/src/manager/crypto/sw-backend/store.cpp
@@ -219,8 +219,12 @@ Token Store::generateSKey(const CryptoAlgorithm &algorithm,
        return Token(m_backendId, ret.type, pack(ret.buffer, pass));
 }
 
-Token Store::import(const Data &data, const Password &pass)
+Token Store::import(const Data &data, const Password &pass, const RawBuffer &iv)
 {
+       if (!iv.empty())
+               ThrowErr(Exc::Crypto::OperationNotSupported,
+                       "Encrypted import is not yet supported on software backend!");
+
        return Token(m_backendId, data.type, pack(data.data, pass));
 }
 

diff --git a/src/manager/crypto/sw-backend/store.h b/src/manager/crypto/sw-backend/store.h
index a12e561..82798cd 100644 (file)
--- a/src/manager/crypto/sw-backend/store.h
+++ b/src/manager/crypto/sw-backend/store.h
@@ -35,7 +35,7 @@ public:
        virtual TokenPair generateAKey(const CryptoAlgorithm &, const Password &,
                                                                   const Password &);
        virtual Token generateSKey(const CryptoAlgorithm &, const Password &);
-       virtual Token import(const Data &data, const Password &);
+       virtual Token import(const Data &data, const Password &, const RawBuffer &);
        virtual void destroy(const Token &) {}
 
 private:

diff --git a/src/manager/crypto/tz-backend/internals.cpp b/src/manager/crypto/tz-backend/internals.cpp
index 578241d..03189d4 100644 (file)
--- a/src/manager/crypto/tz-backend/internals.cpp
+++ b/src/manager/crypto/tz-backend/internals.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2017 - 2018 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -119,8 +119,9 @@ void destroyKey(const RawBuffer &key)
 }
 
 RawBuffer importKey(const Data &data,
+                                       const RawBuffer &encIV,
                                        const Password &pwd,
-                                       const RawBuffer &iv,
+                                       const RawBuffer &pwdIV,
                                        RawBuffer &tag)
 {
        tz_algo_type algo = getAlgType(data.type);
@@ -129,8 +130,9 @@ RawBuffer importKey(const Data &data,
        RawBuffer pwdBuf(pwd.begin(), pwd.end());
        TrustZoneContext::Instance().importKey(algo,
                                                                                data.data,
+                                                                               encIV,
                                                                                pwdBuf,
-                                                                               iv,
+                                                                               pwdIV,
                                                                                result,
                                                                                tag);
        return result;

diff --git a/src/manager/crypto/tz-backend/internals.h b/src/manager/crypto/tz-backend/internals.h
index d9748e9..1fed4b0 100644 (file)
--- a/src/manager/crypto/tz-backend/internals.h
+++ b/src/manager/crypto/tz-backend/internals.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2017 - 2018 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -46,8 +46,9 @@ Data generateSKey(const CryptoAlgorithm &alg,
                                const RawBuffer &iv,
                                RawBuffer &tag);
 RawBuffer importKey(const Data &key,
+                                       const RawBuffer &encIV,
                                        const Password &pwd,
-                                       const RawBuffer &iv,
+                                       const RawBuffer &pwdIV,
                                        RawBuffer &tag);
 
 RawBuffer importData(const Data &data,

diff --git a/src/manager/crypto/tz-backend/store.cpp b/src/manager/crypto/tz-backend/store.cpp
index 3404acb..c688024 100644 (file)
--- a/src/manager/crypto/tz-backend/store.cpp
+++ b/src/manager/crypto/tz-backend/store.cpp
@@ -142,7 +142,7 @@ Token Store::generateSKey(const CryptoAlgorithm &alg, const Password &pass)
        return Token(m_backendId, ret.type, pack(ret.data, pass, iv, tag));
 }
 
-Token Store::import(const Data &data, const Password &pass)
+Token Store::import(const Data &data, const Password &pass, const RawBuffer &encIV)
 {
        if (data.type.isBinaryData()) {
                RawBuffer iv;
@@ -168,18 +168,10 @@ Token Store::import(const Data &data, const Password &pass)
                iv = Internals::generateIV();
        }
 
-       RawBuffer keyId = Internals::importKey(data, pass, iv, tag);
+       RawBuffer keyId = Internals::importKey(data, encIV, pass, iv, tag);
        return Token(m_backendId, data.type, pack(keyId, pass, iv, tag));
 }
 
-Token Store::importEncrypted(const Data &,
-                             const Password &,
-                             const RawBuffer &)
-{
-       ThrowErr(Exc::Crypto::OperationNotSupported,
-               "Encrypted import is not yet supported on TrustZone backend!");
-}
-
 void Store::destroy(const Token &token)
 {
        RawBuffer id = unpackData(token.data);

diff --git a/src/manager/crypto/tz-backend/store.h b/src/manager/crypto/tz-backend/store.h
index 706c341..4d44b6b 100644 (file)
--- a/src/manager/crypto/tz-backend/store.h
+++ b/src/manager/crypto/tz-backend/store.h
@@ -35,10 +35,7 @@ public:
        virtual TokenPair generateAKey(const CryptoAlgorithm &, const Password &,
                                                                   const Password &);
        virtual Token generateSKey(const CryptoAlgorithm &, const Password &);
-       virtual Token import(const Data &, const Password &);
-       virtual Token importEncrypted(const Data &,
-                                     const Password &,
-                                     const RawBuffer &);
+       virtual Token import(const Data &, const Password &, const RawBuffer &);
        virtual void destroy(const Token &);
 
        // TODO device key ID is needed here to support importEncrypted

diff --git a/src/manager/crypto/tz-backend/tz-context.cpp b/src/manager/crypto/tz-backend/tz-context.cpp
index 60dcd80..1387491 100644 (file)
--- a/src/manager/crypto/tz-backend/tz-context.cpp
+++ b/src/manager/crypto/tz-backend/tz-context.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2017 - 2018 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -257,11 +257,13 @@ void TrustZoneContext::generateSKeyPwd(tz_algo_type algo,
 
 void TrustZoneContext::importKey(tz_algo_type algo,
                                                                const RawBuffer &key,
+                                                               const RawBuffer &encIV,
                                                                const RawBuffer &pwd,
-                                                               const RawBuffer &iv,
+                                                               const RawBuffer &pwdIV,
                                                                RawBuffer &keyId,
                                                                RawBuffer &pwdTag)
 {
+       (void)encIV;
        // command ID = CMD_IMPORT_KEY
        //
        // TEEC_Operation layout:
@@ -280,7 +282,7 @@ void TrustZoneContext::importKey(tz_algo_type algo,
        if (!pwd.empty()) {
                bufSize.with_pwd_data = true;
                bufSize.pwd_size = static_cast<uint32_t>(pwd.size());
-               bufSize.pwd_iv_size = static_cast<uint32_t>(iv.size());
+               bufSize.pwd_iv_size = static_cast<uint32_t>(pwdIV.size());
        }
        uint32_t inMemorySize = KM_CalcBufferSize(bufSize);
        TrustZoneMemory inMemory(m_Context, inMemorySize, TEEC_MEM_INPUT);
@@ -303,7 +305,7 @@ void TrustZoneContext::importKey(tz_algo_type algo,
        }
 
        if (!pwd.empty()) {
-               ret = KM_ParamsSerializePwdData(input, pwd.data(), pwd.size(), iv.data(), iv.size(),
+               ret = KM_ParamsSerializePwdData(input, pwd.data(), pwd.size(), pwdIV.data(), pwdIV.size(),
                                                                                nullptr, 0, Params::DERIVED_KEY_LENGTH_BITS,
                                                                                Params::DERIVED_KEY_ITERATIONS, bufSize.tag_size * 8);
                if (ret) {

diff --git a/src/manager/crypto/tz-backend/tz-context.h b/src/manager/crypto/tz-backend/tz-context.h
index 2dd2497..cd7ae74 100644 (file)
--- a/src/manager/crypto/tz-backend/tz-context.h
+++ b/src/manager/crypto/tz-backend/tz-context.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2017 - 2018 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -49,8 +49,9 @@ public:
                                                RawBuffer &pwdTag);
        void importKey(tz_algo_type algo,
                                        const RawBuffer &key,
+                                       const RawBuffer &encIV,
                                        const RawBuffer &pwd,
-                                       const RawBuffer &iv,
+                                       const RawBuffer &pwdIV,
                                        RawBuffer &keyId,
                                        RawBuffer &pwdTag);
 

diff --git a/src/manager/initial-values/BufferHandler.h b/src/manager/initial-values/BufferHandler.h
index 572244d..08bca52 100644 (file)
--- a/src/manager/initial-values/BufferHandler.h
+++ b/src/manager/initial-values/BufferHandler.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2015 - 2018 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -47,14 +47,6 @@ public:
                return m_data;
        }
 
-       bool isEncrypted() const
-       {
-               if (m_encoding == EncodingType::ENCRYPTED)
-                       return true;
-
-               return false;
-       }
-
        const RawBuffer &getIV() const
        {
                return m_IV;

diff --git a/src/manager/initial-values/InitialValueHandler.cpp b/src/manager/initial-values/InitialValueHandler.cpp
index acb2e4b..7853d39 100644 (file)
--- a/src/manager/initial-values/InitialValueHandler.cpp
+++ b/src/manager/initial-values/InitialValueHandler.cpp
@@ -78,14 +78,9 @@ void InitialValueHandler::End()
        // save data
        Policy policy(m_password, m_exportable, m_backend);
 
-       RawBuffer iv;
-
-       if (m_bufferHandler->isEncrypted())
-               iv = m_bufferHandler->getIV();
-
        int ec = m_db_logic.importInitialData(m_name,
                                              Crypto::Data(getDataType(), m_bufferHandler->getData()),
-                                             iv,
+                                             m_bufferHandler->getIV(),
                                              policy);
 
        if (CKM_API_SUCCESS != ec) {

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index e988b7f..98248ec 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -404,7 +404,8 @@ DB::Row CKMLogic::createEncryptedRow(
 
        // do not encrypt data with password during cc_mode on
        Token token = store.import(data,
-                                                          m_accessControl.isCCMode() ? "" : policy.password);
+                                                          m_accessControl.isCCMode() ? "" : policy.password,
+                                                          RawBuffer());
        DB::Row row(std::move(token), name, owner,
                                static_cast<int>(policy.extractable));
        crypto.encryptRow(row);
@@ -803,7 +804,7 @@ Crypto::GObjUPtr CKMLogic::rowToObject(
                store.destroy(row);
 
                // import it to store with new scheme: data -> pass(data)
-               Token token = store.import(Crypto::Data(row.dataType, row.data), pass);
+               Token token = store.import(Crypto::Data(row.dataType, row.data), pass, RawBuffer());
 
                // get it from the store (it can be different than the data we imported into store)
                obj = store.getObject(token, pass);
@@ -1180,17 +1181,19 @@ int CKMLogic::importInitialData(
                Token token;
 
                if (iv.empty()) {
+            // Data are not encrypted, let's try to verify them
                        Crypto::Data binaryData;
 
                        if (CKM_API_SUCCESS != (retCode = toBinaryData(data, binaryData)))
                                return retCode;
 
                        token = store.import(binaryData,
-                                            m_accessControl.isCCMode() ? "" : policy.password);
+                                                                m_accessControl.isCCMode() ? "" : policy.password,
+                                                                iv);
                } else {
-                       token = store.importEncrypted(data,
-                                                     m_accessControl.isCCMode() ? "" : policy.password,
-                                                     iv);
+                       token = store.import(data,
+                                                                m_accessControl.isCCMode() ? "" : policy.password,
+                                                                iv);
                }
 
                DB::Row row(std::move(token), name, CLIENT_ID_SYSTEM,

diff --git a/tests/test_crypto-logic.cpp b/tests/test_crypto-logic.cpp
index 5784365..f519e27 100644 (file)
--- a/tests/test_crypto-logic.cpp
+++ b/tests/test_crypto-logic.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2017 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2017 - 2018 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE(row_encryption)
        Crypto::Data data(DataType(DataType::Type::BINARY_DATA), createRandom(10));
        Crypto::Decider decider;
        Crypto::GStore &store = decider.getStore(data.type, policy);
-       Token token = store.import(data, policy.password);
+       Token token = store.import(data, policy.password, RawBuffer());
 
        Name name = "test_data";
        ClientId owner = "test_owner";
@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(row_encryption_negatives)
        Crypto::Data data(DataType(DataType::Type::BINARY_DATA), createRandom(10));
        Crypto::Decider decider;
        Crypto::GStore &store = decider.getStore(data.type, policy);
-       Token token = store.import(data, policy.password);
+       Token token = store.import(data, policy.password, RawBuffer());
 
        Name name = "test_data";
        ClientId owner = "test_owner";

diff --git a/tests/test_generic-backend.cpp b/tests/test_generic-backend.cpp
index 114d794..0b39bf3 100644 (file)
--- a/tests/test_generic-backend.cpp
+++ b/tests/test_generic-backend.cpp
@@ -72,10 +72,7 @@ BOOST_AUTO_TEST_CASE(gstore)
                                                Exc::Crypto::OperationNotSupported);
        BOOST_REQUIRE_THROW(store.generateSKey(CryptoAlgorithm(), Password()),
                                                Exc::Crypto::OperationNotSupported);
-       BOOST_REQUIRE_THROW(store.import(Crypto::Data(), Password()),
-                                               Exc::Crypto::OperationNotSupported);
-       BOOST_REQUIRE_THROW(store.importEncrypted(Crypto::Data(), Password(),
-                                                 RawBuffer()),
+       BOOST_REQUIRE_THROW(store.import(Crypto::Data(), Password(), RawBuffer()),
                                                Exc::Crypto::OperationNotSupported);
        BOOST_REQUIRE_THROW(store.destroy(Token()),
                                                Exc::Crypto::OperationNotSupported);

diff --git a/tests/test_tz-backend.cpp b/tests/test_tz-backend.cpp
index 853326c..880211b 100644 (file)
--- a/tests/test_tz-backend.cpp
+++ b/tests/test_tz-backend.cpp
@@ -30,9 +30,7 @@ BOOST_AUTO_TEST_CASE(store)
                                                Exc::Crypto::OperationNotSupported);
        BOOST_REQUIRE_THROW(store.generateAKey(CryptoAlgorithm(), Password(), Password()),
                                                Exc::Crypto::OperationNotSupported);
-       BOOST_REQUIRE_THROW(store.import(Data(), Password()),
-                                               Exc::Crypto::OperationNotSupported);
-       BOOST_REQUIRE_THROW(store.importEncrypted(Data(), Password(), RawBuffer()),
+       BOOST_REQUIRE_THROW(store.import(Data(), Password(), RawBuffer()),
                                                Exc::Crypto::OperationNotSupported);
        BOOST_REQUIRE_NO_THROW(store.destroy(Token()));
 }