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

Added fix for WF200 certificate injection #23012

Merged
merged 5 commits into from
Oct 26, 2022
Merged

Added fix for WF200 certificate injection #23012

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54cf4de
Added fix for WF200 certificate injection
shgutte Oct 4, 2022
eb9d367
Adds changes according to comments
shgutte Oct 20, 2022
5b07382
Adds changes according to comments
riwaghe Oct 21, 2022
e7d18f8
Merge branch 'master' into bugfix/WF200_bugfix_certificate_injection
andy31415 Oct 21, 2022
5b9c065
Add restyled changes according to comment
riwaghe Oct 26, 2022
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
10 changes: 4 additions & 6 deletions examples/platform/efr32/EFR32DeviceAttestationCreds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "efr32_creds.h"
#include "psa/crypto.h"

extern uint32_t __attestation_credentials_base;
extern uint8_t __attestation_credentials_base[];

namespace chip {
namespace Credentials {
Expand All @@ -37,7 +37,7 @@ class DeviceAttestationCredsEFR32 : public DeviceAttestationCredentialsProvider
public:
CHIP_ERROR GetCertificationDeclaration(MutableByteSpan & out_buffer) override
{
ByteSpan cd_span(((uint8_t *) &__attestation_credentials_base) + EFR32_CREDENTIALS_CD_OFFSET, EFR32_CREDENTIALS_CD_SIZE);
ByteSpan cd_span(((uint8_t *) __attestation_credentials_base) + EFR32_CREDENTIALS_CD_OFFSET, EFR32_CREDENTIALS_CD_SIZE);
return CopySpanToMutableSpan(cd_span, out_buffer);
}

Expand All @@ -50,15 +50,13 @@ class DeviceAttestationCredsEFR32 : public DeviceAttestationCredentialsProvider

CHIP_ERROR GetDeviceAttestationCert(MutableByteSpan & out_buffer) override
{
ByteSpan cert_span(((uint8_t *) &__attestation_credentials_base) + EFR32_CREDENTIALS_DAC_OFFSET,
EFR32_CREDENTIALS_DAC_SIZE);
ByteSpan cert_span(((uint8_t *) __attestation_credentials_base) + EFR32_CREDENTIALS_DAC_OFFSET, EFR32_CREDENTIALS_DAC_SIZE);
return CopySpanToMutableSpan(cert_span, out_buffer);
}

CHIP_ERROR GetProductAttestationIntermediateCert(MutableByteSpan & out_pai_buffer) override
{
ByteSpan cert_span(((uint8_t *) &__attestation_credentials_base) + EFR32_CREDENTIALS_PAI_OFFSET,
EFR32_CREDENTIALS_PAI_SIZE);
ByteSpan cert_span(((uint8_t *) __attestation_credentials_base) + EFR32_CREDENTIALS_PAI_OFFSET, EFR32_CREDENTIALS_PAI_SIZE);
return CopySpanToMutableSpan(cert_span, out_pai_buffer);
}

Expand Down