still one error left
Change-Id: Id89dd6c85e02032b788d6cf97fc8b3ae9964b757
diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 6df30eb..a7c2fdb 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -234,8 +234,8 @@
std::array<uint8_t, 32> salt;
random::generateSecureBytes(salt.data(), salt.size());
// hkdf
- uint8_t aesKey[AES_128_KEY_LEN];
- hkdf(sharedSecret.data(), sharedSecret.size(), salt.data(), salt.size(), aesKey, sizeof(aesKey));
+ std::array<uint8_t, 16> aesKey;
+ hkdf(sharedSecret.data(), sharedSecret.size(), salt.data(), salt.size(), aesKey.data(), aesKey.size());
// verify identity name
if (!m_config.m_caItem.m_caPrefix.isPrefixOf(clientCert->getIdentity())
@@ -307,9 +307,8 @@
}
RequestId id;
std::memcpy(id.data(), requestIdData, id.size());
- RequestState requestState(m_config.m_caItem.m_caPrefix, id,
- requestType, Status::BEFORE_CHALLENGE, *clientCert,
- makeBinaryBlock(ndn::tlv::ContentType_Key, aesKey, sizeof(aesKey)));
+ RequestState requestState(m_config.m_caItem.m_caPrefix, id, requestType,
+ Status::BEFORE_CHALLENGE, *clientCert, std::move(aesKey));
try {
m_storage->addRequest(requestState);
}
@@ -355,7 +354,7 @@
Buffer paramTLVPayload;
try {
paramTLVPayload = decodeBlockWithAesGcm128(request.getApplicationParameters(),
- requestState->m_encryptionKey.value(),
+ requestState->m_encryptionKey.data(),
requestState->m_requestId.data(),
requestState->m_requestId.size());
}