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.

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

Update Operational Credential Cluster to match the spec #30061

Merged
merged 2 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -836,22 +836,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -874,12 +874,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -890,7 +890,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1103,22 +1103,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -1141,12 +1141,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -1157,7 +1157,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2268,22 +2268,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -2306,12 +2306,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -2322,7 +2322,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1878,22 +1878,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -1916,12 +1916,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -1932,7 +1932,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
18 changes: 9 additions & 9 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1460,22 +1460,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -1498,12 +1498,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -1514,7 +1514,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1285,22 +1285,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -1323,12 +1323,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -1339,7 +1339,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -756,22 +756,22 @@ server cluster OperationalCredentials = 62 {
readonly attribute int16u clusterRevision = 65533;

request struct AttestationRequestRequest {
octet_string attestationNonce = 0;
octet_string<32> attestationNonce = 0;
}

request struct CertificateChainRequestRequest {
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
octet_string CSRNonce = 0;
octet_string<32> CSRNonce = 0;
optional boolean isForUpdateNOC = 1;
}

request struct AddNOCRequest {
octet_string NOCValue = 0;
optional octet_string ICACValue = 1;
octet_string IPKValue = 2;
octet_string<400> NOCValue = 0;
optional octet_string<400> ICACValue = 1;
octet_string<16> IPKValue = 2;
int64u caseAdminSubject = 3;
vendor_id adminVendorId = 4;
}
Expand All @@ -794,12 +794,12 @@ server cluster OperationalCredentials = 62 {
}

response struct AttestationResponse = 1 {
octet_string attestationElements = 0;
octet_string attestationSignature = 1;
octet_string<900> attestationElements = 0;
octet_string<64> attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
octet_string certificate = 0;
octet_string<600> certificate = 0;
}

response struct CSRResponse = 5 {
Expand All @@ -810,7 +810,7 @@ server cluster OperationalCredentials = 62 {
response struct NOCResponse = 8 {
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional char_string debugText = 2;
optional char_string<128> debugText = 2;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
Expand Down
Loading
Loading