Merge branch 'master' into onboarding_payload_renaming

credentials/test/revoked-attestation-certificates/Chip-Test-DAC-FFF1-8001-Signed-By-Revoked-PAI-Cert.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB4zCCAYqgAwIBAgIIfxwXxgcMItIwCgYIKoZIzj0EAwIwRjEuMCwGA1UEAwwl
+TWF0dGVyIFRlc3QgUEFJIDB4RkZGMSBubyBQSUQgUmV2b2tlZDEUMBIGCisGAQQB
+gqJ8AgEMBEZGRjEwIBcNMjQxMjEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
+FDASBgorBgEEAYKifAICDAQ4MDAxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+sNfyDFfIJAuXVFa6iG0ssJzU+dL1zxQG9GPJeYPzTtWjZ2H2ltiv9PPigoZbw3kU
+3rUSquiOWhWnGaS1eiZkD6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFDgkjA4XsiI0fkKqua8/3B09YUkEMB8GA1UdIwQYMBaAFJEz
+fFz+e7KTdv6IfTyU5/Wd2D0vMAoGCCqGSM49BAMCA0cAMEQCICv4s7VU7+W1P2YS
+iRqanmy3JnpVJX7zQUkpslnRt6LhAiBtz9DYStWjLJvQXuxKGw/3pDX+7UvFQPCH
+uB9uxQCbog==
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Chip-Test-DAC-FFF1-8001-Signed-By-Revoked-PAI-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJH6kWQP7l3MWrVt7LHLTS4AVsFrRSgxBMDISewT3M7voAoGCCqGSM49
+AwEHoUQDQgAEsNfyDFfIJAuXVFa6iG0ssJzU+dL1zxQG9GPJeYPzTtWjZ2H2ltiv
+9PPigoZbw3kU3rUSquiOWhWnGaS1eiZkDw==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-CRL.pem

@@ -0,0 +1,8 @@
+-----BEGIN X509 CRL-----
+MIIBCDCBrwIBATAKBggqhkjOPQQDAjAwMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBQ
+QUExFDASBgorBgEEAYKifAIBDARGRkYxFw0yNDEyMTYxMTA1MDNaGA8yMTI0MTIx
+NzExMDUwM1owGzAZAggwJmQ5K4o/KhcNMjQxMjEzMDcyMDIxWqAvMC0wHwYDVR0j
+BBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYDVR0UBAMCAQIwCgYIKoZIzj0E
+AwIDSAAwRQIhAMvFTDo37sY0StA/szyNb5FNtcy/YE6FTmxmsC9kwjpcAiABhqHW
+yjWUkyWauRdFT1Uc5MgYADN0u8XcJy9e3Pzphw==
+-----END X509 CRL-----

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-Cert.der

@@ -0,0 +1 @@
+../../test/attestation/Chip-Test-PAA-FFF1-Cert.der

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-Cert.pem

@@ -0,0 +1 @@
+../../test/attestation/Chip-Test-PAA-FFF1-Cert.pem

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-Key.der

@@ -0,0 +1 @@
+../../test/attestation/Chip-Test-PAA-FFF1-Key.der

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-Key.pem

@@ -0,0 +1 @@
+../../test/attestation/Chip-Test-PAA-FFF1-Key.pem

credentials/test/revoked-attestation-certificates/Chip-Test-PAI-FFF1-noPID-Revoked-Cert.pem

