Skip to content

Commit d3354f6

Browse files
restyled-commitsmykrupp
restyled-commits
authored and
mykrupp
committed
Restyled by clang-format
1 parent 5c1927f commit d3354f6

11 files changed

+52
-56
lines changed

‎examples/platform/silabs/provision/ProvisionStorageDefault.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
#include "AttestationKey.h"
1818
#include "ProvisionStorage.h"
19-
#include <platform/silabs/multi-ota/OtaTlvEncryptionKey.h>
2019
#include <credentials/examples/DeviceAttestationCredsExample.h>
2120
#include <lib/support/BytesToHex.h>
2221
#include <lib/support/CHIPMemString.h>
@@ -28,6 +27,7 @@
2827
#include <platform/CHIPDeviceConfig.h>
2928
#include <platform/silabs/MigrationManager.h>
3029
#include <platform/silabs/SilabsConfig.h>
30+
#include <platform/silabs/multi-ota/OtaTlvEncryptionKey.h>
3131
#include <silabs_creds.h>
3232
#ifdef SLI_SI91X_MCU_INTERFACE
3333
#include <sl_si91x_common_flash_intf.h>

‎src/platform/silabs/multi-ota/OTACustomProcessor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818

1919
#include <platform/internal/CHIPDeviceLayerInternal.h>
20-
#include <platform/silabs/multi-ota/OTAMultiImageProcessorImpl.h>
2120
#include <platform/silabs/multi-ota/OTACustomProcessor.h>
21+
#include <platform/silabs/multi-ota/OTAMultiImageProcessorImpl.h>
2222

2323
#include <app/clusters/ota-requestor/OTARequestorInterface.h>
2424

‎src/platform/silabs/multi-ota/OTACustomProcessor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class OTACustomProcessor : public OTATlvProcessor
4343
CHIP_ERROR ProcessDescriptor(ByteSpan & block);
4444

4545
OTADataAccumulator mAccumulator;
46-
bool mDescriptorProcessed = false;
46+
bool mDescriptorProcessed = false;
4747
static constexpr size_t kAlignmentBytes = 64;
4848
static uint32_t mWriteOffset; // End of last written block
4949
static uint8_t mSlotId; // Bootloader storage slot

‎src/platform/silabs/multi-ota/OTAFactoryDataProcessor.cpp

