From ead9e1d5a1bbbf8033f87da41ff61d16359a3648 Mon Sep 17 00:00:00 2001 From: "isaac2.lee" Date: Thu, 6 Oct 2022 10:17:12 +0900 Subject: [PATCH] add debug log and fix a bug Change-Id: I35d284cb29ec3bfe53500f4473994ed5c8217e61 --- src/manager/crypto/se-backend/internals.cpp | 8 ++++---- src/manager/service/key-provider.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/manager/crypto/se-backend/internals.cpp b/src/manager/crypto/se-backend/internals.cpp index 65260ed..871dcc9 100644 --- a/src/manager/crypto/se-backend/internals.cpp +++ b/src/manager/crypto/se-backend/internals.cpp @@ -117,9 +117,9 @@ void generateAKey(const CryptoAlgorithm &alg, RawBuffer encryptWithDbpKey(const unsigned char* key, const uint32_t key_len, const unsigned char* iv, const uint32_t iv_len) { - - unsigned char* output_data; - uint32_t output_len; + unsigned char* output_data = NULL; + uint32_t output_len = 0; + LogDebug("DBP Key will be encrypted on SE backend"); int ret = kmsb_failure_retry(std::bind(kmsb_encrypt_with_dbp_key, SE_BACKEND_DBP_SCHEME_VERSION, @@ -127,7 +127,7 @@ RawBuffer encryptWithDbpKey(const unsigned char* key, const uint32_t key_len, iv, iv_len, &output_data, &output_len)); if (ret == KMSB_ERROR_NO_KEY) { - ret = kmsb_failure_retry(std::bind(kmsb_generate_dbp_key, + ret = kmsb_failure_retry(std::bind(kmsb_generate_dbp_key, false)); if (ret != KMSB_ERROR_NONE) { LogError("Generate Key: SE Internal error: " << ret); diff --git a/src/manager/service/key-provider.cpp b/src/manager/service/key-provider.cpp index b860c49..ce908c7 100644 --- a/src/manager/service/key-provider.cpp +++ b/src/manager/service/key-provider.cpp @@ -139,7 +139,7 @@ KeyData makePKEK1(const KeyComponentsInfoDKEK& keyInfo, const Password &password #if SE_BACKEND_ENABLED RawBuffer salt; if (keyInfo.backend == (int)CryptoBackend::SecureElement) { - RawBuffer salt = Crypto::SE::Internals::encryptWithDbpKey((unsigned char*)keyInfo.salt, MAX_SALT_SIZE, + salt = Crypto::SE::Internals::encryptWithDbpKey((unsigned char*)keyInfo.salt, MAX_SALT_SIZE, (unsigned char*)keyInfo.iv, MAX_IV_SIZE); } else { salt = RawBuffer(keyInfo.salt, keyInfo.salt + MAX_SALT_SIZE); -- 2.7.4