Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReSubmitted][Chip-Cert] Prevent extra bytes to be encoded when converting key to chip-b64 #16121

Merged
merged 1 commit into from
Mar 14, 2022
Merged

[ReSubmitted][Chip-Cert] Prevent extra bytes to be encoded when converting key to chip-b64 #16121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/tools/chip-cert/KeyUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ bool SerializeKeyPair(EVP_PKEY * key, P256SerializedKeypair & serializedKeypair)
const EC_GROUP * group = nullptr;
const EC_KEY * ecKey = nullptr;
const EC_POINT * ecPoint = nullptr;
uint8_t * pubKey = serializedKeypair;
uint8_t * pubKey = serializedKeypair.Bytes();
uint8_t * privKey = pubKey + kP256_PublicKey_Length;
size_t pubKeyLen = 0;
int privKeyLen = 0;
Expand Down Expand Up @@ -245,10 +245,10 @@ bool WritePrivateKey(const char * fileName, EVP_PKEY * key, KeyFormat keyFmt)
uint8_t * keyToWrite = nullptr;
uint32_t keyToWriteLen = 0;
P256SerializedKeypair serializedKeypair;
uint32_t chipKeyLen = sizeof(serializedKeypair);
uint32_t chipKeyBase64Len = BASE64_ENCODED_LEN(chipKeyLen);
std::unique_ptr<uint8_t[]> chipKey(new uint8_t[chipKeyLen]);
std::unique_ptr<uint8_t[]> chipKeyBase64(new uint8_t[chipKeyBase64Len]);
uint32_t chipKeySize = serializedKeypair.Capacity();
uint32_t chipKeyBase64Size = BASE64_ENCODED_LEN(chipKeySize);
std::unique_ptr<uint8_t[]> chipKey(new uint8_t[chipKeySize]);
std::unique_ptr<uint8_t[]> chipKeyBase64(new uint8_t[chipKeyBase64Size]);

VerifyOrExit(key != nullptr, res = false);

Expand Down Expand Up @@ -282,8 +282,10 @@ bool WritePrivateKey(const char * fileName, EVP_PKEY * key, KeyFormat keyFmt)

if (keyFmt == kKeyFormat_Chip_Base64)
{
res = Base64Encode(serializedKeypair, static_cast<uint32_t>(sizeof(serializedKeypair)), chipKeyBase64.get(),
chipKeyBase64Len, chipKeyBase64Len);
uint32_t chipKeyBase64Len;

res = Base64Encode(serializedKeypair.Bytes(), static_cast<uint32_t>(serializedKeypair.Length()), chipKeyBase64.get(),
chipKeyBase64Size, chipKeyBase64Len);
VerifyTrueOrExit(res);

keyToWrite = chipKeyBase64.get();
Expand All @@ -292,7 +294,7 @@ bool WritePrivateKey(const char * fileName, EVP_PKEY * key, KeyFormat keyFmt)
else
{
keyToWrite = chipKey.get();
keyToWriteLen = chipKeyLen;
keyToWriteLen = static_cast<uint32_t>(serializedKeypair.Length());
}

if (fwrite(keyToWrite, 1, keyToWriteLen, file) != keyToWriteLen)
Expand Down