@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB1DCCAXqgAwIBAgIIMCZkOSuKPyowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yNDEyMTMw
+MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEuMCwGA1UEAwwlTWF0dGVyIFRlc3Qg
+UEFJIDB4RkZGMSBubyBQSUQgUmV2b2tlZDEUMBIGCisGAQQBgqJ8AgEMBEZGRjEw
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS9WKhPeGLgdRxOVigPFJaX33xRqtxa
+T6OTyWJ3pZB53kCQereGDQad5lLqi8j3BTv+fDqO9HANdrnMINsxLK+Ro2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUkTN8
+XP57spN2/oh9PJTn9Z3YPS8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJx09qhLOstaNp3pA5kRTr8KVRULq9PVKyiY
+cIhHvJxuAiBlGIHIG3ogw0a5fGgxPEvhwKiPTzpAcu08fqEdxgmE/A==
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Chip-Test-PAI-FFF1-noPID-Revoked-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIH/u0uB3zq1YnR1XR58XEUVgOnq8mLeBoJH1AYvyJW9joAoGCCqGSM49
+AwEHoUQDQgAEvVioT3hi4HUcTlYoDxSWl998UarcWk+jk8lid6WQed5AkHq3hg0G
+neZS6ovI9wU7/nw6jvRwDXa5zCDbMSyvkQ==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-01-Cert.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5TCCAYugAwIBAgIIGTZ9l46sUzowCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjEwIBcNMjQxMjEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFAxIjAgBgNVBAMM
+GU1hdHRlciBEZXYgREFDIFJldm9rZWQgMDExFDASBgorBgEEAYKifAIBDARGRkYx
+MRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BCo9c3DyIJuxObQsptldvy9wGIi0cY4yxjrnEycUXgUYeGi1KPGpnSRvFHCwzNhV
+7pQ4NSbuCQ3guy/eA4/uPgujYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQD
+AgeAMB0GA1UdDgQWBBT1iulTpObPsMw95NxMM6/gl6oRgjAfBgNVHSMEGDAWgBRj
+VA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNIADBFAiAYM2RESU1NGMeB
+S287Dz9/pd0hJWUVAx2jH9f/jRsQ/QIhAOdcvxcaOJB6kyoWeeXVtCPmoWZynYI/
+7IRPIu85iRKk
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-01-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEICRu6mYqRMtt6T7/1hTpbTcV3oz7bU6XVkTuXmbst5x5oAoGCCqGSM49
+AwEHoUQDQgAEKj1zcPIgm7E5tCym2V2/L3AYiLRxjjLGOucTJxReBRh4aLUo8amd
+JG8UcLDM2FXulDg1Ju4JDeC7L94Dj+4+Cw==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-02-Cert.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5TCCAYugAwIBAgIIJWk4PSS7NuowCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjEwIBcNMjQxMjEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFAxIjAgBgNVBAMM
+GU1hdHRlciBEZXYgREFDIFJldm9rZWQgMDIxFDASBgorBgEEAYKifAIBDARGRkYx
+MRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BNlxPEillSfpPno+VJ6PsOAIKdSgLIzt8o39dGcrABmMfuQ/NeOs4dGrSXsy3eTN
+1qhHYWIZHJUUrve/EV+2xHKjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQD
+AgeAMB0GA1UdDgQWBBTjr5GCszQP3IXHpYtLOISmVUsxTzAfBgNVHSMEGDAWgBRj
+VA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNIADBFAiEAr76P8JYuh1ow
+VO5aLfXEx4wFRltA0xA/mfflYoeA+QMCIBphV/DfeCMiOuJKo6j3phN7SRTGtvXk
+Cil9erdx6cvG
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-02-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEICL40ZprUkEw7MrV0YfOjrfqnX/9WGi04MqRvCtshDmcoAoGCCqGSM49
+AwEHoUQDQgAE2XE8SKWVJ+k+ej5Uno+w4Agp1KAsjO3yjf10ZysAGYx+5D8146zh
+0atJezLd5M3WqEdhYhkclRSu978RX7bEcg==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-03-Cert.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5jCCAYugAwIBAgIICrBCSUMj/lQwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjEwIBcNMjQxMjEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFAxIjAgBgNVBAMM
+GU1hdHRlciBEZXYgREFDIFJldm9rZWQgMDMxFDASBgorBgEEAYKifAIBDARGRkYx
+MRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BCLlc2XpiZD/dQbhHr7DP/g0o5mZ8tnWNe9YR+vgWNh9G/vh5eJBG7bcEfPyfoQs
+wMyr4CpPJp1Q9coHKiY12wSjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQD
+AgeAMB0GA1UdDgQWBBQq0efT8UgAKTZu5MXwcQfySp2brTAfBgNVHSMEGDAWgBRj
+VA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNJADBGAiEA5mlgzDtuph+I
+ML94iDAWa1xqMY6DKEYEqVvCZVvYdOsCIQD1A4Bnl6USq1CTEugIL8goYiaW09dQ
+H38+aLYav+W9uA==
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-03-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJjC2LN18deS5XLHAbR0Dn+4Gp6cyTaqKg+HbOja5VeMoAoGCCqGSM49
+AwEHoUQDQgAEIuVzZemJkP91BuEevsM/+DSjmZny2dY171hH6+BY2H0b++Hl4kEb
+ttwR8/J+hCzAzKvgKk8mnVD1ygcqJjXbBA==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-CRL.pem

