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

Controller: use generated opcred cluster #7263

Merged
merged 2 commits into from
Jun 2, 2021
Merged

Controller: use generated opcred cluster #7263

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
840140b
Controller: use generated opcred cluster
cecille May 31, 2021
152f9ce
Merge remote-tracking branch 'upstream/master' into opcreds_to_gen_cl…
cecille Jun 1, 2021
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
2 changes: 0 additions & 2 deletions src/controller/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ static_library("controller") {
"CHIPDevice.h",
"CHIPDeviceController.cpp",
"CHIPDeviceController.h",
"CHIPOperationalCredentialsProvisioner.cpp",
"CHIPOperationalCredentialsProvisioner.h",
"DeviceAddressUpdateDelegate.h",
"EmptyDataModelHandler.cpp",
"ExampleOperationalCredentialsIssuer.cpp",
Expand Down
6 changes: 3 additions & 3 deletions src/controller/CHIPDeviceController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@ CHIP_ERROR DeviceCommissioner::SendOperationalCertificateSigningRequestCommand(D
{
ChipLogDetail(Controller, "Sending OpCSR request to %p device", device);
VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
chip::Controller::OperationalCredentialsProvisioner cluster;
chip::Controller::OperationalCredentialsCluster cluster;
cluster.Associate(device, 0);

Callback::Cancelable * successCallback = mOpCSRResponseCallback.Cancel();
Expand Down Expand Up @@ -1212,7 +1212,7 @@ CHIP_ERROR DeviceCommissioner::ProcessOpCSR(const ByteSpan & CSR, const ByteSpan
CHIP_ERROR DeviceCommissioner::SendOperationalCertificate(Device * device, const ByteSpan & opCertBuf, const ByteSpan & icaCertBuf)
{
VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
chip::Controller::OperationalCredentialsProvisioner cluster;
chip::Controller::OperationalCredentialsCluster cluster;
cluster.Associate(device, 0);

Callback::Cancelable * successCallback = mOpCertResponseCallback.Cancel();
Expand Down Expand Up @@ -1289,7 +1289,7 @@ CHIP_ERROR DeviceCommissioner::SendTrustedRootCertificate(Device * device)

ChipLogProgress(Controller, "Sending root certificate to the device");

chip::Controller::TrustedRootCertificatesProvisioner cluster;
chip::Controller::TrustedRootCertificatesCluster cluster;
cluster.Associate(device, 0);

Callback::Cancelable * successCallback = mRootCertResponseCallback.Cancel();
Expand Down
2 changes: 1 addition & 1 deletion src/controller/CHIPDeviceController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

#include <app/InteractionModelDelegate.h>
#include <controller/CHIPDevice.h>
#include <controller/CHIPOperationalCredentialsProvisioner.h>
#include <controller/OperationalCredentialsDelegate.h>
#include <controller/data_model/gen/CHIPClientCallbacks.h>
#include <core/CHIPCore.h>
#include <core/CHIPPersistentStorageDelegate.h>
#include <core/CHIPTLV.h>
Expand Down
Loading