Call TA to get the max chunk size

Change-Id: Iec297646564b0a49d2966fcec1ec922bac1b7615

diff --git a/src/manager/crypto/tz-backend/internals.cpp b/src/manager/crypto/tz-backend/internals.cpp
index 5a19cba..efad483 100644 (file)
--- a/src/manager/crypto/tz-backend/internals.cpp
+++ b/src/manager/crypto/tz-backend/internals.cpp
@@ -844,6 +844,10 @@ void deriveKBKDF(const RawBuffer &secretId,
                                                                                          keyHash);
 }
 
+size_t maxChunkSize()
+{
+       return TrustZoneContext::Instance().getMaxChunkSize();
+}
 
 } // namespace Internals
 } // namespace TZ

diff --git a/src/manager/crypto/tz-backend/internals.h b/src/manager/crypto/tz-backend/internals.h
index 8797065..98171a5 100644 (file)
--- a/src/manager/crypto/tz-backend/internals.h
+++ b/src/manager/crypto/tz-backend/internals.h
@@ -162,6 +162,8 @@ void deriveKBKDF(const RawBuffer &secretId,
                                 const RawBuffer &keyPwdIV,
                                 RawBuffer &keyTag,
                                 const RawBuffer &keyHash);
+
+size_t maxChunkSize();
 } // namespace Internals
 } // namespace TZ
 } // namespace Crypto

diff --git a/src/manager/crypto/tz-backend/store.cpp b/src/manager/crypto/tz-backend/store.cpp
index 958da3a..23ba831 100644 (file)
--- a/src/manager/crypto/tz-backend/store.cpp
+++ b/src/manager/crypto/tz-backend/store.cpp
@@ -208,6 +208,11 @@ void Store::unpack(const RawBuffer &packed,
        }
 }
 
+size_t Store::maxChunkSize() const
+{
+       return Internals::maxChunkSize();
+}
+
 } // namespace TZ
 } // namespace Crypto
 } // namespace CKM

diff --git a/src/manager/crypto/tz-backend/store.h b/src/manager/crypto/tz-backend/store.h
index 439cec4..67b480c 100644 (file)
--- a/src/manager/crypto/tz-backend/store.h
+++ b/src/manager/crypto/tz-backend/store.h
@@ -55,7 +55,7 @@ public:
                                           RawBuffer &data,
                                           RawBuffer &iv,
                                           RawBuffer &tag);
-       size_t maxChunkSize() const override { return 4; } // TODO get it from somewhere
+       size_t maxChunkSize() const override;
 
        // 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 a457462..2c013ae 100644 (file)
--- a/src/manager/crypto/tz-backend/tz-context.cpp
+++ b/src/manager/crypto/tz-backend/tz-context.cpp
@@ -948,6 +948,19 @@ void TrustZoneContext::executeKbkdf(const RawBuffer& secretId,
        LogDebug("Derived object ID is (hex): " << rawToHexString(keyHash));
 }
 
+uint32_t TrustZoneContext::getMaxChunkSize()
+{
+       // command ID = CMD_GET_MAX_CHUNK_SIZE
+       LogDebug("TrustZoneContext::getMaxChunkSize");
+
+       TEEC_Operation op;
+       op.paramTypes = TEEC_PARAM_TYPES(TEEC_VALUE_OUTPUT, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+
+       Execute(CMD_GET_MAX_CHUNK_SIZE, &op);
+
+       return op.params[0].value.b;
+}
+
 void TrustZoneContext::Initialize()
 {
        TEEC_Operation op;

diff --git a/src/manager/crypto/tz-backend/tz-context.h b/src/manager/crypto/tz-backend/tz-context.h
index 51f9be1..9fd3a1e 100644 (file)
--- a/src/manager/crypto/tz-backend/tz-context.h
+++ b/src/manager/crypto/tz-backend/tz-context.h
@@ -199,6 +199,8 @@ public:
                                          RawBuffer &keyTag,
                                          const RawBuffer &keyHash);
 
+       uint32_t getMaxChunkSize();
+
 private:
        TrustZoneContext();
        ~TrustZoneContext();