@@ -0,0 +1,9 @@
+-----BEGIN X509 CRL-----
+MIIBSjCB8gIBATAKBggqhkjOPQQDAjA9MSUwIwYDVQQDDBxNYXR0ZXIgRGV2IFBB
+SSAweEZGRjEgbm8gUElEMRQwEgYKKwYBBAGConwCAQwERkZGMRcNMjQxMjE2MTEx
+NjA2WhgPMjEyNDEyMTcxMTE2MDZaMFEwGQIICrBCSUMj/lQXDTI0MTIxMzA3MTUz
+MlowGQIIGTZ9l46sUzoXDTI0MTIxMzA3MTUyNFowGQIIJWk4PSS7NuoXDTI0MTIx
+MzA3MTUyOFqgLzAtMB8GA1UdIwQYMBaAFGNUDkf2Sxw40TiEpGLRbBldj/s8MAoG
+A1UdFAQDAgEEMAoGCCqGSM49BAMCA0cAMEQCIByf5LFJrnfa/5jA6PfQmaJcJ7Jl
+gv6bezlfodLtO8CqAiBL1+I4+ETEN0h0+rvkM5CQWoLK76XNb92OV1Mn9E3DQw==
+-----END X509 CRL-----

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-Cert.der

@@ -0,0 +1 @@
+../../development/attestation/Matter-Development-PAI-FFF1-noPID-Cert.der

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-Cert.pem

@@ -0,0 +1 @@
+../../development/attestation/Matter-Development-PAI-FFF1-noPID-Cert.pem

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-Key.der

@@ -0,0 +1 @@
+../../development/attestation/Matter-Development-PAI-FFF1-noPID-Key.der

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-Key.pem

@@ -0,0 +1 @@
+../../development/attestation/Matter-Development-PAI-FFF1-noPID-Key.pem

examples/all-clusters-app/linux/AppOptions.cpp

@@ -29,14 +29,11 @@ using chip::ArgParser::OptionDef;
 using chip::ArgParser::OptionSet;
 using chip::ArgParser::PrintArgError;
 
-constexpr uint16_t kOptionDacProviderFilePath        = 0xFF01;
 constexpr uint16_t kOptionMinCommissioningTimeout    = 0xFF02;
 constexpr uint16_t kOptionEndUserSupportFilePath     = 0xFF03;
 constexpr uint16_t kOptionNetworkDiagnosticsFilePath = 0xFF04;
 constexpr uint16_t kOptionCrashFilePath              = 0xFF05;
 
-static chip::Credentials::Examples::TestHarnessDACProvider mDacProvider;
-
 static chip::Optional<std::string> sEndUserSupportLogFilePath;
 static chip::Optional<std::string> sNetworkDiagnosticsLogFilePath;
 static chip::Optional<std::string> sCrashLogFilePath;