+15-17
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
namespace chip {
2424

25-
using FactoryProvider = DeviceLayer::Silabs::Provision::Storage;
25+
using FactoryProvider = DeviceLayer::Silabs::Provision::Storage;
2626

2727
CHIP_ERROR OTAFactoryDataProcessor::Init()
2828
{
@@ -69,7 +69,7 @@ CHIP_ERROR OTAFactoryDataProcessor::ProcessInternal(ByteSpan & block)
6969

7070
CHIP_ERROR OTAFactoryDataProcessor::ApplyAction()
7171
{
72-
CHIP_ERROR error = CHIP_NO_ERROR;
72+
CHIP_ERROR error = CHIP_NO_ERROR;
7373

7474
SuccessOrExit(error = Update((uint8_t) FactoryTags::kDacKey, mPayload.mCertDacKey));
7575
SuccessOrExit(error = Update((uint8_t) FactoryTags::kDacCert, mPayload.mCertDac));
@@ -147,24 +147,22 @@ CHIP_ERROR OTAFactoryDataProcessor::Update(uint8_t tag, Optional<ByteSpan> & opt
147147
CHIP_ERROR OTAFactoryDataProcessor::UpdateValue(uint8_t tag, ByteSpan & newValue)
148148
{
149149
FactoryProvider factoryProvider;
150-
switch(tag)
150+
switch (tag)
151151
{
152-
case (int) FactoryTags::kDacKey:
153-
ChipLogProgress(SoftwareUpdate, "Set Device Attestation Key");
154-
return factoryProvider.FactoryProvider::SetDeviceAttestationKey(newValue);
155-
case (int) FactoryTags::kDacCert:
156-
ChipLogProgress(SoftwareUpdate, "Set Device Attestation Cert");
157-
return factoryProvider.FactoryProvider::SetDeviceAttestationCert(newValue);
158-
case (int) FactoryTags::kPaiCert:
159-
ChipLogProgress(SoftwareUpdate, "Set Product Attestionation Intermediate Cert");
160-
return factoryProvider.FactoryProvider::SetProductAttestationIntermediateCert(newValue);
161-
case (int) FactoryTags::kCdCert:
162-
ChipLogProgress(SoftwareUpdate, "Set Certification Declaration");
163-
return factoryProvider.FactoryProvider::SetCertificationDeclaration(newValue);
164-
152+
case (int) FactoryTags::kDacKey:
153+
ChipLogProgress(SoftwareUpdate, "Set Device Attestation Key");
154+
return factoryProvider.FactoryProvider::SetDeviceAttestationKey(newValue);
155+
case (int) FactoryTags::kDacCert:
156+
ChipLogProgress(SoftwareUpdate, "Set Device Attestation Cert");
157+
return factoryProvider.FactoryProvider::SetDeviceAttestationCert(newValue);
158+
case (int) FactoryTags::kPaiCert:
159+
ChipLogProgress(SoftwareUpdate, "Set Product Attestionation Intermediate Cert");
160+
return factoryProvider.FactoryProvider::SetProductAttestationIntermediateCert(newValue);
161+
case (int) FactoryTags::kCdCert:
162+
ChipLogProgress(SoftwareUpdate, "Set Certification Declaration");
163+
return factoryProvider.FactoryProvider::SetCertificationDeclaration(newValue);
165164
}
166165

167-
168166
ChipLogError(DeviceLayer, "Failed to find tag %d.", tag);
169167
return CHIP_ERROR_NOT_FOUND;
170168
}

‎src/platform/silabs/multi-ota/OTAFactoryDataProcessor.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include <lib/support/ScopedBuffer.h>
2323
#include <lib/support/Span.h>
2424
#include <platform/silabs/multi-ota/OTATlvProcessor.h>
25+
#include <provision/ProvisionStorage.h> // nogncheck
2526
#include <provision/ProvisionStorageGeneric.h> // nogncheck
26-
#include <provision/ProvisionStorage.h> // nogncheck
2727

2828
namespace chip {
2929

@@ -53,10 +53,10 @@ struct OTAFactoryPayload
5353

5454
enum class FactoryTags
5555
{
56-
kDacKey = 1,
57-
kDacCert = 2 ,
56+
kDacKey = 1,
57+
kDacCert = 2,
5858
kPaiCert = 3,
59-
kCdCert = 4
59+
kCdCert = 4
6060
};
6161

6262
class OTAFactoryDataProcessor : public OTATlvProcessor
@@ -67,7 +67,6 @@ class OTAFactoryDataProcessor : public OTATlvProcessor
6767
CHIP_ERROR ApplyAction() override;
6868
CHIP_ERROR FinalizeAction() override;
6969

70-
7170
private:
7271
CHIP_ERROR ProcessInternal(ByteSpan & block) override;
7372
CHIP_ERROR DecodeTlv();

‎src/platform/silabs/multi-ota/OTAFirmwareProcessor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818

1919
#include <platform/internal/CHIPDeviceLayerInternal.h>
20-
#include <platform/silabs/multi-ota/OTAMultiImageProcessorImpl.h>
2120
#include <platform/silabs/multi-ota/OTAFirmwareProcessor.h>
21+
#include <platform/silabs/multi-ota/OTAMultiImageProcessorImpl.h>
2222

2323
#include <app/clusters/ota-requestor/OTARequestorInterface.h>
2424

‎src/platform/silabs/multi-ota/OTAHooks.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
#include <app/clusters/ota-requestor/OTARequestorInterface.h>
2323

24-
#include <platform/silabs/multi-ota/OTAFirmwareProcessor.h>
2524
#include <platform/silabs/multi-ota/OTAFactoryDataProcessor.h>
25+
#include <platform/silabs/multi-ota/OTAFirmwareProcessor.h>
2626

2727
#if OTA_TEST_CUSTOM_TLVS
2828
#include <platform/silabs/multi-ota/OTACustomProcessor.h>
@@ -45,8 +45,10 @@ CHIP_ERROR chip::OTAMultiImageProcessorImpl::OtaHookInit()
4545
sFactoryDataProcessor.RegisterDescriptorCallback(ProcessDescriptor);
4646

4747
auto & imageProcessor = chip::OTAMultiImageProcessorImpl::GetDefaultInstance();
48-
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kApplicationProcessor), &sApplicationProcessor));
49-
ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kFactoryDataProcessor), &sFactoryDataProcessor));
48+
ReturnErrorOnFailure(
49+
imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kApplicationProcessor), &sApplicationProcessor));
50+
ReturnErrorOnFailure(
51+
imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kFactoryDataProcessor), &sFactoryDataProcessor));
5052