@@ -51,9 +48,6 @@ bool AppOptions::HandleOptions(const char * program, OptionSet * options, int id
     bool retval = true;
     switch (identifier)
     {
-    case kOptionDacProviderFilePath:
-        mDacProvider.Init(value);
-        break;
     case kOptionMinCommissioningTimeout: {
         auto & commissionMgr = chip::Server::GetInstance().GetCommissioningWindowManager();
         commissionMgr.OverrideMinCommissioningTimeout(chip::System::Clock::Seconds16(static_cast<uint16_t>(atoi(value))));
@@ -92,7 +86,6 @@ bool AppOptions::HandleOptions(const char * program, OptionSet * options, int id
 OptionSet * AppOptions::GetOptions()
 {
     static OptionDef optionsDef[] = {
-        { "dac_provider", kArgumentRequired, kOptionDacProviderFilePath },
         { "min_commissioning_timeout", kArgumentRequired, kOptionMinCommissioningTimeout },
         { "end_user_support_log", kArgumentRequired, kOptionEndUserSupportFilePath },
         { "network_diagnostics_log", kArgumentRequired, kOptionNetworkDiagnosticsFilePath },
@@ -102,8 +95,6 @@ OptionSet * AppOptions::GetOptions()
 
     static OptionSet options = {
         AppOptions::HandleOptions, optionsDef, "PROGRAM OPTIONS",
-        "  --dac_provider <filepath>\n"
-        "       A json file with data used by the example dac provider to validate device attestation procedure.\n"
         "  --min_commissioning_timeout <value>\n"
         "       The minimum time in seconds during which commissioning session establishment is allowed by the Node.\n"
         "  --end_user_support_log <value>\n"
@@ -117,11 +108,6 @@ OptionSet * AppOptions::GetOptions()
     return &options;
 }
 
-chip::Credentials::DeviceAttestationCredentialsProvider * AppOptions::GetDACProvider()
-{
-    return &mDacProvider;
-}
-
 chip::Optional<std::string> AppOptions::GetEndUserSupportLogFilePath()
 {
     return sEndUserSupportLogFilePath;

examples/all-clusters-app/linux/AppOptions.h

@@ -20,15 +20,12 @@
 
 #include "AppMain.h"
 
-#include <app/tests/suites/credentials/TestHarnessDACProvider.h>
-
 #include <string>
 
 class AppOptions
 {
 public:
     static chip::ArgParser::OptionSet * GetOptions();
-    static chip::Credentials::DeviceAttestationCredentialsProvider * GetDACProvider();
     static chip::Optional<std::string> GetEndUserSupportLogFilePath();
     static chip::Optional<std::string> GetNetworkDiagnosticsLogFilePath();
     static chip::Optional<std::string> GetCrashLogFilePath();

examples/all-clusters-app/linux/BUILD.gn

@@ -93,7 +93,6 @@ source_set("chip-all-clusters-common") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/platform/linux:app-main",
     "${chip_root}/src/app:attribute-persistence",
-    "${chip_root}/src/app/tests/suites/credentials:dac_provider",
     "${chip_root}/src/lib",
     "${chip_root}/third_party/jsoncpp",
   ]

examples/all-clusters-app/linux/main.cpp

@@ -31,8 +31,6 @@ int main(int argc, char * argv[])
         ChipLinuxAppInit(argc, argv, AppOptions::GetOptions(), chip::MakeOptional(kNetworkCommissioningEndpointSecondary)) == 0);
     VerifyOrDie(InitBindingHandlers() == CHIP_NO_ERROR);
 
-    LinuxDeviceOptions::GetInstance().dacProvider = AppOptions::GetDACProvider();
-
     ChipLinuxAppMainLoop();
 
     return 0;

examples/all-clusters-minimal-app/linux/AppOptions.cpp

@@ -25,19 +25,13 @@ using chip::ArgParser::OptionDef;
 using chip::ArgParser::OptionSet;
 using chip::ArgParser::PrintArgError;
 
-constexpr uint16_t kOptionDacProviderFilePath     = 0xFF01;
 constexpr uint16_t kOptionMinCommissioningTimeout = 0xFF02;
 
-static chip::Credentials::Examples::TestHarnessDACProvider mDacProvider;
-
 bool AppOptions::HandleOptions(const char * program, OptionSet * options, int identifier, const char * name, const char * value)
 {
     bool retval = true;
     switch (identifier)
     {
-    case kOptionDacProviderFilePath:
-        mDacProvider.Init(value);
-        break;
     case kOptionMinCommissioningTimeout: {
         auto & commissionMgr = chip::Server::GetInstance().GetCommissioningWindowManager();
         commissionMgr.OverrideMinCommissioningTimeout(chip::System::Clock::Seconds16(static_cast<uint16_t>(atoi(value))));
@@ -55,23 +49,14 @@ bool AppOptions::HandleOptions(const char * program, OptionSet * options, int id
 OptionSet * AppOptions::GetOptions()
 {
     static OptionDef optionsDef[] = {
-        { "dac_provider", chip::ArgParser::kArgumentRequired, kOptionDacProviderFilePath },
         { "min_commissioning_timeout", chip::ArgParser::kArgumentRequired, kOptionMinCommissioningTimeout },
         {},
     };
 
     static OptionSet options = {
         AppOptions::HandleOptions, optionsDef, "PROGRAM OPTIONS",
-        "  --dac_provider <filepath>\n"
-        "       A json file with data used by the example dac provider to validate device attestation procedure.\n"
         "  --min_commissioning_timeout <value>\n"
         "       The minimum time in seconds during which commissioning session establishment is allowed by the Node.\n"
     };
-
     return &options;
 }
-
-chip::Credentials::DeviceAttestationCredentialsProvider * AppOptions::GetDACProvider()
-{
-    return &mDacProvider;
-}

examples/all-clusters-minimal-app/linux/AppOptions.h

@@ -20,13 +20,10 @@
 
 #include "AppMain.h"
 
-#include <app/tests/suites/credentials/TestHarnessDACProvider.h>
-
 class AppOptions
 {
 public:
     static chip::ArgParser::OptionSet * GetOptions();
-    static chip::Credentials::DeviceAttestationCredentialsProvider * GetDACProvider();
 
 private:
     static bool HandleOptions(const char * program, chip::ArgParser::OptionSet * options, int identifier, const char * name,

examples/all-clusters-minimal-app/linux/BUILD.gn

@@ -34,7 +34,6 @@ source_set("chip-all-clusters-common") {
   deps = [
     "${chip_root}/examples/all-clusters-minimal-app/all-clusters-common",
     "${chip_root}/examples/platform/linux:app-main",
-    "${chip_root}/src/app/tests/suites/credentials:dac_provider",
     "${chip_root}/src/lib",
   ]
 

examples/all-clusters-minimal-app/linux/main.cpp

@@ -31,8 +31,6 @@ int main(int argc, char * argv[])
         ChipLinuxAppInit(argc, argv, AppOptions::GetOptions(), chip::MakeOptional(kNetworkCommissioningEndpointSecondary)) == 0);
     VerifyOrDie(InitBindingHandlers() == CHIP_NO_ERROR);
 
-    LinuxDeviceOptions::GetInstance().dacProvider = AppOptions::GetDACProvider();
-
     ChipLinuxAppMainLoop();
     return 0;
 }

examples/chip-tool/commands/pairing/PairingCommand.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (c) 2020 Project CHIP Authors
+ *   Copyright (c) 2020-2024 Project CHIP Authors
  *   All rights reserved.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -129,6 +129,20 @@ CommissioningParameters PairingCommand::GetCommissioningParameters()
         params.SetCountryCode(CharSpan::fromCharString(mCountryCode.Value()));
     }
 
+    // Default requiring TCs to false, to preserve release 1.3 chip-tool behavior
+    params.SetRequireTermsAndConditionsAcknowledgement(mRequireTCAcknowledgements.ValueOr(false));
+
+    // mTCAcknowledgements and mTCAcknowledgementVersion are optional, but related. When one is missing, default the value to 0, to
+    // increase the test tools ability to test the applications.
+    if (mTCAcknowledgements.HasValue() || mTCAcknowledgementVersion.HasValue())
+    {
+        TermsAndConditionsAcknowledgement termsAndConditionsAcknowledgement = {
+            .acceptedTermsAndConditions        = mTCAcknowledgements.ValueOr(0),
+            .acceptedTermsAndConditionsVersion = mTCAcknowledgementVersion.ValueOr(0),
+        };
+        params.SetTermsAndConditionsAcknowledgement(termsAndConditionsAcknowledgement);
+    }
+
     // mTimeZoneList is an optional argument managed by TypedComplexArgument mComplex_TimeZones.
     // Since optional Complex arguments are not currently supported via the <chip::Optional> class,
     // we will use mTimeZoneList.data() value to determine if the argument was provided.

examples/chip-tool/commands/pairing/PairingCommand.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (c) 2020 Project CHIP Authors
+ *   Copyright (c) 2020-2024 Project CHIP Authors
  *   All rights reserved.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -202,6 +202,19 @@ class PairingCommand : public CHIPCommand,
             AddArgument("dst-offset", &mComplex_DSTOffsets,
                         "DSTOffset list to use when setting Time Synchronization cluster's DSTOffset attribute",
                         Argument::kOptional);
+
+            AddArgument("require-tc-acknowledgements", 0, 1, &mRequireTCAcknowledgements,
+                        "Indicates whether Terms and Conditions acknowledgements are required during commissioning. If set to "
+                        "true, the tc-acknowledgements and tc-acknowledgements-version arguments must be provided for the "
+                        "commissioning to succeed. If false, the T&C acknowledgement step will be skipped.");
+
+            AddArgument("tc-acknowledgements", 0, UINT16_MAX, &mTCAcknowledgements,
+                        "Bit-field value indicating which Terms and Conditions have been accepted by the user. This value is sent "
+                        "to the device during commissioning via the General Commissioning cluster");
+
+            AddArgument("tc-acknowledgements-version", 0, UINT16_MAX, &mTCAcknowledgementVersion,
+                        "Version number of the Terms and Conditions that were accepted by the user. This value is sent to the "
+                        "device during commissioning to indicate which T&C version was acknowledged");
         }
 
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
@@ -259,6 +272,9 @@ class PairingCommand : public CHIPCommand,
     chip::Optional<uint64_t> mICDMonitoredSubject;
     chip::Optional<chip::app::Clusters::IcdManagement::ClientTypeEnum> mICDClientType;
     chip::Optional<uint32_t> mICDStayActiveDurationMsec;
+    chip::Optional<bool> mRequireTCAcknowledgements;
+    chip::Optional<uint16_t> mTCAcknowledgements;
+    chip::Optional<uint16_t> mTCAcknowledgementVersion;
     chip::app::DataModel::List<chip::app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type> mTimeZoneList;
     TypedComplexArgument<chip::app::DataModel::List<chip::app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type>>
         mComplex_TimeZones;

examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter

@@ -1678,10 +1678,10 @@ cluster IcdManagement = 70 {
   readonly attribute access(read: administer) optional MonitoringRegistrationStruct registeredClients[] = 3;
   readonly attribute access(read: administer) optional int32u ICDCounter = 4;
   readonly attribute optional int16u clientsSupportedPerFabric = 5;
-  provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
-  provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
-  provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
-  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
+  readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
+  readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
+  readonly attribute optional OperatingModeEnum operatingMode = 8;
+  readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;

examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter

@@ -1678,10 +1678,10 @@ cluster IcdManagement = 70 {
   readonly attribute access(read: administer) optional MonitoringRegistrationStruct registeredClients[] = 3;
   readonly attribute access(read: administer) optional int32u ICDCounter = 4;
   readonly attribute optional int16u clientsSupportedPerFabric = 5;
-  provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
-  provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
-  provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
-  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
+  readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
+  readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
+  readonly attribute optional OperatingModeEnum operatingMode = 8;
+  readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;