5153
#if OTA_TEST_CUSTOM_TLVS
5254
static chip::OTACustomProcessor customProcessor1;

‎src/platform/silabs/multi-ota/OTATlvProcessor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include <platform/silabs/multi-ota/OTAMultiImageProcessorImpl.h>
2424
#include <platform/silabs/multi-ota/OTATlvProcessor.h>
2525
#if OTA_ENCRYPTION_ENABLE
26-
#include <platform/silabs/multi-ota/OtaTlvEncryptionKey.h>
2726
#include <platform/silabs/SilabsConfig.h>
27+
#include <platform/silabs/multi-ota/OtaTlvEncryptionKey.h>
2828
#endif
2929

3030
using namespace ::chip::DeviceLayer::Internal;

‎src/platform/silabs/multi-ota/OTATlvProcessor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct OTATlvHeader
6666
enum class OTAProcessorTag
6767
{
6868
kApplicationProcessor = 1,
69-
kBootloaderProcessor = 2 ,
69+
kBootloaderProcessor = 2,
7070
kFactoryDataProcessor = 3
7171
};
7272

‎src/platform/silabs/multi-ota/OtaTlvEncryptionKey.cpp

+17-19
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,19 @@ CHIP_ERROR OtaTlvEncryptionKey::Import(const uint8_t * key, size_t key_len)
4040
psa_set_key_type(&attributes, PSA_KEY_TYPE_AES);
4141
psa_set_key_bits(&attributes, 128);
4242
psa_set_key_algorithm(&attributes, PSA_ALG_CTR);
43-
psa_set_key_usage_flags(
44-
&attributes, PSA_KEY_USAGE_DECRYPT);
43+
psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_DECRYPT);
4544

4645
status = psa_import_key(&attributes, key, key_len, &key_id);
47-
if (status != PSA_SUCCESS) {
46+
if (status != PSA_SUCCESS)
47+
{
4848
printf("Failed to import a key error:%ld\n", status);
4949
return CHIP_ERROR_INTERNAL;
5050
}
5151

5252
return CHIP_NO_ERROR;
53-
5453
}
5554

56-
CHIP_ERROR OtaTlvEncryptionKey::Decrypt(MutableByteSpan & block, uint32_t &mIVOffset)
55+
CHIP_ERROR OtaTlvEncryptionKey::Decrypt(MutableByteSpan & block, uint32_t & mIVOffset)
5756
{
5857
constexpr uint8_t au8Iv[] = { 0x00, 0x00, 0x00, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x00, 0x00, 0x00, 0x00 };
5958
uint8_t iv[16];
@@ -65,7 +64,6 @@ CHIP_ERROR OtaTlvEncryptionKey::Decrypt(MutableByteSpan & block, uint32_t &mIVOf
6564
uint32_t u32IVCount;
6665
uint32_t Offset = 0;
6766

68-
6967
memcpy(iv, au8Iv, sizeof(au8Iv));
7068

7169
u32IVCount = (((uint32_t) iv[12]) << 24) | (((uint32_t) iv[13]) << 16) | (((uint32_t) iv[14]) << 8) | (iv[15]);
@@ -79,20 +77,22 @@ CHIP_ERROR OtaTlvEncryptionKey::Decrypt(MutableByteSpan & block, uint32_t &mIVOf
7977
while (Offset + 16 <= block.size())
8078
{
8179
status = psa_cipher_decrypt_setup(&operation, static_cast<psa_key_id_t>(mId), PSA_ALG_CTR);
82-
if (status != PSA_SUCCESS) {
80+
if (status != PSA_SUCCESS)
81+
{
8382
printf("Failed to begin cipher operation error:%ld\n", status);
8483
return CHIP_ERROR_INTERNAL;
8584
}
8685

8786
status = psa_cipher_set_iv(&operation, iv, sizeof(iv));
88-
if (status != PSA_SUCCESS) {
87+
if (status != PSA_SUCCESS)
88+
{
8989
printf("Failed to set IV error:%ld\n", status);
9090
return CHIP_ERROR_INTERNAL;
9191
}
9292

93-
status = psa_cipher_update(&operation, static_cast<uint8_t *>(&block[Offset]), 16,
94-
output, sizeof(output), &output_len);
95-
if (status != PSA_SUCCESS) {
93+
status = psa_cipher_update(&operation, static_cast<uint8_t *>(&block[Offset]), 16, output, sizeof(output), &output_len);
94+
if (status != PSA_SUCCESS)
95+
{
9696
printf("Failed to update cipher operation error:%ld\n", status);
9797
return CHIP_ERROR_INTERNAL;
9898
}
@@ -109,13 +109,12 @@ CHIP_ERROR OtaTlvEncryptionKey::Decrypt(MutableByteSpan & block, uint32_t &mIVOf
109109

110110
Offset += 16; /* increment the buffer offset */
111111
mIVOffset += 16;
112-
status = psa_cipher_finish(&operation, output + total_output,
113-
sizeof(output) - total_output, &total_output);
114-
if (status != PSA_SUCCESS) {
115-
printf("Failed to finish cipher operation\n");
116-
return CHIP_ERROR_INTERNAL;
112+
status = psa_cipher_finish(&operation, output + total_output, sizeof(output) - total_output, &total_output);
113+
if (status != PSA_SUCCESS)
114+
{
115+
printf("Failed to finish cipher operation\n");
116+
return CHIP_ERROR_INTERNAL;
117117
}
118-
119118
}
120119

121120
printf("Decrypted ciphertext\n");
@@ -125,8 +124,7 @@ CHIP_ERROR OtaTlvEncryptionKey::Decrypt(MutableByteSpan & block, uint32_t &mIVOf
125124
return CHIP_NO_ERROR;
126125
}
127126

128-
129-
} // namespace Provision
127+
} // namespace OtaTlvEncryptionKey
130128
} // namespace Silabs
131129
} // namespace DeviceLayer
132130
} // namespace chip

‎src/platform/silabs/multi-ota/OtaTlvEncryptionKey.h

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3-
#include <lib/support/Span.h>
43
#include <lib/core/CHIPError.h>
4+
#include <lib/support/Span.h>
5+
#include <platform/silabs/multi-ota/OTATlvProcessor.h>
56
#include <psa/crypto.h>
67
#include <stddef.h>
78
#include <stdint.h>
8-
#include <platform/silabs/multi-ota/OTATlvProcessor.h>
99

1010
namespace chip {
1111
namespace DeviceLayer {
@@ -17,19 +17,18 @@ static constexpr uint32_t kAES_KeyId_Default = (PSA_KEY_ID_USER_MIN + 2);
1717
class OtaTlvEncryptionKey
1818
{
1919
public:
20-
OtaTlvEncryptionKey(uint32_t id = 0) { mId = (id > 0)? id : kAES_KeyId_Default; }
20+
OtaTlvEncryptionKey(uint32_t id = 0) { mId = (id > 0) ? id : kAES_KeyId_Default; }
2121
~OtaTlvEncryptionKey() = default;
2222

2323
uint32_t GetId() { return mId; }
2424
CHIP_ERROR Import(const uint8_t * key, size_t key_len);
25-
CHIP_ERROR Decrypt(MutableByteSpan & block, uint32_t &mIVOffset);
25+
CHIP_ERROR Decrypt(MutableByteSpan & block, uint32_t & mIVOffset);
2626

2727
protected:
2828
uint32_t mId = 0;
29-
3029
};
3130

32-
} // namespace Provision
31+
} // namespace OtaTlvEncryptionKey
3332
} // namespace Silabs
3433
} // namespace DeviceLayer
3534
} // namespace chip

0 commit comments

Comments
 (0)